diff --git a/.editorconfig b/.editorconfig index 47c5438..219985c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,22 +13,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - [*.hbs] insert_final_newline = false -indent_style = space -indent_size = 2 - -[*.css] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index b876c89..5ad14dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# See http://help.github.com/ignore-files/ for more about ignoring files. +# See https://help.github.com/ignore-files/ for more about ignoring files. # compiled output /dist @@ -13,7 +13,5 @@ /connect.lock /coverage/* /libpeerconnection.log -npm-debug.log +npm-debug.log* testem.log - -.DS_Store diff --git a/.jshintrc b/.jshintrc index 08096ef..d421faa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -27,6 +27,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/.travis.yml b/.travis.yml index 64533be..a75f20e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,14 @@ sudo: false cache: directories: - - node_modules + - $HOME/.npm + - $HOME/.cache # includes bowers cache before_install: - npm config set spin false - - npm install -g bower - - npm install phantomjs-prebuilt + - npm install -g bower phantomjs-prebuilt + - bower --version + - phantomjs --version install: - npm install diff --git a/README.md b/README.md index 4dff7cf..8081f80 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Villasweb-frontend +# villasweb-frontend This README outlines the details of collaborating on this Ember application. A short introduction of this app could easily go here. @@ -7,22 +7,22 @@ A short introduction of this app could easily go here. You will need the following things properly installed on your computer. -* [Git](http://git-scm.com/) -* [Node.js](http://nodejs.org/) (with NPM) -* [Bower](http://bower.io/) -* [Ember CLI](http://ember-cli.com/) +* [Git](https://git-scm.com/) +* [Node.js](https://nodejs.org/) (with NPM) +* [Bower](https://bower.io/) +* [Ember CLI](https://ember-cli.com/) * [PhantomJS](http://phantomjs.org/) ## Installation * `git clone ` this repository -* change into the new directory +* `cd villasweb-frontend` * `npm install` * `bower install` ## Running / Development -* `ember server` +* `ember serve` * Visit your app at [http://localhost:4200](http://localhost:4200). ### Code Generators @@ -46,8 +46,7 @@ Specify what it takes to deploy your app. ## Further Reading / Useful Links * [ember.js](http://emberjs.com/) -* [ember-cli](http://ember-cli.com/) +* [ember-cli](https://ember-cli.com/) * Development Browser Extensions * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi) * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/) - diff --git a/app/app.js b/app/app.js index 01d4b13..6921924 100644 --- a/app/app.js +++ b/app/app.js @@ -22,10 +22,6 @@ App = Ember.Application.extend({ Resolver }); -Ember.RSVP.on('error', function(error) { - console.error(error.message); -}); - loadInitializers(App, config.modulePrefix); export default App; diff --git a/app/index.html b/app/index.html index fd514c9..f0991a2 100644 --- a/app/index.html +++ b/app/index.html @@ -3,22 +3,22 @@ - VILLASwebFrontend + VillaswebFrontend {{content-for "head"}} - - + + {{content-for "head-footer"}} {{content-for "body"}} - - + + {{content-for "body-footer"}} diff --git a/app/resolver.js b/app/resolver.js index 50a19ab..2fb563d 100644 --- a/app/resolver.js +++ b/app/resolver.js @@ -1,12 +1,3 @@ -/** - * File: resolver.js - * Author: Markus Grigull - * Date: 26.06.2016 - * Copyright: 2016, Institute for Automation of Complex Power Systems, EONERC - * This file is part of VILLASweb. All Rights Reserved. Proprietary and confidential. - * Unauthorized copying of this file, via any medium is strictly prohibited. - **********************************************************************************/ - import Resolver from 'ember-resolver'; export default Resolver; diff --git a/app/router.js b/app/router.js index 47f4580..8fbc33a 100644 --- a/app/router.js +++ b/app/router.js @@ -11,7 +11,8 @@ import Ember from 'ember'; import config from './config/environment'; const Router = Ember.Router.extend({ - location: config.locationType + location: config.locationType, + rootURL: config.rootURL }); Router.map(function() { diff --git a/bower.json b/bower.json index 9020a79..adf3c54 100644 --- a/bower.json +++ b/bower.json @@ -1,15 +1,8 @@ { "name": "villasweb-frontend", "dependencies": { - "ember": "~2.5.0", - "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", - "ember-qunit-notifications": "0.1.0", "jquery-ui": "1.11.4", "bootstrap": "~3.3.5", "flot": "~0.8.3" - }, - "resolutions": { - "ember": "~2.5.0" } } diff --git a/config/environment.js b/config/environment.js index a6feb08..0783652 100644 --- a/config/environment.js +++ b/config/environment.js @@ -4,7 +4,7 @@ module.exports = function(environment) { var ENV = { modulePrefix: 'villasweb-frontend', environment: environment, - baseURL: '/', + rootURL: '/', locationType: 'auto', EmberENV: { FEATURES: { @@ -12,7 +12,8 @@ module.exports = function(environment) { // e.g. 'with-controller': true }, EXTEND_PROTOTYPES: { - Date: false, + // Prevent Ember Data from overriding Date.parse. + Date: false } }, @@ -31,7 +32,6 @@ module.exports = function(environment) { if (environment === 'test') { // Testem prefers this... - ENV.baseURL = '/'; ENV.locationType = 'none'; // keep test console output quieter diff --git a/package.json b/package.json index 30d5a65..4640180 100644 --- a/package.json +++ b/package.json @@ -2,50 +2,53 @@ "name": "villasweb-frontend", "version": "0.0.0", "description": "Small description for villasweb-frontend goes here", - "private": true, + "license": "MIT", + "author": "", "directories": { "doc": "doc", "test": "tests" }, + "repository": "", "scripts": { "build": "ember build", "start": "ember server", "test": "ember test" }, - "repository": "", - "engines": { - "node": ">= 0.10.0" - }, - "author": "", - "license": "MIT", "devDependencies": { - "broccoli-asset-rev": "^2.4.2", - "ember-ajax": "0.7.1", - "ember-cli": "2.5.1", - "ember-cli-app-version": "^1.0.0", - "ember-cli-babel": "^5.1.6", - "ember-cli-dependency-checker": "^1.2.0", + "broccoli-asset-rev": "^2.4.5", + "ember-ajax": "^2.4.1", + "ember-cli": "2.11.0", + "ember-cli-app-version": "^2.0.0", + "ember-cli-babel": "^5.1.7", + "ember-cli-dependency-checker": "^1.3.0", "ember-cli-flot": "0.0.3", - "ember-cli-htmlbars": "^1.0.3", - "ember-cli-htmlbars-inline-precompile": "^0.3.1", - "ember-cli-inject-live-reload": "^1.4.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.3.3", + "ember-cli-inject-live-reload": "^1.4.1", "ember-cli-jquery-ui": "0.0.20", - "ember-cli-jshint": "^1.0.0", - "ember-cli-qunit": "^1.4.0", - "ember-cli-release": "0.2.8", + "ember-cli-jshint": "^2.0.1", + "ember-cli-qunit": "^3.0.1", + "ember-cli-release": "^0.2.9", "ember-cli-sass": "5.5.2", + "ember-cli-shims": "^1.0.2", "ember-cli-sri": "^2.1.0", + "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.5.0", + "ember-data": "^2.11.0", "ember-export-application-global": "^1.0.5", - "ember-load-initializers": "^0.5.1", + "ember-load-initializers": "^0.6.0", "ember-modal-dialog": "^0.9.0", "ember-resolver": "^2.0.3", "ember-simple-auth": "^1.1.0", "ember-tether": "0.3.1", "ember-truth-helpers": "1.2.0", "ember-uploader": "1.2.3", - "loader.js": "^4.0.1" + "ember-source": "^2.11.0", + "ember-welcome-page": "^2.0.2", + "loader.js": "^4.0.10" }, - "dependencies": {} + "engines": { + "node": ">= 0.12.0" + }, + "private": true } diff --git a/tests/.jshintrc b/tests/.jshintrc index 6ec0b7c..d2bd113 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -47,6 +47,6 @@ "strict": false, "white": false, "eqnull": true, - "esnext": true, + "esversion": 6, "unused": true } diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 8c8b74e..76996fd 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -1,23 +1,23 @@ import { module } from 'qunit'; +import Ember from 'ember'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; +const { RSVP: { Promise } } = Ember; + export default function(name, options = {}) { module(name, { beforeEach() { this.application = startApp(); if (options.beforeEach) { - options.beforeEach.apply(this, arguments); + return options.beforeEach.apply(this, arguments); } }, afterEach() { - if (options.afterEach) { - options.afterEach.apply(this, arguments); - } - - destroyApp(this.application); + let afterEach = options.afterEach && options.afterEach.apply(this, arguments); + return Promise.resolve(afterEach).then(() => destroyApp(this.application)); } }); } diff --git a/tests/index.html b/tests/index.html index 9cffb74..4def306 100644 --- a/tests/index.html +++ b/tests/index.html @@ -3,16 +3,16 @@ - VILLASwebFrontend Tests + VillaswebFrontend Tests {{content-for "head"}} {{content-for "test-head"}} - - - + + + {{content-for "head-footer"}} {{content-for "test-head-footer"}} @@ -21,12 +21,11 @@ {{content-for "body"}} {{content-for "test-body"}} - - - - - - + + + + + {{content-for "body-footer"}} {{content-for "test-body-footer"}}