diff --git a/src/controllers/passwordReset.controllers.js b/src/controllers/passwordReset.controllers.js
index ec7af50..4f7bc12 100644
--- a/src/controllers/passwordReset.controllers.js
+++ b/src/controllers/passwordReset.controllers.js
@@ -55,26 +55,50 @@ async function render_reset_form(req, res) {
try {
const { token, userType } = req.query;
+ // ❌ Missing params
if (!token || !userType) {
- return res.render('auth/reset-password-error', { error: 'Reset token or user type is missing', userType: userType || 'va' });
+ return res.render('auth/reset-password-error', {
+ title: "Reset Password",
+ layout: 'layouts/auth',
+ error: 'Reset token or user type is missing',
+ userType: userType || 'va'
+ });
}
- // Validate token
+ // ✅ Validate token
const validation = await passwordResetService.validateResetToken(token, userType);
if (!validation.valid) {
- return res.render('auth/reset-password-error', { error: validation.message, userType: userType || 'va' });
+ return res.render('auth/reset-password-error', {
+ title: "Reset Password",
+ layout: 'layouts/auth',
+ error: validation.message,
+ userType: userType || 'va'
+ });
}
- // Render reset form with token
- res.render('auth/reset-password-form', { token, userType, error: null });
+ // ✅ Render reset password form
+ return res.render('auth/reset-password-form', {
+ title: "Reset Password",
+ layout: 'layouts/auth',
+ token,
+ userType,
+ error: null
+ });
} catch (error) {
logger.error(`PasswordResetController - Render form error: ${error.message}`);
- res.render('auth/reset-password-error', { error: 'Failed to load reset form' });
+
+ return res.render('auth/reset-password-error', {
+ title: "Reset Password",
+ layout: 'layouts/auth',
+ error: 'Failed to load reset form',
+ userType: 'va'
+ });
}
}
+
// Process password reset form submission (shared for both VA and Client)
async function process_reset(req, res) {
try {
diff --git a/src/server.js b/src/server.js
index 370bbc7..7fa53fb 100644
--- a/src/server.js
+++ b/src/server.js
@@ -65,7 +65,9 @@ app.use('/api', apiRoutes);
app.get("/download-tracker", (req, res) => {
res.render("download_tracker", {
- version: "3.2.1"
+ title: 'Download tracker',
+ version: "3.2.1",
+ layout: 'layouts/main'
});
});
@@ -80,42 +82,64 @@ app.get("/download-file", (req, res) => {
});
app.get('/varegister/:sf_token?', (req, res) => {
- const { sf_token } = req.params;
+ const { sf_token } = req.params;
- try {
- const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
+ // No token → invalid request
+ if (!sf_token) {
+ return res.status(404).render('not_found', {
+ title: 'Page Not Found',
+ layout: 'layouts/error'
+ });
+ }
- if (decoded) {
- const email = decoded.email;
- res.render('va_register', { title: "VA Registration", email });
- } else {
- res.render('not_found', { title: "VA Registration" });
- }
- } catch (error) {
- res.render('not_found', { title: "VA Registration" });
- }
+ try {
+ const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
- // if(verified) {
- // res.render('va_register', { title: "VA Registration" });
- // } else {
- // res.render('not_founf', { title: "VA Registration" });
- // }
+ // Token valid
+ return res.render('va_register', {
+ title: 'VA Registration',
+ email: decoded.email,
+ layout: 'layouts/varegisterlayout'
+ });
+
+ } catch (error) {
+ // Invalid / expired token
+ return res.status(401).render('not_found', {
+ title: 'Invalid or Expired Link',
+ layout: 'layouts/error'
+ });
+ }
});
-app.get('/clientregister/:sf_token?', (req, res) => {
- const { sf_token } = req.params;
- try {
- const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
- if (decoded) {
- const email = decoded.email;
- res.render('va_client_register', { title: "Client Registration", email });
- } else {
- res.render('not_found', { title: "Client Registration" });
- }
- } catch (error) {
- res.render('not_found', { title: "Client Registration" });
- }
+app.get('/clientregister/:sf_token?', (req, res) => {
+ const { sf_token } = req.params;
+
+ // No token → invalid request
+ if (!sf_token) {
+ return res.status(404).render('not_found', {
+ title: 'Page Not Found',
+ layout: 'layouts/error'
+ });
+ }
+
+ try {
+ const decoded = jwt.verify(sf_token, process.env.JWT_SECRET_SF_TOKEN);
+
+ // Token valid
+ return res.render('va_client_register', {
+ title: 'Client Registration',
+ email: decoded.email,
+ layout: 'layouts/vaclientlayout'
+ });
+
+ } catch (error) {
+ // Invalid / expired token
+ return res.status(401).render('not_found', {
+ title: 'Invalid or Expired Link',
+ layout: 'layouts/error'
+ });
+ }
});
app.get('/auth/password/reset-form', render_reset_form);
@@ -135,7 +159,11 @@ app.get("/client/login", (req, res) => {
});
app.get("/client/forgot-password", (req, res) => {
- res.render("forgot_password")
+
+ res.render("forgot_password", {
+ title: "Forgot Password",
+ layout: "layouts/forgotpasswordlayout"
+ });
})
// Client Dashboard Routes with new file names
@@ -208,7 +236,7 @@ app.get("/live/:projectId/:vaId", async (req, res) => {
const { projectId, vaId } = req.params;
if (!projectId || !vaId) {
- return res.status(400).send({ "message": "Page not found" });
+ return res.status(400).render("not_found", { title: "Page not found" });
}
let clientId = null;
@@ -219,36 +247,45 @@ app.get("/live/:projectId/:vaId", async (req, res) => {
}
} catch (err) {
console.error("Error fetching client for project:", err.message);
- return;
+ return res.status(500).render("not_found", { title: "Server Error" });
}
- if (!clientId) return res.status(400).send({ "message": "Page not found" });
-
- res.render("va_live_tracker", { title: "VA Live Tracker", projectId, vaId, clientId })
-})
-
-app.get("/live/:projectId/:vaId", async (req, res) => {
- const { projectId, vaId } = req.params;
-
- if (!projectId || !vaId) {
- return res.status(400).send({ "message": "Page not found" });
+ if (!clientId) {
+ return res.status(400).render("not_found", { title: "Page not found" });
}
- let clientId = null;
- try {
- const clientRes = await ProjectModel.findById(projectId);
- if (clientRes) {
- clientId = clientRes.clientId.toString();
- }
- } catch (err) {
- console.error("Error fetching client for project:", err.message);
- return;
- }
+ res.render("va_live_tracker", {
+ title: "VA Live Tracker",
+ projectId,
+ vaId,
+ clientId,
+ layout: "layouts/valivetrackerlayout" // ✅ ADD THIS
+ });
+});
- if (!clientId) return res.status(400).send({ "message": "Page not found" });
- res.render("va_live_tracker", { title: "VA Live Tracker", projectId, vaId, clientId })
-})
+// app.get("/live/:projectId/:vaId", async (req, res) => {
+// const { projectId, vaId } = req.params;
+
+// if (!projectId || !vaId) {
+// return res.status(400).send({ "message": "Page not found" });
+// }
+
+// let clientId = null;
+// try {
+// const clientRes = await ProjectModel.findById(projectId);
+// if (clientRes) {
+// clientId = clientRes.clientId.toString();
+// }
+// } catch (err) {
+// console.error("Error fetching client for project:", err.message);
+// return;
+// }
+
+// if (!clientId) return res.status(400).send({ "message": "Page not found" });
+
+// res.render("va_live_tracker", { title: "VA Live Tracker", projectId, vaId, clientId })
+// })
// Handling Socket
import { VAModel, ProjectModel, ClientModel } from './models/vaModel.js';
@@ -511,11 +548,13 @@ io.on("connection", (socket) => {
});
app.use((req, res) => {
- res.status(404).render("not_found", {
- title: "404 - Page Not Found"
- });
+ res.status(404).render("not_found", {
+ layout: "layouts/error",
+ title: "404 - Page Not Found"
+ });
});
+
server.listen(PORT, () => {
mongoose
.connect(
diff --git a/views/forgot_password.ejs b/views/forgot_password.ejs
index 5c39933..0153ea3 100644
--- a/views/forgot_password.ejs
+++ b/views/forgot_password.ejs
@@ -1,121 +1,4 @@
-
-
-
-
-
- DocVA | Reset Password
-
-
-
-
-
DocTracker