Wait to load until currentUser returns

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(() => {

app/pods/application/template.hbs

@@ -1,53 +0,0 @@
-{{#x-application}}
-  <div class="flakes-navigation">
-    {{site-logo}}
-    {{#if session.isAuthenticated}}
-      <ul>
-        {{#link-to 'protected.compare' tagName='li' href=false}}
-          {{link-to 'Compare' 'protected.compare'}}
-        {{/link-to}}
-        {{#link-to 'protected.measurements' tagName='li' href=false}}
-          {{link-to 'Measurements' 'protected.measurements'}}
-        {{/link-to}}
-        {{#link-to 'protected.characteristics' tagName='li' href=false}}
-          {{link-to 'Characteristics' 'protected.characteristics'}}
-        {{/link-to}}
-        {{#link-to 'protected.species' tagName='li' href=false}}
-          {{link-to 'Species' 'protected.species'}}
-        {{/link-to}}
-        {{#link-to 'protected.strains' tagName='li' href=false}}
-          {{link-to 'Strains' 'protected.strains'}}
-        {{/link-to}}
-        {{#link-to 'protected.about' tagName='li' href=false}}
-          {{link-to 'About' 'protected.about'}}
-        {{/link-to}}
-      </ul>
-      <p class="foot">
-        {{session.currentUser.name}}<br>
-        <a {{action 'invalidateSession'}}>Logout</a>
-      </p>
-    {{else}}
-      <p class="foot">
-        {{link-to 'Login' 'login'}}
-        <br>
-        {{link-to 'Sign Up' 'users.new'}}
-      </p>
-    {{/if}}
-  </div>
-
-  <div class="flakes-content">
-    <div class="flakes-mobile-top-bar">
-      {{site-logo}}
-      <a href="" class="navigation-expand-target">
-        <img src="img/navigation-expand-target.png" height="26px">
-      </a>
-    </div>
-
-    <div class="view-wrap">
-      {{#each flashMessages.queue as |flash|}}
-        {{custom-flash-message flash=flash}}
-      {{/each}}
-      {{outlet}}
-    </div>
-  </div>
-{{/x-application}}

app/pods/components/x-application/component.js

@@ -7,4 +7,11 @@ export default Ember.Component.extend({
     FlakesFrame.init();
   },
 
+  actions: {
+    invalidateSession: function() {
+      this.sendAction('invalidateSession');
+    },
+
+  },
+
 });

app/pods/components/x-application/template.hbs

@@ -1 +1,51 @@
-{{yield}}
+<div class="flakes-navigation">
+  {{site-logo}}
+  {{#if session.isAuthenticated}}
+    <ul>
+      {{#link-to 'protected.compare' tagName='li' href=false}}
+        {{link-to 'Compare' 'protected.compare'}}
+      {{/link-to}}
+      {{#link-to 'protected.measurements' tagName='li' href=false}}
+        {{link-to 'Measurements' 'protected.measurements'}}
+      {{/link-to}}
+      {{#link-to 'protected.characteristics' tagName='li' href=false}}
+        {{link-to 'Characteristics' 'protected.characteristics'}}
+      {{/link-to}}
+      {{#link-to 'protected.species' tagName='li' href=false}}
+        {{link-to 'Species' 'protected.species'}}
+      {{/link-to}}
+      {{#link-to 'protected.strains' tagName='li' href=false}}
+        {{link-to 'Strains' 'protected.strains'}}
+      {{/link-to}}
+      {{#link-to 'protected.about' tagName='li' href=false}}
+        {{link-to 'About' 'protected.about'}}
+      {{/link-to}}
+    </ul>
+    <p class="foot">
+      {{session.currentUser.name}}<br>
+      <a {{action 'invalidateSession'}}>Logout</a>
+    </p>
+  {{else}}
+    <p class="foot">
+      {{link-to 'Login' 'login'}}
+      <br>
+      {{link-to 'Sign Up' 'users.new'}}
+    </p>
+  {{/if}}
+</div>
+
+<div class="flakes-content">
+  <div class="flakes-mobile-top-bar">
+    {{site-logo}}
+    <a href="" class="navigation-expand-target">
+      <img src="img/navigation-expand-target.png" height="26px">
+    </a>
+  </div>
+
+  <div class="view-wrap">
+    {{#each flashMessages.queue as |flash|}}
+      {{custom-flash-message flash=flash}}
+    {{/each}}
+    {{yield}}
+  </div>
+</div>

app/pods/login/template.hbs

@@ -1,6 +1,4 @@
-{{#if loggedIn}}
+{{#x-application invalidateSession="invalidateSession"}}
-  <p>You are already logged in!</p>
-{{else}}
   {{#if loading}}
     {{loading-panel}}
   {{else}}
@@ -11,4 +9,4 @@
         {{input class="button-gray" type="submit" value="Log In"}}
     </form>
   {{/if}}
-{{/if}}
+{{/x-application}}

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');
+    let token = this.get('session.secure.token');
-    console.log(user);
+    let user = parseBase64(token);
-  }
+    return this.store.find('user', user.sub);
+  },
+
 });

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);
     },
 
   },

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');
     },
 
   },

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);
     },
 
   },

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');
     },
 
   },

app/pods/protected/template.hbs

@@ -0,0 +1,3 @@
+{{#x-application invalidateSession="invalidateSession"}}
+  {{outlet}}
+{{/x-application}}

app/pods/users/template.hbs

@@ -0,0 +1,3 @@
+{{#x-application invalidateSession="invalidateSession"}}
+  {{outlet}}
+{{/x-application}}