Skip to content

feat: Login Box: Show info message when page directs to login page #5531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Nov 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3af3294
flash message added during login
Draco9421 Nov 8, 2020
a78c1f1
flash message added during login with changed UI
Draco9421 Nov 9, 2020
f292706
testing error solved
Draco9421 Nov 17, 2020
d37cffa
Delete flash-message.js
Draco9421 Nov 17, 2020
71ec5f8
Update test-helper.js
Draco9421 Nov 17, 2020
90daf9f
added flash-message when add speaker is clicked
Draco9421 Nov 18, 2020
138615a
Merge branch 'development' into development
Draco9421 Nov 18, 2020
0da495f
added flash-message when add speaker is clicked
Draco9421 Nov 18, 2020
8457707
Merge remote-tracking branch 'upstream/development' into development
Draco9421 Nov 18, 2020
2021725
added flash-message when add speaker is clicked
Draco9421 Nov 18, 2020
ee8ba06
added flash-message when add speaker is clicked
Draco9421 Nov 18, 2020
c7eb75b
added flash-message when add speaker is click
Draco9421 Nov 18, 2020
4a7b7d4
change the message shown
Draco9421 Nov 19, 2020
db67828
Update call-for-speakers.js
Draco9421 Nov 19, 2020
5087262
Added alert message to Order button
Draco9421 Nov 19, 2020
6a89307
Added alert message to Order button
Draco9421 Nov 19, 2020
6de23d2
Merge branch 'development' into development
Draco9421 Nov 19, 2020
5e7d150
Merge branch 'development' of https://github.com/Draco9421/open-event…
Draco9421 Nov 19, 2020
6a8bad6
Added alert message to Order button
Draco9421 Nov 19, 2020
bd3e868
added alert message in login-signUp modal
Draco9421 Nov 23, 2020
d8b3582
Merge branch 'development' into development
Draco9421 Nov 23, 2020
6c0b05a
added alert message in login-signUp modal
Draco9421 Nov 23, 2020
af12b5e
Merge branch 'development' of https://github.com/Draco9421/open-event…
Draco9421 Nov 23, 2020
d690c71
Merge branch 'development' into development
Draco9421 Nov 25, 2020
0c42856
Merge branch 'development' into development
Draco9421 Nov 26, 2020
d2aea01
Merge branch 'development' into development
Draco9421 Nov 27, 2020
7a509de
changed style of modal flash-message
Draco9421 Nov 27, 2020
18f775c
designing changes
Draco9421 Nov 27, 2020
164d846
Done
Draco9421 Nov 27, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/components/public/call-for-speakers.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ export default class CallForSpeakers extends Component {
if (this.session.isAuthenticated) {
this.router.transitionTo('public.cfs.new-speaker');
} else {
this.flashMessages.add({
message : 'In order to add Speaker details you need to login',
type : 'info',
preventDuplicates : true
});
this.set('isLoginModalOpen', true);
}
}
Expand Down
5 changes: 5 additions & 0 deletions app/controllers/public/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ export default class IndexController extends Controller {
}
if (!this.session.isAuthenticated) {
this.set('userExists', false);
this.flashMessages.add({
message : 'In order to buy tickets you need to login. If you have not registered yet, please create an account first. Thank you!',
type : 'info',
preventDuplicates : true
});
this.set('isLoginModalOpen', true);
return;
}
Expand Down
17 changes: 17 additions & 0 deletions app/routes/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,31 @@ import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
import { inject as service } from '@ember/service';

@classic
export default class CreateRoute extends Route.extend(AuthenticatedRouteMixin, EventWizardMixin) {

@service
session;

titleToken() {
return this.l10n.t('Create an Event');
}

beforeModel() {
if (!this.session.isAuthenticated) {
this.flashMessages.add({
message : 'Please login to create an event. If you have not registered yet, please create an account first. Thank you!',
type : 'negative',
preventDuplicates : true
});
}
super.beforeModel(...arguments);
}

async model() {

return {
event: this.store.createRecord('event', {
socialLinks : [],
Expand Down
3 changes: 0 additions & 3 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
class="ui fluid container main-container {{unless this.device.isInternetExplorer 'flexed-container' ''}}">
{{outlet}}
</div>


<FooterMain @socialLinks={{this.model.socialLinks}} />

</div>
</SideBar>
<Modals::ConfirmModal @isOpen={{this.confirm.isOpen}} />
Expand Down
11 changes: 10 additions & 1 deletion app/templates/components/forms/login-form.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
<div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid">
<div class="ui stackable {{unless this.noSocial 'three' 'one'}} column doubling centered grid mt-4">
<div class="flash-messages ui container">
{{#each flashMessages.queue as |flash|}}
<div class="ui {{flash.type}} message">
<div>
<FlashMessage @flash = {{flash}}/>
</div>
</div>
{{/each}}
</div>
<div class="column">
<form class="ui large form" autocomplete="off">
<div class="ui aligned segment basic no margin no padding">
Expand Down
9 changes: 9 additions & 0 deletions app/templates/components/modals/login-signup-modal.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<div class="flash-messages m-2">
{{#each flashMessages.queue as |flash|}}
<div class="ui {{flash.type}} message">
<div>
<FlashMessage @flash = {{flash}}/>
</div>
</div>
{{/each}}
</div>
{{#if (eq this.session.currentRouteName 'public.cfs.index')}}
<i class="black close icon"></i>
<div class="header">
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"ember-cli-document-title-northm": "^1.0.3",
"ember-cli-dotenv": "^3.1.0",
"ember-cli-fastboot": "^2.2.3",
"ember-cli-flash": "^2.0.0",
"ember-cli-head": "^1.0.0",
"ember-cli-html-minifier": "^1.1.0",
"ember-cli-htmlbars": "^5.3.1",
Expand Down
19 changes: 18 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6401,7 +6401,7 @@ ember-cli-babel@^5.2.4:
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

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.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:
version "6.18.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
dependencies:
Expand Down Expand Up @@ -6623,6 +6623,15 @@ ember-cli-fastboot@^2.2.3:
md5-hex "^2.0.0"
silent-error "^1.1.0"

ember-cli-flash@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-flash/-/ember-cli-flash-2.0.0.tgz#f32b00a7d1811d883a43ccb4ddbe671e06584f2c"
integrity sha512-haytN365mp20K/fAocXN+2u0hn720qIKRkVQM6KJ+fWu3kbsK1vzMzzPlQslRCZ2MvfBpMSO2c8rpl93y4TsGg==
dependencies:
ember-cli-babel "^7.18.0"
ember-cli-htmlbars "^4.2.3"
ember-runtime-enumerable-includes-polyfill "^2.1.0"

ember-cli-get-component-path-option@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
Expand Down Expand Up @@ -7742,6 +7751,14 @@ ember-runtime-enumerable-includes-polyfill@2.0.0:
ember-cli-babel "^6.0.0"
ember-cli-version-checker "^1.1.6"

ember-runtime-enumerable-includes-polyfill@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5"
integrity sha512-au18iI8VbEDYn3jLFZzETnKN5ciPgCUxMRucEP3jkq7qZ6sE0FVKpWMPY/h9tTND3VOBJt6fgPpEBJoJVCUudg==
dependencies:
ember-cli-babel "^6.9.0"
ember-cli-version-checker "^2.1.0"

ember-simple-auth-token@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/ember-simple-auth-token/-/ember-simple-auth-token-5.2.0.tgz#064aee11a5bc4b84da80ce9bb4fa980865823fde"
Expand Down