Change redirecting to reflect the new landing/login/register layout.

controllers/merchantData.js

@@ -19,18 +19,18 @@ module.exports = {
     createMerchantNone: async function(req, res){
         if(req.body.password.length < 10){
             req.session.error = "PASSWORD MUST CONTAIN AT LEAST 10 CHARACTERS";
-            return res.redirect("/");
+            return res.redirect("/register");
         }
 
         if(req.body.password !== req.body.confirmPassword){
             req.session.error = "PASSWORDS DO NOT MATCH";
-            return res.redirect("/");
+            return res.redirect("/register");
         }
 
         const merchantFind = await Merchant.findOne({email: req.body.email.toLowerCase()});
         if(merchantFind !== null){
             req.session.error = "USER WITH THIS EMAIL ADDRESS ALREADY EXISTS";
-            return res.redirect("/");
+            return res.redirect("/register");
         }
 
         let salt = bcrypt.genSaltSync(10);
@@ -158,7 +158,7 @@ module.exports = {
             })
             .then((merchant)=>{
                 req.session.success = "PASSWORD SUCCESSFULLY RESET. PLEASE LOG IN";
-                return res.redirect("/");
+                return res.redirect("/login");
             })
             .catch((err)=>{
                 if(typeof(err) === "string"){

controllers/passwordReset.js

@@ -56,6 +56,7 @@ module.exports = {
                     return res.redirect("/");
                 }
 
+                //TODO: add banners to the relevant pages
                 if(req.body.password !== req.body.confirmPassword){
                     req.session.error = "PASSWORDS DO NOT MATCH";
                     return res.redirect(`/reset/${merchant._id}/${merchant.verifyId}`);
@@ -77,7 +78,7 @@ module.exports = {
             .then((merchant)=>{
                 if(merchant !== undefined){
                     req.session.success = "PASSWORD SUCCESSFULLY UPDATED.  PLEASE LOG IN";
-                    return res.redirect("/");
+                    return res.redirect("/login");
                 }
             })
             .catch((err)=>{

controllers/renderer.js

@@ -85,6 +85,7 @@ module.exports = {
                 return res.render("dashboardPage/dashboard", {merchant: res.locals.merchant, transactions: transactions});
             })
             .catch((err)=>{
+                //TODO: add banners to the necessary pages
                 if(err === "unverified"){
                     return res.redirect(`/verify/email/${merchant2._id}`);
                 }

middleware.js

@@ -4,7 +4,7 @@ module.exports = {
     verifySession: function(req, res, next){
         if(req.session.user === undefined) {
             req.session.error = "PLEASE LOG IN";
-            return res.redirect("/");
+            return res.redirect("/login");
         }
     
         Merchant.findOne({"session.sessionId": req.session.user})
@@ -20,7 +20,8 @@ module.exports = {
                     merchant.session.sessionId = helper.generateId(25);
                     merchant.session.date = newExpiration;
                     merchant.save();
-                    return res.redirect("/");
+                    req.session.error = "PLEASE LOG IN";
+                    return res.redirect("/login");
                 }
     
                 res.locals.merchant = merchant;
@@ -29,7 +30,7 @@ module.exports = {
             .catch((err)=>{
                 if(err === "no merchant"){
                     req.session.error = "PLEASE LOG IN";
-                    return res.redirect("/");
+                    return res.redirect("/login");
                 }
                 return res.json("ERROR: UNABLE TO RETRIEVE DATA");
             });