lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modernizing: part 1

Browse source
This commit is contained in:
lone-cloud 2016-10-05 23:43:18 -07:00
parent 403f3ec290
commit 54e9cac647
10 changed files with 41 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.editorconfig
View file

@ -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

2
.jshintrc
View file

@ -32,6 +32,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}

8
app/index.html
View file

@ -35,8 +35,8 @@
<meta name="msapplication-TileImage" content="/mstile-144x144.png">
<meta name="theme-color" content="#ffffff">
<link rel="stylesheet" integrity="" href="assets/vendor.css">
<link rel="stylesheet" integrity="" href="assets/huegasm.css">
<link rel="stylesheet" integrity="" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" integrity="" href="{{rootURL}}assets/huegasm.css">
{{content-for 'head-footer'}}
@ -55,8 +55,8 @@
<body>
{{content-for 'body'}}
<script src="assets/vendor.js"></script>
<script src="assets/huegasm.js"></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/huegasm.js"></script>
{{content-for 'body-footer'}}
</body>

3
app/router.js
View file

@ -2,7 +2,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() {

15
bower.json
View file

@ -1,17 +1,16 @@
{
"name": "huegasm",
"dependencies": {
"bootstrap-sass": "~3.3.5",
"ember": "~2.4.1",
"ember-cli-shims": "0.1.0",
"ember-cli-test-loader": "0.2.2",
"bootstrap-sass": "^3.3.5",
"ember": "^2.8.1",
"ember-cli-shims": "^0.1.0",
"ember-load-initializers": "0.5.1",
"ember-qunit-notifications": "0.1.0",
"intro.js": "~2.1.0",
"intro.js": "^2.1.0",
"JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git",
"jquery-mousewheel": "~3.1.13",
"locallyjs": "~0.3.2",
"matchMedia": "~0.3.0",
"jquery-mousewheel": "^3.1.13",
"locallyjs": "^0.3.2",
"matchMedia": "^0.3.0",
"nouislider": "^8.3.0",
"HackTimer": "https://github.com/turuslan/HackTimer.git#~1.0.0",
"hammer.js": "^2.0.8"

5
config/environment.js
View file

@ -5,7 +5,7 @@ module.exports = function(environment) {
modulePrefix: 'huegasm',
podModulePrefix: 'huegasm/pods',
environment: environment,
baseURL: '/',
rootURL: '/',
locationType: 'auto',
EmberENV: {
FEATURES: {
@ -30,7 +30,6 @@ module.exports = function(environment) {
if (environment === 'test') {
// Testem prefers this...
ENV.baseURL = '/';
ENV.locationType = 'none';
// keep test console output quieter
@ -41,7 +40,7 @@ module.exports = function(environment) {
}
if (environment === 'production') {
//ENV.baseURL = '/huegasm';
}
return ENV;

20
package.json
View file

@ -1,7 +1,7 @@
{
"name": "huegasm",
"version": "1.0.0",
"description": "Small description for huegasm goes here",
"version": "2.0.0",
"description": "Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.",
"private": true,
"directories": {
"doc": "doc",
@ -15,32 +15,32 @@
"engines": {
"node": ">= 0.10.0"
},
"author": "",
"author": "Egor Philippov",
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.2.0",
"ember-cli": "^2.4.2",
"ember-ajax": "^2.0.1",
"ember-cli": "^2.8.0",
"ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.5",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-nouislider": "0.7.0",
"ember-cli-nouislider": "0.10.0",
"ember-cli-qunit": "^1.2.1",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "5.2.1",
"ember-cli-sass": "^5.2.1",
"ember-cli-sri": "^2.1.0",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-cli-windows-addon": "^1.2.2",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-load-initializers": "^0.5.0",
"ember-modal-dialog": "0.8.3",
"ember-modal-dialog": "^0.8.3",
"ember-notify": "^5.0.4",
"ember-paper": "^0.2.14",
"ember-resolver": "^2.0.3",
"ember-truth-helpers": "1.2.0",
"ember-truth-helpers": "^1.2.0",
"loader.js": "^4.0.7"
}
}

2
tests/.jshintrc
View file

@ -47,6 +47,6 @@
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"esversion": 6,
"unused": true
}

12
tests/helpers/module-for-acceptance.js
View file

@ -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));
}
});
}

17
tests/index.html
View file

@ -10,9 +10,9 @@
{{content-for "head"}}
{{content-for "test-head"}}
<link rel="stylesheet" href="assets/vendor.css">
<link rel="stylesheet" href="assets/huegasm.css">
<link rel="stylesheet" href="assets/test-support.css">
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
<link rel="stylesheet" href="{{rootURL}}assets/huegasm.css">
<link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
{{content-for "head-footer"}}
{{content-for "test-head-footer"}}
@ -21,12 +21,11 @@
{{content-for "body"}}
{{content-for "test-body"}}
<script src="testem.js" integrity=""></script>
<script src="assets/vendor.js"></script>
<script src="assets/test-support.js"></script>
<script src="assets/huegasm.js"></script>
<script src="assets/tests.js"></script>
<script src="assets/test-loader.js"></script>
<script src="{{rootURL}}testem.js" integrity=""></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<script src="{{rootURL}}assets/test-support.js"></script>
<script src="{{rootURL}}assets/huegasm.js"></script>
<script src="{{rootURL}}assets/tests.js"></script>
{{content-for "body-footer"}}
{{content-for "test-body-footer"}}