From 2b2d62845283d6dbb94eb24b6f74bbedac885aba Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Tue, 20 Apr 2021 19:17:22 +0200 Subject: [PATCH 01/12] stash --- README.md | 34 ++++++++++++++++++++++++++++++++++ src/modules/engine.js | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ae3875..4ca6114 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,37 @@ # JSTE JSTE is a NodeJS-Module for rendering data in static HTML + + +## Example JSON + +```json +{ + "_TEMPLATE_":"firstexample", + "TITLE": "app2", + "LINK":"http://www.google.de" +} +``` + +## Example HTML + +```html +{ + + + + + + + <[TITLE]> + + + +
+ <[LINK]> +
+ <[[ARRAY]]> + + + +``` \ No newline at end of file diff --git a/src/modules/engine.js b/src/modules/engine.js index dea0e82..83f91fd 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -23,7 +23,7 @@ app.render = function(pagecode, templatecode) { for (var i in pagecode) { var value = undefined; - if(i.startsWith("_")) + if(new RegExp("\d*_([A-Z])\w*_",i)) continue; value = pagecode[i].toString(); From cdd4ad4409ed3484bc986870183c512b62ace037 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Tue, 20 Apr 2021 19:20:37 +0200 Subject: [PATCH 02/12] change readme.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4ca6114..dfad314 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ JSTE is a NodeJS-Module for rendering data in static HTML -## Example JSON +## Example Page (JSON) ```json { @@ -14,10 +14,9 @@ JSTE is a NodeJS-Module for rendering data in static HTML } ``` -## Example HTML +## Example Template (HTML) -```html -{ +```html From 520a7b3feaf04d2486b5ea67e44cf17b246bef33 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Tue, 20 Apr 2021 21:13:04 +0200 Subject: [PATCH 03/12] add 'special constants' to readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dfad314..000856b 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,7 @@ JSTE is a NodeJS-Module for rendering data in static HTML -``` \ No newline at end of file +``` + +## special constants: +- ```_TEMPLATE_``` -> Defines the path to the temp file \ No newline at end of file From b0e1d636ebce720b06905522573a93e3e0da974f Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Wed, 21 Apr 2021 18:46:58 +0200 Subject: [PATCH 04/12] add getting templatecode --- src/modules/engine.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index 83f91fd..a7edd90 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -3,21 +3,16 @@ const path = require("path"); var appdir = path.join(__dirname, '..'); var app = {} - -app.config = { - - "templatePath":__dirname+"\\templates", - "pagePath":__dirname+"\\pages" - - }; - app.render = function(pagecode, templatecode) { result = ""; pagecode = JSON.parse(pagecode); //TODO - //if(templatecode === null) + if(templatecode === null) + { + templatecode == fs.readdirSync(pagecode["_TEMPLATE_"]); + } for (var i in pagecode) { From aea8f9bbb48d848ddd058be692d74239963d69bd Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Wed, 21 Apr 2021 19:08:28 +0200 Subject: [PATCH 05/12] some changes --- src/modules/engine.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index a7edd90..99c3773 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -9,16 +9,17 @@ app.render = function(pagecode, templatecode) { pagecode = JSON.parse(pagecode); //TODO - if(templatecode === null) + if(templatecode === null || templatecode == undefined) { - templatecode == fs.readdirSync(pagecode["_TEMPLATE_"]); + templatecode == fs.readFileSync(pagecode["_TEMPLATE_"]+".html"); } for (var i in pagecode) { var value = undefined; - if(new RegExp("\d*_([A-Z])\w*_",i)) + var re = new RegExp("\d*_([A-Z])\w*_"); + if(re.test(i)) continue; value = pagecode[i].toString(); From 3092cb46333df0d08d7488a641d9492b379adcf5 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Wed, 21 Apr 2021 19:09:07 +0200 Subject: [PATCH 06/12] comment getTempalteNameFromPage --- index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 9126d9b..d71de4b 100644 --- a/index.js +++ b/index.js @@ -10,10 +10,10 @@ app.config = { app.render = engine.render(pagecode,templatecode); -app.getTemplateNameFromPage = function(pageName) -{ - return app.pages.get(pageName)["_TEMPLATE_"] -} +// app.getTemplateNameFromPage = function(pageName) +// { +// return app.pages.get(pageName)["_TEMPLATE_"] +// } From 8c90f43a5a9d8e40909beb5df31e9943654b85b9 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Wed, 21 Apr 2021 20:23:07 +0200 Subject: [PATCH 07/12] getting template if undefined --- index.js | 4 +--- src/modules/engine.js | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index d71de4b..eefaacd 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,6 @@ var engine = require("./src/modules/engine") - +var app = {}; app.config = { "templatePath":__dirname+"\\src\\templates", @@ -15,7 +15,5 @@ app.render = engine.render(pagecode,templatecode); // return app.pages.get(pageName)["_TEMPLATE_"] // } - - module.exports = app; diff --git a/src/modules/engine.js b/src/modules/engine.js index 99c3773..8835584 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -6,6 +6,7 @@ var app = {} app.render = function(pagecode, templatecode) { result = ""; + if(!pagecode == JSON) pagecode = JSON.parse(pagecode); //TODO From b2a81e25f476b0492058fe054f450e1dbc5391ff Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Thu, 29 Apr 2021 19:19:20 +0200 Subject: [PATCH 08/12] repalce all vars (HOTFIX) --- src/modules/engine.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index 8835584..93a10da 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -3,6 +3,14 @@ const path = require("path"); var appdir = path.join(__dirname, '..'); var app = {} +function escapeRegExp(string) { + return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); +} + +function replaceAll(str, find, replace) { + return str.replace(new RegExp(escapeRegExp(find), 'g'), replace); +} + app.render = function(pagecode, templatecode) { result = ""; @@ -24,7 +32,7 @@ app.render = function(pagecode, templatecode) { continue; value = pagecode[i].toString(); - templatecode = templatecode.replace("<["+i+"]>",value) + templatecode = replaceAll(templatecode,"<["+i+"]>",value); } return templatecode; From edfa707f98e95f4f3292e73ffc565959814abace Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Thu, 29 Apr 2021 20:24:16 +0200 Subject: [PATCH 09/12] delete empty vars --- src/modules/engine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index 93a10da..07946f3 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -35,7 +35,7 @@ app.render = function(pagecode, templatecode) { templatecode = replaceAll(templatecode,"<["+i+"]>",value); } - return templatecode; + return templatecode.replace(new RegExp(/\d*<\[([A-Z])\w*\]>/g),"");; } From 754806a52b621be8772bd16b479ce3e86aa59849 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Thu, 29 Apr 2021 21:00:28 +0200 Subject: [PATCH 10/12] template var bugfix --- src/modules/engine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/engine.js b/src/modules/engine.js index 07946f3..2aa2cab 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -27,7 +27,7 @@ app.render = function(pagecode, templatecode) { for (var i in pagecode) { var value = undefined; - var re = new RegExp("\d*_([A-Z])\w*_"); + var re = new RegExp(/\d*_([A-Z])\w*_/g); if(re.test(i)) continue; From 8890fa7bbfa18edc6a0d22d33a8780a058367458 Mon Sep 17 00:00:00 2001 From: lucaspalomodevelop Date: Fri, 30 Apr 2021 08:26:06 +0200 Subject: [PATCH 11/12] format everythink --- README.md | 2 +- index.js | 14 +++++-------- src/modules/engine.js | 47 +++++++++++++++++++------------------------ 3 files changed, 27 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 000856b..f1e4f84 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,4 @@ JSTE is a NodeJS-Module for rendering data in static HTML ``` ## special constants: -- ```_TEMPLATE_``` -> Defines the path to the temp file \ No newline at end of file +- ```_TEMPLATE_``` -> Defines the path to the temp file \ No newline at end of file diff --git a/index.js b/index.js index eefaacd..fe53f3c 100644 --- a/index.js +++ b/index.js @@ -1,14 +1,11 @@ - -var engine = require("./src/modules/engine") +var engine = require("./src/modules/engine"); var app = {}; app.config = { + templatePath: __dirname + "\\src\\templates", + pagePath: __dirname + "\\src\\pages", +}; - "templatePath":__dirname+"\\src\\templates", - "pagePath":__dirname+"\\src\\pages" - - }; - -app.render = engine.render(pagecode,templatecode); +app.render = engine.render(pagecode, templatecode); // app.getTemplateNameFromPage = function(pageName) // { @@ -16,4 +13,3 @@ app.render = engine.render(pagecode,templatecode); // } module.exports = app; - diff --git a/src/modules/engine.js b/src/modules/engine.js index 2aa2cab..03a6442 100644 --- a/src/modules/engine.js +++ b/src/modules/engine.js @@ -1,42 +1,37 @@ const fs = require("fs"); const path = require("path"); -var appdir = path.join(__dirname, '..'); -var app = {} +var appdir = path.join(__dirname, ".."); +var app = {}; function escapeRegExp(string) { - return string.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&'); + return string.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"); } function replaceAll(str, find, replace) { - return str.replace(new RegExp(escapeRegExp(find), 'g'), replace); + return str.replace(new RegExp(escapeRegExp(find), "g"), replace); } -app.render = function(pagecode, templatecode) { - result = ""; +app.render = function (pagecode, templatecode) { + result = ""; - if(!pagecode == JSON) - pagecode = JSON.parse(pagecode); + if (!pagecode == JSON) pagecode = JSON.parse(pagecode); - //TODO - if(templatecode === null || templatecode == undefined) - { - templatecode == fs.readFileSync(pagecode["_TEMPLATE_"]+".html"); - } + //TODO + if (templatecode === null || templatecode == undefined) { + templatecode == fs.readFileSync(pagecode["_TEMPLATE_"] + ".html"); + } + for (var i in pagecode) { + var value = undefined; - for (var i in pagecode) { - var value = undefined; + var re = new RegExp(/\d*_([A-Z])\w*_/g); + if (re.test(i)) continue; - var re = new RegExp(/\d*_([A-Z])\w*_/g); - if(re.test(i)) - continue; + value = pagecode[i].toString(); + templatecode = replaceAll(templatecode, "<[" + i + "]>", value); + } - value = pagecode[i].toString(); - templatecode = replaceAll(templatecode,"<["+i+"]>",value); - } + return templatecode.replace(new RegExp(/\d*<\[([A-Z])\w*\]>/g), ""); +}; - return templatecode.replace(new RegExp(/\d*<\[([A-Z])\w*\]>/g),"");; -} - - -module.exports = app; \ No newline at end of file +module.exports = app; From 15070407cefad5bcf866cedb53b9e41d47333d9b Mon Sep 17 00:00:00 2001 From: Lucas Manuel Palomo Lauterbach Date: Wed, 19 May 2021 16:51:24 +0200 Subject: [PATCH 12/12] fix #2 --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index fe53f3c..5329e53 100644 --- a/index.js +++ b/index.js @@ -5,7 +5,7 @@ app.config = { pagePath: __dirname + "\\src\\pages", }; -app.render = engine.render(pagecode, templatecode); +app.render = engine.render; // app.getTemplateNameFromPage = function(pageName) // {