From 8897e3539883559c6f67c411b9e020193006e397 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 10 Jul 2017 18:48:04 -0700 Subject: [PATCH] MAINT: Updating deps and cleaning cruft (#11) --- .jshintrc | 32 -------------------------------- app/index.html | 2 +- app/templates/application.hbs | 14 ++++++++++---- ember-cli-build.js | 18 +++--------------- package.json | 8 ++++---- 5 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 .jshintrc diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index d421faa..0000000 --- a/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise" - ], - "browser": true, - "boss": true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} diff --git a/app/index.html b/app/index.html index 6ae09c4..e01418d 100644 --- a/app/index.html +++ b/app/index.html @@ -3,7 +3,7 @@ - CcdbWeb + CCDB diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 372fe27..103746f 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,5 +1,11 @@ -{{!-- The following component displays Ember's default welcome message. --}} -{{welcome-page}} -{{!-- Feel free to remove this! --}} - +
+
+
+ foo +
+
+ bar +
+
+
{{outlet}} diff --git a/ember-cli-build.js b/ember-cli-build.js index 9a757ff..eba9ff4 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -4,22 +4,10 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function(defaults) { - let app = new EmberApp(defaults, { - // Add options here - }); + let app = new EmberApp(defaults, {}); - // Use `app.import` to add additional libraries to the generated - // output files. - // - // If you need to use different assets in different - // environments, specify an object as the first parameter. That - // object's keys should be the environment name and the values - // should be the asset to use in that environment. - // - // If the library that you are including contains AMD or ES6 - // modules that you would like to import into your application - // please specify an object with the list of modules as keys - // along with the exports of each module as its value. + app.import('bower_components/bootstrap/dist/css/bootstrap.min.css'); + app.import('bower_components/bootstrap/dist/css/bootstrap-theme.min.css'); return app.toTree(); }; diff --git a/package.json b/package.json index 286ff53..19df27c 100644 --- a/package.json +++ b/package.json @@ -32,17 +32,17 @@ "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", "ember-data": "~2.14.3", + "ember-django-adapter": "1.1.3", "ember-export-application-global": "^2.0.0", "ember-inflector": "^2.0.1", "ember-load-initializers": "^1.0.0", - "ember-resolver": "^4.0.0", - "ember-source": "~2.14.0", - "ember-django-adapter": "1.1.3", + "ember-models-table": "^1.12.0", "ember-moment": "7.3.1", "ember-power-select": "1.8.5", "ember-power-select-with-create": "0.4.3", + "ember-resolver": "^4.0.0", "ember-simple-auth": "1.3.0", - "ember-welcome-page": "^3.0.0", + "ember-source": "~2.14.0", "loader.js": "^4.2.3" }, "engines": {