MAINT: Updating deps and cleaning cruft (#11)

This commit is contained in:
Matthew Ryan Dillon 2017-07-10 18:48:04 -07:00 committed by GitHub
parent 4c58b0c331
commit 8897e35398
5 changed files with 18 additions and 56 deletions

View file

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

View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>CcdbWeb</title>
<title>CCDB</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

View file

@ -1,5 +1,11 @@
{{!-- The following component displays Ember's default welcome message. --}}
{{welcome-page}}
{{!-- Feel free to remove this! --}}
<div class="container">
<div class="row">
<div class="col-md-6">
foo
</div>
<div class="col-md-6">
bar
</div>
</div>
</div>
{{outlet}}

View file

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

View file

@ -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": {