From 4d487e79803f0016d05c450af88652aed400ddf7 Mon Sep 17 00:00:00 2001
From: dherrero <dherrero@alfatecsistemas.es>
Date: Thu, 5 Oct 2017 12:38:28 +0200
Subject: [PATCH] estructure for new module route

---
 client/modules.json                  |  8 +++++++
 client/route/index.js                |  1 +
 client/route/routes.json             | 13 +++++++++++
 client/route/src/index/index.html    | 23 ++++++++++++++++++
 client/route/src/index/index.js      | 18 ++++++++++++++
 client/route/src/index/item-route.js |  0
 client/route/src/index/style.css     |  0
 client/route/src/locale/es.json      |  3 +++
 client/route/src/module.js           |  5 ++++
 client/route/src/route.js            |  4 ++++
 client/salix/src/configroutes.js     |  2 +-
 gulpfile.js                          | 35 ++++------------------------
 spliting/import.tpl.js               |  1 -
 spliting/modules.json                |  7 ------
 spliting/require.tpl.js              | 11 ---------
 15 files changed, 80 insertions(+), 51 deletions(-)
 create mode 100644 client/modules.json
 create mode 100644 client/route/index.js
 create mode 100644 client/route/routes.json
 create mode 100644 client/route/src/index/index.html
 create mode 100644 client/route/src/index/index.js
 create mode 100644 client/route/src/index/item-route.js
 create mode 100644 client/route/src/index/style.css
 create mode 100644 client/route/src/locale/es.json
 create mode 100644 client/route/src/module.js
 create mode 100644 client/route/src/route.js
 delete mode 100644 spliting/import.tpl.js
 delete mode 100644 spliting/modules.json
 delete mode 100644 spliting/require.tpl.js

diff --git a/client/modules.json b/client/modules.json
new file mode 100644
index 0000000000..6dbad069d8
--- /dev/null
+++ b/client/modules.json
@@ -0,0 +1,8 @@
+{
+	"salix": [],
+    "auth": [],
+    "core": [],
+    "client": [],
+    "production": [],
+    "route": []
+}
diff --git a/client/route/index.js b/client/route/index.js
new file mode 100644
index 0000000000..eadbde870f
--- /dev/null
+++ b/client/route/index.js
@@ -0,0 +1 @@
+export * from './src/route';
diff --git a/client/route/routes.json b/client/route/routes.json
new file mode 100644
index 0000000000..e6da8754f1
--- /dev/null
+++ b/client/route/routes.json
@@ -0,0 +1,13 @@
+{
+    "module": "route",
+    "name": "Route",
+   
+    "validations" : false,
+    "routes": [
+        {
+            "url": "/routes",
+            "state": "routes",
+            "component": "vn-route-index"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/client/route/src/index/index.html b/client/route/src/index/index.html
new file mode 100644
index 0000000000..6cdc1a1d84
--- /dev/null
+++ b/client/route/src/index/index.html
@@ -0,0 +1,23 @@
+<<mg-ajax path="/client/api/Clients/filter" options="mgIndex"></mg-ajax>
+<div margin-medium>
+    <div style="max-width: 40em; margin: 0 auto;">
+        <vn-card>
+            <vn-horizontal pad-medium>
+                <vn-searchbar vn-auto
+                    index="index"
+                    on-search="$ctrl.search(index)"
+                    advanced="true"
+                    search="$ctrl.model.search"
+                    popover="vn-client-search-panel">
+                </vn-searchbar>
+            </vn-horizontal>
+        </vn-card>
+        <vn-card margin-medium-top>
+            <vn-item-route ng-repeat="route in index.model.instances" title="View Route" client="route"></vn-item-route>
+        </vn-card>
+        <vn-paging index="index" total="index.model.count"></vn-paging>
+    </div>
+    <a ui-sref="create" fixed-bottom-right>
+        <vn-float-button icon="add"></vn-float-button>
+    </a>
+</div>
diff --git a/client/route/src/index/index.js b/client/route/src/index/index.js
new file mode 100644
index 0000000000..c8dc8ffd6f
--- /dev/null
+++ b/client/route/src/index/index.js
@@ -0,0 +1,18 @@
+import ngModule from '../module';
+import './style.css';
+import './item-route';
+
+export default class Controller {
+    constructor() {
+        this.model = {};
+    }
+    search(index) {
+        index.filter.search = this.model.search;
+        index.accept();
+    }
+}
+
+ngModule.component('vnRouteIndex', {
+    template: require('./index.html'),
+    controller: Controller
+});
diff --git a/client/route/src/index/item-route.js b/client/route/src/index/item-route.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/route/src/index/style.css b/client/route/src/index/style.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/client/route/src/locale/es.json b/client/route/src/locale/es.json
new file mode 100644
index 0000000000..0db3279e44
--- /dev/null
+++ b/client/route/src/locale/es.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/client/route/src/module.js b/client/route/src/module.js
new file mode 100644
index 0000000000..779683e388
--- /dev/null
+++ b/client/route/src/module.js
@@ -0,0 +1,5 @@
+import {ng} from 'vendor';
+import 'core';
+
+const ngModule = ng.module('route', []);
+export default ngModule;
diff --git a/client/route/src/route.js b/client/route/src/route.js
new file mode 100644
index 0000000000..69a09db10e
--- /dev/null
+++ b/client/route/src/route.js
@@ -0,0 +1,4 @@
+export * from './module';
+
+// import components
+import './index/index';
diff --git a/client/salix/src/configroutes.js b/client/salix/src/configroutes.js
index 734931316c..8a3bdd1560 100644
--- a/client/salix/src/configroutes.js
+++ b/client/salix/src/configroutes.js
@@ -1,5 +1,5 @@
 import './spliting';
-import deps from 'spliting/modules.json';
+import deps from 'client/modules.json';
 import ngModule from './module';
 import {splitingRegister} from 'core';
 
diff --git a/gulpfile.js b/gulpfile.js
index 866a655991..fd2b4a8938 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,7 +17,8 @@ var srcDir = './client';
 var buildDir = './services/nginx/static';
 var langs = ['es', 'en'];
 
-var modules = require('./spliting/modules.json');
+var modules = require('./client/modules.json');
+
 var webpackConfig = require('./webpack.config.js');
 
 // Main tasks
@@ -69,36 +70,9 @@ gulp.task('install', () => {
         }));
 });
 
