diff --git a/app/pods/application/route.js b/app/pods/application/route.js index 38000bd..e3173ee 100644 --- a/app/pods/application/route.js +++ b/app/pods/application/route.js @@ -1,17 +1,7 @@ import Ember from 'ember'; import ApplicationRouteMixin from 'simple-auth/mixins/application-route-mixin'; -// import parseBase64 from '../../utils/parse-base64'; export default Ember.Route.extend(ApplicationRouteMixin, { - // model: function() { - // let token = this.get('session.secure.token'); - // if (Ember.isNone(token)) { - // return null; - // } - // let user = parseBase64(token); - // return this.store.find('user', user.sub); - // }, - actions: { invalidateSession: function() { this.get('session').invalidate().then(() => { diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs deleted file mode 100644 index e31c7fa..0000000 --- a/app/pods/application/template.hbs +++ /dev/null @@ -1,53 +0,0 @@ -{{#x-application}} -
- {{site-logo}} - {{#if session.isAuthenticated}} - -

- {{session.currentUser.name}}
- Logout -

- {{else}} -

- {{link-to 'Login' 'login'}} -
- {{link-to 'Sign Up' 'users.new'}} -

- {{/if}} -
- -
-
- {{site-logo}} - - - -
- -
- {{#each flashMessages.queue as |flash|}} - {{custom-flash-message flash=flash}} - {{/each}} - {{outlet}} -
-
-{{/x-application}} diff --git a/app/pods/components/x-application/component.js b/app/pods/components/x-application/component.js index 79540b0..27c8d25 100644 --- a/app/pods/components/x-application/component.js +++ b/app/pods/components/x-application/component.js @@ -7,4 +7,11 @@ export default Ember.Component.extend({ FlakesFrame.init(); }, + actions: { + invalidateSession: function() { + this.sendAction('invalidateSession'); + }, + + }, + }); diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs index 889d9ee..7fd81aa 100644 --- a/app/pods/components/x-application/template.hbs +++ b/app/pods/components/x-application/template.hbs @@ -1 +1,51 @@ -{{yield}} +
+ {{site-logo}} + {{#if session.isAuthenticated}} + +

+ {{session.currentUser.name}}
+ Logout +

+ {{else}} +

+ {{link-to 'Login' 'login'}} +
+ {{link-to 'Sign Up' 'users.new'}} +

+ {{/if}} +
+ +
+
+ {{site-logo}} + + + +
+ +
+ {{#each flashMessages.queue as |flash|}} + {{custom-flash-message flash=flash}} + {{/each}} + {{yield}} +
+
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs index c851114..8f07896 100644 --- a/app/pods/login/template.hbs +++ b/app/pods/login/template.hbs @@ -1,6 +1,4 @@ -{{#if loggedIn}} -

You are already logged in!

-{{else}} +{{#x-application invalidateSession="invalidateSession"}} {{#if loading}} {{loading-panel}} {{else}} @@ -11,4 +9,4 @@ {{input class="button-gray" type="submit" value="Log In"}} {{/if}} -{{/if}} +{{/x-application}} diff --git a/app/pods/protected/route.js b/app/pods/protected/route.js index b435021..a665e94 100644 --- a/app/pods/protected/route.js +++ b/app/pods/protected/route.js @@ -1,9 +1,12 @@ import Ember from 'ember'; import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; +import parseBase64 from '../../utils/parse-base64'; export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { - let user = this.get('session.secure.currentUser'); - console.log(user); - } + let token = this.get('session.secure.token'); + let user = parseBase64(token); + return this.store.find('user', user.sub); + }, + }); diff --git a/app/pods/protected/species/edit/controller.js b/app/pods/protected/species/edit/controller.js index 385e70d..d8fae89 100644 --- a/app/pods/protected/species/edit/controller.js +++ b/app/pods/protected/species/edit/controller.js @@ -7,12 +7,12 @@ export default Ember.Controller.extend({ if (species.get('isDirty')) { species.save().then((species) => { - this.transitionToRoute('species.show', species); + this.transitionToRoute('protected.species.show', species); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { - this.transitionToRoute('species.show', species); + this.transitionToRoute('protected.species.show', species); } }, @@ -22,7 +22,7 @@ export default Ember.Controller.extend({ species.get('errors').clear(); species.rollback(); - this.transitionToRoute('species.show', species); + this.transitionToRoute('protected.species.show', species); }, }, diff --git a/app/pods/protected/species/new/controller.js b/app/pods/protected/species/new/controller.js index b3cb74e..dfe5127 100644 --- a/app/pods/protected/species/new/controller.js +++ b/app/pods/protected/species/new/controller.js @@ -7,18 +7,18 @@ export default Ember.Controller.extend({ if (species.get('isDirty')) { species.save().then((species) => { - this.transitionToRoute('species.show', species.get('id')); + this.transitionToRoute('protected.species.show', species.get('id')); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { species.deleteRecord(); - this.transitionToRoute('species.index'); + this.transitionToRoute('protected.species.index'); } }, cancel: function() { - this.transitionToRoute('species.index'); + this.transitionToRoute('protected.species.index'); }, }, diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js index f79a682..0b26876 100644 --- a/app/pods/protected/strains/edit/controller.js +++ b/app/pods/protected/strains/edit/controller.js @@ -7,23 +7,23 @@ export default Ember.Controller.extend({ if (strain.get('isDirty')) { strain.save().then((strain) => { - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { strain.deleteRecord(); - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); } }, cancel: function() { - let strain = this.get('strain'); + let strain = this.get('protected.strain'); strain.get('errors').clear(); strain.rollback(); - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, }, diff --git a/app/pods/protected/strains/new/controller.js b/app/pods/protected/strains/new/controller.js index fa0bcf2..3041572 100644 --- a/app/pods/protected/strains/new/controller.js +++ b/app/pods/protected/strains/new/controller.js @@ -7,17 +7,17 @@ export default Ember.Controller.extend({ if (strain.get('isDirty')) { strain.save().then((strain) => { - this.transitionToRoute('strains.show', strain); + this.transitionToRoute('protected.strains.show', strain); }, (err) => { this.get('flashMessages').error(err.responseJSON.error); }); } else { - this.transitionToRoute('strains.index'); + this.transitionToRoute('protected.strains.index'); } }, cancel: function() { - this.transitionToRoute('strains.index'); + this.transitionToRoute('protected.strains.index'); }, }, diff --git a/app/pods/protected/template.hbs b/app/pods/protected/template.hbs new file mode 100644 index 0000000..dd9b46a --- /dev/null +++ b/app/pods/protected/template.hbs @@ -0,0 +1,3 @@ +{{#x-application invalidateSession="invalidateSession"}} + {{outlet}} +{{/x-application}} diff --git a/app/pods/users/template.hbs b/app/pods/users/template.hbs new file mode 100644 index 0000000..dd9b46a --- /dev/null +++ b/app/pods/users/template.hbs @@ -0,0 +1,3 @@ +{{#x-application invalidateSession="invalidateSession"}} + {{outlet}} +{{/x-application}}