Merge branch 'dev' into feature/questions

Just a bug fix

app.js

@@ -3,8 +3,10 @@ const MongoStore = require("connect-mongo");
 const session = require("express-session");
 const express = require('express');
 const path = require('path');
+const joi = require('joi'); 
 require('dotenv').config();
 
+
 const app = express();
 const port = process.env.PORT || 3000;
 
@@ -18,7 +20,7 @@ app.use(session({
     store: MongoStore.create({ mongoUrl: `${mongoURI}${database}`, crypto: { secret: secret } }),
     resave: true,
     saveUninitialized: false,
-    cookie: { maxAge: 60000 },
+    cookie: { maxAge: 3600000 },
 }));
 
 app.set('view engine', 'ejs');
@@ -60,25 +62,11 @@ app.get('/login', (req, res) => {
     return res.status(status.Ok);
 });
 
-app.get('/home', (req, res) => {
-    res.render('home', { session: req.session });
-    return res.status(status.Ok);
-});
-
 app.get('/aboutUs', (req, res) => {
     res.render('aboutUs');
     return res.status(status.Ok);
 });
 
-app.get('/logout', (req, res) => {
-    req.session.destroy();
-    return res.redirect('/login');
-});
-
-app.get('/*splat', (req, res) => {
-    res.send('404 Not Found');
-    return res.status(status.NotFound);
-});
 
 // Initialize database and start app
 initDatabase().then(() => {
@@ -89,7 +77,7 @@ initDatabase().then(() => {
 
     // Import middleware & apply to user routes
     const middleware = require("./src/auth/middleware")(users);
-    app.use(require("./src/router/user")(middleware));
+    app.use(require('./src/router/user')(middleware, users));
 
     // 404 handler
     app.get('/*splat', (req, res) => {

src/auth/authentication.js

@@ -3,6 +3,9 @@ const bcrypt = require('bcrypt');
 const joi = require("joi");
 const salt = 12;
 
+const middleware = require("./middleware");
+
+
 module.exports = (users) => {
     const router = require("express").Router();
 
@@ -13,6 +16,7 @@ module.exports = (users) => {
     });
     
     router.post("/login", async (req, res) => {
+      
         const credentialSchema = joi.object({
             email: joi.string().email().required(),
             password: joi.string().max(20).required(),
@@ -39,9 +43,10 @@ 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.email = req.body.email;
-
             req.session.errMessage = "";
             res.redirect("/home");
             return res.status(status.Ok);

src/auth/middleware.js

@@ -1,4 +1,5 @@
 const status = require("../util/statuses");
+const session = require("express-session");
 
 /**
  * createMiddleware returns a middleware function for express.
@@ -14,7 +15,7 @@ const createMiddleware = (users) => {
         }
     
         let user = await users.findOne({ "email": req.session.email }).then((user) => user);
-
+    
         if (!user) {
             req.session.errMessage = "User not found";
             res.redirect("/login");

src/router/user.js

@@ -1,39 +1,114 @@
 const status = require("../util/statuses");
+const joi = require("joi");
 
-module.exports = (middleware) => {
+module.exports = (middleware, users) => {
     const router = require("express").Router();
+    
+    router.use(middleware);
 
-    router.get('/home', middleware, async (req, res) => {
+    router.get('/home', async (req, res) => {
         res.render('home', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/assets', middleware, (req, res) => {
+    router.get('/assets', (req, res) => {
         res.render('assets', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/plans', middleware, (req, res) => {
+    router.get('/plans', (req, res) => {
         res.render('plans', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/more', middleware, (req, res) => {
+    router.get('/more', (req, res) => {
         res.render('more', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/profile', middleware, (req, res) => {
+    router.get('/profile', (req, res) => {
         res.render('profiles', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/settings', middleware, (req, res) => {
+    router.get('/settings', (req, res) => {
         res.render('settings', { user: req.user });
         return res.status(status.Ok);
     });
 
-    router.get('/logout', middleware, (req, res) => {
+    router.get('/questionnaire', (req, res) => {
+        const errMessage = req.session.errMessage;
+        req.session.errMessage = ""; 
+        res.render('questionnaire', { user: req.user, errMessage: errMessage });
+    });
+
+    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(),
+            maritalStatus: joi.string().valid('single', 'married', 'divorced', 'widowed').required(),
+            income: joi.number().min(0).required(),
+            expenses: joi.number().min(0).required(),
+            assets: joi.number().min(0).required(),
+            liabilities: joi.number().min(0).required(),
+            retirementAge: joi.number().min(18).max(120).required(),
+            retirementExpenses: joi.number().min(0).required(),
+            retirementAssets: joi.number().min(0).required(),
+            retirementLiabilities: joi.number().min(0).required(),
+        });
+    
+        const validationOptions = { convert: true, abortEarly: false }; 
+        const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
+    
+        if (error) { 
+            console.error("Questionnaire validation error:", error.details);
+            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', '); 
+            res.status(status.BadRequest).redirect("/questionnaire"); 
+            return; 
+        }
+    
+        users.updateOne( 
+            { email: req.session.email }, 
+            { 
+                $set: { 
+                    financialData: true, 
+                    dob: value.dob,
+                    education: value.education,
+                    maritalStatus: value.maritalStatus,
+                    income: value.income,
+                    expenses: value.expenses,
+                    assets: value.assets,
+                    liabilities: value.liabilities,
+                    retirementAge: value.retirementAge,
+                    retirementExpenses: value.retirementExpenses,
+                    retirementAssets: value.retirementAssets,
+                    retirementLiabilities: value.retirementLiabilities,
+                } 
+            }
+        ).then((result) => { 
+            if (result.matchedCount === 0) {
+                console.log(`User not found during questionnaire 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 questionnaire data unchanged (already up-to-date): ${req.session.email}`);
+            }
+        
+            req.session.errMessage = ""; 
+            res.status(status.Ok).redirect("/home"); 
+    
+        }).catch(err => { 
+            console.error("Error updating questionnaire in database:", err);
+            req.session.errMessage = "An error occurred while saving your information. Please try again.";
+            res.status(status.InternalServerError).redirect("/questionnaire"); 
+        });
+    });
+
+    router.get('/logout', (req, res) => {
         req.session.destroy();
         return res.redirect('/login');
     });

src/views/home.ejs

@@ -9,10 +9,14 @@
 </head>
 
 <body>
-    <%- include("./partials/header") %>
-    <% if (session.authenticated) { console.log(session.email); } else { console.log("No user"); } %>
     <main>
+        <%- include("./partials/header") %>
+        Welcome: <%= user.email %>
         The Dashboard Page
+        <% if(user.authenticated) { %>
+            <%= user.email %>
+            <%= user.errMessage %>
+        <% } %>
     </main>
     <footer>
         <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
@@ -20,7 +24,6 @@
                 <p>&copy; 2025 RCalculator. All rights reserved.</p>
              </div>
         </div>
-        <%- include("./partials/navBar") %>
     </footer>
 </body>
 

src/views/partials/header.ejs

@@ -19,15 +19,9 @@
                     <li>
                         <a href="/more" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">More</a>
                     </li>
-                    <% if (session.authenticated) { %>
                     <li>
                         <a href="/logout" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Logout</a>
                     </li>
-                    <% } else { %>
-                    <li>
-                        <a href="/login" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Login</a>
-                    </li>
-                    <% } %>
                 </ul>
             </div>
         </div>

src/views/questionnaire.ejs

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+    <title>Document</title>
+</head>
+
+<body>
+    <%- include("./partials/header") %>
+    <main class="container mx-auto p-4">
+        <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.email %></h2>
+        <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
+            <h3 class="text-lg font-medium mb-6">Financial Questionnaire</h3>
+            <form action="/questionnaire" method="post" class="space-y-4">
+                <div>
+                    <label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth</label>
+                    <input 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">
+                </div>
+                <div>
+                    <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
+                    <select 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">
+                        <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 type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                            <span class="ml-2 text-sm text-gray-700">Single</span>
+                        </label>
+                        <label class="inline-flex items-center">
+                            <input type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                             <span class="ml-2 text-sm text-gray-700">Married</span>
+                        </label>
+                         <label class="inline-flex items-center">
+                            <input type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                             <span class="ml-2 text-sm text-gray-700">Divorced</span>
+                        </label>
+                         <label class="inline-flex items-center">
+                            <input type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                             <span class="ml-2 text-sm text-gray-700">Widowed</span>
+                        </label>
+                    </div>
+                </div>
+                
+                <div>
+                    <label for="income" class="block text-sm font-medium text-gray-700">Annual Gross Income</label>
+                    <input type="number" name="income" min="0" placeholder="e.g., 50000" 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">
+                </div>
+                
+                <div>
+                    <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses</label>
+                    <input type="number" name="expenses" min="0" placeholder="e.g., 2000" 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">
+                </div>
+                
+                <div>
+                    <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth</label>
+                    <input type="number" name="assets" min="0" placeholder="Estimated Net Worth" 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">
+                </div>
+                
+                <div>
+                    <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities</label>
+                    <input type="number" name="liabilities" min="0" placeholder="Estimated Liabilities" 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">
+                </div>
+            
+                <div>
+                    <label for="retirementAge" class="block text-sm font-medium text-gray-700">Desired Retirement Age</label>
+                    <input type="number" name="retirementAge" placeholder="e.g., 65" min="18" max="120" 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">
+                </div>
+
+                <div>
+                    <label for="retirementExpenses" class="block text-sm font-medium text-gray-700">Estimated Monthly Retirement Expenses</label>
+                    <input type="number" name="retirementExpenses" min="0" placeholder="e.g., 3000" 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">
+                </div>
+
+                <div>
+                    <label for="retirementAssets" class="block text-sm font-medium text-gray-700">Estimated Retirement Assets</label>
+                    <input type="number" name="retirementAssets" min="0" placeholder="e.g., 500000" 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">
+                </div>
+
+                <div>
+                    <label for="retirementLiabilities" class="block text-sm font-medium text-gray-700">Estimated Retirement Liabilities</label>
+                    <input type="number" name="retirementLiabilities" min="0" placeholder="e.g., 50000" 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">
+                </div>
+                
+                <div>
+                    <button 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">Submit Questionnaire</button>
+                </div>
+            </form>
+        </div>
+    </main>
+    <footer>
+        <div class="fixed bottom-0 left-0 z-50 sm:hidden mt-5 lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
+            <div class="container mx-auto">
+                <p>&copy; 2025 RCalculator. All rights reserved.</p>
+             </div>
+        </div>
+    </footer>
+</body>
+
+</html>