protected route

app/pods/application/template.hbs

@@ -3,23 +3,23 @@
     {{site-logo}}
     {{#if session.isAuthenticated}}
       <ul>
-        {{#link-to 'compare' tagName='li' href=false}}
+        {{#link-to 'protected.compare' tagName='li' href=false}}
-          {{link-to 'Compare' 'compare'}}
+          {{link-to 'Compare' 'protected.compare'}}
         {{/link-to}}
-        {{#link-to 'measurements' tagName='li' href=false}}
+        {{#link-to 'protected.measurements' tagName='li' href=false}}
-          {{link-to 'Measurements' 'measurements'}}
+          {{link-to 'Measurements' 'protected.measurements'}}
         {{/link-to}}
-        {{#link-to 'characteristics' tagName='li' href=false}}
+        {{#link-to 'protected.characteristics' tagName='li' href=false}}
-          {{link-to 'Characteristics' 'characteristics'}}
+          {{link-to 'Characteristics' 'protected.characteristics'}}
         {{/link-to}}
-        {{#link-to 'species' tagName='li' href=false}}
+        {{#link-to 'protected.species' tagName='li' href=false}}
-          {{link-to 'Species' 'species'}}
+          {{link-to 'Species' 'protected.species'}}
         {{/link-to}}
-        {{#link-to 'strains' tagName='li' href=false}}
+        {{#link-to 'protected.strains' tagName='li' href=false}}
-          {{link-to 'Strains' 'strains'}}
+          {{link-to 'Strains' 'protected.strains'}}
         {{/link-to}}
-        {{#link-to 'about' tagName='li' href=false}}
+        {{#link-to 'protected.about' tagName='li' href=false}}
-          {{link-to 'About' 'about'}}
+          {{link-to 'About' 'protected.about'}}
         {{/link-to}}
       </ul>
       <p class="foot">

app/pods/components/forms/species-form/template.hbs

@@ -16,7 +16,7 @@
         <label>Strains</label>
         {{#each species.strains as |strain index|}}
           {{if index ","}}
-          {{#link-to 'strains.show' strain.id}}
+          {{#link-to 'protected.strains.show' strain.id}}
             {{{strain.strainNameMU}}}
           {{/link-to}}
         {{/each}}

app/pods/components/site-logo/template.hbs

@@ -1,3 +1,3 @@
-{{#link-to 'index' class='logo'}}
+{{#link-to 'protected.index' class='logo'}}
   <h2>{{globals.genus}}.info</h2>
 {{/link-to}}

app/pods/protected/compare/route.js

@@ -1,7 +1,6 @@
 import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Ember.Route.extend({
   resetController: function(controller, isExiting /*, transition*/) {
     if (isExiting) {
       controller.set('data', null);

app/pods/protected/compare/template.hbs

@@ -19,7 +19,7 @@
         <th>Characteristic</th>
         {{#each strains as |strain|}}
           <th>
-            {{#link-to 'strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
+            {{#link-to 'protected.strains.show' strain.id classBinding="data.typeStrain:type-strain"}}
               {{strain.fullNameMU}}
             {{/link-to}}
           </th>

app/pods/protected/index/route.js

@@ -4,6 +4,6 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
   beforeModel: function(transition) {
     this._super(transition);
-    this.transitionTo('compare');
+    this.transitionTo('protected.compare');
   }
 });

app/pods/protected/route.js

@@ -3,6 +3,7 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi
 
 export default Ember.Route.extend(AuthenticatedRouteMixin, {
   model: function() {
-    return this.store.findAll('species');
+    let user = this.get('session.secure.currentUser');
+    console.log(user);
   }
 });

app/pods/protected/species/index/route.js

@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  model: function() {
+    return this.store.findAll('species');
+  }
+});

app/pods/protected/species/index/template.hbs

@@ -1,7 +1,7 @@
 <h2>{{genus-name}} Species</h2>
 <h3>Total species: {{model.length}}</h3>
 
-{{add-button label="Add Species" link="species.new" canAdd=metaData.canAdd}}
+{{add-button label="Add Species" link="protected.species.new" canAdd=metaData.canAdd}}
 
 <table class="flakes-table">
   <thead>
@@ -15,7 +15,7 @@
       <tr>
         <td>
           <em>
-            {{#link-to 'species.show' species}}
+            {{#link-to 'protected.species.show' species}}
               {{species.speciesName}}
             {{/link-to}}
           </em>
@@ -23,7 +23,7 @@
         <td>
           {{#each species.strains as |strain index|}}
             {{if index ","}}
-            {{#link-to 'strains.show' strain.id}}
+            {{#link-to 'protected.strains.show' strain.id}}
               {{{strain.strainNameMU}}}
             {{/link-to}}
           {{/each}}

app/pods/protected/species/show/template.hbs

@@ -13,7 +13,7 @@
             <ul>
               {{#each model.strains as |strain index|}}
                 <li>
-                  {{#link-to 'strains.show' strain.id}}
+                  {{#link-to 'protected.strains.show' strain.id}}
                     {{{strain.strainNameMU}}}
                   {{/link-to}}
                 </li>
@@ -59,7 +59,7 @@
 </div>
 {{#if model.canEdit}}
   <br>
-  {{#link-to 'species.edit' model class="button-gray smaller"}}
+  {{#link-to 'protected.species.edit' model class="button-gray smaller"}}
     Edit
   {{/link-to}}
 {{/if}}

app/pods/protected/strains/index/template.hbs

@@ -14,7 +14,7 @@
     {{#each sortedStrains as |row|}}
       <tr>
         <td>
-          {{#link-to 'strains.show' row.id classBinding="data.typeStrain:type-strain"}}
+          {{#link-to 'protected.strains.show' row.id classBinding="data.typeStrain:type-strain"}}
             {{row.fullNameMU}}
           {{/link-to}}
         </td>

app/pods/protected/strains/show/template.hbs

@@ -9,7 +9,7 @@
       <dl class="span-1">
         <dt>Species</dt>
         <dd>
-          {{#link-to 'species.show' model.species.id}}
+          {{#link-to 'protected.species.show' model.species.id}}
             <em>{{model.species.speciesNameMU}}</em>
           {{/link-to}}
         </dd>
@@ -83,7 +83,7 @@
 </div>
 {{#if model.canEdit}}
   <br>
-  {{#link-to 'species.edit' model class="button-gray smaller"}}
+  {{#link-to 'protected.species.edit' model class="button-gray smaller"}}
     Edit
   {{/link-to}}
 {{/if}}

app/router.js

@@ -7,6 +7,16 @@ var Router = Ember.Router.extend({
 
 Router.map(function() {
   this.route('login');
+
+  this.route('users', function() {
+    this.route('new', function() {
+      this.route('fail');
+      this.route('success');
+      this.route('verify', { path: ':nonce' });
+    });
+  });
+
+  this.route('protected', { path: '/' }, function() {
     this.route('about');
     this.route('characteristics');
     this.route('measurements');
@@ -24,13 +34,8 @@ Router.map(function() {
       this.route('edit', { path: ':strain_id/edit' });
     });
 
-  this.route('users', function() {
-    this.route('new', function() {
-      this.route('fail');
-      this.route('success');
-      this.route('verify', { path: ':nonce' });
-    });
   });
+
 });
 
 export default Router;

config/environment.js

@@ -19,6 +19,7 @@ module.exports = function(environment) {
       session: 'session:custom',
       authorizer: 'simple-auth-authorizer:token',
       store: 'simple-auth-session-store:local-storage',
+      routeAfterAuthentication: 'protected.index',
     },
     'simple-auth-token': {
       identificationField: 'email',