From e623d52f3476901e223af9c78a9d0cf1436f5b28 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 4 Jun 2015 12:18:59 -0800 Subject: [PATCH 1/2] Pods, pods, everywhere --- .ember-cli | 9 ++------- app/components/.gitkeep | 0 app/components/display-errors.js | 4 ---- app/controllers/measurements/index.js | 5 ----- app/controllers/strains/index.js | 5 ----- app/{routes/about.js => pods/about/route.js} | 0 .../about.hbs => pods/about/template.hbs} | 0 .../application/adapter.js} | 2 +- .../application.js => pods/application/route.js} | 0 .../application/template.hbs} | 0 .../application.js => pods/application/view.js} | 0 .../characteristics/controller.js} | 2 +- app/pods/characteristics/route.js | 8 ++++++++ .../characteristics/template.hbs} | 0 .../components/display-errors/template.hbs} | 0 .../components/genus-name/component.js} | 2 +- .../components/genus-name/template.hbs} | 0 .../components/measurement-row/component.js} | 0 .../components/measurement-row/template.hbs} | 0 .../components/scientific-name/component.js} | 2 -- .../components/scientific-name/template.hbs} | 0 .../components/species-details/component.js} | 0 .../components/species-details/template.hbs} | 0 .../components/strain-details/component.js} | 0 .../components/strain-details/template.hbs} | 0 .../characteristics.js => pods/index/route.js} | 0 .../index.hbs => pods/index/template.hbs} | 0 .../login.js => pods/login/controller.js} | 0 app/{routes/login.js => pods/login/route.js} | 0 .../login.hbs => pods/login/template.hbs} | 0 .../species/index/controller.js} | 2 +- app/pods/species/index/route.js | 8 ++++++++ .../species/index/template.hbs} | 0 .../new.js => pods/species/new/controller.js} | 0 .../species/new.js => pods/species/new/route.js} | 0 .../new.hbs => pods/species/new/template.hbs} | 2 +- .../show.js => pods/species/show/controller.js} | 0 .../show.js => pods/species/show/route.js} | 0 .../show.hbs => pods/species/show/template.hbs} | 2 +- app/pods/strains/index/route.js | 8 ++++++++ .../strains/index/template.hbs} | 2 +- .../new.js => pods/strains/new/controller.js} | 0 .../strains/new.js => pods/strains/new/route.js} | 0 .../new.hbs => pods/strains/new/template.hbs} | 2 +- .../show.js => pods/strains/show/controller.js} | 0 .../show.js => pods/strains/show/route.js} | 0 .../show.hbs => pods/strains/show/template.hbs} | 6 +----- app/{adapters/user.js => pods/user/adapter.js} | 2 +- app/pods/users/route.js | 8 ++++++++ .../users/index.hbs => pods/users/template.hbs} | 0 app/router.js | 16 ++++++++-------- app/routes/.gitkeep | 0 app/routes/characteristics/index.js | 7 ------- app/routes/index.js | 4 ---- app/routes/measurements/index.js | 7 ------- app/routes/species.js | 4 ---- app/routes/species/index.js | 7 ------- app/routes/strains.js | 4 ---- app/routes/strains/index.js | 7 ------- app/routes/users.js | 4 ---- app/routes/users/index.js | 7 ------- app/templates/components/.gitkeep | 0 app/templates/measurements/index.hbs | 16 ---------------- app/templates/species.hbs | 1 - app/views/.gitkeep | 0 config/environment.js | 1 + 66 files changed, 53 insertions(+), 113 deletions(-) delete mode 100644 app/components/.gitkeep delete mode 100644 app/components/display-errors.js delete mode 100644 app/controllers/measurements/index.js delete mode 100644 app/controllers/strains/index.js rename app/{routes/about.js => pods/about/route.js} (100%) rename app/{templates/about.hbs => pods/about/template.hbs} (100%) rename app/{adapters/application.js => pods/application/adapter.js} (94%) rename app/{routes/application.js => pods/application/route.js} (100%) rename app/{templates/application.hbs => pods/application/template.hbs} (100%) rename app/{views/application.js => pods/application/view.js} (100%) rename app/{controllers/characteristics/index.js => pods/characteristics/controller.js} (56%) create mode 100644 app/pods/characteristics/route.js rename app/{templates/characteristics/index.hbs => pods/characteristics/template.hbs} (100%) rename app/{templates/components/display-errors.hbs => pods/components/display-errors/template.hbs} (100%) rename app/{components/genus-name.js => pods/components/genus-name/component.js} (71%) rename app/{templates/components/genus-name.hbs => pods/components/genus-name/template.hbs} (100%) rename app/{components/measurements/measurement-row.js => pods/components/measurement-row/component.js} (100%) rename app/{templates/components/measurements/measurement-row.hbs => pods/components/measurement-row/template.hbs} (100%) rename app/{components/scientific-name.js => pods/components/scientific-name/component.js} (60%) rename app/{templates/components/scientific-name.hbs => pods/components/scientific-name/template.hbs} (100%) rename app/{components/species/species-details.js => pods/components/species-details/component.js} (100%) rename app/{templates/components/species/species-details.hbs => pods/components/species-details/template.hbs} (100%) rename app/{components/strains/strain-details.js => pods/components/strain-details/component.js} (100%) rename app/{templates/components/strains/strain-details.hbs => pods/components/strain-details/template.hbs} (100%) rename app/{routes/characteristics.js => pods/index/route.js} (100%) rename app/{templates/index.hbs => pods/index/template.hbs} (100%) rename app/{controllers/login.js => pods/login/controller.js} (100%) rename app/{routes/login.js => pods/login/route.js} (100%) rename app/{templates/login.hbs => pods/login/template.hbs} (100%) rename app/{controllers/species/index.js => pods/species/index/controller.js} (53%) create mode 100644 app/pods/species/index/route.js rename app/{templates/species/index.hbs => pods/species/index/template.hbs} (100%) rename app/{controllers/species/new.js => pods/species/new/controller.js} (100%) rename app/{routes/species/new.js => pods/species/new/route.js} (100%) rename app/{templates/species/new.hbs => pods/species/new/template.hbs} (73%) rename app/{controllers/species/show.js => pods/species/show/controller.js} (100%) rename app/{routes/species/show.js => pods/species/show/route.js} (100%) rename app/{templates/species/show.hbs => pods/species/show/template.hbs} (74%) create mode 100644 app/pods/strains/index/route.js rename app/{templates/strains/index.hbs => pods/strains/index/template.hbs} (93%) rename app/{controllers/strains/new.js => pods/strains/new/controller.js} (100%) rename app/{routes/strains/new.js => pods/strains/new/route.js} (100%) rename app/{templates/strains/new.hbs => pods/strains/new/template.hbs} (78%) rename app/{controllers/strains/show.js => pods/strains/show/controller.js} (100%) rename app/{routes/strains/show.js => pods/strains/show/route.js} (100%) rename app/{templates/strains/show.hbs => pods/strains/show/template.hbs} (53%) rename app/{adapters/user.js => pods/user/adapter.js} (75%) create mode 100644 app/pods/users/route.js rename app/{templates/users/index.hbs => pods/users/template.hbs} (100%) delete mode 100644 app/routes/.gitkeep delete mode 100644 app/routes/characteristics/index.js delete mode 100644 app/routes/index.js delete mode 100644 app/routes/measurements/index.js delete mode 100644 app/routes/species.js delete mode 100644 app/routes/species/index.js delete mode 100644 app/routes/strains.js delete mode 100644 app/routes/strains/index.js delete mode 100644 app/routes/users.js delete mode 100644 app/routes/users/index.js delete mode 100644 app/templates/components/.gitkeep delete mode 100644 app/templates/measurements/index.hbs delete mode 100644 app/templates/species.hbs delete mode 100644 app/views/.gitkeep diff --git a/.ember-cli b/.ember-cli index 59bb55f..a277775 100644 --- a/.ember-cli +++ b/.ember-cli @@ -1,9 +1,4 @@ { - /** - Ember CLI sends analytics information by default. The data is completely - anonymous, but there are times when you might want to disable this behavior. - - Setting `disableAnalytics` to true will prevent any data from being sent. - */ - "disableAnalytics": true + "disableAnalytics": true, + "usePods": true } diff --git a/app/components/.gitkeep b/app/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/components/display-errors.js b/app/components/display-errors.js deleted file mode 100644 index 926b613..0000000 --- a/app/components/display-errors.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Component.extend({ -}); diff --git a/app/controllers/measurements/index.js b/app/controllers/measurements/index.js deleted file mode 100644 index 62d73f0..0000000 --- a/app/controllers/measurements/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import SortableController from '../sortable'; - -export default SortableController.extend({ - sortBy: 'characteristic', -}); diff --git a/app/controllers/strains/index.js b/app/controllers/strains/index.js deleted file mode 100644 index 86fd495..0000000 --- a/app/controllers/strains/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import SortableController from '../sortable'; - -export default SortableController.extend({ - sortBy: 'fullName', -}); diff --git a/app/routes/about.js b/app/pods/about/route.js similarity index 100% rename from app/routes/about.js rename to app/pods/about/route.js diff --git a/app/templates/about.hbs b/app/pods/about/template.hbs similarity index 100% rename from app/templates/about.hbs rename to app/pods/about/template.hbs diff --git a/app/adapters/application.js b/app/pods/application/adapter.js similarity index 94% rename from app/adapters/application.js rename to app/pods/application/adapter.js index 2aab3ad..2037ee8 100644 --- a/app/adapters/application.js +++ b/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, diff --git a/app/routes/application.js b/app/pods/application/route.js similarity index 100% rename from app/routes/application.js rename to app/pods/application/route.js diff --git a/app/templates/application.hbs b/app/pods/application/template.hbs similarity index 100% rename from app/templates/application.hbs rename to app/pods/application/template.hbs diff --git a/app/views/application.js b/app/pods/application/view.js similarity index 100% rename from app/views/application.js rename to app/pods/application/view.js diff --git a/app/controllers/characteristics/index.js b/app/pods/characteristics/controller.js similarity index 56% rename from app/controllers/characteristics/index.js rename to app/pods/characteristics/controller.js index f94b49b..fe6b361 100644 --- a/app/controllers/characteristics/index.js +++ b/app/pods/characteristics/controller.js @@ -1,4 +1,4 @@ -import SortableController from '../sortable'; +import SortableController from '../../controllers/sortable'; export default SortableController.extend({ sortBy: 'characteristicName', diff --git a/app/pods/characteristics/route.js b/app/pods/characteristics/route.js new file mode 100644 index 0000000..df69651 --- /dev/null +++ b/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'); + } +}); diff --git a/app/templates/characteristics/index.hbs b/app/pods/characteristics/template.hbs similarity index 100% rename from app/templates/characteristics/index.hbs rename to app/pods/characteristics/template.hbs diff --git a/app/templates/components/display-errors.hbs b/app/pods/components/display-errors/template.hbs similarity index 100% rename from app/templates/components/display-errors.hbs rename to app/pods/components/display-errors/template.hbs diff --git a/app/components/genus-name.js b/app/pods/components/genus-name/component.js similarity index 71% rename from app/components/genus-name.js rename to app/pods/components/genus-name/component.js index 61a389d..1fb4f1f 100644 --- a/app/components/genus-name.js +++ b/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', diff --git a/app/templates/components/genus-name.hbs b/app/pods/components/genus-name/template.hbs similarity index 100% rename from app/templates/components/genus-name.hbs rename to app/pods/components/genus-name/template.hbs diff --git a/app/components/measurements/measurement-row.js b/app/pods/components/measurement-row/component.js similarity index 100% rename from app/components/measurements/measurement-row.js rename to app/pods/components/measurement-row/component.js diff --git a/app/templates/components/measurements/measurement-row.hbs b/app/pods/components/measurement-row/template.hbs similarity index 100% rename from app/templates/components/measurements/measurement-row.hbs rename to app/pods/components/measurement-row/template.hbs diff --git a/app/components/scientific-name.js b/app/pods/components/scientific-name/component.js similarity index 60% rename from app/components/scientific-name.js rename to app/pods/components/scientific-name/component.js index 26c2df5..40bf39c 100644 --- a/app/components/scientific-name.js +++ b/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 }); diff --git a/app/templates/components/scientific-name.hbs b/app/pods/components/scientific-name/template.hbs similarity index 100% rename from app/templates/components/scientific-name.hbs rename to app/pods/components/scientific-name/template.hbs diff --git a/app/components/species/species-details.js b/app/pods/components/species-details/component.js similarity index 100% rename from app/components/species/species-details.js rename to app/pods/components/species-details/component.js diff --git a/app/templates/components/species/species-details.hbs b/app/pods/components/species-details/template.hbs similarity index 100% rename from app/templates/components/species/species-details.hbs rename to app/pods/components/species-details/template.hbs diff --git a/app/components/strains/strain-details.js b/app/pods/components/strain-details/component.js similarity index 100% rename from app/components/strains/strain-details.js rename to app/pods/components/strain-details/component.js diff --git a/app/templates/components/strains/strain-details.hbs b/app/pods/components/strain-details/template.hbs similarity index 100% rename from app/templates/components/strains/strain-details.hbs rename to app/pods/components/strain-details/template.hbs diff --git a/app/routes/characteristics.js b/app/pods/index/route.js similarity index 100% rename from app/routes/characteristics.js rename to app/pods/index/route.js diff --git a/app/templates/index.hbs b/app/pods/index/template.hbs similarity index 100% rename from app/templates/index.hbs rename to app/pods/index/template.hbs diff --git a/app/controllers/login.js b/app/pods/login/controller.js similarity index 100% rename from app/controllers/login.js rename to app/pods/login/controller.js diff --git a/app/routes/login.js b/app/pods/login/route.js similarity index 100% rename from app/routes/login.js rename to app/pods/login/route.js diff --git a/app/templates/login.hbs b/app/pods/login/template.hbs similarity index 100% rename from app/templates/login.hbs rename to app/pods/login/template.hbs diff --git a/app/controllers/species/index.js b/app/pods/species/index/controller.js similarity index 53% rename from app/controllers/species/index.js rename to app/pods/species/index/controller.js index b5b8af0..e6f1ac9 100644 --- a/app/controllers/species/index.js +++ b/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', diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js new file mode 100644 index 0000000..6b02e0e --- /dev/null +++ b/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'); + } +}); diff --git a/app/templates/species/index.hbs b/app/pods/species/index/template.hbs similarity index 100% rename from app/templates/species/index.hbs rename to app/pods/species/index/template.hbs diff --git a/app/controllers/species/new.js b/app/pods/species/new/controller.js similarity index 100% rename from app/controllers/species/new.js rename to app/pods/species/new/controller.js diff --git a/app/routes/species/new.js b/app/pods/species/new/route.js similarity index 100% rename from app/routes/species/new.js rename to app/pods/species/new/route.js diff --git a/app/templates/species/new.hbs b/app/pods/species/new/template.hbs similarity index 73% rename from app/templates/species/new.hbs rename to app/pods/species/new/template.hbs index b070c4a..f38417f 100644 --- a/app/templates/species/new.hbs +++ b/app/pods/species/new/template.hbs @@ -1,5 +1,5 @@ {{ - species/species-details + species-details species=model isEditing=true save="save" diff --git a/app/controllers/species/show.js b/app/pods/species/show/controller.js similarity index 100% rename from app/controllers/species/show.js rename to app/pods/species/show/controller.js diff --git a/app/routes/species/show.js b/app/pods/species/show/route.js similarity index 100% rename from app/routes/species/show.js rename to app/pods/species/show/route.js diff --git a/app/templates/species/show.hbs b/app/pods/species/show/template.hbs similarity index 74% rename from app/templates/species/show.hbs rename to app/pods/species/show/template.hbs index 5f72e74..b242fc5 100644 --- a/app/templates/species/show.hbs +++ b/app/pods/species/show/template.hbs @@ -1,5 +1,5 @@ {{ - species/species-details + species-details species=model isEditing=isEditing save="save" diff --git a/app/pods/strains/index/route.js b/app/pods/strains/index/route.js new file mode 100644 index 0000000..0bcd81a --- /dev/null +++ b/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'); + } +}); diff --git a/app/templates/strains/index.hbs b/app/pods/strains/index/template.hbs similarity index 93% rename from app/templates/strains/index.hbs rename to app/pods/strains/index/template.hbs index 7b8ddf3..4e8c0ea 100644 --- a/app/templates/strains/index.hbs +++ b/app/pods/strains/index/template.hbs @@ -19,7 +19,7 @@ {{#each strain in controller}} - {{#link-to 'measurements' strain.id}} + {{#link-to 'strains.show' strain.id}} {{scientific-name strain=strain}} {{/link-to}} diff --git a/app/controllers/strains/new.js b/app/pods/strains/new/controller.js similarity index 100% rename from app/controllers/strains/new.js rename to app/pods/strains/new/controller.js diff --git a/app/routes/strains/new.js b/app/pods/strains/new/route.js similarity index 100% rename from app/routes/strains/new.js rename to app/pods/strains/new/route.js diff --git a/app/templates/strains/new.hbs b/app/pods/strains/new/template.hbs similarity index 78% rename from app/templates/strains/new.hbs rename to app/pods/strains/new/template.hbs index 6c0f31d..bd22b30 100644 --- a/app/templates/strains/new.hbs +++ b/app/pods/strains/new/template.hbs @@ -1,5 +1,5 @@ {{ - strains/strain-details + strain-details strain=strain species=species isEditing=true diff --git a/app/controllers/strains/show.js b/app/pods/strains/show/controller.js similarity index 100% rename from app/controllers/strains/show.js rename to app/pods/strains/show/controller.js diff --git a/app/routes/strains/show.js b/app/pods/strains/show/route.js similarity index 100% rename from app/routes/strains/show.js rename to app/pods/strains/show/route.js diff --git a/app/templates/strains/show.hbs b/app/pods/strains/show/template.hbs similarity index 53% rename from app/templates/strains/show.hbs rename to app/pods/strains/show/template.hbs index c3af8fb..16a7df0 100644 --- a/app/templates/strains/show.hbs +++ b/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" }} - -
- {{outlet}} -
diff --git a/app/adapters/user.js b/app/pods/user/adapter.js similarity index 75% rename from app/adapters/user.js rename to app/pods/user/adapter.js index 9ba7563..e4e2bd1 100644 --- a/app/adapters/user.js +++ b/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', diff --git a/app/pods/users/route.js b/app/pods/users/route.js new file mode 100644 index 0000000..2169a4f --- /dev/null +++ b/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'); + } +}); diff --git a/app/templates/users/index.hbs b/app/pods/users/template.hbs similarity index 100% rename from app/templates/users/index.hbs rename to app/pods/users/template.hbs diff --git a/app/router.js b/app/router.js index f82a92c..6cff3a0 100644 --- a/app/router.js +++ b/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; diff --git a/app/routes/.gitkeep b/app/routes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/routes/characteristics/index.js b/app/routes/characteristics/index.js deleted file mode 100644 index 348187c..0000000 --- a/app/routes/characteristics/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - model: function() { - return this.store.findAll('characteristic'); - } -}); diff --git a/app/routes/index.js b/app/routes/index.js deleted file mode 100644 index 5b14286..0000000 --- a/app/routes/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; - -export default Ember.Route.extend(AuthenticatedRouteMixin); diff --git a/app/routes/measurements/index.js b/app/routes/measurements/index.js deleted file mode 100644 index d1416be..0000000 --- a/app/routes/measurements/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - model: function() { - return this.modelFor('strains/show').strain.get('measurements'); - } -}); diff --git a/app/routes/species.js b/app/routes/species.js deleted file mode 100644 index 5b14286..0000000 --- a/app/routes/species.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; - -export default Ember.Route.extend(AuthenticatedRouteMixin); diff --git a/app/routes/species/index.js b/app/routes/species/index.js deleted file mode 100644 index 8f05241..0000000 --- a/app/routes/species/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - model: function() { - return this.store.findAll('species'); - } -}); diff --git a/app/routes/strains.js b/app/routes/strains.js deleted file mode 100644 index 5b14286..0000000 --- a/app/routes/strains.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; - -export default Ember.Route.extend(AuthenticatedRouteMixin); diff --git a/app/routes/strains/index.js b/app/routes/strains/index.js deleted file mode 100644 index eb8fe88..0000000 --- a/app/routes/strains/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - model: function() { - return this.store.findAll('strain'); - } -}); diff --git a/app/routes/users.js b/app/routes/users.js deleted file mode 100644 index 5b14286..0000000 --- a/app/routes/users.js +++ /dev/null @@ -1,4 +0,0 @@ -import Ember from 'ember'; -import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin'; - -export default Ember.Route.extend(AuthenticatedRouteMixin); diff --git a/app/routes/users/index.js b/app/routes/users/index.js deleted file mode 100644 index b578e0b..0000000 --- a/app/routes/users/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import Ember from 'ember'; - -export default Ember.Route.extend({ - model: function() { - return this.store.findAll('user'); - } -}); diff --git a/app/templates/components/.gitkeep b/app/templates/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/templates/measurements/index.hbs b/app/templates/measurements/index.hbs deleted file mode 100644 index 19db67f..0000000 --- a/app/templates/measurements/index.hbs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - {{#each measurement in controller}} - {{measurements/measurement-row measurement=measurement}} - {{/each}} - -
CharacteristicMeasurement TypeMeasurementNotesTest Method
diff --git a/app/templates/species.hbs b/app/templates/species.hbs deleted file mode 100644 index c24cd68..0000000 --- a/app/templates/species.hbs +++ /dev/null @@ -1 +0,0 @@ -{{outlet}} diff --git a/app/views/.gitkeep b/app/views/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/config/environment.js b/config/environment.js index b320842..4713ad1 100644 --- a/config/environment.js +++ b/config/environment.js @@ -17,6 +17,7 @@ module.exports = function(environment) { // when it is created }, genus: 'hymenobacter', + podModulePrefix: 'hymenobacterdotinfo/pods', }; if (environment === 'development') { From 6ba5cf2322244021754ff0fd66c0feb152e43d39 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 4 Jun 2015 20:32:39 -0800 Subject: [PATCH 2/2] Sortable table component --- app/pods/characteristics/controller.js | 5 ---- app/pods/characteristics/route.js | 11 +++++++- app/pods/characteristics/template.hbs | 19 ++----------- .../characteristic-index-row/component.js | 5 ++++ .../characteristic-index-row/template.hbs | 6 ++++ .../sortable-table-header/component.js | 13 +++++++++ .../sortable-table-header/template.hbs | 3 ++ .../components/sortable-table/component.js | 13 +++++++++ .../components/sortable-table/template.hbs | 13 +++++++++ .../components/species-index-row/component.js | 5 ++++ .../components/species-index-row/template.hbs | 13 +++++++++ .../components/strain-index-row/component.js | 5 ++++ .../components/strain-index-row/template.hbs | 8 ++++++ app/pods/species/index/route.js | 11 +++++++- app/pods/species/index/template.hbs | 28 +------------------ app/pods/strains/index/route.js | 11 +++++++- app/pods/strains/index/template.hbs | 23 ++------------- app/styles/app.css | 2 +- .../component-test.js | 21 ++++++++++++++ .../sortable-table-header/component-test.js | 21 ++++++++++++++ .../sortable-table/component-test.js | 21 ++++++++++++++ .../species-index-row/component-test.js | 21 ++++++++++++++ .../strain-index-row/component-test.js | 21 ++++++++++++++ 23 files changed, 225 insertions(+), 74 deletions(-) delete mode 100644 app/pods/characteristics/controller.js create mode 100644 app/pods/components/characteristic-index-row/component.js create mode 100644 app/pods/components/characteristic-index-row/template.hbs create mode 100644 app/pods/components/sortable-table-header/component.js create mode 100644 app/pods/components/sortable-table-header/template.hbs create mode 100644 app/pods/components/sortable-table/component.js create mode 100644 app/pods/components/sortable-table/template.hbs create mode 100644 app/pods/components/species-index-row/component.js create mode 100644 app/pods/components/species-index-row/template.hbs create mode 100644 app/pods/components/strain-index-row/component.js create mode 100644 app/pods/components/strain-index-row/template.hbs create mode 100644 tests/unit/pods/components/characteristic-index-row/component-test.js create mode 100644 tests/unit/pods/components/sortable-table-header/component-test.js create mode 100644 tests/unit/pods/components/sortable-table/component-test.js create mode 100644 tests/unit/pods/components/species-index-row/component-test.js create mode 100644 tests/unit/pods/components/strain-index-row/component-test.js diff --git a/app/pods/characteristics/controller.js b/app/pods/characteristics/controller.js deleted file mode 100644 index fe6b361..0000000 --- a/app/pods/characteristics/controller.js +++ /dev/null @@ -1,5 +0,0 @@ -import SortableController from '../../controllers/sortable'; - -export default SortableController.extend({ - sortBy: 'characteristicName', -}); diff --git a/app/pods/characteristics/route.js b/app/pods/characteristics/route.js index df69651..873f8b3 100644 --- a/app/pods/characteristics/route.js +++ b/app/pods/characteristics/route.js @@ -4,5 +4,14 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return this.store.findAll('characteristic'); - } + }, + setupController: function(controller, model) { + var tableAttrs = [ + { name: 'Name', attr: 'characteristicName' }, + { name: 'Type', attr: 'characteristicType' } + ]; + controller.set('model', model); + controller.set('tableAttrs', tableAttrs); + controller.set('row', 'characteristic-index-row'); + }, }); diff --git a/app/pods/characteristics/template.hbs b/app/pods/characteristics/template.hbs index e9d8ece..3ee1315 100644 --- a/app/pods/characteristics/template.hbs +++ b/app/pods/characteristics/template.hbs @@ -1,19 +1,4 @@

{{genus-name}} Characteristics

-

Total characteristics: {{controller.length}}

+

Total characteristics: {{model.length}}

- - - - - - - - - {{#each characteristic in controller}} - - - - - {{/each}} - -
NameType
{{characteristic.characteristicName}}{{characteristic.characteristicType}}
+{{sortable-table content=model tableAttrs=tableAttrs row=row}} diff --git a/app/pods/components/characteristic-index-row/component.js b/app/pods/components/characteristic-index-row/component.js new file mode 100644 index 0000000..f48ea57 --- /dev/null +++ b/app/pods/components/characteristic-index-row/component.js @@ -0,0 +1,5 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'tr', +}); diff --git a/app/pods/components/characteristic-index-row/template.hbs b/app/pods/components/characteristic-index-row/template.hbs new file mode 100644 index 0000000..6d045bb --- /dev/null +++ b/app/pods/components/characteristic-index-row/template.hbs @@ -0,0 +1,6 @@ + + {{data.characteristicName}} + + + {{data.characteristicType}} + diff --git a/app/pods/components/sortable-table-header/component.js b/app/pods/components/sortable-table-header/component.js new file mode 100644 index 0000000..638b078 --- /dev/null +++ b/app/pods/components/sortable-table-header/component.js @@ -0,0 +1,13 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'th', + upArrow: '▲', + downArrow: '▼', + + actions: { + sortBy: function(sortProperty, ascending) { + this.sendAction('action', sortProperty, ascending); + } + }, +}); diff --git a/app/pods/components/sortable-table-header/template.hbs b/app/pods/components/sortable-table-header/template.hbs new file mode 100644 index 0000000..7710080 --- /dev/null +++ b/app/pods/components/sortable-table-header/template.hbs @@ -0,0 +1,3 @@ +{{title}} +{{{upArrow}}} +{{{downArrow}}} diff --git a/app/pods/components/sortable-table/component.js b/app/pods/components/sortable-table/component.js new file mode 100644 index 0000000..39ab6c0 --- /dev/null +++ b/app/pods/components/sortable-table/component.js @@ -0,0 +1,13 @@ +import Ember from 'ember'; + +export default Ember.Component.extend(Ember.SortableMixin, { + tagName: 'table', + classNames: ['flakes-table'], + + actions: { + sortBy: function(property, ascending) { + this.set('sortAscending', ascending); + this.set('sortProperties', [property]); + } + }, +}); diff --git a/app/pods/components/sortable-table/template.hbs b/app/pods/components/sortable-table/template.hbs new file mode 100644 index 0000000..0874743 --- /dev/null +++ b/app/pods/components/sortable-table/template.hbs @@ -0,0 +1,13 @@ + + + {{#each a in tableAttrs}} + {{sortable-table-header title=a.name sortProperty=a.attr action="sortBy"}} + {{/each}} + + + + + {{#each item in arrangedContent}} + {{component row data=item}} + {{/each}} + diff --git a/app/pods/components/species-index-row/component.js b/app/pods/components/species-index-row/component.js new file mode 100644 index 0000000..f48ea57 --- /dev/null +++ b/app/pods/components/species-index-row/component.js @@ -0,0 +1,5 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'tr', +}); diff --git a/app/pods/components/species-index-row/template.hbs b/app/pods/components/species-index-row/template.hbs new file mode 100644 index 0000000..6e75b2c --- /dev/null +++ b/app/pods/components/species-index-row/template.hbs @@ -0,0 +1,13 @@ + + {{#link-to 'species.show' data}} + {{data.speciesName}} + {{/link-to}} + + + {{#each data.strains as |strain index|}} + {{if index ","}} + {{#link-to 'strains.show' strain.id}} + {{strain.strainName}} + {{/link-to}} + {{/each}} + diff --git a/app/pods/components/strain-index-row/component.js b/app/pods/components/strain-index-row/component.js new file mode 100644 index 0000000..f48ea57 --- /dev/null +++ b/app/pods/components/strain-index-row/component.js @@ -0,0 +1,5 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + tagName: 'tr', +}); diff --git a/app/pods/components/strain-index-row/template.hbs b/app/pods/components/strain-index-row/template.hbs new file mode 100644 index 0000000..acd0c58 --- /dev/null +++ b/app/pods/components/strain-index-row/template.hbs @@ -0,0 +1,8 @@ + + {{#link-to 'strains.show' data.id}} + {{scientific-name strain=data}} + {{/link-to}} + + + {{data.totalMeasurements}} + diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js index 6b02e0e..9208cec 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/species/index/route.js @@ -4,5 +4,14 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return this.store.findAll('species'); - } + }, + setupController: function(controller, model) { + var tableAttrs = [ + { name: 'Name', attr: 'speciesName' }, + { name: 'Strains', attr: 'totalStrains' } + ]; + controller.set('model', model); + controller.set('tableAttrs', tableAttrs); + controller.set('row', 'species-index-row'); + }, }); diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index d31940f..21ce1cc 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -8,30 +8,4 @@ {{/link-to}} {{/if}} - - - - - - - - - {{#each species in controller}} - - - - - {{/each}} - -
NameStrains
- {{#link-to 'species.show' species}} - {{species.speciesName}} - {{/link-to}} - - {{#each species.strains as |strain index|}} - {{if index ","}} - {{#link-to 'strains.show' strain.id}} - {{strain.strainName}} - {{/link-to}} - {{/each}} -
+{{sortable-table content=model tableAttrs=tableAttrs row=row}} diff --git a/app/pods/strains/index/route.js b/app/pods/strains/index/route.js index 0bcd81a..53d3820 100644 --- a/app/pods/strains/index/route.js +++ b/app/pods/strains/index/route.js @@ -4,5 +4,14 @@ import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixi export default Ember.Route.extend(AuthenticatedRouteMixin, { model: function() { return this.store.findAll('strain'); - } + }, + setupController: function(controller, model) { + var tableAttrs = [ + { name: 'Name', attr: 'fullName' }, + { name: 'Total Measurements', attr: 'totalMeasurements' } + ]; + controller.set('model', model); + controller.set('tableAttrs', tableAttrs); + controller.set('row', 'strain-index-row'); + }, }); diff --git a/app/pods/strains/index/template.hbs b/app/pods/strains/index/template.hbs index 4e8c0ea..edb1048 100644 --- a/app/pods/strains/index/template.hbs +++ b/app/pods/strains/index/template.hbs @@ -1,5 +1,5 @@

{{genus-name}} Strains

-

Total strains: {{controller.length}}

+

Total strains: {{model.length}}

{{#if (can "add strain")}} {{! Does nothing ATM }} @@ -8,23 +8,4 @@ {{/link-to}} {{/if}} - - - - - - - - - {{#each strain in controller}} - - - - - {{/each}} - -
NameTotal Measurements
- {{#link-to 'strains.show' strain.id}} - {{scientific-name strain=strain}} - {{/link-to}} - {{strain.totalMeasurements}}
+{{sortable-table content=model tableAttrs=tableAttrs row=row}} diff --git a/app/styles/app.css b/app/styles/app.css index 9d1b1df..61a0502 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -2,7 +2,7 @@ padding: 2em 0em 0em 0em; } -.flakes-table thead tr { +.flakes-table thead tr th span { cursor: pointer; } diff --git a/tests/unit/pods/components/characteristic-index-row/component-test.js b/tests/unit/pods/components/characteristic-index-row/component-test.js new file mode 100644 index 0000000..0964cf7 --- /dev/null +++ b/tests/unit/pods/components/characteristic-index-row/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('characteristic-index-row', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +}); diff --git a/tests/unit/pods/components/sortable-table-header/component-test.js b/tests/unit/pods/components/sortable-table-header/component-test.js new file mode 100644 index 0000000..adb3489 --- /dev/null +++ b/tests/unit/pods/components/sortable-table-header/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('sortable-table-header', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +}); diff --git a/tests/unit/pods/components/sortable-table/component-test.js b/tests/unit/pods/components/sortable-table/component-test.js new file mode 100644 index 0000000..2d888ff --- /dev/null +++ b/tests/unit/pods/components/sortable-table/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('sortable-table', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +}); diff --git a/tests/unit/pods/components/species-index-row/component-test.js b/tests/unit/pods/components/species-index-row/component-test.js new file mode 100644 index 0000000..2b6b389 --- /dev/null +++ b/tests/unit/pods/components/species-index-row/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('species-index-row', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +}); diff --git a/tests/unit/pods/components/strain-index-row/component-test.js b/tests/unit/pods/components/strain-index-row/component-test.js new file mode 100644 index 0000000..819c0e9 --- /dev/null +++ b/tests/unit/pods/components/strain-index-row/component-test.js @@ -0,0 +1,21 @@ +import { + moduleForComponent, + test +} from 'ember-qunit'; + +moduleForComponent('strain-index-row', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'] +}); + +test('it renders', function(assert) { + assert.expect(2); + + // Creates the component instance + var component = this.subject(); + assert.equal(component._state, 'preRender'); + + // Renders the component to the page + this.render(); + assert.equal(component._state, 'inDOM'); +});