Merge branch 'dev' into feature/calculations
This commit is contained in:
6 files changed
+235
-10
No files matched your search
@@ -50,6 +50,8 @@ app.get('/', (req, res) => {
|
||||
});
|
||||
|
||||
app.get('/signup', (req, res) => {
|
||||
const ignore = ["User not found", "Incorrect password"];
|
||||
if (ignore.includes(req.session.errMessage)) req.session.errMessage = "";
|
||||
res.render('signup', { errMessage: req.session.errMessage });
|
||||
return res.status(status.Ok);
|
||||
});
|
||||
|
||||
@@ -39,8 +39,6 @@ module.exports = (users) => {
|
||||
return res.redirect("/login");
|
||||
}
|
||||
|
||||
console.log("User logged in successfully");
|
||||
console.log("User email: " + req.body.email);
|
||||
req.session.authenticated = true;
|
||||
req.session.userId = user._id;
|
||||
req.session.email = req.body.email;
|
||||
@@ -53,7 +51,7 @@ module.exports = (users) => {
|
||||
router.post("/signup", async (req, res) => {
|
||||
const userSchema = joi.object({
|
||||
email: joi.string().email().required(),
|
||||
// name: joi.string().alphanum().max(20).required(),
|
||||
name: joi.string().alphanum().max(20).required(),
|
||||
password: joi.string().max(20).min(8).required(),
|
||||
repassword: joi.string().max(20).min(8).required(),
|
||||
});
|
||||
@@ -76,13 +74,13 @@ module.exports = (users) => {
|
||||
|
||||
users.insertOne({
|
||||
email: req.body.email,
|
||||
// name: req.body.name,
|
||||
name: req.body.name,
|
||||
password: hashedPassword,
|
||||
}).then((results, err) => {
|
||||
if (err) {
|
||||
res.status(status.InternalServerError);
|
||||
console.error(err);
|
||||
return res.send("Internal server error");
|
||||
res.session.errMessage = "Internal server error";
|
||||
return res.status(status.InternalServerError).redirect("/signup");
|
||||
}
|
||||
|
||||
req.session.authenticated = true;
|
||||
@@ -90,8 +88,7 @@ module.exports = (users) => {
|
||||
req.session.userId = results.insertedId;
|
||||
|
||||
req.session.errMessage = "";
|
||||
res.status(status.Ok);
|
||||
return res.redirect("/home");
|
||||
return res.status(status.Ok).redirect("/home");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
/**
|
||||
* lockAccount resets inputs and disabled inputs
|
||||
*/
|
||||
function lockAccount() {
|
||||
// Clear unsaved inputs on page load (refresh doesnt clear them)
|
||||
document.getElementById("account-form").reset();
|
||||
|
||||
document.getElementById("save-account").disabled = true;
|
||||
document.getElementById("email").disabled = true;
|
||||
document.getElementById("name").disabled = true;
|
||||
document.getElementById("password").disabled = true;
|
||||
document.getElementById("repassword").disabled = true;
|
||||
document.getElementById("save-account").classList.add("cursor-not-allowed");
|
||||
|
||||
document.getElementById("edit-account").innerHTML = "Edit";
|
||||
document.getElementById("edit-account").onclick = unlockAccount;
|
||||
}
|
||||
|
||||
/**
|
||||
* lockPersonal resets inputs and disabled inputs
|
||||
*/
|
||||
function lockPersonal() {
|
||||
// Clear unsaved inputs on page load (refresh doesnt clear them)
|
||||
document.getElementById("personal-form").reset();
|
||||
|
||||
document.getElementById("save-personal").disabled = true;
|
||||
document.getElementById("dob").disabled = true;
|
||||
document.getElementById("education").disabled = true;
|
||||
document.getElementById("ms-single").disabled = true;
|
||||
document.getElementById("ms-married").disabled = true;
|
||||
document.getElementById("ms-divorced").disabled = true;
|
||||
document.getElementById("ms-widowed").disabled = true;
|
||||
document.getElementById("save-personal").classList.add("cursor-not-allowed");
|
||||
|
||||
document.getElementById("edit-personal").innerHTML = "Edit";
|
||||
document.getElementById("edit-personal").onclick = unlockPersonal;
|
||||
}
|
||||
|
||||
/**
|
||||
* unlockAccount removes disabled from inputs and
|
||||
* allows users to edit their profile.
|
||||
*/
|
||||
function unlockAccount() {
|
||||
document.getElementById("save-account").disabled = false;
|
||||
// document.getElementById("email").disabled = false;
|
||||
document.getElementById("name").disabled = false;
|
||||
document.getElementById("password").disabled = false;
|
||||
document.getElementById("repassword").disabled = false;
|
||||
document.getElementById("save-account").classList.remove("cursor-not-allowed");
|
||||
|
||||
document.getElementById("edit-account").innerHTML = "Cancel changes";
|
||||
document.getElementById("edit-account").onclick = lockAccount;
|
||||
}
|
||||
|
||||
/**
|
||||
* unlocPersonal removes disabled from inputs and
|
||||
* allows users to edit their personal information.
|
||||
*/
|
||||
function unlockPersonal() {
|
||||
document.getElementById("save-personal").disabled = false;
|
||||
document.getElementById("dob").disabled = false;
|
||||
document.getElementById("education").disabled = false;
|
||||
document.getElementById("ms-single").disabled = false;
|
||||
document.getElementById("ms-married").disabled = false;
|
||||
document.getElementById("ms-divorced").disabled = false;
|
||||
document.getElementById("ms-widowed").disabled = false;
|
||||
document.getElementById("save-personal").classList.remove("cursor-not-allowed");
|
||||
|
||||
document.getElementById("edit-personal").innerHTML = "Cancel changes";
|
||||
document.getElementById("edit-personal").onclick = lockPersonal;
|
||||
}
|
||||
|
||||
// On page load, ensure forms are locked and reset
|
||||
lockAccount();
|
||||
// lockPersonal();
|
||||
+57
-2
@@ -1,5 +1,7 @@
|
||||
const status = require("../util/statuses");
|
||||
const bcrypt = require('bcrypt');
|
||||
const joi = require("joi");
|
||||
const salt = 12;
|
||||
|
||||
module.exports = (middleware, users, plans) => {
|
||||
const router = require("express").Router();
|
||||
@@ -94,7 +96,7 @@ module.exports = (middleware, users, plans) => {
|
||||
});
|
||||
|
||||
router.get('/profile', (req, res) => {
|
||||
res.render('profiles', { user: req.user });
|
||||
res.render('profile', { user: req.user, errMessage: req.session.errMessage });
|
||||
return res.status(status.Ok);
|
||||
});
|
||||
|
||||
@@ -111,7 +113,7 @@ module.exports = (middleware, users, plans) => {
|
||||
|
||||
router.post('/questionnaire', (req, res) => {
|
||||
// console.log("Questionnaire POST body:", req.body);
|
||||
|
||||
|
||||
const questionnaireSchema = joi.object({
|
||||
dob: joi.date().required(),
|
||||
education: joi.string().valid('primary', 'secondary', 'tertiary', 'postgraduate').required(),
|
||||
@@ -167,5 +169,58 @@ module.exports = (middleware, users, plans) => {
|
||||
});
|
||||
});
|
||||
|
||||
router.post("/updateAccount", async (req, res) => {
|
||||
const accountSchema = joi.object({
|
||||
email: joi.string().email(),
|
||||
name: joi.string().alphanum().max(20),
|
||||
password: joi.string().max(20).min(8),
|
||||
repassword: joi.string().max(20).min(8),
|
||||
});
|
||||
|
||||
const valid = accountSchema.validate(req.body);
|
||||
|
||||
if (valid.err) {
|
||||
req.session.errMessage = "Invalid input",
|
||||
res.status(status.BadRequest);
|
||||
return res.redirect("/profile");
|
||||
}
|
||||
|
||||
let update = {
|
||||
// email: req.body.email,
|
||||
name: req.body.name,
|
||||
};
|
||||
|
||||
if ((req.body.password != "") && (req.body.password != req.body.repassword)) {
|
||||
req.session.errMessage = "New passwords must match";
|
||||
res.status(status.BadRequest);
|
||||
return res.redirect("/profile");
|
||||
} else if (req.body.password != "") {
|
||||
let hashedPassword = await bcrypt.hashSync(req.body.password, salt);
|
||||
update.password = hashedPassword;
|
||||
}
|
||||
|
||||
users.updateOne(
|
||||
{ email: req.session.email },
|
||||
{ $set: update }
|
||||
).then((result) => {
|
||||
if (result.matchedCount === 0) {
|
||||
console.log(`User not found during account update: ${req.session.email}`);
|
||||
req.session.errMessage = "User session invalid. Please log in again.";
|
||||
res.status(status.NotFound).redirect("/login");
|
||||
return;
|
||||
}
|
||||
if (result.modifiedCount === 0 && result.matchedCount === 1) {
|
||||
console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
|
||||
}
|
||||
|
||||
req.session.errMessage = "";
|
||||
return res.status(status.Ok).redirect("/profile");
|
||||
}).catch(err => {
|
||||
console.error("Error updating account in database:", err);
|
||||
req.session.errMessage = "An error occurred while saving your information. Please try again.";
|
||||
return res.status(status.InternalServerError).redirect("/profile");
|
||||
});
|
||||
});
|
||||
|
||||
return router;
|
||||
};
|
||||
@@ -0,0 +1,90 @@
|
||||
<%- include("./partials/fileHeader") %>
|
||||
<%- include("./partials/header") %>
|
||||
|
||||
<main>
|
||||
<h2 class="ml-11 mt-5 mb-6 text-xl font-semibold mb-4 text-white">Welcome <%= user.name %></h2>
|
||||
|
||||
<% if (errMessage != "") { %>
|
||||
<div class="max-w-md mx-auto mb-10 rounded-lg shadow-md text-white font-bold bg-red-400 py-4 text-center"><%= errMessage %></div>
|
||||
<% } %>
|
||||
|
||||
<div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
|
||||
<div class="flex flex-row justify-between">
|
||||
<h3 class="pt-2 pr-2 pb-2">Account settings</h3>
|
||||
<button id="edit-account" onclick="unlockAccount()" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Edit</button>
|
||||
</div>
|
||||
<form action="/updateAccount" method="post" class="space-y-4 mt-4" id="account-form">
|
||||
|
||||
<label for="email" class="block text-sm font-medium text-gray-700">Email</label>
|
||||
<input id="email" disabled type="text" name="email" value="<%= user.email %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
|
||||
<label for="name" class="block text-sm font-medium text-gray-700">Name</label>
|
||||
<input id="name" disabled type="text" name="name" value="<%= user.name %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
|
||||
<label for="password" class="block text-sm font-medium text-gray-700">New password</label>
|
||||
<input id="password" disabled type="password" name="password" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
|
||||
<label for="repassword" class="block text-sm font-medium text-gray-700">Confirm new password</label>
|
||||
<input id="repassword" disabled type="password" name="repassword" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
|
||||
<div>
|
||||
<button id="save-account" disabled type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-not-allowed">Save</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<!--
|
||||
<div class="mb-10 max-w-md mx-auto bg-white p-8 rounded-lg shadow-md">
|
||||
<div class="flex flex-row justify-between">
|
||||
<h3 class="pt-2 pr-2 pb-2">Personal information</h3>
|
||||
<button onclick="unlockPersonal()" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Edit</button>
|
||||
</div>
|
||||
<form action="/updatePersonal" method="post" class="space-y-4" id="personal-form">
|
||||
<div>
|
||||
<label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth</label>
|
||||
<input id="dob" disabled type="date" name="dob" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
</div>
|
||||
<div>
|
||||
<label for="education" class="block text-sm font-medium text-gray-700">Education</label>
|
||||
<select disabled name="education" id="education" class="mt-1 block w-full px-3 py-2 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
<option value="primary">Primary (Elementary)</option>
|
||||
<option value="secondary">Secondary (High School)</option>
|
||||
<option value="tertiary">Tertiary (College/University)</option>
|
||||
<option value="postgraduate">Postgraduate (Master's/PhD)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700">Marital Status</label>
|
||||
<div class="mt-1 space-x-4">
|
||||
<label class="inline-flex items-center">
|
||||
<input disabled id="ms-single" type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
<span class="ml-2 text-sm text-gray-700">Single</span>
|
||||
</label>
|
||||
<label class="inline-flex items-center">
|
||||
<input disabled id="ms-married" type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
<span class="ml-2 text-sm text-gray-700">Married</span>
|
||||
</label>
|
||||
<label class="inline-flex items-center">
|
||||
<input disabled id="ms-divorced" type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
<span class="ml-2 text-sm text-gray-700">Divorced</span>
|
||||
</label>
|
||||
<label class="inline-flex items-center">
|
||||
<input disabled id="ms-widowed" type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
|
||||
<span class="ml-2 text-sm text-gray-700">Widowed</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button id="save-personal" disabled type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-not-allowed">Save</button>
|
||||
</div>
|
||||
</form>
|
||||
</div> -->
|
||||
|
||||
<div class="mt-24"></div>
|
||||
</main>
|
||||
|
||||
<script src="/static/scripts/profile.js"></script>
|
||||
|
||||
<%- include("./partials/navBar") %>
|
||||
<%- include("./partials/footer") %>
|
||||
@@ -13,6 +13,12 @@
|
||||
class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Email" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="name" class="block text-base mb-2">Name</label>
|
||||
<input type="text" id="name" name="name"
|
||||
class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Name" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="password" class="block text-base mb-2">Password</label>
|
||||
<input type="password" id="password" name="password"
|
||||
|
||||
Reference in new issue
Block a user