Merge "Yangman - moint points"

[dlux.git] / dlux-web / build.config.js

diff --git a/dlux-web/build.config.js b/dlux-web/build.config.js
index 60d9cd1a744326fcde5b097f35726c8da835be08..9b487f090117fe58861868a97a542a3bba6a6782 100644 (file)
--- a/dlux-web/build.config.js
+++ b/dlux-web/build.config.js
@@ -9,7 +9,7 @@ module.exports = {
    */\r
   build_dir: 'build',\r
   compile_dir: 'target/generated-resources/pages',\r
-  \r
+\r
   /**\r
    * This is a collection of file patterns that refer to our app code (the\r
    * stuff in `src/`). These file paths are used in the configuration of\r
@@ -24,13 +24,17 @@ module.exports = {
     jsunit: [ 'src/**/*.spec.js' ],\r
     js_common: [ 'src/common/**/*.js', '!src/common/**/*.spec.js', '!src/common/assets/**/*.js'  ],\r
     js_app: [ 'src/app/**/*.js', '!src/app/**/*.spec.js', '!src/app/assets/**/*.js'  ],\r
+    app_assets: [ '! src/app/yangui/assets/js/**/*.js', '! src/app/yangman/assets/js/**/*.js' ],\r
 \r
     atpl: [ 'src/app/**/*.tpl.html' ],\r
     ctpl: [ 'src/common/**/*.tpl.html' ],\r
 \r
     html: [ 'src/index.html'],\r
     less: 'src/less/main.less',\r
-    templates: ['src/**/*.tpl.html']\r
+    css: ['src/app/**/*.css'],\r
+    lang: ['src/app/**/assets/data/*.json'],\r
+    templates: ['src/**/*.tpl.html'],\r
+    images: ['src/app/**/assets/images/*.*']\r
   },\r
 \r
   /**\r
@@ -65,9 +69,6 @@ module.exports = {
       'vendor/bootstrap/js/dropdown.js',\r
       'vendor/angular/angular.js',\r
       'vendor/requirejs/requirejs.js',\r
-      'vendor/angularAMD/angularAMD.js',\r
-      'vendor/angularAMD/ngload.js',\r
-      'vendor/requirejs-domready/domReady.js',\r
       'vendor/ocLazyLoad/dist/ocLazyLoad.js',\r
       'vendor/angular-css-injector/angular-css-injector.js',\r
       'vendor/angular-route/angular-route.js',\r
@@ -89,12 +90,21 @@ module.exports = {
       'vendor/footable/dist/footable.paginate.min.js',\r
       'vendor/footable/dist/footable.sort.min.js',\r
       'vendor/angular-translate/angular-translate.min.js',\r
+      'vendor/angular-sanitize/angular-sanitize.min.js',\r
       'vendor/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js',\r
+      'vendor/ng-slider/dist/ng-slider.min.js',\r
       'vendor/sigma/sigma.min.js',\r
       'vendor/sigma/plugins/sigma.parsers.gexf.min.js',\r
       'vendor/sigma/plugins/sigma.layout.forceAtlas2.min.js',\r
       'vendor/sigma/plugins/sigma.plugins.dragNodes.min.js',\r
-      'vendor/sigma/plugins/sigma.renderers.customShapes.min.js'\r
+      'vendor/sigma/plugins/sigma.renderers.customShapes.min.js',\r
+      'vendor/ng-clip/src/ngClip.js',\r
+      'vendor/zeroclipboard/dist/ZeroClipboard.js',\r
+      'vendor/angular-translate-loader-partial/angular-translate-loader-partial.js',\r
+      'vendor/angular-animate/angular-animate.min.js',\r
+      'vendor/angular-aria/angular-aria.min.js',\r
+      'vendor/angular-material/angular-material.min.js',\r
+      'vendor/angular-messages/angular-messages.min.js',\r
     ],\r
     css: [\r
     'vendor/ng-grid/ng-grid.min.css',\r
@@ -102,8 +112,10 @@ module.exports = {
     'vendor/select2-bootstrap-css/select2-bootstrap.css',\r
     'vendor/footable/css/footable.core.min.css',\r
     'vendor/footable/css/footable.standalone.min.css',\r
-    'vendor/vis/dist/vis.min.css'\r
-\r
+    'vendor/vis/dist/vis.min.css',\r
+    'vendor/ng-slider/dist/css/ng-slider.min.css',\r
+    'vendor/angular-material/angular-material.css',\r
+    'vendor/material-design-icons/iconfont/*',\r
     ],\r
     images: [\r
     'vendor/select2/select2.png',\r
@@ -111,11 +123,12 @@ module.exports = {
     'vendor/select2/select2x2.png'\r
     ],\r
     assets: [\r
-    \r
+    'vendor/zeroclipboard/dist/ZeroClipboard.swf',\r
     ],\r
     font: [\r
       'vendor/font-awesome/font/*',\r
-      'vendor/footable/css/fonts/*'\r
+      'vendor/footable/css/fonts/*',\r
+\r
     ]\r
   }\r
 };\r