Pods, pods, everywhere

app/components/display-errors.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Component.extend({
-});

app/controllers/measurements/index.js

@@ -1,5 +0,0 @@
-import SortableController from '../sortable';
-
-export default SortableController.extend({
-  sortBy: 'characteristic',
-});

app/controllers/strains/index.js

@@ -1,5 +0,0 @@
-import SortableController from '../sortable';
-
-export default SortableController.extend({
-  sortBy: 'fullName',
-});

app/pods/application/adapter.js

@@ -1,6 +1,6 @@
 import DS from 'ember-data';
 import Ember from 'ember';
-import config from '../config/environment';
+import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
   namespace: 'api/' + config.genus,

app/pods/characteristics/controller.js

@@ -1,4 +1,4 @@
-import SortableController from '../sortable';
+import SortableController from '../../controllers/sortable';
 
 export default SortableController.extend({
   sortBy: 'characteristicName',

app/pods/characteristics/route.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('characteristic');
+  }
+});

app/pods/components/genus-name/component.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import config from '../config/environment';
+import config from '../../../config/environment';
 
 export default Ember.Component.extend({
   tagName: 'em',

app/pods/components/scientific-name/component.js

@@ -1,8 +1,6 @@
 import Ember from 'ember';
-import layout from '../templates/components/scientific-name';
 
 export default Ember.Component.extend({
-  layout: layout,
   tagName: 'span',
   strain: null, // passed in
 });

app/pods/species/index/controller.js

@@ -1,4 +1,4 @@
-import SortableController from '../sortable';
+import SortableController from '../../../controllers/sortable';
 
 export default SortableController.extend({
   sortBy: 'speciesName',

app/pods/species/index/route.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('species');
+  }
+});

app/pods/species/new/template.hbs

@@ -1,5 +1,5 @@
 {{
-  species/species-details
+  species-details
   species=model
   isEditing=true
   save="save"

app/pods/species/show/template.hbs

@@ -1,5 +1,5 @@
 {{
-  species/species-details
+  species-details
   species=model
   isEditing=isEditing
   save="save"

app/pods/strains/index/route.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('strain');
+  }
+});

app/pods/strains/index/template.hbs

@@ -19,7 +19,7 @@
     {{#each strain in controller}}
       <tr>
         <td>
-          {{#link-to 'measurements' strain.id}}
+          {{#link-to 'strains.show' strain.id}}
             {{scientific-name strain=strain}}
           {{/link-to}}
         </td>

app/pods/strains/new/template.hbs

@@ -1,5 +1,5 @@
 {{
-  strains/strain-details
+  strain-details
   strain=strain
   species=species
   isEditing=true

app/pods/strains/show/template.hbs

@@ -1,12 +1,8 @@
 {{
-  strains/strain-details
+  strain-details
   strain=strain
   species=species
   isEditing=isEditing
   save="save"
   cancel="cancel"
 }}
-
-<div class="measurements-container">
-  {{outlet}}
-</div>

app/pods/user/adapter.js

@@ -1,5 +1,5 @@
 import DS from 'ember-data';
-import config from '../config/environment';
+import config from '../../config/environment';
 
 export default DS.RESTAdapter.extend({
   namespace: 'api',

app/pods/users/route.js

@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+  model: function() {
+    return this.store.findAll('user');
+  }
+});

app/router.js

@@ -8,18 +8,18 @@ var Router = Ember.Router.extend({
 Router.map(function() {
   this.route('login');
   this.route('about');
-  this.resource('species', function() {
+  this.route('characteristics');
+  this.route('users');
+
+  this.route('species', function() {
+    this.route('new');
     this.route('show', { path: ':species_id' });
-    this.route('new');
   });
-  this.resource('strains', function() {
+  this.route('strains', function() {
     this.route('new');
-    this.route('show', { path: ':strain_id' }, function() {
-      this.resource('measurements', function() {});
-    });
+    this.route('show', { path: ':strain_id' });
   });
-  this.resource('characteristics', function() {});
-  this.resource('users', function() {});
+
 });
 
 export default Router;

app/routes/characteristics/index.js

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

app/routes/index.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/measurements/index.js

@@ -1,7 +0,0 @@
-import Ember from 'ember';
-
-export default Ember.Route.extend({
-  model: function() {
-    return this.modelFor('strains/show').strain.get('measurements');
-  }
-});

app/routes/species.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/species/index.js

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

app/routes/strains.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/strains/index.js

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

app/routes/users.js

@@ -1,4 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin);

app/routes/users/index.js

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

app/templates/measurements/index.hbs

@@ -1,16 +0,0 @@
-<table class="flakes-table">
-  <thead>
-    <tr>
-      <th {{action "setSortBy" "characteristic"}}>Characteristic</th>
-      <th {{action "setSortBy" "computedType"}}>Measurement Type</th>
-      <th {{action "setSortBy" "computedValue"}}>Measurement</th>
-      <th {{action "setSortBy" "notes"}}>Notes</th>
-      <th {{action "setSortBy" "testMethod"}}>Test Method</th>
-    </tr>
-  </thead>
-  <tbody>
-    {{#each measurement in controller}}
-      {{measurements/measurement-row measurement=measurement}}
-    {{/each}}
-  </tbody>
-</table>

app/templates/species.hbs

@@ -1 +0,0 @@
-{{outlet}}