5 лет назад · 49262e7708
--- a/controllers/emailVerification.js
+++ b/controllers/emailVerification.js
@@ -16,7 +16,7 @@ module.exports = {
 
				                         link: `${process.env.SITE}/verify/${merchant._id}`,
			
 
				                         code: merchant.verifyId
			
 
				                     })
			
 
				-                }
			
 
				+                };
			
 
				                 mailgun.messages().send(mailgunData, (err, body)=>{});
			
 
				 
			
 
				                 return res.redirect(`/verify/${merchant._id}`);
			
--- a/controllers/passwordReset.js
+++ b/controllers/passwordReset.js
@@ -46,6 +46,6 @@ module.exports = {
 
				     },
			
 
				 
			
 
				     enterPassword: function(req, res){
			
 
				-        return res.render("passwordResetPages/password");
			
 
				+        return res.render("passwordResetPages/password", {code: req.params.code});
			
 
				     }
			
 
				 }
			
--- a/routes.js
+++ b/routes.js
@@ -71,5 +71,5 @@ module.exports = function(app){
 
				     //Password reset
			
 
				     app.get("/reset/email", passwordReset.enterEmail);
			
 
				     app.post("/reset/email", passwordReset.generateCode);
			
 
				-    app.get("/reset/:id", passwordReset.enterPassword);
			
 
				+    app.get("/reset/:code", passwordReset.enterPassword);
			
 
				 }
			
--- a/views/passwordResetPages/email.ejs
+++ b/views/passwordResetPages/email.ejs
@@ -15,7 +15,7 @@
 
				         <h1 class="title">Enter your email to reset your password</h1>
			
 
				 
			
 
				         <form class="form" action="/reset/email" method="post">
			
 
				-            <input class="email" name="email" type="email" placeholder="email">
			
 
				+            <input class="formInput" name="email" type="email" placeholder="email">
			
 
				 
			
 
				             <input class="button" type="submit" value="SEND EMAIL">
			
 
				         </form>
			
--- a/views/passwordResetPages/password.ejs
+++ b/views/passwordResetPages/password.ejs
@@ -0,0 +1,31 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+    <head>
			
 
				+        <meta charset="utf-8">
			
 
				+        <meta content="width=device-width, initial-scale=1" name="viewport"/>
			
 
				+        <title>The Subline</title>
			
 
				+        <link rel="icon" type="img/png" href="/shared/images/logo.png">
			
 
				+        <link rel="stylesheet" href="/shared/shared.css">
			
 
				+        <link rel="stylesheet" href="/passwordResetPages/passwordReset.css">
			
 
				+        <link href="https://fonts.googleapis.com/css?family=Saira&display=swap" rel="stylesheet"> 
			
 
				+    </head>
			
 
				+    <body>
			
 
				+        <% include ../shared/header %>
			
 
				+
			
 
				+        <h1 class="title">Reset Password</h1>
			
 
				+
			
 
				+        <form class="form" action="" method="post">
			
 
				+            <input name="password" type="password" class="formInput" placeholder="password">
			
 
				+
			
 
				+            <input name="confirmPassword" type="password" class="formInput" placeholder="confirm password">
			
 
				+
			
 
				+            <input class="button" type="submit" value="RESET PASSWORD">
			
 
				+        </form>
			
 
				+
			
 
				+        <script>
			
 
				+            document.getElementById("helpLink").style.display = "block";
			
 
				+            document.getElementById("privacyPolicyLink").style.display = "block";
			
 
				+            document.getElementById("termsLink").style.display = "block";
			
 
				+        </script>
			
 
				+    </body>
			
 
				+</html>
			
--- a/views/passwordResetPages/passwordReset.css
+++ b/views/passwordResetPages/passwordReset.css
@@ -12,7 +12,7 @@ body{
 
				     background: none;
			
 
				 }
			
 
				 
			
 
				-    .email{
			
 
				+    .formInput{
			
 
				        font-size: 30px;
			
 
				        margin-bottom: 15px;
			
 
				        text-align: center;