Project configuration fixed

.eslintignore

@@ -1,2 +1 @@
-node_modules
+node_modules
-services/nginx/*

README.md

@@ -10,7 +10,6 @@ Required applications.
 
 * Visual Studio Code
 * Node.js = 8.15.0
-* NGINX
 * Docker
 
 In Visual Studio Code we use the ESLint extension. Open Visual Studio Code, press Ctrl+P and paste the following command.
@@ -44,12 +43,6 @@ Launch application in developer environment.
 $ gulp
 ```
 
-Also you can run backend and frontend as separately gulp tasks (including NGINX).
-```
-$ gulp front
-$ gulp back
-```
-
 Manually reset fixtures.
 ```
 $ gulp docker

back/model-config.json

@@ -11,6 +11,9 @@
     "Company": {
         "dataSource": "vn"
     },
+    "Delivery": {
+        "dataSource": "vn"
+    },
     "Message": {
         "dataSource": "vn"
     },
@@ -46,6 +49,12 @@
     },
     "PersonDepartment": {
         "dataSource": "vn"
+    },
+    "Route": {
+        "dataSource": "vn"
+    },
+    "Vehicle": {
+        "dataSource": "vn"
     }
 }
 

front/module-import.js

@@ -1,7 +1,18 @@
 
 export default function moduleImport(moduleName) {
-    return import(
+    // FIXME: Webpack watches module backend files when using dynamic import
-        /* webpackInclude: /modules\/[a-z0-9-]+\/front\/index.js$/ */
+    //return import(
-        `../modules/${moduleName}/front/index.js`
+    //    /* webpackInclude: /modules\/[a-z0-9-]+\/front\/index.js$/ */
-    );
+    //    '../modules/'+ moduleName +'/front/index.js'
-}
+    //);
+
+    switch(moduleName) {
+    case 'client' : return import('client/front');
+    case 'item'   : return import('item/front');
+    case 'ticket' : return import('ticket/front');
+    case 'order'  : return import('order/front');
+    case 'claim'  : return import('claim/front');
+    case 'agency' : return import('agency/front');
+    case 'travel' : return import('travel/front');
+    }
+}

gulpfile.js

@@ -42,6 +42,9 @@ backOnly.description = `Starts backend service`;
 
 function backWatch(done) {
     const nodemon = require('gulp-nodemon');
+
+    // XXX: Workaround to avoid nodemon bug
+    // https://github.com/remy/nodemon/issues/1346
     let sleepBin = isWindows ? '' : 'sleep 1 &&';
 
     nodemon({

modules/route/back/model-config.json

@@ -1,11 +0,0 @@
-{
-    "Delivery": {
-        "dataSource": "vn"
-    },
-    "Route": {
-        "dataSource": "vn"
-    },
-    "Vehicle": {
-        "dataSource": "vn"
-    }
-}

modules/route/front/index.js

@@ -1 +0,0 @@
-export * from './module';

modules/route/front/locale/en.yml

@@ -1 +0,0 @@
-Routes: Routes

modules/route/front/locale/es.yml

@@ -1,3 +0,0 @@
-Routes: Rutas
-List: Listado
-Enter a new search: Introduce una nueva búsqueda

modules/route/front/module.js

@@ -1,3 +0,0 @@
-import {ng} from 'core/vendor';
-
-export default ng.module('route', ['vnCore']);

modules/route/front/routes.json

@@ -1,22 +0,0 @@
-/* {
-    "module": "route",
-    "name": "Routes",
-    "icon" : "local_shipping",
-    "validations" : true,
-    "routes": [
-        {
-            "url": "/route",
-            "state": "route",
-            "abstract": true,
-            "component": "ui-view",
-            "description": "Routes"
-        },
-        {
-            "url": "/index?q",
-            "state": "route.index",
-            "component": "vn-route-index",
-            "description": "Routes",
-            "acl": ["developer"]
-        }
-    ]
-} */

webpack.config.js

@@ -70,6 +70,12 @@ let baseConfig = {
             'vn-loopback': `${__dirname}/loopback`
         }
     },
+    watchOptions: {
+        ignored: [
+            'node_modules',
+            './modules/*/back/**'
+        ]
+    },
     plugins: [
         new HtmlWebpackPlugin({
             template: 'front/salix/index.ejs',
@@ -79,11 +85,11 @@ let baseConfig = {
         })
     ],
     devtool: 'source-map',
-    stats: {
+    stats: {/*
         modules: false,
         assets: false,
         children: false,
-        entrypoints: false,
+        entrypoints: false,*/
         colors: true
     }
 };