From e6dfd100f8b99d88b502b203a4a36e7cd82cfd25 Mon Sep 17 00:00:00 2001 From: D Shrat Date: Sun, 21 Nov 2021 12:59:23 +0700 Subject: [PATCH 01/10] add modal on newsletter --- views/pages/index.ejs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/views/pages/index.ejs b/views/pages/index.ejs index a6386a7..995026a 100644 --- a/views/pages/index.ejs +++ b/views/pages/index.ejs @@ -566,8 +566,25 @@ + From 1d9947455eeed1602c5d7d74eb052d2f078aa189 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:17:40 +0700 Subject: [PATCH 02/10] Fixed wording, and changed Successful Subscription message. --- views/pages/index.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/index.ejs b/views/pages/index.ejs index 995026a..be5dbce 100644 --- a/views/pages/index.ejs +++ b/views/pages/index.ejs @@ -577,7 +577,7 @@
- Succefully Subscribe + You have successfully subscribed to the newsletter. Thank you for your subscription.
From ebdb0b7fbb86071828c2169d58d76c382e14cfd6 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:32:29 +0700 Subject: [PATCH 03/10] Added back register-error.ejs --- views/pages/register-error.ejs | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 views/pages/register-error.ejs diff --git a/views/pages/register-error.ejs b/views/pages/register-error.ejs new file mode 100644 index 0000000..9ecdb8d --- /dev/null +++ b/views/pages/register-error.ejs @@ -0,0 +1,33 @@ + + + +<%- include('../layouts/header.ejs', {title: 'Register', state: 'register-error'}); %> + + + <%- include('../layouts/navbar.ejs', {types: 'v2', title: 'Register'}); %> +
+ + +
+
+
+
+
+

ERROR

