Skip to content

Commit 1433dac

Browse files
Draco9421Draco9421
authored
feat: Login Box: Show info message when page directs to login page (#5531)
* flash message added during login * flash message added during login with changed UI * testing error solved * Delete flash-message.js * Update test-helper.js * added flash-message when add speaker is clicked * added flash-message when add speaker is clicked * added flash-message when add speaker is clicked * added flash-message when add speaker is click * change the message shown * Update call-for-speakers.js * Added alert message to Order button * Added alert message to Order button * Added alert message to Order button * added alert message in login-signUp modal * added alert message in login-signUp modal * changed style of modal flash-message * designing changes * Done
1 parent e80b30f commit 1433dac

File tree

8 files changed

+65
-5
lines changed

8 files changed

+65
-5
lines changed

‎app/components/public/call-for-speakers.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ export default class CallForSpeakers extends Component {
1313
if (this.session.isAuthenticated) {
1414
this.router.transitionTo('public.cfs.new-speaker');
1515
} else {
16+
this.flashMessages.add({
17+
message : 'In order to add Speaker details you need to login',
18+
type : 'info',
19+
preventDuplicates : true
20+
});
1621
this.set('isLoginModalOpen', true);
1722
}
1823
}

‎app/controllers/public/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ export default class IndexController extends Controller {
105105
}
106106
if (!this.session.isAuthenticated) {
107107
this.set('userExists', false);
108+
this.flashMessages.add({
109+
message : 'In order to buy tickets you need to login. If you have not registered yet, please create an account first. Thank you!',
110+
type : 'info',
111+
preventDuplicates : true
112+
});
108113
this.set('isLoginModalOpen', true);
109114
return;
110115
}

‎app/routes/create.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,31 @@ import classic from 'ember-classic-decorator';
22
import Route from '@ember/routing/route';
33
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
44
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
5+
import { inject as service } from '@ember/service';
56

67
@classic
78
export default class CreateRoute extends Route.extend(AuthenticatedRouteMixin, EventWizardMixin) {
9+
10+
@service
11+
session;
12+
813
titleToken() {
914
return this.l10n.t('Create an Event');
1015
}
1116

17+
beforeModel() {
18+
if (!this.session.isAuthenticated) {
19+
this.flashMessages.add({
20+
message : 'Please login to create an event. If you have not registered yet, please create an account first. Thank you!',
21+
type : 'negative',
22+
preventDuplicates : true
23+
});
24+
}
25+
super.beforeModel(...arguments);
26+
}
27+
1228
async model() {
29+
1330
return {
1431
event: this.store.createRecord('event', {
1532
socialLinks : [],

‎app/templates/application.hbs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
class="ui fluid container main-container {{unless this.device.isInternetExplorer 'flexed-container' ''}}">
2020
{{outlet}}
2121
</div>
22-
23-
2422
<FooterMain @socialLinks={{this.model.socialLinks}} />
25-
2623
</div>
2724
</SideBar>
2825
<Modals::ConfirmModal @isOpen={{this.confirm.isOpen}} />

‎app/templates/components/forms/login-form.hbs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
<div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid">
1+
<div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid mt-4">
2+
<div class="flash-messages ui container">
3+
{{#each flashMessages.queue as |flash|}}
4+
<div class="ui {{flash.type}} message">
5+
<div>
6+
<FlashMessage @flash = {{flash}}/>
7+
</div>
8+
</div>
9+
{{/each}}
10+
</div>
211
<div class="column">
312
<form class="ui large form" autocomplete="off">
413
<div class="ui aligned segment basic no margin no padding">

‎app/templates/components/modals/login-signup-modal.hbs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
<div class="flash-messages m-2">
2+
{{#each flashMessages.queue as |flash|}}
3+
<div class="ui {{flash.type}} message">
4+
<div>
5+
<FlashMessage @flash = {{flash}}/>
6+
</div>
7+
</div>
8+
{{/each}}
9+
</div>
110
{{#if (eq this.session.currentRouteName 'public.cfs.index')}}
211
<i class="black close icon"></i>
312
<div class="header">

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"ember-cli-document-title-northm": "^1.0.3",
8181
"ember-cli-dotenv": "^3.1.0",
8282
"ember-cli-fastboot": "^2.2.3",
83+
"ember-cli-flash": "^2.0.0",
8384
"ember-cli-head": "^1.0.0",
8485
"ember-cli-html-minifier": "^1.1.0",
8586
"ember-cli-htmlbars": "^5.3.1",

‎yarn.lock

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6401,7 +6401,7 @@ ember-cli-babel@^5.2.4:
64016401
ember-cli-version-checker "^1.0.2"
64026402
resolve "^1.1.2"
64036403

6404-
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
6404+
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0:
64056405
version "6.18.0"
64066406
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
64076407
dependencies:
@@ -6623,6 +6623,15 @@ ember-cli-fastboot@^2.2.3:
66236623
md5-hex "^2.0.0"
66246624
silent-error "^1.1.0"
66256625

6626+
ember-cli-flash@^2.0.0:
6627+
version "2.0.0"
6628+
resolved "https://registry.yarnpkg.com/ember-cli-flash/-/ember-cli-flash-2.0.0.tgz#f32b00a7d1811d883a43ccb4ddbe671e06584f2c"
6629+
integrity sha512-haytN365mp20K/fAocXN+2u0hn720qIKRkVQM6KJ+fWu3kbsK1vzMzzPlQslRCZ2MvfBpMSO2c8rpl93y4TsGg==
6630+
dependencies:
6631+
ember-cli-babel "^7.18.0"
6632+
ember-cli-htmlbars "^4.2.3"
6633+
ember-runtime-enumerable-includes-polyfill "^2.1.0"
6634+
66266635
ember-cli-get-component-path-option@^1.0.0:
66276636
version "1.0.0"
66286637
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
@@ -7742,6 +7751,14 @@ ember-runtime-enumerable-includes-polyfill@2.0.0:
77427751
ember-cli-babel "^6.0.0"
77437752
ember-cli-version-checker "^1.1.6"
77447753

7754+
ember-runtime-enumerable-includes-polyfill@^2.1.0:
7755+
version "2.1.0"
7756+
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
7757+
integrity sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==
7758+
dependencies:
7759+
ember-cli-babel "^6.9.0"
7760+
ember-cli-version-checker "^2.1.0"
7761+
77457762
ember-simple-auth-token@^5.2.0:
77467763
version "5.2.0"
77477764
resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-5.2.0.tgz#064aee11a5bc4b84da80ce9bb4fa980865823fde"

0 commit comments

Comments
 (0)