Skip to content

Commit 44bb7b6

Browse files
committed
use ember-cli-admin structure
1 parent d641a8a commit 44bb7b6

187 files changed

Lines changed: 11245 additions & 357 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 0 additions & 33 deletions
This file was deleted.

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66

77
# dependencies
88
/node_modules
9-
/bower_components
9+
/bower_components/*
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log
18+
/.prevgit
19+
/.idea
20+
/.editorconfig
21+
/vendor/*
22+
!/vendor/app.css
23+
!/vendor/nested-sortable.js

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ cache:
77
directories:
88
- node_modules
99

10-
before_install:
11-
- "npm config set spin false"
12-
- "npm install -g npm@^2"
13-
1410
install:
1511
- npm install -g bower
1612
- npm install

Brocfile.js

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
/* global require, module */
22

3-
var EmberApp = require('ember-cli/lib/broccoli/ember-app');
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
var app = new EmberApp();
5+
var app = new EmberAddon();
6+
//app.import('vendor/ember-easy-decorator.js');
7+
//app.import('vendor/ember-easyForm.js');
8+
//app.import('bower_components/ember-forms/dist/globals/main.js');
9+
//app.import('bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js');
10+
app.import('bower_components/chance/chance.js');
611

7-
// Use `app.import` to add additional libraries to the generated
8-
// output files.
9-
//
10-
// If you need to use different assets in different
11-
// environments, specify an object as the first parameter. That
12-
// object's keys should be the environment name and the values
13-
// should be the asset to use in that environment.
14-
//
15-
// If the library that you are including contains AMD or ES6
16-
// modules that you would like to import into your application
17-
// please specify an object with the list of modules as keys
18-
// along with the exports of each module as its value.
12+
// Put the bootstrap fonts in the place that the bootstrap css expects to find them.
1913

20-
module.exports = app.toTree();
14+
var pickFiles = require('broccoli-static-compiler');
15+
var bootstrapFonts = pickFiles('bower_components/bootstrap-sass-official/assets/fonts/bootstrap', {
16+
srcDir: '/',
17+
destDir: '/assets/bootstrap'
18+
});
19+
20+
var compileSass = require('broccoli-sass');
21+
var mainCss = compileSass(['app/styles'], 'app.scss', 'assets/dummy.css');
22+
23+
var mergeTrees = require('broccoli-merge-trees');
24+
25+
module.exports = mergeTrees([app.toTree(), bootstrapFonts, mainCss], {
26+
overwrite: true
27+
});

LICENSE.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)