From 86001a1e8eaaf61869f17aed4efa48a48e86d4ae Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Wed, 9 Nov 2016 13:10:56 +0100
Subject: [PATCH] Fallos de rutas solucionados

---
 @salix-services/account/server/boot/createmodel.js |  6 ++----
 @salix-services/salix/client/index.ejs             |  2 +-
 @salix-services/salix/server/boot/routes.js        | 13 +++----------
 @salix/gulpfile.js                                 |  2 +-
 @salix/webpack.config.js                           |  2 +-
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/@salix-services/account/server/boot/createmodel.js b/@salix-services/account/server/boot/createmodel.js
index 9d8b7a34a..94ba11859 100644
--- a/@salix-services/account/server/boot/createmodel.js
+++ b/@salix-services/account/server/boot/createmodel.js
@@ -3,7 +3,5 @@ module.exports = function(app) {
   User.create ({
     email: 'admin@admin.com',
     password: '1234'
-  }, function (err, user) {
-    console.log ('User created!');
-  });
-};
\ No newline at end of file
+  }, function (err, user) {});
+};
diff --git a/@salix-services/salix/client/index.ejs b/@salix-services/salix/client/index.ejs
index cb7ec8e13..950dd0d41 100644
--- a/@salix-services/salix/client/index.ejs
+++ b/@salix-services/salix/client/index.ejs
@@ -14,7 +14,7 @@
 	</div>
 	<script
 		type="text/javascript"
-		src="/salix/config.js">
+		src="/static/salix.routes.js">
 	</script>
 	<script
 		type="text/javascript"
diff --git a/@salix-services/salix/server/boot/routes.js b/@salix-services/salix/server/boot/routes.js
index 93abebaf5..9431bcdc0 100644
--- a/@salix-services/salix/server/boot/routes.js
+++ b/@salix-services/salix/server/boot/routes.js
@@ -4,19 +4,15 @@ module.exports = function (app) {
   var url_account = app.get('url account');
 
   app.get('/', function (req, res) {
-
-
     if (req.cookies['salix-session']) {
       res.render('index.ejs');
     }
     else {
-
       res.redirect(url_account + "/?api_key=" + api_key);
     }
   });
-  //https://github.com/expressjs/cookie-parser
-  app.get('/login', function (req, res) {
 
+  app.get('/login', function (req, res) {
     var token = req.query.access_token;
     if (token) {
       res.cookie('salix-session', token, { httpOnly: true, path: '/salix' });
@@ -28,17 +24,14 @@ module.exports = function (app) {
   });
 
   app.get('/config.js', (req, res) => {
-
     if (req.cookies['salix-session']) {
+      // TODO: construir js dinamico de las rutas
       res.set('Content-Type', 'application/javascript');
-      //TODO: construir js dinamico de las rutas
-
-      res.send('var routesSalix={}');
+      res.send('var routes = {}');
     }
     else {
       res.status(401);
       res.send("No autorizado");
     }
   });
-
 };
diff --git a/@salix/gulpfile.js b/@salix/gulpfile.js
index 6a9b8a83e..71dc0db9d 100644
--- a/@salix/gulpfile.js
+++ b/@salix/gulpfile.js
@@ -17,7 +17,7 @@ gulp.task ('routes', function ()
 		.pipe (concat ('salix.routes.js', {newLine: ','}))
 		.pipe (wrap (globalTpl))
 		.pipe (babel ({presets: ['es2015']}))
-		.pipe (gulp.dest ('./build/private'));
+		.pipe (gulp.dest ('./build/public'));
 });
 
 // Spliting
diff --git a/@salix/webpack.config.js b/@salix/webpack.config.js
index 518ab1de1..b44e2eebd 100644
--- a/@salix/webpack.config.js
+++ b/@salix/webpack.config.js
@@ -10,7 +10,7 @@ module.exports =
     output: {
         path: path.join (__dirname, 'build', 'public'),
         filename: '[name].js',
-        publicPath: 'build/public/',
+        publicPath: '/static/',
         chunkFilename: "[name].js"
     },
     module: {