-// Spliting
-
-var splitingFiles = './spliting/*';
-
-gulp.task('spliting', function(cb) {
-    var importTpl = fs.readFileSync('./spliting/import.tpl.js', 'utf8');
-    var requireTpl = fs.readFileSync('./spliting/require.tpl.js', 'utf8');
-
-    for (var modName in modules) {
-        var deps = modules[modName];
-        var splitFile = `${srcDir}/${modName}/src/spliting.js`;
-
-        try {
-            fs.unlinkSync(splitFile);
-        } catch (e) {}
-
-        fs.appendFileSync(splitFile, importTpl);
-
-        var i = deps.length;
-        while (i--)
-            fs.appendFileSync(splitFile,
-				requireTpl.replace(/\$module/g, deps[i]));
-    }
-
-    cb();
-});
-
 // Webpack
 
-gulp.task('webpack', ['spliting'], function(cb) {
+gulp.task('webpack', function(cb) {
     var configCopy = Object.create(webpackConfig);
     var compiler = webpack(configCopy);
 
@@ -109,7 +83,7 @@ gulp.task('webpack', ['spliting'], function(cb) {
     });
 });
 
-gulp.task('webpack-dev-server', ['spliting'], function() {
+gulp.task('webpack-dev-server', function() {
     var configCopy = Object.create(webpackConfig);
 
     for (var entry in configCopy.entry) {
@@ -170,7 +144,6 @@ gulp.task('routes', function() {
 // Watch
 
 gulp.task('watch', function() {
-    gulp.watch(splitingFiles, ['spliting']);
     gulp.watch(routeFiles, ['routes']);
     gulp.watch(localeFiles, ['locales']);
 });
diff --git a/spliting/import.tpl.js b/spliting/import.tpl.js
deleted file mode 100644
index 86ad3e68bc..0000000000
--- a/spliting/import.tpl.js
+++ /dev/null
@@ -1 +0,0 @@
-import * as core from 'core';
diff --git a/spliting/modules.json b/spliting/modules.json
deleted file mode 100644
index 3efb5f977e..0000000000
--- a/spliting/modules.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"salix": ["client", "production"],
-    "auth": [],
-    "core": [],
-    "client": [],
-    "production": []
-}
diff --git a/spliting/require.tpl.js b/spliting/require.tpl.js
deleted file mode 100644
index d3fe92000d..0000000000
--- a/spliting/require.tpl.js
+++ /dev/null
@@ -1,11 +0,0 @@
-
-export const $module = () => {
-    return new Promise(resolve => {
-        require.ensure([], () => {
-            require('$module');
-            resolve('$module');
-        }, '$module');
-    });
-};
-
-core.splitingRegister.register('$module', $module);