make it work

This commit is contained in:
Sam 2016-05-05 22:12:40 +03:00
parent 96591cc1e8
commit 500980199b
7 changed files with 820 additions and 44 deletions

View file

@ -13,7 +13,7 @@ module.exports = function(grunt) {
clientViews: ['public/modules/**/views/**/*.html', '!public/modules/**/demo/**/*.html', '!public/modules/**/dist/**/*.html', '!public/modules/**/node_modules/**/*.html'], clientViews: ['public/modules/**/views/**/*.html', '!public/modules/**/demo/**/*.html', '!public/modules/**/dist/**/*.html', '!public/modules/**/node_modules/**/*.html'],
clientJS: ['public/js/*.js', 'public/modules/**/*.js', '!public/modules/**/gruntfile.js', '!public/modules/**/demo/**/*.js', '!public/modules/**/dist/**/*.js', '!public/modules/**/node_modules/**/*.js'], clientJS: ['public/js/*.js', 'public/modules/**/*.js', '!public/modules/**/gruntfile.js', '!public/modules/**/demo/**/*.js', '!public/modules/**/dist/**/*.js', '!public/modules/**/node_modules/**/*.js'],
clientCSS: ['public/modules/**/*.css', '!public/modules/**/demo/**/*.css', '!public/modules/**/dist/**/*.css', '!public/modules/**/node_modules/**/*.css'], clientCSS: ['public/modules/**/*.css', '!public/modules/**/demo/**/*.css', '!public/modules/**/dist/**/*.css', '!public/modules/**/node_modules/**/*.css'],
serverTests: ['app/tests/**/*.js'], serverTests: ['app/tests/**/*.js'],
clientTests: ['public/modules/**/tests/*.js', '!public/modules/**/demo/**/*.js', '!public/modules/**/dist/**/*.js', '!public/modules/**/node_modules/**/*.js'] clientTests: ['public/modules/**/tests/*.js', '!public/modules/**/demo/**/*.js', '!public/modules/**/dist/**/*.js', '!public/modules/**/node_modules/**/*.js']
@ -135,21 +135,13 @@ module.exports = function(grunt) {
production: { production: {
files: { files: {
'public/dist/application.js': '<%= applicationJavaScriptFiles %>' 'public/dist/application.js': '<%= applicationJavaScriptFiles %>'
} }
} }
}, },
concurrent: { concurrent: {
default: ['nodemon', 'watch'], default: ['nodemon', 'watch'],
debug: ['nodemon', 'watch', 'node-inspector'], debug: ['nodemon', 'watch', 'node-inspector'],
options: { options: {
logConcurrentOutput: true,
limit: 10
}
},
concurrent: {
default: ['nodemon', 'watch'],
debug: ['nodemon', 'watch', 'node-inspector'],
options: {
logConcurrentOutput: true, logConcurrentOutput: true,
limit: 10 limit: 10
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -18,7 +18,7 @@
"ng-file-upload": "~10.0.2", "ng-file-upload": "~10.0.2",
"angular-ui-date": "~0.0.8", "angular-ui-date": "~0.0.8",
"lodash": "~3.10.0", "lodash": "~3.10.0",
"angular-input-stars": "*", "angular-input-stars": "https://github.com/whitef0x0/angular-input-stars.git#master",
"file-saver.js": "~1.20150507.2", "file-saver.js": "~1.20150507.2",
"angular-scroll": "^1.0.0", "angular-scroll": "^1.0.0",
"angular-sanitize": "^1.5.3", "angular-sanitize": "^1.5.3",

View file

@ -1,7 +1,8 @@
angular.module('forms', [ angular.module('forms', [
'duScroll', 'ngResource', 'NodeForm.templates', 'pascalprecht.translate', 'duScroll', 'ngResource', 'NodeForm.templates', 'pascalprecht.translate',
'angular-input-stars' 'angular-input-stars',
'ui.select'
]); ]);
angular.module('NodeForm', [ angular.module('NodeForm', [

File diff suppressed because one or more lines are too long

View file

@ -5,4 +5,3 @@ ApplicationConfiguration.registerModule('forms', [
'ngFileUpload', 'ui.router.tabs', 'ui.date', 'ui.sortable', 'ngFileUpload', 'ui.router.tabs', 'ui.date', 'ui.sortable',
'angular-input-stars', 'users', 'pascalprecht.translate' 'angular-input-stars', 'users', 'pascalprecht.translate'
]);//, 'colorpicker.module' @TODO reactivate this module ]);//, 'colorpicker.module' @TODO reactivate this module