Главная Обзор Помощь
Регистрация Вход
lee
/
subline
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Add banner to appropriate verify email and password reset pages.

Lee Morgan 5 лет назад
Родитель
8cc137d94e
Сommit
6514cb4003
7 измененных файлов с 39 добавлено и 12 удалено
Единый вид Показать статистику Diff
  1. 1 1
      controllers/emailVerification.js
  2. 1 2
      controllers/passwordReset.js
  3. 1 0
      controllers/renderer.js
  4. 3 4
      routes.js
  5. 1 1
      views/otherPages/login.ejs
  6. 22 4
      views/passwordResetPages/password.ejs
  7. 10 0
      views/verifyPage/verify.ejs

+ 1 - 1
controllers/emailVerification.js
Просмотреть файл 

@@ -19,7 +19,7 @@ module.exports = {
 
                 mailgun.messages().send(mailgunData, (err, body)=>{});
 
                 mailgun.messages().send(mailgunData, (err, body)=>{});
 
 
 
 
 
-                return res.render(`verifyPage/verify`, {id: merchant._id, email: merchant.email});
 
+                return res.render(`verifyPage/verify`, {id: merchant._id, email: merchant.email, banner: res.locals.merchant});
 
             })
 
             })
 
             .catch((err)=>{
 
             .catch((err)=>{
 
                 req.session.error = "ERROR: UNABLE TO SEND VERIFICATION EMAIL";
 
                 req.session.error = "ERROR: UNABLE TO SEND VERIFICATION EMAIL";

+ 1 - 2
controllers/passwordReset.js
Просмотреть файл 

@@ -45,7 +45,7 @@ module.exports = {
 
     },
 
     },
 
 
 
     enterPassword: function(req, res){
 
     enterPassword: function(req, res){
 
-        return res.render("passwordResetPages/password", {id: req.params.id, code: req.params.code});
 
+        return res.render("passwordResetPages/password", {id: req.params.id, code: req.params.code, banner: res.locals.banner});
 
     },
 
     },
 
 
 
     resetPassword: function(req, res){
 
     resetPassword: function(req, res){
 
@@ -56,7 +56,6 @@ module.exports = {
 
                     return res.redirect("/");
 
                     return res.redirect("/");
 
                 }
 
                 }
 
 
 
-                //TODO: add banners to the relevant pages
 
                 if(req.body.password !== req.body.confirmPassword){
 
                 if(req.body.password !== req.body.confirmPassword){
 
                     req.session.error = "PASSWORDS DO NOT MATCH";
 
                     req.session.error = "PASSWORDS DO NOT MATCH";
 
                     return res.redirect(`/reset/${merchant._id}/${merchant.verifyId}`);
 
                     return res.redirect(`/reset/${merchant._id}/${merchant.verifyId}`);

+ 1 - 0
controllers/renderer.js
Просмотреть файл 

@@ -87,6 +87,7 @@ module.exports = {
 
             .catch((err)=>{
 
             .catch((err)=>{
 
                 //TODO: add banners to the necessary pages
 
                 //TODO: add banners to the necessary pages
 
                 if(err === "unverified"){
 
                 if(err === "unverified"){
 
+                    req.session.error = "PLEASE VERIFY YOUR EMAIL ADDRESS";
 
                     return res.redirect(`/verify/email/${merchant2._id}`);
 
                     return res.redirect(`/verify/email/${merchant2._id}`);
 
                 }
 
                 }
 
                 req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";
 
                 req.session.error = "ERROR: UNABLE TO RETRIEVE USER DATA";

+ 3 - 4
routes.js
Просмотреть файл 

@@ -12,8 +12,7 @@ const passwordReset = require("./controllers/passwordReset.js");
 
 const session = require("./middleware.js").verifySession;
 
 const session = require("./middleware.js").verifySession;
 
 const banner = require("./middleware.js").formatBanner;
 
 const banner = require("./middleware.js").formatBanner;
 
 
 
-const multer = require("multer");
 
-const upload = multer({dest: "uploads/"});
 
+const upload = require("multer")({dest: "uploads/"});
 
 
 
 module.exports = function(app){
 
 module.exports = function(app){
 
     //Render page
 
     //Render page
 
@@ -67,13 +66,13 @@ module.exports = function(app){
 
     app.get("/help", informationPages.help);
 
     app.get("/help", informationPages.help);
 
 
 
     //Email verification
 
     //Email verification
 
-    app.get("/verify/email/:id", emailVerification.sendVerifyEmail);
 
+    app.get("/verify/email/:id", banner, emailVerification.sendVerifyEmail);
 
     app.post("/verify/resend", emailVerification.resendEmail);
 
     app.post("/verify/resend", emailVerification.resendEmail);
 
     app.get("/verify/:id/:code", emailVerification.verify);
 
     app.get("/verify/:id/:code", emailVerification.verify);
 
 
 
     //Password reset
 
     //Password reset
 
     app.get("/reset/email", passwordReset.enterEmail);
 
     app.get("/reset/email", passwordReset.enterEmail);
 
     app.post("/reset/email", passwordReset.generateCode);
 
     app.post("/reset/email", passwordReset.generateCode);
 
-    app.get("/reset/:id/:code", passwordReset.enterPassword);
 
+    app.get("/reset/:id/:code", banner, passwordReset.enterPassword);
 
     app.post("/reset", passwordReset.resetPassword);
 
     app.post("/reset", passwordReset.resetPassword);
 
 }
 
 }

+ 1 - 1
views/otherPages/login.ejs
Просмотреть файл 

@@ -50,7 +50,7 @@
 
             setTimeout(()=>{
 
             setTimeout(()=>{
 
                 let banner = document.getElementById("banner");
 
                 let banner = document.getElementById("banner");
 
                 if(banner !== null) banner.style.display = "none";
 
                 if(banner !== null) banner.style.display = "none";
 
-            }, 10000)
 
+            }, 10000);
 
         </script>
 
         </script>
 
     </body>
 
     </body>
 
 </html>
 
 </html>

+ 22 - 4
views/passwordResetPages/password.ejs
Просмотреть файл 

@@ -10,7 +10,24 @@
 
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet"> 
         <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet"> 
     </head>
 
     </head>
 
     <body>
 
     <body>
 
-        <% include ../shared/header %>
 
+        <div class="header">
 
+            <a class="headerStart" href="/" >
 
+                <img src="/shared/images/logo.png" alt="Subline">
 
+                <div class='headerLogo'>THE SUBLINE</div>
 
+            </a>
 
+        
+            <div class="headerEnd">
 
+                <a id="helpLink" class="headerHide" href="/help">HELP</a>
 
+        
+                <a id="privacyPolicyLink" class="headerHide" href="/privacy">PRIVACY POLICY</a>
 
+        
+                <a id="termsLink" class="headerHide" href="/terms">TERMS AND CONDITIONS</a>        
+            </div>
 
+        </div>
 
+
 
+        <% if(banner !== undefined){ %>
 
+            <% include ./banner.ejs %>
 
+        <% } %>
 
 
 
         <h1 class="title">Reset Password</h1>
 
         <h1 class="title">Reset Password</h1>
 
 
 
@@ -27,9 +44,10 @@
 
         </form>
 
         </form>
 
 
 
         <script>
 
         <script>
 
-            document.getElementById("helpLink").style.display = "block";
 
-            document.getElementById("privacyPolicyLink").style.display = "block";
 
-            document.getElementById("termsLink").style.display = "block";
 
+            setTimeout(()=>{
 
+                let banner = document.getElementById("banner");
 
+                if(banner !== null) banner.style.display = "none";
 
+            }, 10000);
 
         </script>
 
         </script>
 
     </body>
 
     </body>
 
 </html>
 
 </html>

+ 10 - 0
views/verifyPage/verify.ejs
Просмотреть файл 

@@ -12,6 +12,10 @@
 
     <body>
 
     <body>
 
         <% include ../shared/header %>
 
         <% include ../shared/header %>
 
 
 
+        <% if(banner !== undefined){ %>
 
+            <% include ./banner.ejs %>
 
+        <% } %>
 
+
 
         <h1 class="title">An email has been sent to <%=email%>.  Use the link in the email to verify your account.</h1>
 
         <h1 class="title">An email has been sent to <%=email%>.  Use the link in the email to verify your account.</h1>
 
 
 
         <p class="text">If you did not recieve an email or need to change your email address, enter it below and click submit.</p>
 
         <p class="text">If you did not recieve an email or need to change your email address, enter it below and click submit.</p>
 
@@ -30,4 +34,10 @@
 
         document.getElementById("privacyPolicyLink").style.display = "block";
 
         document.getElementById("privacyPolicyLink").style.display = "block";
 
         document.getElementById("termsLink").style.display = "block";
 
         document.getElementById("termsLink").style.display = "block";
 
     </script>
 
     </script>
 
+    <script>
 
+        setTimeout(()=>{
 
+            let banner = document.getElementById("banner");
 
+            if(banner !== null) banner.style.display = "none";
 
+        }, 10000);
 
+    </script>
 
 </html>
 
 </html>