From 0a73b347f918bb9cb3af0c94a00450a781a74def Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 10:33:21 -0800 Subject: [PATCH 01/28] sort order --- app/models/characteristic-type.js | 3 ++- app/models/characteristic.js | 3 ++- app/models/species.js | 1 + app/models/strain.js | 1 + app/pods/characteristics/route.js | 2 +- .../measurement-search-panel/component.js | 4 ++-- app/pods/species/index/route.js | 2 +- app/pods/strains/index/route.js | 2 +- server/mocks/characteristic-types.js | 9 ++++++--- server/mocks/characteristics.js | 15 ++++++++++----- server/mocks/species.js | 4 ++++ server/mocks/strains.js | 4 ++++ 12 files changed, 35 insertions(+), 15 deletions(-) diff --git a/app/models/characteristic-type.js b/app/models/characteristic-type.js index 31f793a..284486e 100644 --- a/app/models/characteristic-type.js +++ b/app/models/characteristic-type.js @@ -8,5 +8,6 @@ export default DS.Model.extend({ deletedAt: DS.attr('date'), createdBy: DS.attr('number'), updatedBy: DS.attr('number'), - deletedBy: DS.attr('number') + deletedBy: DS.attr('number'), + sortOrder: DS.attr('number'), }); diff --git a/app/models/characteristic.js b/app/models/characteristic.js index eeeafe4..9f33d7b 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -10,5 +10,6 @@ export default DS.Model.extend({ deletedAt : DS.attr('date'), createdBy : DS.attr('number'), updatedBy : DS.attr('number'), - deletedBy : DS.attr('number') + deletedBy : DS.attr('number'), + sortOrder : DS.attr('number'), }); diff --git a/app/models/species.js b/app/models/species.js index 8c679ee..fee135a 100644 --- a/app/models/species.js +++ b/app/models/species.js @@ -15,6 +15,7 @@ export default DS.Model.extend({ createdBy : DS.attr('number'), updatedBy : DS.attr('number'), deletedBy : DS.attr('number'), + sortOrder : DS.attr('number'), speciesNameMU: function() { return Ember.String.htmlSafe(`${this.get('speciesName')}`); diff --git a/app/models/strain.js b/app/models/strain.js index 09983a5..a3621e9 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -17,6 +17,7 @@ export default DS.Model.extend({ updatedBy : DS.attr('number'), deletedBy : DS.attr('number'), totalMeasurements: DS.attr('number'), + sortOrder : DS.attr('number'), strainNameMU: function() { let type = this.get('typeStrain') ? 'T' : ''; diff --git a/app/pods/characteristics/route.js b/app/pods/characteristics/route.js index bde4ffa..5ac902c 100644 --- a/app/pods/characteristics/route.js +++ b/app/pods/characteristics/route.js @@ -16,6 +16,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { controller.set('model', models.characteristics); controller.set('tableAttrs', tableAttrs); controller.set('row', 'characteristic-index-row'); - controller.set('sort', ['characteristicName']); + controller.set('sort', ['characteristicType.characteristicTypeName', 'sortOrder']); }, }); diff --git a/app/pods/components/measurement-search-panel/component.js b/app/pods/components/measurement-search-panel/component.js index e56e6e9..b9e9749 100644 --- a/app/pods/components/measurement-search-panel/component.js +++ b/app/pods/components/measurement-search-panel/component.js @@ -23,10 +23,10 @@ export default Ember.Component.extend({ models[item.model] = models[item.model].filter((i) => { if (!Ember.isEmpty(i.get(item.children))) { return true; } }); - models[item.model] = models[item.model].sortBy(item.text); + models[item.model] = models[item.model].sortBy('sortOrder'); let temp = models[item.model].map((data) => { let temp_children = []; - let sorted_children = data.get(item.children).sortBy(item.ctext); + let sorted_children = data.get(item.children).sortBy('sortOrder'); sorted_children.forEach((child) => { temp_children.push({id: child.get(item.cid), text: child.get(item.ctext)}); }); diff --git a/app/pods/species/index/route.js b/app/pods/species/index/route.js index 6ef9dd3..9d02d32 100644 --- a/app/pods/species/index/route.js +++ b/app/pods/species/index/route.js @@ -13,6 +13,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { controller.set('model', model); controller.set('tableAttrs', tableAttrs); controller.set('row', 'species-index-row'); - controller.set('sort', ['speciesName']); + controller.set('sort', ['sortOrder']); }, }); diff --git a/app/pods/strains/index/route.js b/app/pods/strains/index/route.js index 81bcc2b..7185ff2 100644 --- a/app/pods/strains/index/route.js +++ b/app/pods/strains/index/route.js @@ -13,6 +13,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, { controller.set('model', model); controller.set('tableAttrs', tableAttrs); controller.set('row', 'strain-index-row'); - controller.set('sort', ['fullNameMU']); + controller.set('sort', ['sortOrder']); }, }); diff --git a/server/mocks/characteristic-types.js b/server/mocks/characteristic-types.js index 906a454..9eb84bc 100644 --- a/server/mocks/characteristic-types.js +++ b/server/mocks/characteristic-types.js @@ -12,7 +12,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 1, }, { id: 2, @@ -23,7 +24,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 2, }, { id: 3, @@ -34,7 +36,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 3, }, ] diff --git a/server/mocks/characteristics.js b/server/mocks/characteristics.js index 3be513c..09c4d44 100644 --- a/server/mocks/characteristics.js +++ b/server/mocks/characteristics.js @@ -14,7 +14,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 1, }, { id: 2, @@ -27,7 +28,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 2, }, { id: 3, @@ -40,7 +42,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 3, }, { id: 4, @@ -53,7 +56,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 4, }, { id: 5, @@ -66,7 +70,8 @@ module.exports = function(app) { deletedAt: null, createdBy: 1, updatedBy: 1, - deletedBy: null + deletedBy: null, + sortOrder: 5, } ] diff --git a/server/mocks/species.js b/server/mocks/species.js index f3b0430..c7b66a4 100644 --- a/server/mocks/species.js +++ b/server/mocks/species.js @@ -17,6 +17,7 @@ module.exports = function(app) { createdBy: 1, updatedBy: 1, deletedBy: null, + sortOrder: 1, }, { id: 2, @@ -32,6 +33,7 @@ module.exports = function(app) { createdBy: 1, updatedBy: 1, deletedBy: null, + sortOrder: 2, }, { id: 3, @@ -47,6 +49,7 @@ module.exports = function(app) { createdBy: 1, updatedBy: 1, deletedBy: null, + sortOrder: 3, }, { id: 4, @@ -62,6 +65,7 @@ module.exports = function(app) { createdBy: 1, updatedBy: 1, deletedBy: null, + sortOrder: 4, } ]; diff --git a/server/mocks/strains.js b/server/mocks/strains.js index d6bfccf..2a39419 100644 --- a/server/mocks/strains.js +++ b/server/mocks/strains.js @@ -20,6 +20,7 @@ module.exports = function(app) { deletedBy: null, totalMeasurements: 5, notes: "Test notes", + sortOrder: 1, }, { id: 2, @@ -38,6 +39,7 @@ module.exports = function(app) { deletedBy: null, totalMeasurements: 5, notes: "Test notes", + sortOrder: 2, }, { id: 3, @@ -56,6 +58,7 @@ module.exports = function(app) { deletedBy: null, totalMeasurements: 0, notes: "Test notes", + sortOrder: 3, }, { id: 4, @@ -74,6 +77,7 @@ module.exports = function(app) { deletedBy: null, totalMeasurements: 0, notes: "Test notes", + sortOrder: 4. } ]; From 43800d6dd83d3468225dc36884f5ea1af09b92f4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 12:46:08 -0800 Subject: [PATCH 02/28] strain whole genome sequence --- app/models/strain.js | 33 ++++++++++--------- .../components/strain-details/template.hbs | 15 +++++++-- server/mocks/strains.js | 4 +++ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/models/strain.js b/app/models/strain.js index a3621e9..7f69f45 100644 --- a/app/models/strain.js +++ b/app/models/strain.js @@ -2,22 +2,23 @@ import DS from 'ember-data'; import Ember from 'ember'; export default DS.Model.extend({ - measurements : DS.hasMany('measurements', { async: true }), - species : DS.belongsTo('species', { async: true }), - strainName : DS.attr('string'), - typeStrain : DS.attr('boolean'), - accessionNumbers : DS.attr('string'), - genbank : DS.attr('string'), - isolatedFrom : DS.attr('string'), - notes : DS.attr('string'), - createdAt : DS.attr('date'), - updatedAt : DS.attr('date'), - deletedAt : DS.attr('date'), - createdBy : DS.attr('number'), - updatedBy : DS.attr('number'), - deletedBy : DS.attr('number'), - totalMeasurements: DS.attr('number'), - sortOrder : DS.attr('number'), + measurements : DS.hasMany('measurements', { async: true }), + species : DS.belongsTo('species', { async: true }), + strainName : DS.attr('string'), + typeStrain : DS.attr('boolean'), + accessionNumbers : DS.attr('string'), + genbank : DS.attr('string'), + wholeGenomeSequence: DS.attr('string'), + isolatedFrom : DS.attr('string'), + notes : DS.attr('string'), + createdAt : DS.attr('date'), + updatedAt : DS.attr('date'), + deletedAt : DS.attr('date'), + createdBy : DS.attr('number'), + updatedBy : DS.attr('number'), + deletedBy : DS.attr('number'), + totalMeasurements : DS.attr('number'), + sortOrder : DS.attr('number'), strainNameMU: function() { let type = this.get('typeStrain') ? 'T' : ''; diff --git a/app/pods/components/strain-details/template.hbs b/app/pods/components/strain-details/template.hbs index f2d648f..9d6e9ca 100644 --- a/app/pods/components/strain-details/template.hbs +++ b/app/pods/components/strain-details/template.hbs @@ -5,7 +5,7 @@ {{#if isEditing}} {{input value=strain.strainName}} {{else}} - {{strain.strainName}} + {{strain.strainNameMU}} {{/if}} {{display-errors a=strain.errors.strainName}} @@ -43,7 +43,7 @@ {{! ROW 2 }} -
+
Accession Numbers
@@ -66,6 +66,17 @@ {{display-errors a=strain.errors.genbank}}
+
+
Whole Genome Sequence
+
+ {{#if isEditing}} + {{input value=strain.wholeGenomeSequence}} + {{else}} + {{strain.wholeGenomeSequence}} + {{/if}} + {{display-errors a=strain.errors.wholeGenomeSequence}} +
+
{{! ROW 3 }} diff --git a/server/mocks/strains.js b/server/mocks/strains.js index 2a39419..d98fc96 100644 --- a/server/mocks/strains.js +++ b/server/mocks/strains.js @@ -10,6 +10,7 @@ module.exports = function(app) { typeStrain: true, accessionNumbers: "Test Accession", genbank: "Test Genbank", + wholeGenomeSequence: "Seq123", isolatedFrom: "Location 1", measurements: [1,2,3,4,5], createdAt: "0001-01-01T00:00:00Z", @@ -29,6 +30,7 @@ module.exports = function(app) { typeStrain: false, accessionNumbers: "Test Accession", genbank: "Test Genbank", + wholeGenomeSequence: null, isolatedFrom: "Location 2", measurements: [6,7,8,9,10], createdAt: "0001-01-01T00:00:00Z", @@ -48,6 +50,7 @@ module.exports = function(app) { typeStrain: true, accessionNumbers: "Test Accession", genbank: "Test Genbank", + wholeGenomeSequence: "Seq123", isolatedFrom: "Location 1", measurements: [], createdAt: "0001-01-01T00:00:00Z", @@ -67,6 +70,7 @@ module.exports = function(app) { typeStrain: true, accessionNumbers: "Test Accession", genbank: "Test Genbank", + wholeGenomeSequence: "Seq123", isolatedFrom: "Location 2", measurements: [], createdAt: "0001-01-01T00:00:00Z", From 94511ba170260fa436f78fa236b265b8efac13e4 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 12:49:26 -0800 Subject: [PATCH 03/28] Customize search panel labels --- app/pods/compare/template.hbs | 7 ++++++- app/pods/components/measurement-search-panel/template.hbs | 4 ++-- app/pods/measurements/template.hbs | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/pods/compare/template.hbs b/app/pods/compare/template.hbs index 8cf1faa..cd0cebb 100644 --- a/app/pods/compare/template.hbs +++ b/app/pods/compare/template.hbs @@ -1,6 +1,11 @@

{{genus-name}} - Compare Strains

-{{measurement-search-panel search='search'}} +{{ + measurement-search-panel + search='search' + strainLabel='Select one or more strains' + charLabel='Select one or more characteristics' +}} {{#if dataEmpty}}
diff --git a/app/pods/components/measurement-search-panel/template.hbs b/app/pods/components/measurement-search-panel/template.hbs index ae9dc36..0376f8a 100644 --- a/app/pods/components/measurement-search-panel/template.hbs +++ b/app/pods/components/measurement-search-panel/template.hbs @@ -10,7 +10,7 @@ content=species value=selectedStrains optionValuePath="id" - placeholder="All strains" + placeholder=strainLabel }}
  • @@ -21,7 +21,7 @@ content=characteristicTypes value=selectedCharacteristics optionValuePath="id" - placeholder="All characteristics" + placeholder=charLabel }}
  • diff --git a/app/pods/measurements/template.hbs b/app/pods/measurements/template.hbs index 63a47e0..6ddf84e 100644 --- a/app/pods/measurements/template.hbs +++ b/app/pods/measurements/template.hbs @@ -1,6 +1,6 @@

    {{genus-name}} Measurements

    -{{measurement-search-panel search='search'}} +{{measurement-search-panel search='search' strainLabel='All strains' charLabel='All characteristics'}}
    From 74c61385d779d04c8f178a772cef327bcd95f068 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 12:58:59 -0800 Subject: [PATCH 04/28] Add link to strain on compare route --- app/pods/compare/template.hbs | 6 +++++- app/pods/components/strain-index-row/template.hbs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/pods/compare/template.hbs b/app/pods/compare/template.hbs index cd0cebb..8724242 100644 --- a/app/pods/compare/template.hbs +++ b/app/pods/compare/template.hbs @@ -18,7 +18,11 @@ Characteristic {{#each strains as |strain|}} - {{strain.fullNameMU}} + + {{#link-to 'strains.show' strain.id classBinding="data.typeStrain:type-strain"}} + {{strain.fullNameMU}} + {{/link-to}} + {{/each}} diff --git a/app/pods/components/strain-index-row/template.hbs b/app/pods/components/strain-index-row/template.hbs index f512924..0cebc7a 100644 --- a/app/pods/components/strain-index-row/template.hbs +++ b/app/pods/components/strain-index-row/template.hbs @@ -1,6 +1,6 @@ {{#link-to 'strains.show' data.id classBinding="data.typeStrain:type-strain"}} - {{{data.fullNameMU}}} + {{data.fullNameMU}} {{/link-to}} From 0710fdf680c7f1c21791d208ec04dd506797d63d Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 14:37:22 -0800 Subject: [PATCH 05/28] Upgrade ember simple auth 0.8.0 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 6aa21fe..7c160ea 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,7 @@ "loader.js": "ember-cli/loader.js#3.2.0", "qunit": "~1.17.1", "flakes": "~1.0.0", - "ember-simple-auth": "~0.8.0-beta.3", + "ember-simple-auth": "~0.8.0", "moment": "~2.9.0", "select2": "3.5.2", "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356", diff --git a/package.json b/package.json index f39391f..4284c02 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", "ember-cli-qunit": "0.3.13", - "ember-cli-simple-auth": "^0.8.0-beta.3", + "ember-cli-simple-auth": "^0.8.0", "ember-cli-simple-auth-token": "^0.7.2", "ember-cli-uglify": "^1.0.1", "ember-data": "1.0.0-beta.18", From 19359c341df85fdbba20df59584c59caf3941409 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 18 Jun 2015 14:38:12 -0800 Subject: [PATCH 06/28] Misc cleanup --- app/pods/components/display-errors/template.hbs | 2 +- app/pods/components/sortable-table/template.hbs | 4 ++-- app/pods/components/strain-details/template.hbs | 9 ++++----- app/pods/species/index/template.hbs | 2 +- app/pods/users/template.hbs | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/pods/components/display-errors/template.hbs b/app/pods/components/display-errors/template.hbs index 8d95c0d..6a74209 100644 --- a/app/pods/components/display-errors/template.hbs +++ b/app/pods/components/display-errors/template.hbs @@ -1,3 +1,3 @@ -{{#each error in a}} +{{#each a as |error|}}
    {{error.message}}
    {{/each}} diff --git a/app/pods/components/sortable-table/template.hbs b/app/pods/components/sortable-table/template.hbs index 0874743..1e48be3 100644 --- a/app/pods/components/sortable-table/template.hbs +++ b/app/pods/components/sortable-table/template.hbs @@ -1,13 +1,13 @@ - {{#each a in tableAttrs}} + {{#each tableAttrs as |a|}} {{sortable-table-header title=a.name sortProperty=a.attr action="sortBy"}} {{/each}} - {{#each item in arrangedContent}} + {{#each arrangedContent as |item|}} {{component row data=item}} {{/each}} diff --git a/app/pods/components/strain-details/template.hbs b/app/pods/components/strain-details/template.hbs index 9d6e9ca..4f98ea7 100644 --- a/app/pods/components/strain-details/template.hbs +++ b/app/pods/components/strain-details/template.hbs @@ -11,17 +11,16 @@ {{! ROW 1 }} -
    +
    Species
    {{#if isEditing}} {{ - view "select" + select-2 content=species - optionValuePath="content.id" - optionLabelPath="content.speciesName" - selection=strain.species + optionLabelPath="speciesName" + value=strain.species }} {{else}} {{#link-to 'species.show' strain.species}} diff --git a/app/pods/species/index/template.hbs b/app/pods/species/index/template.hbs index b73fee7..13fa4b7 100644 --- a/app/pods/species/index/template.hbs +++ b/app/pods/species/index/template.hbs @@ -1,5 +1,5 @@

    {{genus-name}} Species

    -

    Total species: {{controller.length}}

    +

    Total species: {{model.length}}

    {{add-button label="Add Species" link="species.new"}} diff --git a/app/pods/users/template.hbs b/app/pods/users/template.hbs index 005836e..f3239cb 100644 --- a/app/pods/users/template.hbs +++ b/app/pods/users/template.hbs @@ -1,3 +1,3 @@ -{{#each user in model}} +{{#each model as |user|}} {{user.email}}
    {{/each}} From a8fdff6be0bb4edb05c47a12a5b8ecd973de4c64 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 23 Jun 2015 12:08:59 -0800 Subject: [PATCH 07/28] WIP New user signup --- app/models/user.js | 1 + app/pods/application/template.hbs | 4 +-- app/pods/users/{ => index}/route.js | 0 app/pods/users/{ => index}/template.hbs | 0 app/pods/users/new/new-user-form/component.js | 16 ++++++++++ app/pods/users/new/new-user-form/template.hbs | 30 +++++++++++++++++++ app/pods/users/new/route.js | 14 +++++++++ app/pods/users/new/template.hbs | 1 + app/router.js | 4 ++- server/mocks/authenticate.js | 2 +- tests/unit/pods/users/new/route-test.js | 11 +++++++ 11 files changed, 79 insertions(+), 4 deletions(-) rename app/pods/users/{ => index}/route.js (100%) rename app/pods/users/{ => index}/template.hbs (100%) create mode 100644 app/pods/users/new/new-user-form/component.js create mode 100644 app/pods/users/new/new-user-form/template.hbs create mode 100644 app/pods/users/new/route.js create mode 100644 app/pods/users/new/template.hbs create mode 100644 tests/unit/pods/users/new/route-test.js diff --git a/app/models/user.js b/app/models/user.js index 67efa88..ae851d0 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -2,6 +2,7 @@ import DS from 'ember-data'; export default DS.Model.extend({ email : DS.attr('string'), + password : DS.attr('string'), name : DS.attr('string'), role : DS.attr('string'), createdAt: DS.attr('date'), diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs index 729e634..ebf45d8 100644 --- a/app/pods/application/template.hbs +++ b/app/pods/application/template.hbs @@ -29,9 +29,9 @@

    {{else}}

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

    {{/if}}
    diff --git a/app/pods/users/route.js b/app/pods/users/index/route.js similarity index 100% rename from app/pods/users/route.js rename to app/pods/users/index/route.js diff --git a/app/pods/users/template.hbs b/app/pods/users/index/template.hbs similarity index 100% rename from app/pods/users/template.hbs rename to app/pods/users/index/template.hbs diff --git a/app/pods/users/new/new-user-form/component.js b/app/pods/users/new/new-user-form/component.js new file mode 100644 index 0000000..6f3629a --- /dev/null +++ b/app/pods/users/new/new-user-form/component.js @@ -0,0 +1,16 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + classNames: ['grid-1'], + passwordConfirm: null, + + actions: { + save: function() { + var user = this.get('user'); + + if (user.get('isDirty')) { + user.save(); + } + }, + }, +}); diff --git a/app/pods/users/new/new-user-form/template.hbs b/app/pods/users/new/new-user-form/template.hbs new file mode 100644 index 0000000..d4d2958 --- /dev/null +++ b/app/pods/users/new/new-user-form/template.hbs @@ -0,0 +1,30 @@ +
    +
    + New User Signup +
    +
      +
    • + + {{input value=user.name}} +
      • +
    • + + {{input value=user.email}} +
      • +
    • + + {{input value=user.password}} +
      • +
    • + + {{input value=passwordConfirm}} +
      • +
    • + + Submit + +
      • +
    +
    +
    +
    diff --git a/app/pods/users/new/route.js b/app/pods/users/new/route.js new file mode 100644 index 0000000..5e18e0d --- /dev/null +++ b/app/pods/users/new/route.js @@ -0,0 +1,14 @@ +import Ember from 'ember'; +import UnauthenticatedRouteMixin from 'simple-auth/mixins/unauthenticated-route-mixin'; + +export default Ember.Route.extend(UnauthenticatedRouteMixin, { + model: function() { + return Ember.RSVP.hash({ + user: this.store.createRecord('user'), + }); + }, + + setupController: function(controller, model) { + controller.setProperties(model); + }, +}); diff --git a/app/pods/users/new/template.hbs b/app/pods/users/new/template.hbs new file mode 100644 index 0000000..abf9f72 --- /dev/null +++ b/app/pods/users/new/template.hbs @@ -0,0 +1 @@ +{{users/new/new-user-form user=user}} diff --git a/app/router.js b/app/router.js index 03f3b68..5f40894 100644 --- a/app/router.js +++ b/app/router.js @@ -9,7 +9,6 @@ Router.map(function() { this.route('login'); this.route('about'); this.route('characteristics'); - this.route('users'); this.route('measurements'); this.route('compare'); @@ -21,6 +20,9 @@ Router.map(function() { this.route('new'); this.route('show', { path: ':strain_id' }); }); + this.route('users', function() { + this.route('new'); + }); }); export default Router; diff --git a/server/mocks/authenticate.js b/server/mocks/authenticate.js index 0a6a8b8..4ec4913 100644 --- a/server/mocks/authenticate.js +++ b/server/mocks/authenticate.js @@ -35,7 +35,7 @@ module.exports = function(app) { authenticateRouter.post('/', function(req, res) { // wait for a bit to simulate cold boot of heroku api - var ms = 3000 + new Date().getTime(); + var ms = 1000 + new Date().getTime(); while (new Date() < ms){} if ((req.body.email === 'testA' || req.body.email === 'testR' || req.body.email === 'testW' ) diff --git a/tests/unit/pods/users/new/route-test.js b/tests/unit/pods/users/new/route-test.js new file mode 100644 index 0000000..fe4901b --- /dev/null +++ b/tests/unit/pods/users/new/route-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:users/new', 'Unit | Route | users/new', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + var route = this.subject(); + assert.ok(route); +}); From c1b180ebacdad3ed32c5191c2ba36ceeb10b2158 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 23 Jun 2015 13:42:13 -0800 Subject: [PATCH 08/28] Set up ember-cli-flash --- app/pods/application/template.hbs | 3 +++ .../custom-flash-message/component.js | 7 +++++++ .../custom-flash-message/template.hbs | 1 + app/pods/login/controller.js | 4 ++-- app/pods/login/route.js | 6 +----- app/pods/login/template.hbs | 8 +------- config/environment.js | 5 +++++ package.json | 1 + tests/helpers/flash-message.js | 3 +++ tests/test-helper.js | 2 ++ .../custom-flash-message/component-test.js | 19 +++++++++++++++++++ 11 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 app/pods/components/custom-flash-message/component.js create mode 100644 app/pods/components/custom-flash-message/template.hbs create mode 100644 tests/helpers/flash-message.js create mode 100644 tests/unit/pods/components/custom-flash-message/component-test.js diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs index ebf45d8..78cabb1 100644 --- a/app/pods/application/template.hbs +++ b/app/pods/application/template.hbs @@ -47,6 +47,9 @@
    + {{#each flashMessages.queue as |flash|}} + {{custom-flash-message flash=flash}} + {{/each}} {{outlet}}
    diff --git a/app/pods/components/custom-flash-message/component.js b/app/pods/components/custom-flash-message/component.js new file mode 100644 index 0000000..f89312c --- /dev/null +++ b/app/pods/components/custom-flash-message/component.js @@ -0,0 +1,7 @@ +import Ember from 'ember'; + +export default Ember.Component.extend({ + classNames: ['flakes-message'], + classNameBindings: ['type'], + type: Ember.computed.readOnly('flash.type'), +}); diff --git a/app/pods/components/custom-flash-message/template.hbs b/app/pods/components/custom-flash-message/template.hbs new file mode 100644 index 0000000..2197d70 --- /dev/null +++ b/app/pods/components/custom-flash-message/template.hbs @@ -0,0 +1 @@ +{{flash.message}} diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js index d055e8f..1282885 100644 --- a/app/pods/login/controller.js +++ b/app/pods/login/controller.js @@ -3,16 +3,16 @@ import Ember from 'ember'; export default Ember.Controller.extend({ actions: { authenticate: function() { - this.set('errorMessage', null); let credentials = this.getProperties('identification', 'password'); let authenticator = 'simple-auth-authenticator:token'; this.set('loading', true); + this.get('flashMessages').clearMessages(); this.get('session').authenticate(authenticator, credentials).then(()=>{ this.set('loading', false); }, (error)=> { this.set('loading', false); - this.set('errorMessage', error.error); + this.get('flashMessages').error(error.error); }); } } diff --git a/app/pods/login/route.js b/app/pods/login/route.js index 596bf30..457fe0c 100644 --- a/app/pods/login/route.js +++ b/app/pods/login/route.js @@ -1,8 +1,4 @@ import Ember from 'ember'; import UnauthenticatedRouteMixin from 'simple-auth/mixins/unauthenticated-route-mixin'; -export default Ember.Route.extend(UnauthenticatedRouteMixin, { - setupController: function(controller) { - controller.set('errorMessage', null); - } -}); +export default Ember.Route.extend(UnauthenticatedRouteMixin, {}); diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs index 18d24ef..c851114 100644 --- a/app/pods/login/template.hbs +++ b/app/pods/login/template.hbs @@ -2,10 +2,7 @@

    You are already logged in!

    {{else}} {{#if loading}} - + {{loading-panel}} {{else}}

    Log In

    @@ -14,7 +11,4 @@ {{input class="button-gray" type="submit" value="Log In"}}
    {{/if}} - {{#if errorMessage}} -
    {{errorMessage}}
    - {{/if}} {{/if}} diff --git a/config/environment.js b/config/environment.js index e71d629..f1f7848 100644 --- a/config/environment.js +++ b/config/environment.js @@ -34,6 +34,11 @@ module.exports = function(environment) { 'style-src': "'self' 'unsafe-inline'", 'media-src': "'self'" }, + flashMessageDefaults: { + sticky: true, + type: 'error', + types: ['error', 'warning', 'success', 'information', 'tip', 'message'], + }, }; if (environment === 'development') { diff --git a/package.json b/package.json index 4284c02..4b024f0 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "ember-cli-content-security-policy": "0.4.0", "ember-cli-dependency-checker": "^1.0.0", "ember-cli-divshot": "^0.1.7", + "ember-cli-flash": "1.1.4", "ember-cli-htmlbars": "0.7.6", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", diff --git a/tests/helpers/flash-message.js b/tests/helpers/flash-message.js new file mode 100644 index 0000000..1acf2cf --- /dev/null +++ b/tests/helpers/flash-message.js @@ -0,0 +1,3 @@ +import FlashObject from 'ember-cli-flash/flash/object'; + +FlashObject.reopen({ _destroyLater: null }); diff --git a/tests/test-helper.js b/tests/test-helper.js index e6cfb70..0b009b7 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -1,4 +1,6 @@ import resolver from './helpers/resolver'; +import flashMessageHelper from './helpers/flash-message'; + import { setResolver } from 'ember-qunit'; diff --git a/tests/unit/pods/components/custom-flash-message/component-test.js b/tests/unit/pods/components/custom-flash-message/component-test.js new file mode 100644 index 0000000..b6967e6 --- /dev/null +++ b/tests/unit/pods/components/custom-flash-message/component-test.js @@ -0,0 +1,19 @@ +import { moduleForComponent, test } from 'ember-qunit'; + +moduleForComponent('custom-flash-message', 'Unit | Component | custom flash message', { + // Specify the other units that are required for this test + // needs: ['component:foo', 'helper:bar'], + unit: true +}); + +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'); +}); From d4bd0e915c4d4cec1534b40b835901cf2d48f3c0 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Tue, 23 Jun 2015 15:09:14 -0800 Subject: [PATCH 09/28] Make site name h2 + component --- app/pods/application/template.hbs | 8 ++------ app/pods/components/site-logo/template.hbs | 3 +++ .../components/site-logo/component-test.js | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 app/pods/components/site-logo/template.hbs create mode 100644 tests/unit/pods/components/site-logo/component-test.js diff --git a/app/pods/application/template.hbs b/app/pods/application/template.hbs index 78cabb1..6e52a50 100644 --- a/app/pods/application/template.hbs +++ b/app/pods/application/template.hbs @@ -1,7 +1,5 @@
    - {{#link-to 'index' class='logo'}} - {{globals.genus}}.info - {{/link-to}} + {{site-logo}} {{#if session.isAuthenticated}}