wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62 from Newtbot/Vivian

Browse Source 
c
This commit is contained in:
noot 2024-01-30 15:57:40 +08:00 committed by GitHub
commit 22230eca12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 25 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
consumerWebsite/database/mySQL.js
View File

@ -21,7 +21,6 @@ const sequelize = new Sequelize(
}, },
}, },
); );
sequelize.authenticate().then(() => { sequelize.authenticate().then(() => {

49
consumerWebsite/functions/nodeMail.js
View File

@ -62,7 +62,6 @@ async function sendTokenEmail(email, token) {
<p>EcoSaver Team</p> <p>EcoSaver Team</p>
<p><a href="https://ecosaver.teeseng.uk/">EcoSaver Website</a></p> <p><a href="https://ecosaver.teeseng.uk/">EcoSaver Website</a></p>
<p>Please do not reply to this email.</p> <p>Please do not reply to this email.</p>
`, `,
}); });
transporter.sendMail({ tokenMessage }, function (error, info) { transporter.sendMail({ tokenMessage }, function (error, info) {
@ -77,19 +76,19 @@ async function sendTokenEmail(email, token) {
} }
} }
async function sendResetPasswordEmail(email, message) { async function sendResetPasswordEmail(email, link, resetToken) {
console.log(email, message); console.log(email);
try { try {
let resetMessage = await transporter.sendMail({ let resetMessage = await transporter.sendMail({
to: process.env.euser, to: email,
from: process.env.euser,
subject: "Reset Password", subject: "Reset Password",
html: ` html: `
<h1>Reset Password</h1> <h1>Reset Password</h1>
<p><strong>Reset Password Link:</strong> ${link}</p>
<p><strong>One time token:</strong> ${resetToken}</p>
<p><strong>From:</strong> Eco Saver</p> <p><strong>From:</strong> Eco Saver</p>
<p><strong>User Email:</strong> ${email}</p> <p>Kindly click on the link and key in the one time token given to reset your password!</p>
<p><strong>Message:</strong> ${message}</p>
<p>Kindly click on the link given to reset your password!</p>
<p>Regards,</p> <p>Regards,</p>
<p>EcoSaver Team</p> <p>EcoSaver Team</p>
<p><a href="https://ecosaver.teeseng.uk/">EcoSaver Website</a></p> <p><a href="https://ecosaver.teeseng.uk/">EcoSaver Website</a></p>
@ -108,36 +107,4 @@ async function sendResetPasswordEmail(email, message) {
} }
} }
async function sendResetTokenEmail(email, token) { module.exports = { sendContactEmail , sendTokenEmail, sendResetPasswordEmail };
try {
let tokenMessage = await transporter.sendMail({
to: email,
from: process.env.euser,
subject: "API Token",
html: `
<h1>API Token</h1>
<p><strong>Token:</strong> ${token}</p>
<p>Please do not lose this token and do not share your token with anyone!</p>
<p>Thank you for using EcoSaver.</p>
<p>Regards,</p>
<p>EcoSaver Team</p>
<p><a href="https://ecosaver.teeseng.uk/">EcoSaver Website</a></p>
<p>Please do not reply to this email.</p>
`,
});
transporter.sendMail({ resetMessage }, function (error, info) {
if (error) {
console.log(error);
} else {
console.log("Email sent: " + info.response);
}
});
} catch (error) {
console.error(error);
}
}
module.exports = { sendContactEmail , sendTokenEmail, sendResetPasswordEmail, sendResetTokenEmail };

2
consumerWebsite/routes/auth.js
View File

@ -84,7 +84,7 @@ router.post("/checkemail", async (req, res, next) => {
} }
else{ else{
//console.log(Res); //console.log(Res);
send(req.body.email, req.body.name, req.body.message);
return res.json({ return res.json({
message: "Reset Password Link has successfully sent to your email!", message: "Reset Password Link has successfully sent to your email!",
}); });

6
consumerWebsite/views/forgotPassword.ejs
View File

@ -3,10 +3,10 @@
<body> <body>
<section class="wrapper"> <section class="wrapper">
<div class="form"> <div class="form">
<header>Reset Password</header> <header>Forgot Password</header>
<form action="auth/checkemail" method="POST" onsubmit="formAJAX(this)"> <form action="auth/checkemail" onsubmit="formAJAX(this)" evalAJAX="app.auth.logInRedirect();">
<input type="email" name="email" placeholder="Email" required <input type="email" name="email" placeholder="Email" required
pattern="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" /> pattern="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" />
<input type="submit" value="Reset Password" /> <input type="submit" value="Reset Password" />
</form> </form>
<br> <br>

39
consumerWebsite/views/resetpassword.ejs
View File

@ -1,30 +1,19 @@
<!DOCTYPE html> <%- include('logintop') %>
<html>
<head>
<title>Your password has been resetted</title>
<link href="css/reset.css" rel="stylesheet">
</head>
<body> <body>
<table class="main-header"> <section class="wrapper">
<tr> <div class="form">
<td style="text-align: center;"> <header>Reset Password</header>
<img src="images/passwordreset.png" alt="Image"> <form action="auth/resetPassword" >
<h1>Your password has been resetted</h1> <input type="password" name="password" placeholder="password" required>
</td> <input type="cpassword" name="cpassword" placeholder="cpassword" required>
</tr> <input type="submit" value="Reset Password" />
</table> </form>
<br>
<table class="content-section"> <a>Dont have an account?</a> <a href="/login">Sign Up</a>
<tr> </div>
<td> </section>
<p>Hello,</p>
<p>Please check your email to reset your password.</p>
</td>
</tr>
</table>
<table class="footer"> <table class="footer">
<tr> <tr>
@ -35,5 +24,3 @@
</table> </table>
</body> </body>
</html>