From 78614e8f0ec3e4778f78a8511daf2f347ead34b9 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:24:32 +0700 Subject: [PATCH 01/11] Fixed spelling on api.js --- routes/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/api.js b/routes/api.js index b9c3e74..494aa08 100644 --- a/routes/api.js +++ b/routes/api.js @@ -183,7 +183,7 @@ router.post("/login", async (req, res) => { if (response[0].verify == 0) { res.status(204); res.json({ - message: "Sorry You havent verified your email", + message: "Sorry You haven't verified your email", }); } else { let token = randtoken.generate(256); From 796ca77d17dae38c91bad2396a2a7e836cb7c931 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:29:27 +0700 Subject: [PATCH 02/11] Fixed spelling in index.js --- routes/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/index.js b/routes/index.js index c5a1677..806481b 100644 --- a/routes/index.js +++ b/routes/index.js @@ -48,17 +48,17 @@ router } else if (data[0] == 204) { res.render("pages/login", { companyName: "SALAH", - error: "Please confirm your email", + error: "Please confim your account by checking your email", }); } else if (data[0] == 205) { res.render("pages/login", { companyName: "SALAH", - error: "Sorry Your email is not registered in our system", + error: "The Email you provided is not registered in our website", }); } else { res.render("pages/login", { companyName: "SALAH", - error: "Invalid Email or Password", + error: "Wrong Email or Password", }); } }); From be87ac2992e1a2551c78ae77e30c47da709f4226 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:31:08 +0700 Subject: [PATCH 03/11] Changed text so user cant exploit the login to check which email is registered by trying random emails --- routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/index.js b/routes/index.js index 806481b..f11f14c 100644 --- a/routes/index.js +++ b/routes/index.js @@ -53,7 +53,7 @@ router } else if (data[0] == 205) { res.render("pages/login", { companyName: "SALAH", - error: "The Email you provided is not registered in our website", + error: "Wrong Email or Password", }); } else { res.render("pages/login", { From 3c0620e013ea6f258e9ce776a42fae77cc8db15a Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:32:23 +0700 Subject: [PATCH 04/11] Fixed spelling on bag.ejs --- views/pages/bag.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/bag.ejs b/views/pages/bag.ejs index 010aaad..92509ac 100644 --- a/views/pages/bag.ejs +++ b/views/pages/bag.ejs @@ -22,7 +22,7 @@
-

Estimate

+

Estimated Price

-


From 061c0624b87756391a2a679b2faedc8be6e33c68 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:34:29 +0700 Subject: [PATCH 05/11] Fixed grammar and spelling in change-password.ejs --- views/pages/change-password.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/change-password.ejs b/views/pages/change-password.ejs index fc9273a..cb79fee 100644 --- a/views/pages/change-password.ejs +++ b/views/pages/change-password.ejs @@ -14,7 +14,7 @@
From d4e3a60f6908650bb9861614e7ad30c4de736313 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:35:25 +0700 Subject: [PATCH 06/11] Fixed spelling in checkout.ejs --- views/pages/checkout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/checkout.ejs b/views/pages/checkout.ejs index bd225b5..f6cdc7e 100644 --- a/views/pages/checkout.ejs +++ b/views/pages/checkout.ejs @@ -49,7 +49,7 @@
- We'll never share your Phone Number with + We'll never share your private information with anyone else. From 54d4a31b5a30db8a1c823597c82256d685d5f371 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:36:18 +0700 Subject: [PATCH 07/11] Fixed wording on forgot-password.ejs --- views/pages/forgot-password.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/forgot-password.ejs b/views/pages/forgot-password.ejs index 8d57ee6..f2e1909 100644 --- a/views/pages/forgot-password.ejs +++ b/views/pages/forgot-password.ejs @@ -14,7 +14,7 @@
From 544d7095e61ed99f6e4d5ced8d563dbf620a1b77 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:40:55 +0700 Subject: [PATCH 08/11] Fixed text on login-error/ejs --- views/pages/login-error.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/login-error.ejs b/views/pages/login-error.ejs index 14c2085..0343217 100644 --- a/views/pages/login-error.ejs +++ b/views/pages/login-error.ejs @@ -18,7 +18,7 @@
-
An error has occured... Make sure to check if you have empty fields, or if your email has been login before. Click the button below to get back to the login page.
+
An error has occured... Make sure to check if you have empty fields. Click the button below to get back to the login page.

Login
From d06d876b2549d6fc616feb1c4526a55cefdbcfed Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:44:36 +0700 Subject: [PATCH 09/11] Fixed wording on notif-pay.ejs --- views/pages/notif-pay.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/notif-pay.ejs b/views/pages/notif-pay.ejs index c4308cb..41d9393 100644 --- a/views/pages/notif-pay.ejs +++ b/views/pages/notif-pay.ejs @@ -15,7 +15,7 @@
-
Your order has been added to the transaction list. +
Your order has been received. Wanna see how to pay?
How to Pay
From 2bce9370368195831d2667c53b4304ead7525879 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:46:50 +0700 Subject: [PATCH 10/11] Fixed wording on otp.ejs --- views/pages/otp.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/otp.ejs b/views/pages/otp.ejs index b2448cc..ea3f8ef 100644 --- a/views/pages/otp.ejs +++ b/views/pages/otp.ejs @@ -14,7 +14,7 @@
From 221ac5f43b5b5d58b375bb794fe1854f10774335 Mon Sep 17 00:00:00 2001 From: Matthew Patrick Date: Thu, 18 Nov 2021 13:49:40 +0700 Subject: [PATCH 11/11] Fixed wording on success-add.ejs --- views/pages/success-add.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/pages/success-add.ejs b/views/pages/success-add.ejs index 33d9ad4..fb8ec6f 100644 --- a/views/pages/success-add.ejs +++ b/views/pages/success-add.ejs @@ -15,7 +15,7 @@
-
SUCCESSFULLY ADDED TO BAG
+
Added to your shopping bag !