From a62d4cd9ad5d85b6fb0870ca56a0dcb5656fe4b3 Mon Sep 17 00:00:00 2001 From: Mali Akmanalp Date: Tue, 26 Apr 2016 18:10:18 -0400 Subject: [PATCH] WIP --- .travis.yml | 9 ++-- .watchmanconfig | 2 +- Brocfile.js | 1 + app/app.js | 8 ++-- app/initializers/data-attributes.js | 2 +- app/resolver.js | 3 ++ app/router.js | 6 ++- app/routes/index.js | 6 +-- .../components/graphbuilder-table.hbs | 8 ++-- app/templates/components/search-result.hbs | 2 +- app/templates/components/select-dropdown.hbs | 2 +- app/templates/components/stream-header.hbs | 2 +- .../components/visualization-legend.hbs | 4 +- .../-buildermod-drawer-change-graph.hbs | 2 +- app/templates/search.hbs | 6 +-- app/templates/sortable-cell.hbs | 11 ++--- app/templates/sortable-header-cell.hbs | 6 +-- bower.json | 16 +++---- ember-cli-build.js | 24 ++++++++++ package.json | 48 +++++++++++-------- public/robots.txt | 4 +- testem.js | 13 +++++ tests/.jshintrc | 5 +- tests/helpers/destroy-app.js | 5 ++ tests/helpers/module-for-acceptance.js | 23 +++++++++ tests/helpers/resolver.js | 4 +- tests/helpers/start-app.js | 7 ++- tests/index.html | 19 ++++---- 28 files changed, 158 insertions(+), 90 deletions(-) create mode 100644 app/resolver.js create mode 100644 ember-cli-build.js create mode 100644 testem.js create mode 100644 tests/helpers/destroy-app.js create mode 100644 tests/helpers/module-for-acceptance.js diff --git a/.travis.yml b/.travis.yml index 66dd1076..64533bea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "0.12" + - "4" sudo: false @@ -10,12 +10,11 @@ cache: - node_modules before_install: - - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH - - "npm config set spin false" - - "npm install -g npm@^2" + - npm config set spin false + - npm install -g bower + - npm install phantomjs-prebuilt install: - - npm install -g bower - npm install - bower install diff --git a/.watchmanconfig b/.watchmanconfig index 5e9462c2..e7834e3e 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp"] + "ignore_dirs": ["tmp", "dist"] } diff --git a/Brocfile.js b/Brocfile.js index c92c963b..3253c97b 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -10,6 +10,7 @@ var templateTree = new HtmlbarsCompiler('app/templates', { }); var app = new EmberApp({ + 'hinting': false, dotEnv: { clientAllowedKeys: [ 'GA', diff --git a/app/app.js b/app/app.js index 0676c1b8..6a19a69c 100644 --- a/app/app.js +++ b/app/app.js @@ -1,15 +1,15 @@ import Ember from 'ember'; -import Resolver from 'ember/resolver'; -import loadInitializers from 'ember/load-initializers'; +import Resolver from './resolver'; +import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -var App; +let App; App = Ember.Application.extend({ LOG_TRANSITIONS: true, // basic logging of successful transitions modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, - Resolver: Resolver, + Resolver }); loadInitializers(App, config.modulePrefix); diff --git a/app/initializers/data-attributes.js b/app/initializers/data-attributes.js index ae2a7d9b..2a48d52c 100644 --- a/app/initializers/data-attributes.js +++ b/app/initializers/data-attributes.js @@ -3,7 +3,7 @@ import Ember from 'ember'; export default { name: 'data-attributes', initialize: function() { - Ember.View.reopen({ + Ember.Component.reopen({ init: function() { this._super(); var self = this; diff --git a/app/resolver.js b/app/resolver.js new file mode 100644 index 00000000..2fb563d6 --- /dev/null +++ b/app/resolver.js @@ -0,0 +1,3 @@ +import Resolver from 'ember-resolver'; + +export default Resolver; diff --git a/app/router.js b/app/router.js index 74e02b63..73fa03d2 100644 --- a/app/router.js +++ b/app/router.js @@ -2,11 +2,11 @@ import Ember from 'ember'; import config from './config/environment'; import googlePageview from './mixins/google-pageview'; -var Router = Ember.Router.extend(googlePageview,{ +const Router = Ember.Router.extend(googlePageview,{ location: config.locationType }); -export default Router.map(function() { +Router.map(function() { this.route('search'); this.route('downloads'); this.route('colombia'); @@ -37,3 +37,5 @@ export default Router.map(function() { }); this.route('rankings'); }); + +export default Router; diff --git a/app/routes/index.js b/app/routes/index.js index df9f3220..3569ba79 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -7,9 +7,9 @@ export default Ember.Route.extend({ }, model() { let hash = { - locations: this.store.find('location'), - products: this.store.find('product', { level: '4digit' }), - industries: this.store.find('industry', { level: 'division' }) + locations: this.store.findAll('location'), + products: this.store.findAll('product', { level: '4digit' }), + industries: this.store.findAll('industry', { level: 'division' }) }; return RSVP.hash(hash).then((hash) => { diff --git a/app/templates/components/graphbuilder-table.hbs b/app/templates/components/graphbuilder-table.hbs index f041d60c..591103d0 100644 --- a/app/templates/components/graphbuilder-table.hbs +++ b/app/templates/components/graphbuilder-table.hbs @@ -1,8 +1,8 @@ {{#if hasHeader}} - {{view "header-table-container"}} + {{header-table-container}} {{/if}} -{{view "body-table-container"}} +{{body-table-container}} -{{view "scroll-container"}} -{{view "column-sortable-indicator"}} +{{scroll-container}} +{{column-sortable-indicator}} diff --git a/app/templates/components/search-result.hbs b/app/templates/components/search-result.hbs index 21ae36a4..d3acd290 100644 --- a/app/templates/components/search-result.hbs +++ b/app/templates/components/search-result.hbs @@ -1,7 +1,7 @@
{{#if isLocation }}