+
+ +
+
An error has occured... Make sure to check if you have empty fields, or if your email has been registered before. Click the button below to get back to the register page.
+
+ Register +
+
+
+
+
+ + <%- include('../layouts/footer.ejs', {state: 'register-error'}); %> + + + \ No newline at end of file From a10921cfadd0d41484eb3239c8703e9d3ad299d6 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:32:39 +0700 Subject: [PATCH 04/10] Added back register-error.css --- public/css/register-error.css | 124 ++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 public/css/register-error.css diff --git a/public/css/register-error.css b/public/css/register-error.css new file mode 100644 index 0000000..bd3d028 --- /dev/null +++ b/public/css/register-error.css @@ -0,0 +1,124 @@ +body { + font-family: 'Poppins', sans-serif; + background-color: #1b1c1e; +} + +.nav-color { + background-color: #212226; +} + +.nav-radius { + border-bottom-left-radius: 20px; + border-bottom-right-radius: 20px; +} + +.card { + position: center; + margin: auto; + text-align: center; + border-radius: 20px; + background-color: #212226; +} + +.icon { + position: center; + margin: auto; + width: 70%; + height: 70%; +} + +.btn { + background-color: darkred; + border-color: darkred; + border-radius: 100px; + width: 50%; +} + +.btn:hover { + background-color: red; + border-color: red; +} + +@media screen and (max-width: 766px) { + .card h2 { + font-size: 7vw; + } + + .card h5 { + font-size: 5vw; + } + + .card a { + font-size: 5vw; + } + + .navbar-brand { + width: 11vw; + height: 11vw; + } + +} + +@media screen and (min-width: 767px) { + .card h2 { + font-size: 4vw; + } + + .card h5 { + font-size: 2vw; + } + + .card a { + font-size: 2.5vw; + } + + .navbar-brand { + width: 8vw; + height: 8vw; + } + +} + +@media screen and (min-width: 993px) { + .card h2 { + font-size: 3vw; + } + + .card h5 { + font-size: 1.3vw; + } + + .card a { + font-size: 1.5vw; + } + + .navbar-brand { + width: 6vw; + height: 6vw; + } + +} + +@media screen and (min-width: 1400px) { + .card h2 { + font-size: 3vw; + } + + .card h5 { + font-size: 1.5vw; + } + + .card a { + font-size: 2vw; + } + + .navbar-brand { + width: 6vw; + height: 6vw; + } + + :focus { + outline: 0 !important; + box-shadow: 0 0 0 0 rgba(0, 0, 0, 0) !important; + } +} \ No newline at end of file From 18dd5858506e593a7d1c477bdef987c8de97a53f Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:33:04 +0700 Subject: [PATCH 05/10] Modified header.ejs to link register-error's CSS --- views/layouts/header.ejs | 119 +++++++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 50 deletions(-) diff --git a/views/layouts/header.ejs b/views/layouts/header.ejs index 19ad87c..332349f 100644 --- a/views/layouts/header.ejs +++ b/views/layouts/header.ejs @@ -1,51 +1,70 @@ - - - - - - <%= title %> - - - - - - - - - - - - <% if(state == "index") { %> - - <% } else if(state == "bag") { %> - - <% } else if(state == "checkout") { %> - - <% } else if(state == "about-us") { %> - - <% } else if(state == "payment") { %> - - <% } else if(state == "products") { %> - - <% } else if(state == "product") { %> - - <% } else if(state == "login") { %> - - <% } else if(state == "register") { %> - - <% } else if(state == "register-verification-completed") { %> - - <% } else if(state == "register-verification-sent") { %> - - <% } else if(state == "forgot-password") { %> - - <% } else if(state == "change-password") { %> - - <% } else if(state == "otp") { %> - - <% } else if(state == "faq") { %> - - <% } %> - \ No newline at end of file + + + + + + <%= title %> + + + + + + + + + + + + <% if(state == "index") { %> + + <% } else if(state == "bag") { %> + + <% } else if(state == "checkout") { %> + + <% } else if(state == "about-us") { %> + + <% } else if(state == "payment") { %> + + <% } else if(state == "products") { %> + + <% } else if(state == "product") { %> + + <% } else if(state == "login") { %> + + <% } else if(state == "register") { %> + + <% } else if(state == "register-verification-completed") { %> + + <% } else if(state == "register-verification-sent") { %> + + <% } else if(state == "forgot-password") { %> + + <% } else if(state == "register-error") { %> + + <% } else if(state == "change-password") { %> + + <% } else if(state == "otp") { %> + + <% } else if(state == "faq") { %> + + <% } %> + From db8e988c910335539b82efe2551fbc0819f2f725 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:34:33 +0700 Subject: [PATCH 06/10] --- routes/api.js | 327 +++++++++++++++----------------------------------- 1 file changed, 97 insertions(+), 230 deletions(-) diff --git a/routes/api.js b/routes/api.js index 541c57d..1823351 100644 --- a/routes/api.js +++ b/routes/api.js @@ -1,12 +1,9 @@ const express = require("express"); const bcrypt = require("bcrypt"); const randtoken = require("rand-token"); - const router = express.Router(); - const db = require("../modules/db"); const mail = require("../modules/mail"); -const auth = require("../auth/auth"); const saltRounds = 10; @@ -241,251 +238,121 @@ router.post("/login", async (req, res) => { } }); -router.post("/verify-mail", async (req, res) => { - if (!req.body.token) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - const conn = db.connect(); - conn.query( - 'SELECT * FROM users WHERE token ="' + req.body.token + '"', - function (err, result) { - if (err) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } - if (result.length > 0) { - if (result[0].verify == 0) { - var data = { - verify: 1, - token: randtoken.generate(64), - }; - conn.query( - 'UPDATE users SET ? WHERE email ="' + result[0].email + '"', - data, - function (err, result) { - if (err) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - res.status(200); - res.json({ - message: "Verified ~", - }); - } - } - ); - } else { - res.status(403); - res.json({ - message: "Forbidden", - }); - } - } else { - res.status(400); - res.json({ - message: "Bad Request", - }); - } - } - ); - } -}); - -router.post("/checkout", async (req, res) => { - if (!req.query.key) { - res.status(401); - res.json({ - message: "Unauthorized", - }); - } else { - auth.auth_checker(req.query.key).then((status) => { - if (status) { - if ( - !req.body.firstName || - !req.body.lastName || - !req.body.phoneNumber || - !req.body.streetAddress1 || - !req.body.streetAddress2 || - !req.body.region || - !req.body.province || - !req.body.city || - !req.body.district || - !req.body.subDistrict || - !req.body.postalCode || - !req.body.logistic || - !req.body.data - ) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - const conn = db.connect(); - conn.query( - "SELECT * FROM users WHERE token = ?", - [req.query.key], - async function (error, resp, fields) { - if (error) { - res.status(401); - res.json({ - message: "Unauthorized", - }); - } else { - var data = { - firstName: req.body.firstName, - lastName: req.body.lastName, - phoneNumber: req.body.phoneNumber, - streetAddress1: req.body.streetAddress1, - streetAddress2: req.body.streetAddress2, - region: req.body.region, - province: req.body.province, - city: req.body.city, - district: req.body.district, - subDistrict: req.body.subDistrict, - postalCode: req.body.postalCode, - logistic: req.body.logistic, - paymentMethod: '-', - data: req.body.data, - userId: resp[0].id, - paid: '0', - status: 'pending' - }; - conn.query( - "INSERT INTO transactions SET ?", - data, - function (error, response, fields) { - if (error) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - conn.query( - 'SELECT * FROM transactions WHERE id ="' + response.insertId + '"', - function (err, result) { - if (err) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - res.status(201); - res.json({ - 'order_id': result[0].id, - 'data': result[0].data - }); - } - }); - } - } - ); - } - } - ); - } - } else { - res.status(401); +router.get("/verify-mail", async (req, res) => { + const conn = db.connect(); + conn.query( + 'SELECT * FROM users WHERE token ="' + req.query.token + '"', + function (err, result) { + if (err) { + res.status(400); res.json({ - message: "Unauthorized", + message: "Bad Request", }); } - }); - } -}); - -router.post("/transaction", async (req, res) => { - if (!req.query.key) { - res.status(401); - res.json({ - message: "Unauthorized", - }); - } else { - auth.auth_checker(req.query.key).then((status) => { - if (status) { - const conn = db.connect(); - conn.query( - "SELECT * FROM users WHERE token = ?", - [req.query.key], - async function (error, response, fields) { - if (error) { - res.status(401); - res.json({ - message: "Unauthorized", - }); - } else { - conn.query( - "SELECT * FROM transactions WHERE userId = ?", - [response[0].id], - async function (error, resp, fields) { - if (error) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - res.status(200); - res.json(resp); - } - } - ); - } - } - ); - } else { - res.status(401); - res.json({ - message: "Unauthorized", - }); - } - }); - } -}); - -router.get("/subscribe", (req, res) => { - if (!req.query.email) { - res.status(400); - res.json({ - message: "Bad Request", - }); - } else { - const conn = db.connect(); - conn.execute( - "SELECT * FROM `subscribe` WHERE `email` = ?", - [req.query.email], - function (err, results) { - if (!results[0]) { - let data = { - email: req.query.email, - type: "email" + if (result.length > 0) { + if (result[0].verify == 0) { + var data = { + verify: 1, }; - conn.query( - "INSERT INTO subscribe SET ?", + db_connect.query( + 'UPDATE users SET ? WHERE email ="' + result[0].email + '"', data, - function (err, resp) { + function (err, result) { if (err) { res.status(400); res.json({ message: "Bad Request", }); } else { - res.status(201); + res.status(200); res.json({ - message: "Success", + message: "Verified ~", }); } } ); } else { - res.status(200); + res.status(403); res.json({ - message: "Success", + message: "Forbidden", + }); + } + } else { + res.status(400); + res.json({ + message: "Bad Request", + }); + } + } + ); +}); + +router.post("/checkout", async (req, res) => { + if ( + !req.body.firstName || + !req.body.lastName || + !req.body.phoneNumber || + !req.body.streetAddress1 || + !req.body.streetAddress2 || + !req.body.region || + !req.body.province || + !req.body.city || + !req.body.district || + !req.body.subDistrict || + !req.body.postalCode || + !req.body.logistic || + !req.body.data + ) { + res.status(400); + res.json({ + message: "Bad Request", + }); + } else { + const conn = db.connect(); + var data = { + firstName: req.body.firstName, + lastName: req.body.lastName, + phoneNumber: req.body.phoneNumber, + streetAddress1: req.body.streetAddress1, + streetAddress2: req.body.streetAddress2, + region: req.body.region, + province: req.body.province, + city: req.body.city, + district: req.body.district, + subDistrict: req.body.subDistrict, + postalCode: req.body.postalCode, + logistic: req.body.logistic, + paymentMethod: '-', + data: req.body.data, + userId: 14, + paid: '0', + status: 'pending' + }; + conn.query( + "INSERT INTO transactions SET ?", + data, + function (error, response, fields) { + if (error) { + res.status(400); + res.json({ + message: "Bad Request", + }); + } else { + conn.query( + 'SELECT * FROM transactions WHERE id ="' + response.insertId + '"', + function (err, result) { + if (err) { + res.status(400); + res.json({ + message: "Bad Request", + }); + } else { + res.status(201); + res.json({ + 'order_id': result[0].id, + 'data': result[0].data + }); + } }); } } From b00ab551ac670a5f2bb1508f65f61078e39e1b8f Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:35:28 +0700 Subject: [PATCH 07/10] index.js - Redirect Register errors to custom .ejs --- routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/index.js b/routes/index.js index 030d04e..3934d8d 100644 --- a/routes/index.js +++ b/routes/index.js @@ -39,7 +39,7 @@ router.route("/register") if (data == 200) { res.render("pages/register-verification-sent"); } else { - res.redirect("/register"); + res.render("pages/register-error") } }); }); From b3f3a1913f15746adc8aa12697b9f4ffa9dd210c Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:39:49 +0700 Subject: [PATCH 08/10] Added close button style --- public/css/product.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/public/css/product.css b/public/css/product.css index 56ac661..a2b5a47 100644 --- a/public/css/product.css +++ b/public/css/product.css @@ -41,6 +41,18 @@ border-color: red; } +.button-close { + color: white; + background-color: darkred; + border-color: darkred; + border-radius: 100px; +} + +.button-close:hover { + background-color: red; + border-color: red; +} + .button-checkout_1 { color: white; background-color: darkred; From dd2ae6dade5b207b85200c01459b53282133d274 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:40:07 +0700 Subject: [PATCH 09/10] Added close button style --- views/pages/product.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/product.ejs b/views/pages/product.ejs index 795429f..e1945c2 100644 --- a/views/pages/product.ejs +++ b/views/pages/product.ejs @@ -47,7 +47,7 @@ Succefully added to Bag
- +
From 24b20587373f28de6e16d51dfd22786c2cbeb07f Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Sun, 21 Nov 2021 13:40:39 +0700 Subject: [PATCH 10/10] Fixed wording when adding to bag --- views/pages/product.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/product.ejs b/views/pages/product.ejs index e1945c2..f918f72 100644 --- a/views/pages/product.ejs +++ b/views/pages/product.ejs @@ -44,7 +44,7 @@
- Succefully added to Bag + Successfully added to Bag