Availlable for v2.0 !

Signed-off-by: Bruno Lesieur <[email protected]>
MachinisteWeb · Dec 6, 2016 · 484bb92 · 484bb92
1 parent fdc9241
commit 484bb92
Show file tree

Hide file tree

Showing 22 changed files with 647 additions and 689 deletions.
diff --git a/README.md b/README.md
diff --git a/components/templates/component-example-loop.htm b/components/templates/component-example-loop.htm
diff --git a/components/templates/component-example.htm b/components/templates/component-example.htm
diff --git a/components/templates/edit-atlas.htm b/components/templates/edit-atlas.htm
diff --git a/components/templates/foot.htm b/components/templates/foot.htm
diff --git a/components/templates/head.htm b/components/templates/head.htm
diff --git a/controllers/common.js b/controllers/common.js
@@ -5,11 +5,11 @@ website.components = {};
 
 (function (publics) {
 
-    website.components.editAtlas = require('../components/controllers/edit-atlas');
-    website.components.componentAtlas = require('../components/controllers/component-atlas');
-    website.components.socketio = require('../components/controllers/socket-io');
+    website.components.editAtlas = require('./modules/edit-atlas');
+    website.components.componentAtlas = require('./modules/component-atlas');
+    website.components.socketio = require('./modules/socket-io');
 
-    publics.loadModules = function () {
+    publics.setModules = function () {
         var NA = this;
 
         NA.modules.cookie = require('cookie');
@@ -37,7 +37,7 @@ website.components = {};
         });
     };
 
-    publics.changeVariation = function (params, mainCallback) {
+    publics.changeVariation = function (params, next) {
         var NA = this,
             variation = params.variation,
             template = variation.common.demo.template[0],
@@ -75,13 +75,13 @@ website.components = {};
         variation = website.components.editAtlas.setFilters.call(NA, variation);
         variation = website.components.componentAtlas.includeComponents.call(NA, variation, "components", "mainTag");
 
-        mainCallback(variation);
+        next(variation);
     };
 
 }(website));
 
 
 
 exports.changeVariation = website.changeVariation;
-exports.loadModules = website.loadModules;
+exports.setModules = website.setModules;
 exports.setConfigurations = website.setConfigurations;
diff --git a/components/controllers/component-atlas.js → controllers/modules/component-atlas.js b/components/controllers/component-atlas.js → controllers/modules/component-atlas.js
@@ -98,7 +98,7 @@ var website = {};
                     }
 
                     dom = ejs.render(
-                        '<%- include("' + currentComponents[placeholder][i].path + '", { component: ' + currentVariation + ', path : "' + currentPath + '" }) %>',
+                        '<?- include("' + currentComponents[placeholder][i].path + '", { component: ' + currentVariation + ', path : "' + currentPath + '" }) ?>',
                         variation
                     );
 

diff --git a/components/controllers/edit-atlas.js → controllers/modules/edit-atlas.js b/components/controllers/edit-atlas.js → controllers/modules/edit-atlas.js
@@ -298,13 +298,13 @@ var website = {};
 
         function changeOnBackEnd(file) {
             if (typeof activateDemo === 'undefined' || activateDemo) {
-                fs.writeFileSync(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, file), JSON.stringify(object, undefined, "    "));
+                fs.writeFileSync(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, file), JSON.stringify(object, undefined, "    "));
             }
         }
 
         NA.forEach(files, function (file) {
             try {
-                object = require(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, file));
+                object = require(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, file));
                 if (object) {
                     for (var i = 0, l = files[file].length; i < l; i++) {
                         changeOnFrontEnd(file, i);
@@ -332,8 +332,8 @@ var website = {};
 
         try {
             if (typeof activateDemo === 'undefined' || activateDemo) {
-                fs.writeFileSync(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, options.fileCommon), JSON.stringify(objectCommon, undefined, "    "));
-                fs.writeFileSync(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, options.fileSpecific), JSON.stringify(objectSpecific, undefined, "    "));
+                fs.writeFileSync(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, options.fileCommon), JSON.stringify(objectCommon, undefined, "    "));
+                fs.writeFileSync(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, options.fileSpecific), JSON.stringify(objectSpecific, undefined, "    "));
                 socket.emit('update-block', {
                     status: true
                 });
@@ -357,7 +357,7 @@ var website = {};
             path = NA.modules.path;
 
         try {
-            object = require(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, options.file));
+            object = require(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, options.file));
             if (object) {
                 key = options.path.split('.').slice(1).join('.');
 
@@ -384,8 +384,8 @@ var website = {};
             path = NA.modules.path;
 
         try {
-            objectCommon = fs.readFileSync(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, options.fileCommon), 'utf-8');
-            objectSpecific = fs.readFileSync(path.join(NA.websitePhysicalPath, NA.webconfig.variationsRelativePath, options.fileSpecific), 'utf-8');
+            objectCommon = fs.readFileSync(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, options.fileCommon), 'utf-8');
+            objectSpecific = fs.readFileSync(path.join(NA.serverPath, NA.webconfig.variationsRelativePath, options.fileSpecific), 'utf-8');
             socket.emit('source-block', {
                 fileCommon: objectCommon,
                 fileSpecific: objectSpecific

diff --git a/components/controllers/socket-io.js → controllers/modules/socket-io.js b/components/controllers/socket-io.js → controllers/modules/socket-io.js
diff --git a/routes.json b/routes.json
@@ -1,6 +1,6 @@
 {
 	"/": {
-		"template": "index.htm",
+		"view": "index.htm",
 		"variation": "index.json"
 	},
 	"/page-inexistante/": {

diff --git a/server.na b/server.na
@@ -1,3 +1,3 @@
-require('node-atlas').run({
+require('node-atlas')().run({
 	browse: true
 });