From 736751afd3e153261dacc126a922a830eb303377 Mon Sep 17 00:00:00 2001 From: Akilan Date: Wed, 19 Aug 2020 09:05:33 +0400 Subject: [PATCH 1/3] fixed template bugs --- .gitignore | 12 +++ website-generator/app/controllers/home.js | 4 - .../public/templates/Colo_Shop/cart.ejs | 6 +- .../public/templates/Colo_Shop/cart.ejs.html | 20 ++-- .../public/templates/Colo_Shop/contact.ejs | 14 ++- .../templates/Colo_Shop/contact.ejs.html | 22 ++++- .../public/templates/Colo_Shop/index.ejs | 55 ++++++----- .../public/templates/Colo_Shop/index.ejs.html | 92 ++++++++++++------- .../Colo_Shop/styles/main_styles.css | 3 - 9 files changed, 148 insertions(+), 80 deletions(-) diff --git a/.gitignore b/.gitignore index 0d5cdf0..711675a 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,15 @@ typings/ #session whatsappwebjs json file whatsapp-web.js/session.json + +# ignore file in the generated website section +website-generator/public/pages/* + +# ignore ejs.html files +website-generator/public/templates/*/*.ejs.html + +# Not IPFS file in the direcotry +!website-generator/public/pages/ipfs-deploy.sh + + + diff --git a/website-generator/app/controllers/home.js b/website-generator/app/controllers/home.js index 412aef4..3819524 100644 --- a/website-generator/app/controllers/home.js +++ b/website-generator/app/controllers/home.js @@ -24,8 +24,6 @@ exports.generate = function (req, res) { //we can now manipulate the data let result = req.body.companyName; - //console.log(req.body); - let dir = './public/pages/' + req.body.companyName; if (!fs.existsSync(dir)) { @@ -100,12 +98,10 @@ exports.deploy_ipfs = function (req, res) { } exports.convertCsv = function (req, res, next) { - console.log(req.body); const csvStr = req.body.csv; csv() .fromString(csvStr) .then((jsonObj) => { - console.log(jsonObj) req.body.csv = jsonObj; //delete file at path next() diff --git a/website-generator/public/templates/Colo_Shop/cart.ejs b/website-generator/public/templates/Colo_Shop/cart.ejs index 77d4a49..1661e6e 100644 --- a/website-generator/public/templates/Colo_Shop/cart.ejs +++ b/website-generator/public/templates/Colo_Shop/cart.ejs @@ -117,9 +117,9 @@
diff --git a/website-generator/public/templates/Colo_Shop/cart.ejs.html b/website-generator/public/templates/Colo_Shop/cart.ejs.html index c1c8907..b745a70 100644 --- a/website-generator/public/templates/Colo_Shop/cart.ejs.html +++ b/website-generator/public/templates/Colo_Shop/cart.ejs.html @@ -86,7 +86,7 @@
- +
@@ -289,19 +289,19 @@ diff --git a/website-generator/public/templates/Colo_Shop/index.ejs.html b/website-generator/public/templates/Colo_Shop/index.ejs.html index 866c108..1e42883 100644 --- a/website-generator/public/templates/Colo_Shop/index.ejs.html +++ b/website-generator/public/templates/Colo_Shop/index.ejs.html @@ -87,7 +87,7 @@
@@ -145,18 +145,17 @@

Our Products

+

test <li class="grid_sorting_button button d-flex flex-column justify-content-center align-items-center" data-filter=".women">women's</li> + <li class="grid_sorting_button button d-flex flex-column justify-content-center align-items-center" data-filter=".accessories">accessories</li> + <li class="grid_sorting_button button d-flex flex-column justify-content-center align-items-center" data-filter=".men">men's</li>

-
-
+
- +
-
-
test
-
$12
+
java
+

We all love java fsdf sdf' sd'f 'sdf sfsdf sdf sdf

+
$130
+
+
-
- + +
+
+
+ +
+
+
C
+

C lord it is

+
$200
+
+
+ +
+
+
@@ -190,24 +205,37 @@

+
+
+
+
+
+
+
+
+
+
+
+
+
+ + - - - - + @@ -220,13 +248,13 @@ diff --git a/website-generator/public/templates/Colo_Shop/styles/main_styles.css b/website-generator/public/templates/Colo_Shop/styles/main_styles.css index 7a10c77..03ba8f8 100755 --- a/website-generator/public/templates/Colo_Shop/styles/main_styles.css +++ b/website-generator/public/templates/Colo_Shop/styles/main_styles.css @@ -1031,14 +1031,11 @@ section } .product-item:hover::after { - box-shadow: 0 25px 29px rgba(63, 78, 100, 0.15); - border: solid 2px rgba(235,235,235,1); } .product { width: 100%; height: 340px; - border-right: solid 1px #e9e9e9; } .product_image { From 7baf3aa0fa32a7e2c810c3b37218a3219500dbc5 Mon Sep 17 00:00:00 2001 From: Akilan Date: Wed, 19 Aug 2020 11:31:59 +0400 Subject: [PATCH 2/3] updated README.md file --- README.md | 7 +++++-- .../public/templates/Colo_Shop/cart.ejs.html | 14 +++++++------- .../templates/Colo_Shop/contact.ejs.html | 8 ++++---- .../public/templates/Colo_Shop/index.ejs.html | 18 ++++++++---------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index ce32cd3..1eba360 100644 --- a/README.md +++ b/README.md @@ -50,5 +50,8 @@ You need to start both website-generator and whatsapp-bot. ### Contributors -1. Akilan Selvacoumar : as251@hw.ac.uk -2. Gaurav Gosain : gg68@hw.ac.uk +1. Akilan Selvacoumar: akilan@hwtech.club (https://akilan.io) +2. Gaurav Gosain: gg68@hw.ac.uk +3. Nicole Tobe: https://github.com/tobenxe +4. Humaid AlQassimi: me@humaid.ae(https://humaidq.ae) + (Website generator based on: https://humaidq.ae/projects/shopsheet/) diff --git a/website-generator/public/templates/Colo_Shop/cart.ejs.html b/website-generator/public/templates/Colo_Shop/cart.ejs.html index b745a70..926b4df 100644 --- a/website-generator/public/templates/Colo_Shop/cart.ejs.html +++ b/website-generator/public/templates/Colo_Shop/cart.ejs.html @@ -86,7 +86,7 @@
- +