Skip to content

Commit 51933d7

Browse files
committed
remove old packages && add some new to blueprint
1 parent 6a9f9bf commit 51933d7

6 files changed

Lines changed: 14 additions & 43 deletions

File tree

Brocfile.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
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');
11-
12-
// Put the bootstrap fonts in the place that the bootstrap css expects to find them.
136

147
var pickFiles = require('broccoli-static-compiler');
158
var bootstrapFonts = pickFiles('bower_components/bootstrap-sass-official/assets/fonts/bootstrap', {
Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
1-
var fs = require('fs');
2-
var path = require('path');
3-
var renameFile = require('ember-cli-admin/lib/proccess-text-content').renameFile;
4-
51
module.exports = {
62
normalizeEntityName: function() {},
73
afterInstall: function() {
8-
renameFile.bind(this)('app/styles/app.css', 'app/styles/app.scss');
94
this.addBowerPackagesToProject([
10-
{name: "bootstrap-sass-official", target: "3.2.0"},
11-
{name: "typeahead.js", target: "0.10.5"},
12-
{name: "jquery-ui-sortable", target: "*"}
5+
{name: "ember-simple-auth", target: "0.7.2"}
136
]);
7+
148
return this.addPackagesToProject([
15-
{name: "ember-cli-map", target: "0.2.2"},
16-
{name: "ember-cli-bootstrap-datepicker", target: "0.3.0"},
17-
{name: "broccoli-merge-trees", target: "0.1.4"},
18-
{name: "broccoli-sass", target: "^0.2.2"},
19-
{name: "broccoli-static-compiler", target: "0.1.4"}
9+
{name: "ember-cli-simple-auth", target: "^0.7.2"},
10+
{name: "ember-cli-simple-auth-devise", target: "^0.7.2"}
2011
]);
2112
}
2213
};

bower.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "ember-cli-admin",
2+
"name": "ember-cli-admin-auth",
33
"dependencies": {
44
"handlebars": "~1.3.0",
55
"jquery": "^1.11.1",
@@ -18,7 +18,6 @@
1818
"typeahead.js": "twitter/typeahead.js#0.10.5",
1919
"jquery-ui-sortable": "*",
2020
"bootstrap-datepicker": "~1.3.1",
21-
"chance": "~0.7.3",
2221
"ember-simple-auth": "0.7.2"
2322
},
2423
"resolutions": {

index.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
module.exports = {
2-
name: 'ember-cli-admin',
2+
name: 'ember-cli-admin-auth',
33

44
included: function(app) {
55
this.app = app;
6-
app.import('vendor/app.css');
7-
app.import('bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js');
8-
app.import('bower_components/typeahead.js/dist/bloodhound.min.js');
9-
app.import('bower_components/typeahead.js/dist/typeahead.jquery.js');
10-
app.import('bower_components/jquery-ui-sortable/jquery-ui-sortable.js');
11-
app.import('vendor/nested-sortable.js');
126
}
137
};

package.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "ember-cli-admin",
3-
"version": "0.4.1",
4-
"description": "powerful admin dashboard for ember-cli projects, more in http://ember-admin.com",
2+
"name": "ember-cli-admin-auth",
3+
"version": "0.0.1",
4+
"description": "Authentication module for Ember-Cli-Admin",
55
"directories": {
66
"doc": "doc",
77
"test": "tests"
@@ -11,7 +11,7 @@
1111
"build": "ember build",
1212
"test": "ember test"
1313
},
14-
"repository": "https://github.com/ember-admin/ember-cli-admin",
14+
"repository": "https://github.com/ember-admin/ember-cli-admin-auth",
1515
"engines": {
1616
"node": ">= 0.10.0"
1717
},
@@ -21,16 +21,16 @@
2121
"admin",
2222
"ember",
2323
"ember-cli-admin",
24+
"ember-cli-admin-auth",
2425
"ember-admin",
26+
"devise",
27+
"auth",
2528
"bootstrap-admin"
2629
],
2730
"ember-addon": {
2831
"configPath": "tests/dummy/config"
2932
},
30-
"author": "Alex Opak <opak.alexandr@gmail.com>",
31-
"contributors": [
32-
"Valeria Leshchenko <valeria.leshchenko@gmail.com>"
33-
],
33+
"author": "Igor Kurinnoy <kurinnoyi@gmail.com>",
3434
"license": "MIT",
3535
"devDependencies": {
3636
"body-parser": "^1.2.0",
@@ -56,8 +56,5 @@
5656
"ember-export-application-global": "^1.0.0",
5757
"express": "^4.8.5",
5858
"glob": "^4.0.5"
59-
},
60-
"dependencies": {
61-
"chance": "^0.7.3"
6259
}
6360
}

server/mocks/app.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
var Chance = require('chance');
2-
var chance = new Chance();
3-
41
module.exports = function(app) {
52
var express = require('express');
63
var appRouter = express.Router();

0 commit comments

Comments
 (0)