fix/mobile layout

feature/vehicle depreciation calculated towards total assets value

README.md

@@ -53,16 +53,22 @@ Example:
 ```
 retirementCalculator/
 ├── src/
-│   ├── views/
+|   ├── auth/
-│   │   └── partials/
+|   ├── database/
-│   ├── css/
+│   ├── public/
-│   ├── images/
+│   │   ├── images/
-│   ├── scripts/
+│   │   ├── scripts/
-│   └── utils/
+│   │   └── svgs/
+|   |
+│   ├── router/
+│   ├── utils/
+│   └── views/
+│       └── partials/
 │
-├── app.js
 ├── .env.example
 ├── .gitignore
+├── app.js
+├── CONTRIBUTING.md
 ├── LICENSE
 ├── package-lock.json
 ├── package.json

app.js

@@ -54,9 +54,21 @@ app.get('/', (req, res) => {
 });
 
 app.get('/signup', (req, res) => {
+    let error = req.session.errMessage;
+    delete req.session.errMessage;
+
     const ignore = ["User not found", "Incorrect password"];
-    if (ignore.includes(req.session.errMessage)) req.session.errMessage = "";
+    if (ignore.includes(error)) error = "";
-    res.render('signup', { errMessage: req.session.errMessage });
+    
+    if (req.query.name && req.query.email) {
+        res.render('signup', { 
+            errMessage: error,
+            name: req.query.name,
+            email: req.query.email
+        });    
+    } else {
+        res.render('signup', { errMessage: error });
+    }
     return res.status(status.Ok);
 });
 
@@ -65,13 +77,31 @@ app.get('/login', (req, res) => {
         res.redirect("/home");
         return res.status(status.Ok);
     }
-    res.render('login', { errMessage: req.session.errMessage });
+
+    if (req.query.email) {
+        res.render('login', { 
+            errMessage: req.session.errMessage,
+            email: req.query.email
+        });
+    } else {
+        res.render('login', { errMessage: req.session.errMessage });
+    }
     return res.status(status.Ok);
 });
 
 app.get('/aboutUs', (req, res) => {
-    res.render('aboutUs');
+    if (!req.session.authenticated) {
-    return res.status(status.Ok);
+        res.render('aboutUs', {
+            geoData: undefined
+        });
+        return res.status(status.Ok);
+    } else {
+        res.render('aboutUs', {
+            user: req.session.user,
+            geoData: req.session.geoData
+        });
+        return res.status(status.Ok);
+    }
 });
 
 app.get('/forgotPassword', (req, res) => {

package-lock.json

@@ -11,6 +11,7 @@
       "dependencies": {
         "@google/genai": "^0.14.0",
         "bcrypt": "^5.1.1",
+        "check-password-strength": "^3.0.0",
         "connect-mongo": "^5.1.0",
         "crypto": "^1.0.1",
         "dotenv": "^16.5.0",
@@ -20,7 +21,7 @@
         "joi": "^17.13.3",
         "mongodb": "^6.16.0",
         "nodemailer": "^7.0.3",
-        "sweetalert2": "^11.21.0"
+        "sweetalert2": "^11.6.13"
       },
       "devDependencies": {
         "nodemon": "^3.1.10"
@@ -446,6 +447,15 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/check-password-strength": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/check-password-strength/-/check-password-strength-3.0.0.tgz",
+      "integrity": "sha512-XIBvWpb7/RI2DO05tMixE4WbFFvEC7ls/jr1VSrWgXvlCmdiH2fsdkixG0cNGs1uIXwoSqJ75T3s9H/TlJV6Cw==",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^5.0.0"
+      }
+    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -769,6 +779,18 @@
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "license": "MIT"
     },
+    "node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -2430,9 +2452,10 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.21.0",
+      "version": "11.6.13",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.6.13.tgz",
-      "integrity": "sha512-fiEK7SqRY/QD/wC2uqEHlfYGZ7qe2UcyQbJpbpj4YRVqplBgcI+euPZLZL+evLINcvbtXmL1SFUdZHKqBHGAAQ==",
+      "integrity": "sha512-n5yVF0FNx1lm4XzpPyb1HIaiptzODfVyeCzmB809tpK+1bPdoKoevKOxYjrtId75DV7xuIp4r6cjn8xUAB8dPQ==",
+      "license": "MIT",
       "funding": {
         "type": "individual",
         "url": "https://github.com/sponsors/limonte"

package.json

@@ -20,6 +20,7 @@
   "dependencies": {
     "@google/genai": "^0.14.0",
     "bcrypt": "^5.1.1",
+    "check-password-strength": "^3.0.0",
     "connect-mongo": "^5.1.0",
     "crypto": "^1.0.1",
     "dotenv": "^16.5.0",
@@ -29,7 +30,7 @@
     "joi": "^17.13.3",
     "mongodb": "^6.16.0",
     "nodemailer": "^7.0.3",
-    "sweetalert2": "^11.21.0"
+    "sweetalert2": "^11.6.13"
   },
   "devDependencies": {
     "nodemon": "^3.1.10"

src/auth/authentication.js

@@ -1,5 +1,5 @@
+const { passwordStrength } = require("check-password-strength");
 const status = require("../util/statuses");
-const session = require("express-session");
 const bcrypt = require('bcrypt');
 const joi = require("joi");
 const salt = 12;
@@ -27,14 +27,14 @@ module.exports = (users) => {
     router.post("/login", async (req, res) => {
       
         const credentialSchema = joi.object({
-            email: joi.string().email().required(),
+            email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }).required(),
-            password: joi.string().alphanum().max(20).required(),
+            password: joi.string().max(20).required(),
         });
 
         const valid = credentialSchema.validate(req.body);
 
-        if (valid.err) {
+        if (valid.error) {
-            req.session.errMessage = "Invalid input";
+            req.session.errMessage = "Invalid input:" + valid.error.details.map(d => d.message.replace(/"/g, '')).join(', ');
             res.status(status.BadRequest);
             return res.redirect("/login");
         }
@@ -43,13 +43,13 @@ module.exports = (users) => {
             if (!user) {
                 req.session.errMessage = "User not found";
                 res.status(status.NotFound);
-                return res.redirect("/login");
+                return res.redirect(`/login/?email=${req.body.email}`);
             }
 
             if (!bcrypt.compareSync(req.body.password, user.password)) {
                 req.session.errMessage = "Incorrect password";
                 res.status(status.Unauthorized);
-                return res.redirect("/login");
+                return res.redirect(`/login/?email=${req.body.email}`);
             }
 
             req.session.authenticated = true;
@@ -72,16 +72,16 @@ module.exports = (users) => {
 
     router.post("/signup", async (req, res) => {
         const userSchema = joi.object({
-            email: joi.string().email().required(),
+            email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }).required(),
             name: joi.string().pattern(new RegExp('^[a-zA-Z]+$')).max(20).required(),
-            password: joi.string().alphanum().max(20).min(8).required(),
+            password: joi.string().max(20).min(8).required(),
-            repassword: joi.string().alphanum().max(20).min(8).required(),
+            repassword: joi.string().max(20).min(8).required(),
         });
 
         const valid = userSchema.validate(req.body);
-
+        
-        if (valid.err) {
+        if (valid.error) {
-            req.session.errMessage = "Invalid input",
+            req.session.errMessage = valid.error.details[0].message,
             res.status(status.BadRequest);
             return res.redirect("/signup");
         }
@@ -95,8 +95,17 @@ module.exports = (users) => {
 
         if (req.body.password != req.body.repassword) {
             req.session.errMessage = "Passwords must match";
+
             res.status(status.BadRequest);
-            return res.redirect("/signup");
+            return res.redirect(`/signup/?name=${req.body.name}&email=${req.body.email}`);
+        }
+
+        let strength = passwordStrength(req.body.password);
+
+        if (strength.id < 2) {
+            req.session.errMessage = `Password ${strength.value}`;
+            res.status(status.BadRequest);
+            return res.redirect(`/signup/?name=${req.body.name}&email=${req.body.email}`);
         }
 
         let hashedPassword = await bcrypt.hashSync(req.body.password, salt);

src/auth/forgotPass.js

@@ -1,8 +1,9 @@
+const { passwordStrength } = require("check-password-strength");
+const nodeMail = require('nodemailer');
 const express = require('express');
+const bcrypt = require('bcrypt');
 const crypto = require('crypto');
 const joi = require('joi');
-const nodeMail = require('nodemailer');
-const bcrypt = require('bcrypt');
 require('dotenv').config();
 
 const PORT = process.env.PORT;
@@ -20,7 +21,7 @@ module.exports = (users) => {
 
     router.post('/auth/resetPass', async (req, res) => {
         const resetSchema = joi.object({
-            email: joi.string().email().required(),
+            email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }).required(),
         });
         req.session.error = '';
         req.session.reset = '';
@@ -40,20 +41,26 @@ module.exports = (users) => {
 
         const token = crypto.randomBytes(32).toString('hex');
         console.log(`The reset token is ${token}`)
-        const expiration = Date.now() + 360000;
+        const expiration = Date.now() + 3600000;
 
         await users.updateOne({ email }, {
             $set: { resetToken: token, resetTokenExpires: expiration }
         });
 
-        const resetUrl = `http://localhost:${PORT}/reset/${token}`;
+        const resetUrl = `https://rcalculator.sowinski.dev/${PORT}/reset/${token}`;
 
         const mailSend = {
             from: process.env.EMAIL_USER,
             to: email,
             subject: 'Password reset',
-            text: `reset your password here ${resetUrl}   this link will expire within 1 hour`,
+            text: `Hi ${user.name},\nA request was sent to reset your password. If this wasn't you, please ignore this email.\nIf you sent the request, reset your password here ${resetUrl}   this link will expire within 1 hour, \n Do not share this link with anyone.
-
+                \n \n Thankyou, The RCalculator team.`,
+                html: `
+                <p>Hi ${user.name}</p>
+                <p>A request was sent to reset your password. <strong>If this wasn't you, please ignore this email.</strong></p>
+                <p>If you sent the request, reset your password <a href="${resetUrl}">here</a>. This link will expire in 1 hour.</p>
+                <p><img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" alt="wallet icon" width="150"/></p>
+                <p>Thank you,<br/>The RCalculator team</p>`,
         };
 
         try {
@@ -66,6 +73,7 @@ module.exports = (users) => {
         }
     });
 
+    //Reset link verifies information from user and checks token
     router.post('/resetLink', async (req, res) => {
         const { token, password, confirmPassword, } = req.body;
         const passwordSchema = joi.object({
@@ -75,7 +83,7 @@ module.exports = (users) => {
         const valid = passwordSchema.validate({ password, confirmPassword });
         if (valid.error) {
             console.log("houston we have a problem"); // nice
-            req.session.error = 'Invalid input';
+            req.session.error = "Invalid input:" + valid.error.details.map(d => d.message.replace(/"/g, '')).join(', ');;
             res.status(status.BadRequest);
             return res.redirect(`/reset/${token}`);
         }
@@ -96,6 +104,13 @@ module.exports = (users) => {
             req.session.error = 'Reset link is invalid.';
             return res.redirect(`/reset`);
         }
+
+        let strength = passwordStrength(password);
+        if (strength.id < 2) {
+            req.session.errMessage = `Password ${strength.value}`;
+            return res.redirect(`/reset/${token}`);
+        }
+
         const hashPassword = await bcrypt.hash(password, 12);
 
         await users.updateOne(

src/auth/middleware.js

@@ -24,10 +24,9 @@ const createMiddleware = (users) => {
             res.redirect("/login");
             return res.status(status.Unauthorized);
         }
-    
+        
         if (!req.session.user) {
             let user = await users.findOne({ _id: new ObjectId(req.session.userId) }).then((user) => user);
-        
             if (!user) {
                 return req.session.destroy((err) => {
                     if (err) {
@@ -49,7 +48,7 @@ const createMiddleware = (users) => {
                     console.error("Failed to save session: ", err);
 
                     return req.session.destroy((err) => {
-                        req.session.errMessage = "An error occured, please login again.";
+                        req.session.errMessage = "Failed to save session, please login again.";
 
                         if (err) {
                             console.error("Failed to destroy session: ", err);

src/public/scripts/assetManager.js

@@ -85,6 +85,8 @@ function lockAsset(assetId, icon) {
         document.getElementById(`${key}-${assetId}`).disabled = true;
     });
 
+    if (icon === "Car" || icon === "Motorcycle") document.getElementById(`year-${assetId}`).disabled = true;
+
     document.getElementById(`save-${assetId}`).disabled = true;
     document.getElementById(`save-${assetId}`).classList.remove("cursor-pointer");
     document.getElementById(`save-${assetId}`).classList.add("cursor-not-allowed");
@@ -105,6 +107,8 @@ function unlockAsset(assetId, icon) {
         document.getElementById(`${key}-${assetId}`).disabled = false;
     });
 
+    if (icon === "Car" || icon === "Motorcycle") document.getElementById(`year-${assetId}`).disabled = false;
+
     document.getElementById(`save-${assetId}`).disabled = false;
     document.getElementById(`save-${assetId}`).classList.remove("cursor-not-allowed");
     document.getElementById(`save-${assetId}`).classList.add("cursor-pointer");
@@ -133,6 +137,8 @@ function autoOpenCreate() {
  * @param {string} assetId
  */
 function selectIcon(selectedIcon, assetId="") {
+    toggleYear(selectedIcon.value, assetId);
+    
     document.getElementById(`dropdown-icon-button${assetId != "" ? "-" : ""}${assetId}`).value = selectedIcon.value;
     document.getElementById(`icon${assetId != "" ? "-" : ""}${assetId}`).value = selectedIcon.value
 
@@ -144,5 +150,29 @@ function selectIcon(selectedIcon, assetId="") {
     `;
 }
 
+/**
+ * toggleYear shows or hides year input
+ * @param {string} type of asset
+ */
+function toggleYear(type, assetId="") {
+    if (type === "Car" || type === "Motorcycle") {
+        if (assetId) {
+            document.getElementById(`year-${assetId}`).disabled = false;
+            document.getElementById(`year-modify-${assetId}`).style.display = 'block';
+        } else {
+            document.getElementById('year-input').disabled = false;
+            document.getElementById('year-create').style.display = 'block';
+        }
+    } else {
+        if (assetId) {
+            document.getElementById(`year-${assetId}`).disabled = true;
+            document.getElementById(`year-modify-${assetId}`).style.display = 'none';
+        } else {
+            document.getElementById('year-input').disabled = true;
+            document.getElementById('year-create').style.display = 'none';
+        }
+    }
+}
+
 resetRadio();
 autoOpenCreate();

src/public/scripts/calcExchange.js

@@ -1,3 +0,0 @@
-let rate = document.getElementsByClassName("countryButton").value;
-
-document.getElementById("exchange").innerHTML

src/public/scripts/dollarFormat.js

@@ -0,0 +1,20 @@
+
+/** 
+ * Function takes in a number and formats it to currency
+ * @param {number} value
+ * @returns {string} number formatted in currency
+ */
+document.addEventListener("DOMContentLoaded", () => {
+    const number = document.querySelectorAll(".planGoal");
+    number.forEach((value) => {
+        num = parseFloat(value.textContent);
+        if (num >= 999999) {
+            value.textContent = "$" + (num /= 1000000) + "M";
+        } else if (num > 999) {
+            value.textContent = "$" + (num /= 1000) + "k";
+        } else {
+            return "$" + num;
+        }
+    });
+});
+

src/public/scripts/editPlanModals.js

@@ -0,0 +1,67 @@
+// Basic client-side form submission handler to process JSON response
+document.addEventListener('DOMContentLoaded', () => {
+    const form = document.getElementById('editPlanForm');
+    const errorMessagesDiv = document.getElementById('formErrorMessages');
+
+    // Store initial form values
+    const initialValues = {
+        name: form.name.value,
+        retirementAge: form.retirementAge.value,
+        retirementExpenses: form.retirementExpenses.value,
+        retirementAssets: form.retirementAssets.value,
+        retirementLiabilities: form.retirementLiabilities.value
+    };
+
+    const resetButton = document.getElementById('resetButton');
+    resetButton.addEventListener('click', function() {
+        form.name.value = initialValues.name;
+        form.retirementAge.value = initialValues.retirementAge;
+        form.retirementExpenses.value = initialValues.retirementExpenses;
+        form.retirementAssets.value = initialValues.retirementAssets;
+        form.retirementLiabilities.value = initialValues.retirementLiabilities;
+        if (errorMessagesDiv) {
+            errorMessagesDiv.style.display = 'none'; // Hide error message on reset
+            errorMessagesDiv.textContent = '';
+        }
+    });
+
+    if (form) {
+        form.addEventListener('submit', async function(event) {
+            event.preventDefault(); // Prevent traditional form submission
+            errorMessagesDiv.textContent = '';
+            errorMessagesDiv.style.display = 'none';
+
+            const formData = new FormData(form);
+            const data = {};
+            formData.forEach((value, key) => {
+                data[key] = value;
+            });
+
+            try {
+                const response = await fetch(form.action, {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify(data),
+                });
+
+                const result = await response.json();
+
+                if (response.ok && result.success) {
+                    const actionUrl = form.action;
+                    const urlParts = actionUrl.split('/');
+                    const planId = urlParts[urlParts.length - 2];
+                    window.location.href = `/plans/${planId}`;
+                } else {
+                    errorMessagesDiv.textContent = result.message || 'An error occurred while updating the plan.';
+                    errorMessagesDiv.style.display = 'block';
+                }
+            } catch (error) {
+                console.error('Error submitting form:', error);
+                errorMessagesDiv.textContent = 'A network error occurred. Please try again.';
+                errorMessagesDiv.style.display = 'block';
+            }
+        });
+    }
+});

src/public/scripts/footer.js

@@ -0,0 +1,71 @@
+const factButton = document.getElementById("factButton");
+const factMenu = document.getElementById("factMenu");
+const factInput = document.getElementById("factInput");
+const factSubmitButton = document.getElementById("factSubmitButton");
+
+var path = window.location.pathname;
+var page = path.split("/").pop();
+
+if(page !== "login" && page !== "signup" && page !== "forgotPassword" && page !== "") {
+    factButton.classList.remove("hidden");
+}
+
+factButton.addEventListener("click", () => {
+    factMenu.classList.toggle("hidden");
+});
+
+factSubmitButton.addEventListener("click", () => {
+    fetch("/fact", {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            fact: factInput.value,
+        }),
+    })
+    .then(response => response.json())
+    .then(data => {
+        Swal.fire('Here is a fact!', data.fact, 'success');
+    })
+    .catch(error => {
+        console.error("Error fetching fact:", error);
+        Swal.fire('Error fetching fact', 'Please try again later', 'error');
+    });
+});
+
+document.addEventListener("DOMContentLoaded", () => {
+    const drawer = document.getElementById("drawer-navigation");
+    const toggle = document.getElementById("drawer-toggle");
+
+    function openDrawer() {
+        drawer.classList.remove("translate-x-full");
+
+        // Add backdrop
+        const backdrop = document.createElement("div");
+        backdrop.className = "fixed inset-0 bg-gray-900/50 z-30 drawer-backdrop";
+        document.body.appendChild(backdrop);
+
+        // Optional: prevent scroll
+        document.body.classList.add("overflow-hidden");
+
+        backdrop.addEventListener("click", closeDrawer);
+    }
+
+    function closeDrawer() {
+        drawer.classList.add("translate-x-full");
+
+        const backdrop = document.querySelector(".drawer-backdrop");
+        if (backdrop) backdrop.remove();
+
+        document.body.classList.remove("overflow-hidden");
+    }
+
+    toggle.addEventListener("click", openDrawer);
+
+    // Also close on X button if needed
+    const closeBtn = drawer.querySelector("[data-drawer-hide]");
+    if (closeBtn) {
+        closeBtn.addEventListener("click", closeDrawer);
+    }
+});

src/public/scripts/geolocation.js

@@ -1,9 +1,17 @@
+/**
+ * getLocation gets the geolocation of user on page load.
+ */
 function getLocation() {
     if (navigator.geolocation) {
         navigator.geolocation.getCurrentPosition(getLatestExchange, error);
     }
 }
 
+/**
+ * update the currency exchange rate dropdown 
+ * or display error
+ * @param {object} data
+ */
 function update(data) {
     if (data.data.message != "error") {
         document.getElementById("loading").style = "display: none";
@@ -48,6 +56,10 @@ function update(data) {
     }
 }
 
+/**
+ * switchButton changes the selected exchange rate icon
+ * @param {element} clickedButton
+ */
 function switchButton(clickedButton) {
     document.getElementById("dropdown-country-button").value = clickedButton.value;
     updateExchange(document.getElementById("dropdown-country-button").value);
@@ -60,10 +72,18 @@ function switchButton(clickedButton) {
     `;
 }
 
+/**
+ * updateExchange updates the exchange rate
+ * @param {number} exRate
+ */
 function updateExchange(exRate) {
     document.getElementById("exchange").innerHTML = "$1.00 = $" +`${(1 * exRate).toFixed(2)}`;
 }
 
+/**
+ * getLatestExchange gets rates from API from a given location.
+ * @param {object} position coordinates
+ */
 async function getLatestExchange(position) {
     let lat = position.coords.latitude;
     let lon = position.coords.longitude;
@@ -73,6 +93,10 @@ async function getLatestExchange(position) {
     update(data);
 }
 
+/**
+ * error displays error message
+ * @param {string} err
+ */
 function error(err) {
     const data = {
         data: {

src/public/scripts/planManager.js

@@ -0,0 +1,47 @@
+/**
+ * editPlan redirect
+ * @param {string} planId
+ */
+function editPlan(planId) {
+    if (planId) {
+        window.location.href = `/plans/${planId}/edit`;
+    } else {
+        console.error('editPlan called without a planId');
+        alert('Cannot edit plan: Plan ID is missing.');
+    }
+}
+
+/**
+ * deletePlan handler
+ * @param {string} planId
+ */
+async function deletePlan(planId) {
+    if (!planId) {
+        console.error('deletePlan called without a planId');
+        alert('Cannot delete plan: Plan ID is missing.');
+        return;
+    }
+
+    if (confirm('Are you sure you want to delete this plan? This action cannot be undone.')) {
+        try {
+            const response = await fetch(`/plans/${planId}`, {
+                method: 'DELETE',
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            });
+
+            const result = await response.json();
+
+            if (response.ok && result.success) {
+                alert('Plan deleted successfully.');
+                window.location.href = '/plans'; // Redirect to the plans list page
+            } else {
+                alert(`Failed to delete plan: ${result.message || 'Unknown error'}`);
+            }
+        } catch (error) {
+            console.error('Error deleting plan:', error);
+            alert('An error occurred while trying to delete the plan. Please check the console for details and ensure the server is running.');
+        }
+    }
+}

src/public/scripts/planModals.js

@@ -0,0 +1,85 @@
+document.addEventListener('DOMContentLoaded', () => {
+    const openModalBtn = document.getElementById('openNewPlanModalBtn');
+    const newPlanDialog = document.getElementById('newPlanDialog');
+    const newPlanForm = document.getElementById('newPlanForm');
+    const submitNewPlanBtn = document.getElementById('submitNewPlanBtn');
+    const newPlanError = document.getElementById('newPlanError');
+    const resetNewPlanFormBtn = document.getElementById('resetNewPlanFormBtn');
+
+    let url = new URLSearchParams(window.location.search);
+    let modalValue = url.get('openModal');
+
+    if (modalValue === 'true') {
+        newPlanDialog.showModal();
+    }
+
+    openModalBtn.addEventListener('click', () => {
+        newPlanDialog.showModal();
+        // Error reset is now handled by 'close' event, but good to clear on open too
+        newPlanError.style.display = 'none'; 
+        newPlanError.textContent = '';
+    });
+
+    // Handles form reset and error clearing when dialog is closed by any means (Esc, Cancel button, backdrop click, successful submit)
+    newPlanDialog.addEventListener('close', () => {
+        newPlanForm.reset();
+        newPlanError.style.display = 'none';
+        newPlanError.textContent = '';
+    });
+
+    // Close dialog if user clicks on the backdrop
+    newPlanDialog.addEventListener('click', (event) => {
+        if (event.target === newPlanDialog) {
+            newPlanDialog.close(); // This will trigger the 'close' event listener above
+        }
+    });
+
+    resetNewPlanFormBtn.addEventListener('click', () => {
+        newPlanForm.reset();
+        newPlanError.style.display = 'none';
+        newPlanError.textContent = '';
+    });
+
+    newPlanForm.addEventListener('submit', async (event) => {
+        event.preventDefault();
+        submitNewPlanBtn.disabled = true;
+        submitNewPlanBtn.textContent = 'Saving...';
+        newPlanError.style.display = 'none';
+
+        const formData = new FormData(newPlanForm);
+        const data = Object.fromEntries(formData.entries());
+
+        try {
+            const response = await fetch('/newPlan', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(data),
+            });
+
+            if (response.ok) {
+                const result = await response.json();
+                if (result.success) {
+                    newPlanDialog.close(); // This will trigger the 'close' event listener
+                    window.location.reload(); // Reload to see the new plan
+                } else {
+                    newPlanError.textContent = result.message || 'Failed to create plan. Please try again.';
+                    newPlanError.style.display = 'block';
+                }
+            } else {
+                const errorData = await response.json();
+                newPlanError.textContent = errorData.message || `Error: ${response.status} - ${response.statusText}`;
+                newPlanError.style.display = 'block';
+            }
+        } catch (error) {
+            console.error('Error submitting new plan:', error);
+            newPlanError.textContent = 'An unexpected error occurred. Please try again.';
+            newPlanError.style.display = 'block';
+        }
+        finally {
+            submitNewPlanBtn.disabled = false;
+            submitNewPlanBtn.textContent = 'Save Plan';
+        }
+    });
+});

src/public/scripts/profile.js

@@ -11,6 +11,7 @@ function lockAccount() {
   document.getElementById("password").disabled = true;
   document.getElementById("repassword").disabled = true;
   document.getElementById("save-account").classList.add("cursor-not-allowed");
+  document.getElementById("save-account").classList.remove("cursor-pointer");
 
   document.getElementById("edit-account").innerHTML = "Edit";
   document.getElementById("edit-account").onclick = unlockAccount;
@@ -30,7 +31,12 @@ function lockPersonal() {
   document.getElementById("ms-married").disabled = true;
   document.getElementById("ms-divorced").disabled = true;
   document.getElementById("ms-widowed").disabled = true;
+  document.getElementById("income").disabled = true;
+  document.getElementById("expenses").disabled = true;
+  document.getElementById("assets").disabled = true;
+  document.getElementById("liabilities").disabled = true;
   document.getElementById("save-personal").classList.add("cursor-not-allowed");
+  document.getElementById("save-personal").classList.remove("cursor-pointer");
 
   document.getElementById("edit-personal").innerHTML = "Edit";
   document.getElementById("edit-personal").onclick = unlockPersonal;
@@ -42,11 +48,12 @@ function lockPersonal() {
  */
 function unlockAccount() {
   document.getElementById("save-account").disabled = false;
-  // document.getElementById("email").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("save-account").classList.add("cursor-pointer");
 
   document.getElementById("edit-account").innerHTML = "Cancel changes";
   document.getElementById("edit-account").onclick = lockAccount;
@@ -64,7 +71,12 @@ function unlockPersonal() {
   document.getElementById("ms-married").disabled = false;
   document.getElementById("ms-divorced").disabled = false;
   document.getElementById("ms-widowed").disabled = false;
+  document.getElementById("income").disabled = false;
+  document.getElementById("expenses").disabled = false;
+  document.getElementById("assets").disabled = false;
+  document.getElementById("liabilities").disabled = false;
   document.getElementById("save-personal").classList.remove("cursor-not-allowed");
+  document.getElementById("save-personal").classList.add("cursor-pointer");
 
   document.getElementById("edit-personal").innerHTML = "Cancel changes";
   document.getElementById("edit-personal").onclick = lockPersonal;
@@ -72,4 +84,4 @@ function unlockPersonal() {
 
 // On page load, ensure forms are locked and reset
 lockAccount();
-// lockPersonal();
+lockPersonal();

src/router/user.js

@@ -1,5 +1,5 @@
 const getRates = require("../util/exchangeRate");
-const { calculatePlanProgress, updatePlanProgressInDB } = require("../util/calculations");
+const { calculateProgress, updatePlanProgressInDB, updateProgress, calculateTotalAssetValue } = require("../util/calculations");
 const suggestions = require("../util/suggestions");
 const status = require("../util/statuses");
 const ObjectId = require('mongodb').ObjectId;
@@ -24,29 +24,33 @@ const getAssetSchema = (type) => {
             assetSchema = joi.object({
                 type: joi.string().valid("other", "stock", "saving").required(),
                 icon: joi.string().alphanum().required(),
-                name: joi.string().alphanum().min(3).max(30).required(),
+                name: joi.string().min(3).max(30).required(),
                 value: joi.number().min(0).required(),
+                year: joi.number().min(1900).max(new Date().getFullYear()),
                 purchaseDate: joi.date().required(),
-                description: joi.string().alphanum().max(240),
+                description: joi.string().max(240).min(0),
                 id: joi.string().alphanum(), // May be passed when updating existing asset
+                userId: joi.string().alphanum(),
             });
             break;
         case "saving":
             assetSchema = joi.object({
                 type: joi.string().valid("other", "stock", "saving").required(),
-                name: joi.string().alphanum().min(3).max(30).required(),
+                name: joi.string().min(3).max(30).required(),
                 value: joi.number().min(0).required(),
                 id: joi.string().alphanum(), // May be passed when updating existing asset
+                userId: joi.string().alphanum(),
             });
             break;
         case "stock":
             assetSchema = joi.object({
                 type: joi.string().valid("other", "stock", "saving").required(),
-                ticker: joi.string().alphanum().min(3).max(5).required(),
+                ticker: joi.string().min(3).max(5).required(),
                 price: joi.number().min(0).required(),
                 quantity: joi.number().min(1).required(),
                 purchaseDate: joi.date().required(),
                 id: joi.string().alphanum(), // May be passed when updating existing asset
+                userId: joi.string().alphanum(),
             });
             break;
         default:
@@ -56,6 +60,12 @@ const getAssetSchema = (type) => {
     return assetSchema;
 }
 
+/** 
+ * Function takes in a number and formats it to currency
+ * @param {integer}
+ * @returns nuber formatted in currency
+ */
+
 /**
  * @param {function} middleware handler
  * @param {MongoClient.collection} users db collection
@@ -72,6 +82,7 @@ module.exports = (middleware, users, plans, assets) => {
     router.use(middleware);
 
     router.get('/home', async (req, res) => {
+        let user = req.session.user._id;
         // if no session with geoData
         if (!req.session.geoData) {
             req.session.geoData = {
@@ -79,36 +90,56 @@ module.exports = (middleware, users, plans, assets) => {
                 toCurrencyRates: [],
             };
         }
+        const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
 
-        res.render('dashboard', { user: req.user, geoData: req.session.geoData });
+        for (const plan of userPlansFromDB) {
+            const progress = await calculateProgress(plan, assets, users, req.session.user._id);
+            await updatePlanProgressInDB(plan._id, progress.percentage, plans);
+        }
+
+        const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
+
+        res.render('dashboard', {
+            user: req.session.user,
+            geoData: req.session.geoData,
+            plans: updatedUserPlans,
+        });
 
         return res.status(status.Ok);
     });
 
     router.get('/assets', async (req, res) => {
+
+        if (!req.session.user.financialData || !req.session.user) {
+            req.session.errMessage = "Please complete your financial data before creating a plan.";
+            return res.status(status.Unauthorized).redirect('/questionnaire');
+        }
+
         let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
+        let totalUserAssetValue = await calculateTotalAssetValue(userAssets);
+
         res.render('assets', {
             user: req.session.user,
             errMessage: req.session.errMessage,
             assets: userAssets,
             geoData: req.session.geoData,
+            totalUserAssetValue: totalUserAssetValue,
             icons: icons,
         });
         return res.status(status.Ok);
     });
 
     router.get('/plans', async (req, res) => {
+
+        if (!req.session.user.financialData || !req.session.user) {
+            req.session.errMessage = "Please complete your financial data before creating a plan.";
+            return res.status(status.Unauthorized).redirect('/questionnaire');
+        }
+
         try {
-            const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
-
-            for (const plan of userPlansFromDB) {
-                const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
-                await updatePlanProgressInDB(plan._id, percentage, plans);
-            }
-
-            const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
-
 
+            const updatedUserPlans = await updateProgress(plans, assets, users, req.session.user._id);
+            
             res.render('plans', {
                 user: req.session.user,
                 plans: updatedUserPlans,
@@ -126,25 +157,28 @@ module.exports = (middleware, users, plans, assets) => {
         try {
             const planId = req.params.id;
             let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
+            let totalUserAssetValue = await calculateTotalAssetValue(userAssets);
 
             if (!ObjectId.isValid(planId)) {
                 req.session.errMessage = "Invalid plan ID format.";
                 return res.status(status.BadRequest).redirect('/plans');
             }
-
             const plan = await plans.findOne({ userId: new ObjectId(req.session.userId), _id: new ObjectId(planId) });
 
             if (!plan) {
-                console.log(`Plan not found with ID: ${planId} for user: ${req.session.userId}`);
                 req.session.errMessage = "Plan not found or you do not have permission to view it.";
                 return res.status(status.NotFound).redirect('/plans');
             }
 
+            const progress = await calculateProgress(plan, assets, users, req.session.userId);
+
             res.render('planDetail', {
                 user: req.session.user,
-                plan: plan,
+                plan: plan, 
                 geoData: req.session.geoData,
+                totalUserAssetValue: totalUserAssetValue,
                 assets: userAssets,
+                progress: progress, 
                 suggestions: await suggestions.generateSuggestions(),
             });
 
@@ -155,21 +189,27 @@ module.exports = (middleware, users, plans, assets) => {
         }
     });
 
-    router.get('/newPlan', (req, res) => {
+    // router.get('/newPlan', (req, res) => {
+    //     if (!req.session.user.financialData || !req.session.user) {
+    //         req.session.errMessage = "Please complete your financial data before creating a plan.";
+    //         return res.status(status.Unauthorized).redirect('/questionnaire');
+    //     }
+    //     const errMessage = req.session.errMessage;
+    //     req.session.errMessage = "";
+    //     res.render('newPlan', {
+    //         user: req.session.user,
+    //         errMessage: errMessage,
+    //         geoData: req.session.geoData
+    //     });
+    // });
+
+    router.post('/newPlan', async (req, res) => {
+
         if (!req.session.user.financialData || !req.session.user) {
             req.session.errMessage = "Please complete your financial data before creating a plan.";
             return res.status(status.Unauthorized).redirect('/questionnaire');
         }
-        const errMessage = req.session.errMessage;
-        req.session.errMessage = "";
-        res.render('newPlan', {
-            user: req.session.user,
-            errMessage: errMessage,
-            geoData: req.session.geoData
-        });
-    });
 
-    router.post('/newPlan', async (req, res) => {
         const planSchema = joi.object({
             name: joi.string().min(3).max(100).required(),
             retirementAge: joi.number().min(18).max(120).required(),
@@ -183,29 +223,134 @@ module.exports = (middleware, users, plans, assets) => {
 
         if (error) {
             console.error("Plan validation error:", error.details);
-            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
+            const errorMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
-            res.status(status.BadRequest).redirect("/newPlan");
+            res.status(status.BadRequest).json({ success: false, message: errorMessage });
             return;
         }
-        const newPlan = {
+
+        const planToInsert = {
             userId: new ObjectId(req.session.userId),
             name: value.name,
             retirementAge: value.retirementAge,
             retirementExpenses: value.retirementExpenses,
             retirementAssets: value.retirementAssets,
             retirementLiabilities: value.retirementLiabilities,
-            progress: "0"
+            progress: "0" 
         };
 
         try {
-            await plans.insertOne({ userId: new ObjectId(req.session.userId), ...newPlan });
+            await plans.insertOne(planToInsert);
-            req.session.errMessage = "";
+            res.status(status.Ok).json({ success: true, message: "Plan created successfully." });
-            res.redirect('/plans');
         }
         catch (err) {
             console.error("Error saving plan:", err);
-            req.session.errMessage = "An error occurred while saving your plan. Please try again.";
+            res.status(status.InternalServerError).json({ success: false, message: "An error occurred while saving your plan. Please try again." });
-            res.status(status.InternalServerError).redirect("/newPlan");
+        }
+    });
+
+    router.delete('/plans/:id', async (req, res) => {
+        const planId = req.params.id;
+        const plan = await plans.findOne({ _id: new ObjectId(planId) });
+        if(!plan) {
+            console.log(`Plan not found with ID: ${planId}`);
+            res.status(status.NotFound).json({ success: false, message: "Plan not found or you do not have permission to delete it." });
+            return;
+        }
+        if(plan.userId.toString() !== req.session.userId) {
+            console.log(`User ${req.session.userId} does not have permission to delete plan ${planId}`);
+            res.status(status.Forbidden).json({ success: false, message: "You do not have permission to delete this plan." });
+            return;
+        }
+        try {
+            await plans.deleteOne({ _id: new ObjectId(planId) });
+            res.status(status.Ok).json({ success: true, message: "Plan deleted successfully." });
+        }
+        catch (err) {
+            console.error("Error deleting plan:", err);
+            res.status(status.InternalServerError).json({ success: false, message: "An error occurred while deleting your plan. Please try again." });
+        }
+    });
+
+    router.get('/plans/:id/edit', async (req, res) => {
+        const planId = req.params.id;
+        const plan = await plans.findOne({ _id: new ObjectId(planId) });
+        if(!plan) {
+            console.log(`Plan not found with ID: ${planId}`);
+            res.status(status.NotFound).json({ success: false, message: "Plan not found or you do not have permission to edit it." });
+            return;
+        }
+        if(plan.userId.toString() !== req.session.userId) {
+            console.log(`User ${req.session.userId} does not have permission to edit plan ${planId}`);
+            res.status(status.Forbidden).json({ success: false, message: "You do not have permission to edit this plan." });
+            return;
+        }
+        res.render('editPlan', {
+            user: req.session.user,
+            plan: plan,
+            geoData: req.session.geoData
+        });
+    });
+
+    router.post('/plans/:id/edit', async (req, res) => {
+        const planId = req.params.id;
+        const plan = await plans.findOne({ _id: new ObjectId(planId) });
+        if(!plan) {
+            console.log(`Plan not found with ID: ${planId}`);
+            res.status(status.NotFound).json({ success: false, message: "Plan not found or you do not have permission to edit it." });
+            return;
+        }
+        if(plan.userId.toString() !== req.session.userId) {
+            console.log(`User ${req.session.userId} does not have permission to edit plan ${planId}`);
+            res.status(status.Forbidden).json({ success: false, message: "You do not have permission to edit this plan." });
+            return;
+        }
+
+        const planSchema = joi.object({
+            name: joi.string().min(3).max(100).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(),
+        });
+
+        // Object for Joi validation - only fields from req.body
+        const dataToValidate = {
+            name: req.body.name,
+            retirementAge: Number(req.body.retirementAge),
+            retirementExpenses: parseFloat(req.body.retirementExpenses),
+            retirementAssets: parseFloat(req.body.retirementAssets),
+            retirementLiabilities: parseFloat(req.body.retirementLiabilities),
+        };
+
+        const { error, value } = planSchema.validate(dataToValidate);
+        if (error) {
+            console.error("Plan validation error:", error.details);
+            const errorMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
+            res.status(status.BadRequest).json({ success: false, message: errorMessage });
+            return;
+        }
+
+        const progressCalculated = await calculateProgress(value, assets, users, req.session.userId);
+
+        const planToSet = {
+            name: value.name,
+            retirementAge: value.retirementAge,
+            retirementExpenses: value.retirementExpenses,
+            retirementAssets: value.retirementAssets,
+            retirementLiabilities: value.retirementLiabilities,
+            progress: progressCalculated.percentage,
+        };
+        try {
+            await plans.updateOne(
+                { _id: new ObjectId(planId), userId: new ObjectId(req.session.userId) }, 
+                { $set: planToSet }
+            );
+            await updateProgress(plans, assets, users, req.session.user._id);
+            res.status(status.Ok).json({ success: true, message: "Plan updated successfully." });
+        }
+        catch (err) {
+            console.error("Error updating plan:", err);
+            res.status(status.InternalServerError).json({ success: false, message: "An error occurred while updating your plan. Please try again." });
         }
     });
 
@@ -264,10 +409,12 @@ module.exports = (middleware, users, plans, assets) => {
         const validationOptions = { convert: true, abortEarly: false };
         const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
 
+        let referrer = req.get('Referrer') || "/home";
         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");
+            let redirect = referrer.includes("?profile") ? "/questionnaire?profile" : "/questionnaire";
+            res.status(status.BadRequest).redirect(redirect);
             return;
         }
 
@@ -296,40 +443,55 @@ module.exports = (middleware, users, plans, assets) => {
                 console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.userId}`);
             }
 
-            req.session.user.financialData = true;
             req.session.errMessage = "";
-
+            req.session.user = null; // set user to null so middleware updates user
-            req.session.save(err => {
+            req.session.save((err) => {
                 if (err) {
-                    res.status(status.InternalServerError).redirect("/plans");
+                    console.error("Failed to save session: ", err);
+
+                    return req.session.destroy((err) => {
+                        req.session.errMessage = "Failed to save session, please login again.";
+
+                        if (err) {
+                            console.error("Failed to destroy session: ", err);
+                        }
+
+                        res.status(status.InternalServerError);
+                        return res.redirect("/login");
+                    });
                 }
-                res.status(status.Ok).redirect("/plans");
+
+                let redirect = referrer.includes("?profile") ? "/profile" :
+                    referrer != "/home" ? "/plans" : referrer;
+                return res.status(status.Ok).redirect(redirect);
             });
 
         }).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");
+            let redirect = referrer.includes("?profile") ? "/questionnaire?profile" : "/questionnaire";
+            res.status(status.InternalServerError).redirect(redirect);
         });
     });
 
     router.post("/updateAccount", async (req, res) => {
         const accountSchema = joi.object({
-            email: joi.string().email(),
+            email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }),
             name: joi.string().pattern(new RegExp('^[a-zA-Z]+$')).max(20),
-            password: joi.string().alphanum().max(20).min(8),
+            password: joi.string().max(20).min(8),
-            repassword: joi.string().alphanum().max(20).min(8),
+            repassword: joi.string().max(20).min(8),
         });
 
         const valid = accountSchema.validate(req.body);
 
-        if (valid.err) {
+        if (valid.error) {
-            req.session.errMessage = "Invalid input",
+            req.session.errMessage = "Invalid input:" + valid.error.details.map(d => d.message.replace(/"/g, '')).join(', ');
             res.status(status.BadRequest);
             return res.redirect("/profile");
         }
 
         let update = {
+            email: req.body.email,
             name: req.body.name,
         };
 
@@ -357,7 +519,26 @@ module.exports = (middleware, users, plans, assets) => {
             }
 
             req.session.errMessage = "";
-            return res.status(status.Ok).redirect("/profile");
+            req.session.user = null; // set user to null so middleware updates user
+            req.session.save((err) => {
+                if (err) {
+                    console.error("Failed to save session: ", err);
+
+                    return req.session.destroy((err) => {
+                        req.session.errMessage = "Failed to save session, please login again.";
+
+                        if (err) {
+                            console.error("Failed to destroy session: ", err);
+                        }
+
+                        res.status(status.InternalServerError);
+                        return res.redirect("/login");
+                    });
+                }
+
+                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.";
@@ -365,7 +546,81 @@ module.exports = (middleware, users, plans, assets) => {
         });
     });
 
-    router.post("/createAsset", async (req, res) => {
+    router.post("/updatePersonal", (req, res) => {
+        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(),
+        });
+
+        const validationOptions = { convert: true, abortEarly: false };
+        const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
+
+        if (error) {
+            console.error("Personal info validation error:", error.details);
+            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
+            res.status(status.BadRequest).redirect("/profile");
+            return;
+        }
+
+        users.updateOne(
+            { _id: new ObjectId(req.session.userId) },
+            {
+                $set: {
+                    financialData: true,
+                    dob: value.dob,
+                    education: value.education,
+                    maritalStatus: value.maritalStatus,
+                    income: value.income,
+                    expenses: value.expenses,
+                    assets: value.assets,
+                    liabilities: value.liabilities,
+                }
+            }
+        ).then((result) => {
+            if (result.matchedCount === 0) {
+                console.log(`User not found during personal info update: ${req.session.userId}`);
+                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 personal info unchanged (already up-to-date): ${req.session.userId}`);
+            }
+
+            req.session.errMessage = "";
+            req.session.user = null; // set user to null so middleware updates user
+            req.session.save((err) => {
+                if (err) {
+                    console.error("Failed to save session: ", err);
+
+                    return req.session.destroy((err) => {
+                        req.session.errMessage = "Failed to save session, please login again.";
+
+                        if (err) {
+                            console.error("Failed to destroy session: ", err);
+                        }
+
+                        res.status(status.InternalServerError);
+                        return res.redirect("/login");
+                    });
+                }
+
+                return res.status(status.Ok).redirect("/profile");
+            });
+
+        }).catch(err => {
+            console.error("Error updating personal info in database:", err);
+            req.session.errMessage = "An error occurred while saving your information. Please try again.";
+            res.status(status.InternalServerError).redirect("/profile");
+        });
+    });
+
+    router.post("/createAsset", (req, res) => {
         // Create asset, each asset has different data structure based on type
         const type = req.body.type;
         const assetSchema = getAssetSchema(type);
@@ -378,9 +633,9 @@ module.exports = (middleware, users, plans, assets) => {
 
         const valid = assetSchema.validate(req.body);
 
-        if (valid.err) {
+        if (valid.error) {
-            req.session.errMessage = "Invalid input",
+            req.session.errMessage = "Invalid input:" + valid.error.details.map(d => d.message.replace(/"/g, '')).join(', ');
-                res.status(status.BadRequest);
+            res.status(status.BadRequest);
             return res.redirect("/assets");
         }
 
@@ -396,6 +651,7 @@ module.exports = (middleware, users, plans, assets) => {
             newAsset.value = newAsset.quantity * newAsset.price;
             newAsset.name = `${newAsset.ticker} Stock`;
         }
+        if (type == "other" && newAsset.year != "") newAsset.year = parseInt(newAsset.year);
         newAsset.value = parseFloat(newAsset.value);
         newAsset.icon = type == "stock" ? "Stock" : type == "saving" ? "Coins" : newAsset.icon;
 
@@ -411,7 +667,7 @@ module.exports = (middleware, users, plans, assets) => {
         return res.status(status.Ok).redirect("/assets");
     });
 
-    router.post("/updateAsset", async (req, res) => {
+    router.post("/updateAsset", (req, res) => {
         const type = req.body.type;
         const assetSchema = getAssetSchema(type);
 
@@ -423,9 +679,9 @@ module.exports = (middleware, users, plans, assets) => {
 
         const valid = assetSchema.validate(req.body);
 
-        if (valid.err) {
+        if (valid.error) {
-            req.session.errMessage = "Invalid input",
+            req.session.errMessage = "Invalid input:" + valid.error.details.map(d => d.message.replace(/"/g, '')).join(', ');
-                res.status(status.BadRequest);
+            res.status(status.BadRequest);
             return res.redirect("/assets");
         }
 
@@ -442,6 +698,7 @@ module.exports = (middleware, users, plans, assets) => {
             update.value = update.quantity * update.price;
             update.name = `${update.ticker} Stock`;
         }
+        if (type == "other" && update.year != "") update.year = parseInt(update.year);
         update.value = parseFloat(update.value);
         delete update.id;
         delete update.userId;

src/util/calculations.js

@@ -12,7 +12,7 @@ async function calculatePlanProgress(plans, assets, userId) {
 
     try {
         const userAssets = await assets.find({ userId: new ObjectId(userId) }).toArray();
-        const totalUserAssetValue = userAssets.reduce((total, asset) => total + asset.value, 0);
+        const totalUserAssetValue = await calculateTotalAssetValue(userAssets);
         let percentage = 0;
 
         if (plans.retirementAssets > 0) {
@@ -42,4 +42,127 @@ async function updatePlanProgressInDB(planId, percentage, plans) {
     }
 }
 
-module.exports = { calculatePlanProgress, updatePlanProgressInDB };
+async function calculateTotalAssetValue(assets) {
+    if (!assets || typeof assets.find !== 'function') {
+        console.error("Error with the assets collection");
+        return 0; 
+    }
+    try {
+        let totalAssetValue = 0;
+        const today = new Date();
+
+        for (const asset of assets) {
+            if (asset.icon === "Motorcycle" || asset.icon === "Car") {
+                if (asset.value < 1000) {
+                    totalAssetValue += asset.value;
+                } else {
+                    const assetYear = new Date(asset.year).getFullYear();
+                    const age = today.getFullYear() - assetYear;
+                    let depreciatedValue = asset.value * Math.pow(0.85, age);
+
+                    if (depreciatedValue < 1000) {
+                        totalAssetValue += 1000;
+                    } else {
+                        totalAssetValue += depreciatedValue;
+                    }
+                }
+            } else {
+                totalAssetValue += asset.value;
+            }
+        }
+        return totalAssetValue;
+    } catch (err) {
+        console.error("Error in calculateTotalAssetValue:", err);
+        return 0; 
+    }
+}
+
+
+async function calculateProgress(plan, assets, users, userId) {
+    if (!plan || typeof plan !== 'object') {
+        console.error("Error with the plan");
+        return;
+    }
+    if (!assets || typeof assets.find !== 'function') {
+        console.error("Error with the assets collection");
+        return;
+    }
+    if (!users || typeof users.findOne !== 'function') {
+        console.error("Error with the users collection");
+        return;
+    }
+    if (!userId) {
+        console.error("No user ID provided");
+        return;
+    }
+
+    try {
+        const userAssets = await assets.find({ userId: new ObjectId(userId) }).toArray();
+        const totalUserAssetValue = await calculateTotalAssetValue(userAssets);
+        const totalUserPlanValue = plan.retirementAssets;
+    
+        
+        const userDoc = await users.findOne({ _id: new ObjectId(userId) });
+
+        if (!userDoc || !userDoc.dob) {
+            console.error("[calculateProgress] User document or DOB not found for userId:", userId);
+            // Ensure a structured return even on error to avoid undefined.progress issues
+            return { monthlyInvestment: NaN, totalCostOfRetirement: NaN, monthsUntilRetirement: NaN, yearsRetired: NaN, yearsUntilRetirement: NaN, percentage: NaN }; 
+        }
+        const userDob = new Date(userDoc.dob);
+
+        if (isNaN(userDob.getTime())) {
+            console.error("[calculateProgress] userDob is an invalid date. Aborting calculation.");
+            return { monthlyInvestment: NaN, totalCostOfRetirement: NaN, monthsUntilRetirement: NaN, yearsRetired: NaN, yearsUntilRetirement: NaN, percentage: NaN };
+        }
+
+        const today = new Date();
+        const userUnalivedBy = new Date(userDob);
+        userUnalivedBy.setFullYear(userUnalivedBy.getFullYear() + 90);
+        const yearOfRetirement = userDob.getFullYear() + plan.retirementAge;
+        const monthsUntilRetirement = (yearOfRetirement - today.getFullYear()) * 12;
+        const yearsRetired = userUnalivedBy.getFullYear() - yearOfRetirement;
+        
+        const totalCostOfRetirement = ((plan.retirementExpenses + plan.retirementLiabilities) * 12) * yearsRetired;
+        
+        const monthlyInvestment = (totalUserPlanValue - totalUserAssetValue + totalCostOfRetirement) / monthsUntilRetirement;
+        
+        const percentageCalculated = (totalUserAssetValue / (totalUserPlanValue + totalCostOfRetirement)) * 100;
+
+        if (monthsUntilRetirement <= 0) {
+            return { monthlyInvestment: 0, totalCostOfRetirement: totalCostOfRetirement, monthsUntilRetirement: 0, yearsRetired: yearsRetired, yearsUntilRetirement: 0, percentage: 0 };
+        }
+        
+        const progress = {};
+
+        progress.monthlyInvestment = Math.round(monthlyInvestment);
+        progress.totalCostOfRetirement = totalCostOfRetirement;
+        progress.monthsUntilRetirement = monthsUntilRetirement;
+        progress.yearsRetired = yearsRetired;
+        progress.yearsUntilRetirement = (yearOfRetirement - today.getFullYear());
+        progress.percentage = percentageCalculated;
+        
+        return progress;
+
+    } catch (err) {
+        console.error("Error in calculateProgress:", err);
+        // Ensure a structured return even on error to avoid undefined.progress issues
+        return { monthlyInvestment: NaN, totalCostOfRetirement: NaN, monthsUntilRetirement: NaN, yearsRetired: NaN, yearsUntilRetirement: NaN, percentage: NaN }; 
+    }
+}
+
+async function updateProgress(plans, assets, users, userId) {
+                const userPlansFromDB = await plans.find({ userId: new ObjectId(userId) }).toArray();
+    
+                for (const plan of userPlansFromDB) {
+                    const progress = await calculateProgress(plan, assets, users, userId);
+                    await updatePlanProgressInDB(plan._id, progress.percentage, plans);
+                }
+    
+                const updatedUserPlans = await plans.find({ userId: new ObjectId(userId) }).toArray();
+                return updatedUserPlans;
+            }
+
+
+
+module.exports = { calculatePlanProgress, updatePlanProgressInDB, calculateTotalAssetValue, calculateProgress, updateProgress};

src/views/aboutUs.ejs

@@ -1,19 +1,24 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
 
-<main>
+<% if (!geoData) { %>
-    <section class="bg-white dark:bg-gray-900 py-12 md:py-20">
+    <%- include("./partials/headerStart") %>
+<% } else { %>
+    <%- include("./partials/header") %>
+<% } %>
+
+<main class="pt-24 pb-16">
+    <section class="bg-gray-900 py-12 md:py-20">
         <div class="max-w-screen-lg mx-auto px-4 text-center">
-            <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-gray-900 md:text-5xl lg:text-6xl dark:text-white">About RCalculator</h1>
+            <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none md:text-5xl lg:text-6xl text-white">About RCalculator</h1>
-            <p class="mb-12 text-lg font-normal text-gray-500 lg:text-xl sm:px-16 dark:text-gray-400">Welcome to RCalculator, your partner in building a secure and fulfilling financial future.</p>
+            <p class="mb-12 text-lg font-normal lg:text-xl sm:px-16 text-gray-400">Welcome to RCalculator, your partner in building a secure and fulfilling financial future.</p>
         </div>
 
         <div class="max-w-screen-md mx-auto px-4">
-            <h2 class="mb-4 text-3xl font-bold tracking-tight text-gray-900 dark:text-white text-center">Our Mission</h2>
+            <h2 class="mb-4 text-3xl font-bold tracking-tight text-white text-center">Our Mission</h2>
-            <p class="mb-6 font-normal text-gray-600 dark:text-gray-400 text-lg text-center">
+            <p class="mb-6 font-normal text-gray-400 text-lg text-center">
                 Our mission is to empower you with the tools and insights needed to take control of your long-term financial goals.
             </p>
-            <div class="prose lg:prose-lg dark:prose-invert mx-auto text-gray-600 dark:text-gray-400">
+            <div class="prose lg:prose-lg mx-auto text-gray-400">
                 <p class="mb-4">
                     We believe that planning for your desired future, especially retirement, shouldn't be daunting. It doesn't matter what your current age or career status is – starting now is what counts.
                 </p>
@@ -25,15 +30,23 @@
                 </p>
             </div>
         </div>
-        <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
+
-            <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+        <% if (!geoData) { %>
-                Get started
+            <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
+                <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-900">
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
+                    Get started
-                </svg>
+                    <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
-            </a>
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
-        </div>
+                    </svg>
+                </a>
+            </div>
+        <% } %>
     </section>
 </main>
 
+<% if (!geoData) { %>
+<% } else { %>
+    <%- include("./partials/navBar") %>
+<% } %>
+
 <%- include("./partials/footer") %>

src/views/assets.ejs

@@ -1,157 +1,8 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
+<main class="pt-26">
-    <!-- Create Asset popup Modal -->
+    <%- include("./partials/createAsset", { icons: icons }) %>
-    <dialog id="create-asset-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
-        <div class="flex flex-row justify-between">
-            <h2 class="text-lg font-bold mb-2">Create New Asset</h2>
-            <form method="dialog">
-                <button 
-                    onclick="resetAll()"
-                    type="submit"
-                    class="text-center py-2 mx-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-pointer"
-                >
-                    Cancel
-                </button>
-            </form>
-        </div>
-
-        <div class="my-4">
-            <label class="block text-sm font-medium text-gray-700">Asset Type</label>
-            <div class="mt-1 space-x-4">
-                <label class="inline-flex items-center">
-                    <input checked onclick="selectAssetForm('create-other-asset-form')" id="asset-other" type="radio" name="type" value="other" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                    <span class="ml-2 text-sm text-gray-700">Other Assets</span>
-                </label>
-                <label class="inline-flex items-center">
-                    <input onclick="selectAssetForm('create-saving-asset-form')" id="asset-saving" type="radio" name="type" value="saving" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                    <span class="ml-2 text-sm text-gray-700">Savings</span>
-                </label>
-                <label class="inline-flex items-center">
-                    <input onclick="selectAssetForm('create-stock-asset-form')" id="asset-stock" type="radio" name="type" value="stock" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500 cursor-pointer">
-                    <span class="ml-2 text-sm text-gray-700">Stocks</span>
-                </label>
-            </div>
-        </div>
-
-        <!-- Create other asset form -->
-        <form method="POST" action="/createAsset" id="create-other-asset-form">
-            <input style="display: none;" id="type" value="other" name="type" type="text">
-            <input style="display: none;" id="icon" value="Other" name="icon" type="text">
-            
-            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Select an Icon</label>            
-            <div class="flex items-center">
-                <button id="dropdown-icon-button" value="" data-dropdown-toggle="dropdown-icons" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm" type="button">
-                    <img src="/static/svgs/icons/Other.svg" class="h-4 w-4 me-2" alt="Other"> Other
-                    <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
-                    </svg>
-                </button>
-                <div id="dropdown-icons" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
-                    <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button">
-                        <% icons.forEach(icon => { %>
-                            <li>
-                                <button onclick="selectIcon(this)" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
-                                    <span class="inline-flex items-center">
-                                        <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
-                                    </span>
-                                </button>
-                            </li>
-                        <% }); %>
-                    </ul>
-                </div>
-            </div>
-
-            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Asset Name</label>
-            <input required id="name" type="text" name="name" minlength="3" maxlength="30" 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">
-
-            <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Asset Value</label>
-            <input required placeholder="CAD" min="0" id="value" type="number" name="value" 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">
-
-            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
-            <input required type="date" id="purchaseDate" name="purchaseDate" 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">
-
-            <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
-            <textarea maxlength="240" id="description" name="description" rows="4" cols="50" 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"></textarea>
-
-            <div class="mt-6 flex flex-row justify-between">
-                <button 
-                    type="reset"
-                    onclick="document.getElementById('create-other-asset-form').reset()"
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Clear
-                </button>
-                <button 
-                    type="submit"
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Create
-                </button>
-            </div>
-        </form>
-
-        <!-- Create savings asset form -->
-        <form style="display: none;" method="POST" action="/createAsset" id="create-saving-asset-form">
-            <input style="display: none;" value="saving" name="type" type="text">
-
-            <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Savings Name</label>
-            <input required id="name" type="text" name="name" minlength="3" maxlength="30" 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">
-
-            <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Savings Value</label>
-            <input required placeholder="CAD" min="0" id="value" type="number" name="value" 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 class="mt-6 flex flex-row justify-between">
-                <button 
-                    type="reset"
-                    onclick="document.getElementById('create-saving-asset-form').reset()"
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Clear
-                </button>
-                <button 
-                    type="submit" 
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Create
-                </button>
-            </div>
-        </form>
-
-        <!-- Create stock asset form -->
-        <form style="display: none;" method="POST" action="/createAsset" id="create-stock-asset-form">
-            <input style="display: none;" value="stock" name="type" type="text">
-
-            <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
-            <input required id="ticker" type="text" name="ticker" minlength="3" maxlength="5" 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">
-
-            <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
-            <input required placeholder="CAD" min="0" id="price" type="number" name="price" 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">
-
-            <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
-            <input required type="number" min="1" id="quantity" name="quantity" 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">
-
-            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase</label>
-            <input required type="date" id="purchaseDate" name="purchaseDate" 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 class="mt-6 flex flex-row justify-between">
-                <button 
-                    type="reset"
-                    onclick="document.getElementById('create-stock-asset-form').reset()"
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Clear
-                </button>
-                <button 
-                    type="submit"
-                    class="text-center w-sm py-2 mx-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-pointer"
-                >
-                    Create
-                </button>
-            </div>
-        </form>
-    </dialog>
 
     <% 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>
@@ -159,26 +10,29 @@
 
     <!-- Main display -->
     <section>
-        <div class="mt-8 max-w-md mx-auto bg-white px-8 py-6 rounded-lg shadow-md flex flex-col justify-center">
+        <div class="mt-2 max-w-md mx-auto bg-white px-8 py-6 rounded-lg shadow-md flex flex-col justify-center">
             <div class="flex flex-row justify-between text-right">
-                <h1 class="text-2xl font-bold tracking-tight leading-none">Assets:</h1>
+                <h1 class="text-lg font-medium">Assets:</h1>
-                <h1 class="text-xl font-medium tracking-tight leading-none"><%= assets.length %></h1>
+                <h1 class="text-lg font-medium"><%= assets.length %></h1>
             </div>
             <div class="flex flex-row justify-between text-right mt-6">
-                <h1 class="text-2xl font-bold tracking-tight leading-none">Total Value:</h1>
+                <h1 class="text-lg font-medium">Total Value:</h1>
-                <h1 class="text-xl font-medium tracking-tight leading-none">
+                <h1 class="text-lg font-medium">
                     <!-- sum of assets array values and formated as proper dollar amount -->
-                    $<%= assets.reduce((total, e) => total + e.value, 0).toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) %>
+                    <%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(totalUserAssetValue) %>
                 </h1>
             </div>
         </div>
 
         <div class="w-md my-6 max-w-md mx-auto px-4 flex flex-row justify-between">
-            <a href="/home" class="text-center w-sm py-2 mx-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">
+            <a href="/home" class="text-center w-sm py-2 mx-2 px-4 border 
+            border-transparent rounded-md shadow-sm text-sm font-medium 
+            text-white bg-blue-600 hover:bg-blue-700 focus:outline-none">
                 Back to Dashboard
             </a>
             <button 
-                class="text-center w-sm py-2 py-2 mx-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-pointer"
+                class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 
+                hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-pointer"
                 onclick="document.getElementById('create-asset-modal').showModal()"
             >
                 Add New Asset
@@ -196,183 +50,11 @@
             </div>
         <% } %>
         <% assets.forEach((asset) => { %>
-            <!-- Clickable asset list item -->
+            <%- include("./partials/assetPreview", { asset: asset }); %>
-            <div class="mt-4 max-w-md mx-auto bg-white rounded-lg shadow-md">
-                <button onclick="document.getElementById('<%= asset._id %>-modal').showModal()" style="width: 100%; height: 100%;" class="px-4 py-4 cursor-pointer">
-                    <div class="flex flex-row justify-between">
-                        <div class="flex flex-row justify-between">
-                            <div class="mx-2">
-                                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-6 w-6 me-2" alt="<%= asset.icon %>">
-                            </div>
-                            <div class="mx-2"><h3><%= asset.name %></h3></div>
-                        </div>
-                        <div>
-                            <h3><strong>
-                                $<%= asset.value.toLocaleString(undefined, {minimumFractionDigits: 2, maximumFractionDigits: 2}) %>
-                            </strong></h3>
-                        </div>
-                    </div>
-                </button>
-            </div>
 
-            <!-- Confirm delete asset modal -->
+            <%- include("./partials/assetDelete", { asset: asset }); %>
-            <dialog id="<%= asset._id %>-delete-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
-                <div class="relative p-4 w-full max-w-md h-full md:h-auto">
-                    <!-- Modal content -->
-                    <div class="relative p-4 text-center bg-white rounded-lg shadow dark:bg-gray-800 sm:p-5">
-                        <form method="dialog">
-                            <button type="submit" class="text-gray-400 absolute top-2.5 right-2.5 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white">
-                                <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
-                                <span class="sr-only">Close modal</span>
-                            </button>
-                        </form>
-                        <svg class="text-gray-400 dark:text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
-                        <p class="mb-4 text-gray-500 dark:text-gray-300">Are you sure you want to delete this item?</p>
-                        <div class="flex justify-center items-center space-x-4">
-                            <div style="width: 100%;">
-                                <form method="dialog" style="width: 100%;">
-                                    <button
-                                        type="submit" 
-                                        class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
-                                    >
-                                        No, cancel
-                                    </button>
-                                </form>
-                            </div>
-                            <div style="width: 100%;">
-                                <form method="POST" action="/deleteAsset">
-                                    <input id="id-delete-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
-                                    <button 
-                                        type="submit" 
-                                        class="py-2 px-3 text-sm font-medium text-center text-white bg-red-600 rounded-lg hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-500 dark:hover:bg-red-600 dark:focus:ring-red-900"
-                                    >
-                                        Yes, I'm sure
-                                    </button>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </dialog>
 
-            <!-- View/edit popup modal for asset -->
+            <%- include("./partials/assetModify", { asset: asset }); %>
-            <dialog id="<%= asset._id %>-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
-                <div class="flex flex-row justify-between">
-                    <div style="width: 45%;">
-                        <form method="dialog" style="width: 100%;">
-                            <button
-                                style="width: 100%;"
-                                onclick="lockAsset('<%= asset._id %>', '<%= asset.icon %>')" 
-                                type="submit" 
-                                class="text-center w-sm py-2 py-2 mx-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-pointer"
-                            >
-                                Close
-                            </button>
-                        </form>
-                    </div>
-                    <div style="width: 45%;">
-                        <button
-                            style="width: 100%;"
-                            type="submit" 
-                            class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 cursor-pointer"
-                            onclick="document.getElementById('<%= asset._id %>-delete-modal').showModal()"
-                        >
-                            Delete
-                        </button>
-                    </div>
-                </div>
-                <br>
-
-                <div class="flex flex-row justify-between">
-                    <% if (asset.type == "other") { %>
-                        <div class="flex items-center">
-                            <button id="dropdown-icon-button-<%= asset._id %>" value="" data-dropdown-toggle="dropdown-icons-<%= asset._id %>" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center 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" type="button">
-                                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4 me-2" alt="<%= asset.icon %>"> <%= asset.icon %>
-                                <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
-                                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
-                                </svg>
-                            </button>
-                            <div id="dropdown-icons-<%= asset._id %>" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
-                                <ul id="dropdown-<%= asset._id %>" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-icon-button-<%= asset._id %>">
-                                    <% icons.forEach(icon => { %>
-                                        <li>
-                                            <button onclick="selectIcon(this, '<%= asset._id %>')" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
-                                                <span class="inline-flex items-center">
-                                                    <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
-                                                </span>
-                                            </button>
-                                        </li>
-                                    <% }); %>
-                                </ul>
-                            </div>
-                        </div>
-                    <% } else { %>
-                        <button disabled class="inline-flex items-center py-2.5 px-10 text-sm font-medium text-center 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" type="button">
-                            <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4" alt="<%= asset.icon %>">
-                        </button>
-                    <% } %>
-                    
-                    <h2 class="text-xl font-medium tracking-tight leading-none mt-3"><%= String(asset.type).charAt(0).toUpperCase() + String(asset.type).slice(1); %> Asset</h2>
-                    <div>
-                        <button
-                            id="edit-<%= asset._id %>"
-                            onclick="unlockAsset('<%= asset._id %>')"
-                            class="py-3 px-8 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-pointer"
-                        >
-                            Edit
-                        </button>
-                    </div>
-                </div>
-                <br>
-
-                <form id="<%= asset._id %>-form" method="POST" action="/updateAsset">
-                    <input id="type-<%= asset._id %>" name="type" type="text" hidden value="<%= asset.type %>">
-                    <input id="id-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
-                    <input id="userId-<%= asset.userId %>" name="userId" type="text" hidden value="<%= asset.userId %>">
-                    <input id="icon-<%= asset._id %>" name="icon" type="text" hidden value="<%= asset.icon %>">
-
-                    <% if (asset.type != "stock") { %>
-                        <label for="name" class="block text-sm font-medium text-gray-700 mt-6">Name</label>
-                        <input id="name-<%= asset._id %>" disabled type="text" name="name" value="<%= asset.name %>" class="mt-1 mb-2 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">
-                    <% } else { %>
-                        <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker</label>
-                        <input id="ticker-<%= asset._id %>" disabled type="text" name="ticker" value="<%= asset.ticker %>" class="mt-1 mb-2 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">
-                    <% } %>
-
-                    <hr class="h-px mt-6 mb-4 bg-gray-500 border-0 mx-10">
-
-                    <% if (asset.type != "stock") { %>
-                        <label for="value" class="block text-sm font-medium text-gray-700">Value</label>
-                        <input id="value-<%= asset._id %>" disabled type="number" name="value" value="<%= asset.value %>" 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">
-                    <% } else { %>
-                        <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share</label>
-                        <input id="price-<%= asset._id %>" disabled type="number" name="price" value="<%= asset.price %>" 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="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares</label>
-                        <input id="quantity-<%= asset._id %>" disabled type="number" name="quantity" value="<%= asset.quantity %>" 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">
-                    <% } %>
-
-                    <% if (asset.type == "other") { %>
-                        <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
-                        <textarea disabled maxlength="240" id="description-<%= asset._id %>" name="description" rows="4" cols="50" 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"><%= asset.description %></textarea>
-                    <% } %>
-
-                    <% if (asset.type != "saving") { %>
-                        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Purchased on</label>
-                        <input id="purchaseDate-<%= asset._id %>" disabled type="date" name="purchaseDate" value="<%= asset.purchaseDate %>" 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">
-                    <% } %>
-
-                    <br>
-                    <small class="block text-sm font-medium text-gray-700">Last Modified: <%= asset.updatedAt %></small>
-                    <br>
-
-                    <div>
-                        <button id="save-<%= asset._id %>" 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>
-            </dialog>
         <% }) %>
     </section>
 </main>
@@ -382,11 +64,12 @@
 <script src="/static/scripts/assetManager.js"></script>
 <script>
     // Ensure all assets popup modals are locked and reset on page load    
-    <% assets.forEach((asset) => { %>
+    let assets = <%- JSON.stringify(assets) %>;
-        lockAsset("<%= asset._id %>", "<%= asset.icon %>");
+    assets.forEach((asset) => {
-    <% }) %>
+        lockAsset(asset._id, asset.icon);
+    });
 </script>
 
 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
-<%- include("./partials/footer") %>
+<%- include("./partials/footer") %>

src/views/dashboard.ejs

@@ -1,116 +1,45 @@
 <%- include("./partials/fileHeader") %>
     <%- include("./partials/header") %>
 
-        <main>
+        <main class="pt-24 pb-14">
             <!-- Buttons -->
-            <div class="flex justify-end gap-4 px-5 py-6">
+            <div class="flex md:justify-end justify-center gap-4 px-5 py-6 md:py-0">
                 <a href="/assets?popup"
-                    class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
+                    id="addAss" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
                     type="button">Add Asset</a>
-                <a href="/newPlan"
+                <a href="/plans?openModal=true"
                     class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
                     type="button">Create new plan </a>
             </div>
-            <!--This is the cards for plans and other things-->
+            <div class="w-full">
-            <div class="mt-12">
+                <div class="mb-12 grid grid-cols-1  md:grid-cols-2 lg:grid-cols-3 gap-y-4 gap-x-6">
-                <!--box to put logo icon if we want on in a box-->
+                    <% if (plans.length === 0) { %>
-                <!-- <div -->
+                        <div class="flex justify-center md:col-start-2">
-                <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
+                            <div class="col-span-1 mt-25">
-                <!-- </div> -->
+                                <div class="w-86 p-4 bg-white rounded-lg shadow-xl border border-slate-200">
-                <!--This is the cards for plans and other things-->
+                                    <h1 class="text-2xl block text-center font-semibold text-slate-700">Don't have any retirement plans? </h1>                              
-                <div class="mt-12">
+                                    <div class="mt-4 flex justify-center items-center">                                
-                    <div class="mb-12 grid gap-y-10 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
+                                            <div class="mt-4 flex justify-center">
-                        <!--box to put logo icon if we want on in a box-->
+                                                <a href="/plans" class="cursor-pointer border-2 border-blue-600 bg-blue-600 text-white py-2 px-6 
-                        <div class=" relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                                                    rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold 
-                            <!-- <div -->
+                                                    transition-colors duration-200 focus:outline-none ">Make one</a>
-                            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
+                                            </div>
-                            <!-- </div> -->
-                            <div class="p-4 flex items-center justify-between">
-                                <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                                    Retirement goal</p>
-                                <h4
-                                    class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                                    $53k</h4>
-                            </div>
-                            <div class="border-t border-blue-gray-50 p-10">
-                                <p
-                                    class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                                    <strong class="text-green-500">Make this percent bar or graph or
-                                        something
-                                    </strong>&nbsp;than lastweek
-                                </p>
-                            </div>
-                        </div>
-                        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                            <div class="p-4 flex items-center justify-between">
-                                <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                                    Retirement goal</p>
-                                <h4
-                                    class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                                    $53k</h4>
-                            </div>
-                            <div class="border-t border-blue-gray-50 p-10">
-                                <p
-                                    class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                                    <strong class="text-green-500">Make this percent bar or graph or
-                                        something
-                                    </strong>&nbsp;than last
-                                    week
-                                </p>
-                            </div>
-                        </div>
-                        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                            <!-- <div -->
-                            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-green-600 to-green-400 text-white shadow-green-500/40 shadow-lg absolute -mt-4 grid h-16 w-16 place-items-center"> -->
-                            <!--   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" -->
-                            <!--     class="w-6 h-6 text-white"> -->
-                            <!--     <path -->
-                            <!--       d="M6.25 6.375a4.125 4.125 0 118.25 0 4.125 4.125 0 01-8.25 0zM3.25 19.125a7.125 7.125 0 0114.25 0v.003l-.001.119a.75.75 0 01-.363.63 13.067 13.067 0 01-6.761 1.873c-2.472 0-4.786-.684-6.76-1.873a.75.75 0 01-.364-.63l-.001-.122zM19.75 7.5a.75.75 0 00-1.5 0v2.25H16a.75.75 0 000 1.5h2.25v2.25a.75.75 0 001.5 0v-2.25H22a.75.75 0 000-1.5h-2.25V7.5z"> -->
-                            <!--     </path> -->
-                            <!--   </svg> -->
-                            <!-- </div> -->
-                            <!-- we can use this later if needed not sure what it shoudl be for right now. -->
-                            <!--   <div class="p-4 text-right"> -->
-                            <!--     <p class="block antialiased font-sans text-sm leading-normal font-normal text-blue-gray-600">New Clients -->
-                            <!--     </p> -->
-                            <!--     <h4 -->
-                            <!--       class="block antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900"> -->
-                            <!--       3,462</h4> -->
-                            <!--   </div> -->
-                            <!--   <div class="border-t border-blue-gray-50 p-4"> -->
-                            <!--     <p class="block antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600"> -->
-                            <!--       <strong class="text-red-500">-2%</strong>&nbsp;than yesterday -->
-                            <!--     </p> -->
-                            <!--   </div> -->
-                            <!-- </div> -->
-                            <div
-                                class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                                <div
-                                    class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-                                    <div class="p-4 flex items-center justify-between">
-                                        <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                                            Retirement goal</p>
-                                        <h4
-                                            class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                                            $53k</h4>
-                                    </div>
-                                    <div class="border-t border-blue-gray-50 p-10">
-                                        <p
-                                            class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                                            <strong class="text-green-500">Make this percent bar or
-                                                graph or something
-                                            </strong>&nbsp;than last
-                                            week
-                                        </p>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
+
-                    <div class="text-blue-gray-600">
+                    <% } else %>
-                    </div>
+                        <% plans.forEach(plan=> { %>
+                        <%- include('./partials/dashboardBox.ejs', {thing: plan}) %>
+                    <% }); %>
+                    
+                </div>
+            </div>
         </main>
 
+        <script src="/static/scripts/dollarFormat.js"></script>
+
         <%- include("./partials/navBar") %>
             <%- include("./partials/scriptLoader") %>
                 <%- include("./partials/footer") %>

src/views/editPlan.ejs

@@ -0,0 +1,62 @@
+<%- include('./partials/fileHeader') %>
+<%- include('./partials/header') %>
+
+<main class="container mx-auto p-4 pt-28">
+    <div class="max-w-2xl mx-auto bg-gray-800 p-6 sm:p-8 rounded-xl shadow-xl">
+        <h2 class="text-2xl font-bold text-center text-white mb-8">Edit Plan: <%= plan.name %></h2>
+        <p class="text-sm text-gray-400 text-left mb-8"><span class="text-red-500">*</span> Indicates a required field</p>
+
+        <form id="editPlanForm" action="/plans/<%= plan._id %>/edit" method="POST" class="space-y-6">
+            <div>
+                <label for="name" class="block text-sm font-medium text-gray-300">Plan Name <span class="text-red-500">*</span></label>
+                <input type="text" name="name" id="name" value="<%= plan.name %>" required
+                       class="mt-1 block w-full px-4 py-2 border border-gray-600 rounded-md shadow-sm bg-gray-700 text-white focus:ring-blue-500 focus:border-blue-500 sm:text-sm placeholder-gray-400">
+            </div>
+
+            <div>
+                <label for="retirementAge" class="block text-sm font-medium text-gray-300">Desired Retirement Age <span class="text-red-500">*</span></label>
+                <input type="number" name="retirementAge" id="retirementAge" value="<%= plan.retirementAge %>" required min="18"
+                       class="mt-1 block w-full px-4 py-2 border border-gray-600 rounded-md shadow-sm bg-gray-700 text-white focus:ring-blue-500 focus:border-blue-500 sm:text-sm placeholder-gray-400">
+            </div>
+
+            <div>
+                <label for="retirementExpenses" class="block text-sm font-medium text-gray-300">Estimated Monthly Expenses at Retirement (<%= geoData.currency || 'CAD' %>) <span class="text-red-500">*</span></label>
+                <input type="number" name="retirementExpenses" id="retirementExpenses" value="<%= plan.retirementExpenses %>" required min="0" step="any"
+                       class="mt-1 block w-full px-4 py-2 border border-gray-600 rounded-md shadow-sm bg-gray-700 text-white focus:ring-blue-500 focus:border-blue-500 sm:text-sm placeholder-gray-400">
+            </div>
+
+            <div>
+                <label for="retirementAssets" class="block text-sm font-medium text-gray-300">Target Retirement Assets (<%= geoData.currency || 'CAD' %>) <span class="text-red-500">*</span></label>
+                <input type="number" name="retirementAssets" id="retirementAssets" value="<%= plan.retirementAssets %>" required min="0" step="any"
+                       class="mt-1 block w-full px-4 py-2 border border-gray-600 rounded-md shadow-sm bg-gray-700 text-white focus:ring-blue-500 focus:border-blue-500 sm:text-sm placeholder-gray-400">
+            </div>
+
+            <div>
+                <label for="retirementLiabilities" class="block text-sm font-medium text-gray-300">Estimated Monthly Liabilities at Retirement (<%= geoData.currency || 'CAD' %>) <span class="text-red-500">*</span></label>
+                <input type="number" name="retirementLiabilities" id="retirementLiabilities" value="<%= plan.retirementLiabilities %>" required min="0" step="any"
+                       class="mt-1 block w-full px-4 py-2 border border-gray-600 rounded-md shadow-sm bg-gray-700 text-white focus:ring-blue-500 focus:border-blue-500 sm:text-sm placeholder-gray-400">
+            </div>
+            
+            <div id="formErrorMessages" class="text-red-400 text-sm my-2" style="display: none;"></div>
+
+            <div class="flex items-center justify-center space-x-4 pt-4">
+                <button type="submit"
+                        class="inline-flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-blue-500">
+                    Save Changes
+                </button>
+                <button type="button" id="resetButton" class="inline-flex justify-center py-2 px-4 border border-gray-600 rounded-md shadow-sm bg-gray-600 text-sm font-medium text-white hover:bg-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-blue-500">
+                    Reset
+                </button>
+                <a href="/plans/<%= plan._id %>" class="inline-flex justify-center py-2 px-4 border border-gray-600 rounded-md shadow-sm bg-gray-600 text-sm font-medium text-white hover:bg-gray-500 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-blue-500">
+                    Cancel
+                </a>
+            </div>
+        </form>
+    </div>
+</main>
+
+<script src="/static/scripts/editPlanModals.js"></script>
+
+<%- include('./partials/navBar') %>
+<%- include('./partials/scriptLoader') %>
+<%- include('./partials/footer') %>

src/views/forgotPass.ejs

@@ -1,38 +1,42 @@
 <%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
 
-    <main>
+<main class="pt-12">
-        <div class="flex justify-center items-center h-screen">
+    <div class="flex justify-center items-center py-10">
-            <form action="/auth/resetPass" method="POST">
+        <form action="/auth/resetPass" method="POST">
-                <div class="w-96 p-6 shadow-1g bg-white rounded-md">
+            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
-                    <h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
+                <h1 class="text-3xl block text-center font-semibold text-slate-700">Reset Password</h1>
-                    <hr class="mt-3">
+                <hr class="mt-4 mb-6 border-slate-300">
-                    <% if (!reset ) { %>
-                        <div class="mt-3">
-                            <label for="email" class="block text-base mb-2">Email</label>
-                            <input type="text" id="email" name="email"
-                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
-                                placeholder="Enter Email" />
-                        </div>
-                        <% } else { %>
-                            <div class="mt-3">
-                                <h1 class="text-2xl block text-center font-bold text-red-600"> Reset link sent. </h1>
-                            </div>
-                            <% } %>
-                                <!---->
 
-                                <div class="text-red-800 font-bold" id="forgor">
+                <% if (!reset ) { %>
-                                    <%= error%>
+                    <div class="mt-4">
-                                </div>
+                        <label for="email" class="block text-base mb-2 text-slate-600">Email</label>
-                                <% if (!reset) { %>
+                        <input type="text" id="email" name="email"
-                                    <div class="mt-5">
+                            class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
-                                        <button type="submit"
+                            placeholder="Enter Email" />
-                                            class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Send
+                    </div>
-                                            reset Link</button>
+                <% } else { %>
-                                    </div>
+                    <div class="mt-4 text-center">
-                                    <% } %>
+                        <h2 class="text-xl font-semibold text-green-600">Reset link sent.</h2>
-                </div>
+                        <p class="text-sm text-slate-600 mt-2">Please check your email inbox (and spam folder).</p>
-            </form>
+                    </div>
-        </div>
+                <% } %>
-    </main>
+                
+                <% if (typeof error !== 'undefined' && error && error.length > 0) { %>
+                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"><%= error %></div>
+                <% } else if (!reset) { %>
+                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder for layout consistency */ %>
+                <% } %>
 
-    <%- include("./partials/footer") %> <%- include("./partials/footer") %>
+                <% if (!reset) { %>
+                    <div class="mt-6">
+                        <button type="submit"
+                            class="border-2 border-blue-600 bg-blue-600 text-white py-2 w-full rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2">Send Reset Link</button>
+                    </div>
+                <% } %>
+            </div>
+        </form>
+    </div>
+</main>
+
+<%- include("./partials/footer") %>

src/views/landing.ejs

@@ -7,7 +7,7 @@
             <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">Plan now, live better.</h1>
             <p class="mb-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">Planning your retirement is a crucial step towards financial security and a happy future.</p>
             <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                <a href="/signup" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+                <a href="/signup" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-900">
                     Get started
                     <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>

src/views/login.ejs

@@ -1,40 +1,46 @@
 <%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
 
-<main>
+<main class="pt-12">
-    <div class="flex justify-center items-center h-screen">
+    <div class="flex justify-center items-center py-10">
         <form action="/login" method="POST">
-            <div class="w-96 p-6 shadow-1g bg-white rounded-md">
+            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
-                <h1 class="text-3xl block text-center font-semibold">Login</h1>
+                <h1 class="text-3xl block text-center font-semibold text-slate-700">Login</h1>
-                <hr class="mt-3">
+                <hr class="mt-4 mb-4 border-slate-300">
-                <div class="mt-3">
+                <p class="text-sm text-gray-400 text-left mb-4"><span class="text-red-500">*</span> Indicates a required field</p>
-                    <label for="email" class="block text-base mb-2">Email</label>
+                <div class="mt-4">
-                    <input type="text" id="email" name="email"
+                    <label for="email" class="block text-base mb-2 text-slate-600">Email <span class="text-red-500">*</span></label>
-                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                    <input required  type="text" id="email" name="email"
-                        placeholder="Enter Email" />
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
+                        placeholder="Enter Email" value="<%= typeof email != 'undefined' ? email : '' %>"/>
                 </div>
-                <div class="mt-3">
+                <div class="mt-4">
-                    <label for="password" class="block text-base mb-2">Password</label>
+                    <label for="password" class="block text-base mb-2 text-slate-600">Password <span class="text-red-500">*</span></label>
-                    <input type="password" id="password" name="password"
+                    <input required type="password" id="password" name="password"
-                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
                         placeholder="Enter Password" />
                 </div>
-                <div class="text-red-800 font-bold" id="forgor"> <%= errMessage %></div>
+                <% if (errMessage && errMessage.length > 0) { %>
-                <div class="mt-3 flex justify-between items-center">
+                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"> <%= errMessage %></div>
-                    <div>
+                <% } else { %>
-                        <input type="checkbox">
+                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder to maintain layout when no error */ %>
-                        <label>Remember me</label>
+                <% } %>
+                <div class="mt-4 flex justify-between items-center">
+                    <div class="flex items-center">
+                        <input type="checkbox" id="rememberMe" class="h-4 w-4 text-blue-600 border-slate-300 rounded focus:ring-blue-500">
+                        <label for="rememberMe" class="ml-2 text-sm text-slate-600">Remember me</label>
                     </div>
                     <div>
-                        <a href="/forgotPassword" class="text-indigo-600 font-semibold">Forgot Password? </a>
+                        <a href="/forgotPassword" class="text-sm text-blue-600 hover:text-blue-500 font-semibold transition-colors duration-200">Forgot Password? </a>
                     </div>
                 </div>
-                <div class="mt-5">
+                <div class="mt-6">
                     <button type="submit"
-                        class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Login</button>
+                        class="border-2 border-blue-600 bg-blue-600 text-white py-2 w-full rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2">Login</button>
                 </div>
-                <div class="mt-5 block justify-between items-center">
+                <div class="mt-6 text-center">
-                    <label>Don't have an account?</label>
+                    <span class="text-sm text-slate-600">Don't have an account?</span>
-                    <a href="/signup" class="text-indigo-600 font-semibold">Register</a>
+                    <a href="/signup" class="text-sm text-blue-600 hover:text-blue-500 font-semibold ml-1 transition-colors duration-200">Register</a>
                 </div>
             </div>
         </form>

src/views/more.ejs

@@ -1,11 +1,54 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
+<main class="pt-24 pb-10">
-    The More Page
+    <div class="mt-6">
+        <div class="mb-12 grid gap-y-6 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
+            <!--box to put logo icon if we want on in a box-->
+            <a href="/profile" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                <div class="p-4 flex items-center justify-between">
+                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                        Profile
+                    </p>
+                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
+                    </svg>
+                </div>
+            </a>
+            <a href="/settings" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                <div class="p-4 flex items-center justify-between">
+                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                        Settings
+                    </p>
+                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
+                    </svg>
+                </div>
+            </a>
+            <a href="/aboutUs" class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                <div class="p-4 flex items-center justify-between">
+                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                        About Us
+                    </p>
+                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
+                    </svg>
+                </div>
+            </a>
+            <a href="/logout" class="mt-77 relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                <div class="p-4 flex items-center justify-between">
+                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                        Log Out
+                    </p>
+                    <svg class="w-[40px] h-[40px]" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="3" d="m10 16 4-4-4-4"/>
+                    </svg>
+                </div>
+            </a>
+        </div>
+    </div>
 </main>
 
 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
-<%- include("./partials/footer") %>
+<%- include("./partials/footer") %>
-    

src/views/newPlan.ejs

@@ -1,42 +0,0 @@
-<%- include("./partials/fileHeader") %>
-<%- include("./partials/header") %>
-
-<main class="container mx-auto p-4">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></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">Retirement Plan</h3>
-        <form action="/newPlan" method="post" class="space-y-4">
-            <div>
-                <label for="name" class="block text-sm font-medium text-gray-700">Plan Name</label>
-                <input type="text" name="name" placeholder="e.g., Retirement Plan" 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">Save Plan</button>
-            </div>
-        </form>
-    </div>
-</main>
-
-<%- include("./partials/navBar") %>
-<%- include("./partials/scriptLoader") %>
-<%- include("./partials/footer") %>

src/views/notFound.ejs

@@ -7,7 +7,7 @@
             <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">404 - Not found</h1>
             <p class="mb-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">It appears you stumbled accross a misleading page.</p>
             <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                <a href="/" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+                <a href="/" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-900">
                     Go home
                     <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                         <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>

src/views/partials/assetDelete.ejs

@@ -0,0 +1,42 @@
+<!-- Confirm delete asset modal -->
+<dialog id="<%= asset._id %>-delete-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
+    <div class="relative p-4 w-full max-w-md h-full md:h-auto">
+        <!-- Modal content -->
+        <div class="relative p-4 text-center rounded-lg shadow bg-gray-800 sm:p-5">
+            <form method="dialog">
+                <button 
+                    type="submit" 
+                    class="text-gray-500 absolute top-2.5 right-2.5 bg-transparent rounded-lg text-sm p-1.5 ml-auto inline-flex items-center hover:bg-gray-600 hover:text-white"
+                >
+                    <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
+                    <span class="sr-only">Close modal</span>
+                </button>
+            </form>
+            <svg class="text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
+            <p class="mb-4 text-gray-300">Are you sure you want to delete this item?</p>
+            <div class="flex justify-center items-center space-x-4">
+                <div style="width: 100%;">
+                    <form method="dialog" style="width: 100%;">
+                        <button
+                            type="submit" 
+                            class="py-2 px-3 text-sm font-medium rounded-lg border focus:ring-4 focus:outline-none focus:ring-primary-300 focus:z-10 bg-gray-700 text-gray-300 border-gray-500 hover:text-white hover:bg-gray-600 focus:ring-gray-600"
+                        >
+                            No, cancel
+                        </button>
+                    </form>
+                </div>
+                <div style="width: 100%;">
+                    <form method="POST" action="/deleteAsset">
+                        <input id="id-delete-<%= asset._id %>" name="id" type="text" hidden value="<%= asset._id %>">
+                        <button 
+                            type="submit" 
+                            class="py-2 px-3 text-sm font-medium text-center text-white rounded-lg focus:ring-4 focus:outline-none bg-red-500 hover:bg-red-600 focus:ring-red-900"
+                        >
+                            Yes, I'm sure
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</dialog>

src/views/partials/assetModify.ejs

@@ -0,0 +1,209 @@
+
+<!-- View/edit popup modal for asset -->
+<dialog id="<%= asset._id %>-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
+    <div class="flex flex-row justify-between">
+        <div style="width: 45%;">
+            <form method="dialog" style="width: 100%;">
+                <button
+                    style="width: 100%;"
+                    onclick="lockAsset('<%= asset._id %>', '<%= asset.icon %>')" 
+                    type="submit" 
+                    class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white
+                    bg-blue-600 hover:bg-blue-700 focus:outline-none "
+                >
+                    Close
+                </button>
+            </form>
+        </div>
+        <div style="width: 45%;">
+            <button
+                style="width: 100%;"
+                type="submit" 
+                class="text-center w-sm py-2 py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 cursor-pointer"
+                onclick="document.getElementById('<%= asset._id %>-delete-modal').showModal()"
+            >
+                Delete
+            </button>
+        </div>
+    </div>
+    <br>
+
+    <div class="flex flex-row justify-between">
+        <% if (asset.type == "other") { %>
+            <div class="flex items-center">
+                <button 
+                    id="dropdown-icon-button-<%= asset._id %>" 
+                    value="" 
+                    data-dropdown-toggle="dropdown-icons-<%= asset._id %>" 
+                    class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" 
+                    type="button"
+                >
+                    <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4 me-2" alt="<%= asset.icon %>"> <%= asset.icon %>
+                    <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                    </svg>
+                </button>
+                <div id="dropdown-icons-<%= asset._id %>" class="overflow-y-auto h-40 z-10 hidden divide-y divide-gray-100 rounded-lg shadow-sm w-32 bg-gray-700">
+                    <ul id="dropdown-<%= asset._id %>" class="py-2 text-sm text-gray-200" aria-labelledby="dropdown-icon-button-<%= asset._id %>">
+                        <% icons.forEach(icon => { %>
+                            <li>
+                                <button onclick="selectIcon(this, '<%= asset._id %>')" type="button" value="<%= icon %>" class="inline-flex w-full px-4 py-2 text-sm text-gray-200 hover:bg-gray-600 hover:text-white" role="menuitem">
+                                    <span class="inline-flex items-center">
+                                        <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
+                                    </span>
+                                </button>
+                            </li>
+                        <% }); %>
+                    </ul>
+                </div>
+            </div>
+        <% } else { %>
+            <button 
+                disabled 
+                class="inline-flex items-center py-2.5 px-10 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none" 
+                type="button"
+            >
+                <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-4 w-4" alt="<%= asset.icon %>">
+            </button>
+        <% } %>
+        
+        <h2 class="text-xl font-medium tracking-tight leading-none mt-3"><%= String(asset.type).charAt(0).toUpperCase() + String(asset.type).slice(1); %> Asset</h2>
+        <div>
+            <button
+                id="edit-<%= asset._id %>"
+                onclick="unlockAsset('<%= asset._id %>')"
+                class="py-3 px-8 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500  cursor-pointer"
+            >
+                Edit
+            </button>
+        </div>
+    </div>
+    <br>
+
+    <form id="<%= asset._id %>-form" method="POST" action="/updateAsset">
+        <input id="type-<%= asset._id %>"      name="type"   type="text" hidden value="<%= asset.type %>">
+        <input id="id-<%= asset._id %>"        name="id"     type="text" hidden value="<%= asset._id %>">
+        <input id="userId-<%= asset.userId %>" name="userId" type="text" hidden value="<%= asset.userId %>">
+        <input id="icon-<%= asset._id %>"      name="icon"   type="text" hidden value="<%= asset.icon %>">
+
+        <% if (asset.type != "stock") { %>
+            <label for="name" class="block text-sm font-medium text-gray-700 mt-6">Name <span class="text-red-500">*</span></label>
+            <input 
+                id="name-<%= asset._id %>" 
+                disabled 
+                type="text" 
+                name="name" 
+                value="<%= asset.name %>" 
+                class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+        <% } else { %>
+            <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker <span class="text-red-500">*</span></label>
+            <input 
+                id="ticker-<%= asset._id %>" 
+                disabled 
+                type="text" 
+                name="ticker" 
+                value="<%= asset.ticker %>" 
+                class="mt-1 mb-2 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+        <% } %>
+
+        <hr class="h-px mt-6 mb-4 bg-gray-500 border-0 mx-10">
+
+        <% if (asset.type != "stock") { %>
+            <label for="value" class="block text-sm font-medium text-gray-700">Value <span class="text-red-500">*</span></label>
+            <input 
+                id="value-<%= asset._id %>" 
+                disabled 
+                type="number" 
+                step=".01" 
+                name="value" 
+                value="<%= asset.value %>" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+
+            <div 
+                id="year-modify-<%= asset._id %>"
+                <% if (asset.icon != "Car" && asset.icon != "Motorcycle") { %>
+                    style="display: none;"
+                <% } %>
+            >
+                <label for="year" class="block text-sm font-medium text-gray-700 mt-2">Year <span class="text-red-500">*</span></label>
+                <input
+                    id="year-<%= asset._id %>"
+                    disabled
+                    required 
+                    placeholder="2000" 
+                    min="1900" 
+                    max="<% new Date().getFullYear() %>" 
+                    type="number"
+                    name="year" 
+                    class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+                    value="<%= asset.year %>"
+                >
+            </div>
+        <% } else { %>
+            <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share <span class="text-red-500">*</span></label>
+            <input 
+                id="price-<%= asset._id %>" 
+                disabled 
+                type="number" 
+                step=".01" 
+                name="price" 
+                value="<%= asset.price %>" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+            
+            <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares <span class="text-red-500">*</span></label>
+            <input 
+                id="quantity-<%= asset._id %>" 
+                disabled 
+                type="number" 
+                name="quantity" 
+                value="<%= asset.quantity %>" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+        <% } %>
+
+        <% if (asset.type == "other") { %>
+            <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
+            <textarea 
+                disabled 
+                maxlength="240" 
+                id="description-<%= asset._id %>" 
+                name="description" 
+                rows="4" 
+                cols="50" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            ><%= asset.description %></textarea>
+        <% } %>
+
+        <% if (asset.type != "saving") { %>
+            <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Purchased on <span class="text-red-500">*</span></label>
+            <input 
+                id="purchaseDate-<%= asset._id %>" 
+                disabled 
+                type="date" 
+                name="purchaseDate" 
+                value="<%= asset.purchaseDate %>" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+            >
+        <% } %>
+
+        <br>
+        <% let options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }; %>
+        <small class="block text-sm font-medium text-gray-700">Last Modified: <%= asset.updatedAt.toLocaleDateString("en-US", options); %></small>
+        <br>
+
+        <div>
+            <button 
+                id="save-<%= asset._id %>" 
+                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-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-not-allowed"
+            >
+                Save
+            </button>
+        </div>
+    </form>
+</dialog>

src/views/partials/assetPreview.ejs

@@ -0,0 +1,22 @@
+<!-- Clickable asset list item -->
+<div class="mt-4 max-w-md mx-auto bg-white rounded-lg shadow-md">
+    <button 
+        onclick="document.getElementById('<%= asset._id %>-modal').showModal()" 
+        style="width: 100%; height: 100%;" 
+        class="px-4 py-4 cursor-pointer"
+    >
+        <div class="flex flex-row justify-between">
+            <div class="flex flex-row justify-between">
+                <div class="mx-2">
+                    <img src="/static/svgs/icons/<%= asset.icon %>.svg" class="h-6 w-6 me-2" alt="<%= asset.icon %>">
+                </div>
+                <div class="mx-2"><h3><%= asset.name %></h3></div>
+            </div>
+            <div>
+                <h3><strong>
+                    <%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(asset.value) %>
+                </strong></h3>
+            </div>
+        </div>
+    </button>
+</div>

src/views/partials/createAsset.ejs

@@ -0,0 +1,276 @@
+<!-- Create Asset popup Modal -->
+<dialog id="create-asset-modal" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
+    <div class="flex flex-row justify-between">
+        <h2 class="text-lg font-bold mb-2">Create New Asset</h2>
+        <form method="dialog">
+            <button 
+                onclick="resetAll()"
+                type="submit"
+                class="text-center py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none cursor-pointer"
+            >
+                Cancel
+            </button>
+        </form>
+    </div>
+    <p class="text-sm text-gray-400 text-left mb-4"><span class="text-red-500">*</span> Indicates a required field</p>
+
+    <div class="my-4">
+        <label class="block text-sm font-medium text-gray-700">Asset Type</label>
+        <div class="mt-1 space-x-4">
+            <label class="inline-flex items-center">
+                <input 
+                    checked 
+                    onclick="selectAssetForm('create-other-asset-form')" 
+                    id="asset-other" 
+                    type="radio" 
+                    name="type" 
+                    value="other" 
+                    class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-500 cursor-pointer"
+                >
+                <span class="ml-2 text-sm text-gray-700">Other Assets</span>
+            </label>
+            <label class="inline-flex items-center">
+                <input 
+                    onclick="selectAssetForm('create-saving-asset-form')" 
+                    id="asset-saving" 
+                    type="radio" 
+                    name="type" 
+                    value="saving" 
+                    class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-500 cursor-pointer"
+                >
+                <span class="ml-2 text-sm text-gray-700">Savings</span>
+            </label>
+            <label class="inline-flex items-center">
+                <input 
+                    onclick="selectAssetForm('create-stock-asset-form')" 
+                    id="asset-stock" 
+                    type="radio" 
+                    name="type" 
+                    value="stock" 
+                    class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-500 cursor-pointer"
+                >
+                <span class="ml-2 text-sm text-gray-700">Stocks</span>
+            </label>
+        </div>
+    </div>
+
+    <!-- Create other asset form -->
+    <form method="POST" action="/createAsset" id="create-other-asset-form">
+        <input style="display: none;" id="type" value="other" name="type" type="text">
+        <input style="display: none;" id="icon" value="Other" name="icon" type="text">
+        
+        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Select an Icon</label>            
+        <div class="flex items-center">
+            <button 
+                id="dropdown-icon-button" 
+                data-dropdown-toggle="dropdown-icons" 
+                class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" 
+                type="button"
+            >
+                <img src="/static/svgs/icons/Other.svg" class="h-4 w-4 me-2" alt="Other"> Other
+                <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                </svg>
+            </button>
+            <div id="dropdown-icons" class="overflow-y-auto h-40 z-10 hidden divide-y divide-gray-100 rounded-lg shadow-sm w-32 bg-gray-700">
+                <ul id="dropdown" class="py-2 text-sm text-gray-200" aria-labelledby="dropdown-icon-button">
+                    <% icons.forEach(icon => { %>
+                        <li>
+                            <button 
+                                onclick="selectIcon(this)" 
+                                type="button" 
+                                value="<%= icon %>" 
+                                class="inline-flex w-full px-4 py-2 text-sm text-gray-200 hover:bg-gray-600 hover:text-white" 
+                                role="menuitem"
+                            >
+                                <span class="inline-flex items-center">
+                                    <img src="/static/svgs/icons/<%= icon %>.svg" class="h-4 w-4 me-2" alt="<%= icon %>"> (<%= icon %>)
+                                </span>
+                            </button>
+                        </li>
+                    <% }); %>
+                </ul>
+            </div>
+        </div>
+
+        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Asset Name <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            id="name" 
+            type="text" 
+            name="name" 
+            minlength="3" 
+            maxlength="30" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <div style="display: none;" id="year-create">
+            <label for="year" class="block text-sm font-medium text-gray-700 mt-2">Year <span class="text-red-500">*</span></label>
+            <input
+                id="year-input"
+                disabled
+                required 
+                placeholder="2000" 
+                min="1900" 
+                max="<% new Date().getFullYear() %>" 
+                type="number"
+                name="year" 
+                class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+            >   
+        </div>
+
+        <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Asset Value <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            placeholder="CAD" 
+            min="0" 
+            step=".01" 
+            id="value" 
+            type="number" 
+            name="value" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            type="date" 
+            id="purchaseDate" 
+            name="purchaseDate" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="description" class="block text-sm font-medium text-gray-700 mt-2">Description</label>
+        <textarea 
+            maxlength="240" 
+            id="description" 
+            name="description" 
+            rows="4" 
+            cols="50" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        ></textarea>
+
+        <div class="mt-6 flex flex-row justify-between">
+            <button 
+                type="reset"
+                onclick="document.getElementById('create-other-asset-form').reset()"
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Clear
+            </button>
+            <button 
+                type="submit"
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Create
+            </button>
+        </div>
+    </form>
+
+    <!-- Create savings asset form -->
+    <form style="display: none;" method="POST" action="/createAsset" id="create-saving-asset-form">
+        <input style="display: none;" value="saving" name="type" type="text">
+
+        <label for="name" class="block text-sm font-medium text-gray-700 mt-2">Savings Name <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            id="name" 
+            type="text" 
+            name="name" 
+            minlength="3" 
+            maxlength="30" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="value" class="block text-sm font-medium text-gray-700 mt-2">Savings Value <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            placeholder="CAD" 
+            min="0" 
+            step=".01" 
+            id="value" 
+            type="number" 
+            name="value" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <div class="mt-6 flex flex-row justify-between">
+            <button 
+                type="reset"
+                onclick="document.getElementById('create-saving-asset-form').reset()"
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Clear
+            </button>
+            <button 
+                type="submit" 
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Create
+            </button>
+        </div>
+    </form>
+
+    <!-- Create stock asset form -->
+    <form style="display: none;" method="POST" action="/createAsset" id="create-stock-asset-form">
+        <input style="display: none;" value="stock" name="type" type="text">
+
+        <label for="ticker" class="block text-sm font-medium text-gray-700 mt-2">Stock Ticker <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            id="ticker" 
+            type="text" 
+            name="ticker" 
+            minlength="3" 
+            maxlength="5" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="price" class="block text-sm font-medium text-gray-700 mt-2">Price per Share <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            placeholder="CAD" 
+            min="0" 
+            step=".01" 
+            id="price" 
+            type="number" 
+            name="price" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="quantity" class="block text-sm font-medium text-gray-700 mt-2">Quantity of Shares <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            type="number" 
+            min="1" 
+            id="quantity" 
+            name="quantity" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <label for="purchaseDate" class="block text-sm font-medium text-gray-700 mt-2">Date of Purchase <span class="text-red-500">*</span></label>
+        <input 
+            required 
+            type="date" 
+            id="purchaseDate" 
+            name="purchaseDate" 
+            class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
+        >
+
+        <div class="mt-6 flex flex-row justify-between">
+            <button 
+                type="reset"
+                onclick="document.getElementById('create-stock-asset-form').reset()"
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Clear
+            </button>
+            <button 
+                type="submit"
+                class="text-center w-sm py-2 mx-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer"
+            >
+                Create
+            </button>
+        </div>
+    </form>
+</dialog>

src/views/partials/dashboardBox.ejs

@@ -0,0 +1,35 @@
+<div class="w-full h-full mt-3">
+    <a href="/plans/<%=thing._id%>"
+        class="block p-4 w-full h-full rounded-xl transition-shadow duration-300 ease-in-out hover:shadow-xl">
+        <div
+            class="relative flex flex-col bg-white text-gray-700 shadow-md rounded-xl w-full h-full overflow-hidden min-h-[175px]">
+            <!-- Header Section -->
+            <div class="p-4 flex items-center justify-between border-b ">
+                <p class="text-2xl font-bold tracking-tight text-blue-gray-700 truncate" title="<%= thing.name %>">
+                    <%= thing.name %>
+                </p>
+                <h4 class="planGoal text-2xl font-bold tracking-tight whitespace-nowrap">
+                    <%= thing.retirementAssets %>
+                </h4>
+            </div>
+
+            <!-- Progress Bar Section - Pushed to the bottom -->
+            <div class="mt-2">
+                <div class="p-4 mt-auto border-gray-900">
+                    <div class="flex justify-between items-center mb-1">
+                        <p class="text-lg font-bold tracking-tight text-blue-gray-600">
+                            Progress:
+                        </p>
+                        <p class="text-sm font-semibold justify-between text-green-500">
+                            <%=Math.floor(thing.progress)> 100 ? 100 : Math.floor(thing.progress) %>%
+                        </p>
+                    </div>
+                    <div class="w-full bg-gray-300 rounded-full h-2.5">
+                        <div class="bg-green-500 h-2.5 rounded-full"
+                            style="width: <%= thing.progress > 100 ? 100 : thing.progress %>%;"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </a>
+</div>

src/views/partials/fileHeader.ejs

@@ -6,5 +6,16 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
         <title>RCalculator</title>
+
+        <style>
+            ::-webkit-scrollbar {
+                display: none;
+            }
+
+            * {
+                scrollbar-width: none;
+                -ms-overflow-style: none;
+            }
+        </style>
     </head>
-    <body class="bg-gray-900">
+    <body class="bg-gray-900 overflow-y-auto">

src/views/partials/footer.ejs

@@ -1,54 +1,28 @@
-<div class="fixed end-6 bottom-20 group">
+    <div class="fixed end-6 bottom-20 group">
-    <div id="factMenu" class="absolute right-0 bottom-full mb-2 hidden">
+        <div id="factMenu" class="absolute right-0 bottom-full mb-2 hidden">
-        <div id="factContainer" class="bg-white p-4 rounded-lg shadow-md dark:bg-gray-700 w-64">
+            <div id="factContainer" class="p-4 rounded-lg shadow-md bg-gray-700 w-64">
-            <p class="mb-2 text-sm text-gray-700 dark:text-gray-300">Insert the kind of short fact you would like to know more about:</p>
+                <p class="mb-2 text-sm text-gray-300">Insert the kind of short fact you would like to know more about:</p>
-            <input type="text" id="factInput" placeholder="Enter your topic here" class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-600 dark:border-gray-500 dark:text-white dark:placeholder-gray-400">
+                <input type="text" id="factInput" placeholder="Enter your topic here" class="w-full px-3 py-2 border rounded-md focus:outline-none focus:ring-2 bg-gray-600 border-gray-500 text-white placeholder-gray-400">
-            <button type="button" id="factSubmitButton" class="mt-3 w-full px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 dark:focus:ring-offset-gray-700">Submit</button>
+                <button type="button" id="factSubmitButton" class="mt-3 w-full px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-gray-700">Submit</button>
+            </div>
         </div>
+        <button type="button" id="factButton" class="flex items-center justify-center text-white rounded-full w-14 h-14 bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-none focus:ring-blue-800 hidden">
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>
+            <span class="sr-only">Get a Fact</span>
+        </button>
     </div>
-    <button type="button" id="factButton" class="flex items-center justify-center text-white bg-blue-700 rounded-full w-14 h-14 hover:bg-blue-800 dark:bg-blue-600 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 focus:outline-none dark:focus:ring-blue-800">
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>
-        <span class="sr-only">Get a Fact</span>
-    </button>
-</div>
 
-<footer class="mt-16">
+    <footer class="mt-16">
-    <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
+        <div class="fixed bottom-0 left-0 z-30 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
-        <div class="container mx-auto">
+            <div class="container mx-auto">
-            <p>&copy; 2025 RCalculator. All rights reserved.</p>
+                <p>&copy; 2025 RCalculator. All rights reserved.</p>
+            </div>
         </div>
-    </div>
+    </footer>
-</footer>
+    
-
+    <script src="/static/scripts/footer.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
-<script>
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    const factButton = document.getElementById("factButton");
+    
-    const factMenu = document.getElementById("factMenu");
-    const factInput = document.getElementById("factInput");
-    const factSubmitButton = document.getElementById("factSubmitButton");
-
-    factButton.addEventListener("click", () => {
-        factMenu.classList.toggle("hidden");
-    });
-    factSubmitButton.addEventListener("click", () => {
-        fetch("/fact", {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                fact: factInput.value,
-            }),
-        })
-        .then(response => response.json())
-        .then(data => {
-            Swal.fire('Here is a fact!', data.fact, 'success');
-        })
-        .catch(error => {
-            console.error("Error fetching fact:", error);
-            Swal.fire('Error fetching fact', 'Please try again later', 'error');
-        });
-    });
-</script>
 </body>
-</html>
+</html>

src/views/partials/header.ejs

@@ -1,39 +1,39 @@
 
 <header>
-    <nav class="bg-gray-800 border-b border-gray-700">
+    <nav class="fixed bg-gray-800 border-b border-gray-700 z-30">
-        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+        <div class="w-screen flex flex-col md:flex-row flex-wrap items-center justify-between p-3">
-            <a href="/home" class="flex items-center space-x-3 rtl:space-x-reverse">
+            <a href="/home" class="flex xl:w-[320px] items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
-                <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>
+                <span class="self-center text-2xl font-semibold whitespace-nowrap text-white">RCalculator</span>
             </a>
 
             <% if (!geoData.country) { %>
                 <div role="status" id="loading">
-                    <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <svg aria-hidden="true" class="w-8 h-8 animate-spin text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
                         <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
                     </svg>
                     <span class="sr-only">Loading...</span>
                 </div>
                 
-                <div style="display: none;" class="flex items-center" id="currencyExchange">
+                <div style="display: none;" class="flex items-center pt-2 md:pt-0 lg:pt-0" id="currencyExchange">
-                    <div id="exFrom" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div id="exFrom" class="shrink-0 z-10 inline-flex w-[115px] items-center py-2.5 px-4 text-sm font-medium text-center border rounded-s-lg focus:ring-4 focus:outline-none bg-gray-700 focus:ring-gray-700 text-white border-gray-600">
                         <img src="" id="yourFlag" class="h-4 w-4 me-2" alt="">
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
                         </p>
                     </div>
-                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
+                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border rounded-e-lg focus:ring-4 focus:outline-none bg-gray-700 hover:bg-gray-600 focus:ring-gray-700 text-white border-gray-600" type="button">
                         <img src="" id="exchangeFlag" class="h-4 w-4 me-2" alt="">
                         <p id="exFlagTag"></p>
                         <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
                         </svg>
                     </button>
-                    <div id="dropdown-country" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                    <div id="dropdown-country" class="overflow-y-auto w-[115px] h-40 z-10 hidden divide-y divide-gray-100 rounded-lg shadow-sm w-32 bg-gray-700">
-                        <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-country-button">
+                        <ul id="dropdown" class="py-2 text-sm text-gray-200" aria-labelledby="dropdown-country-button">
 
                         </ul>
                     </div>
@@ -41,28 +41,28 @@
             <% } else if(geoData.message == "error") { %>
                 <p>error</p>
             <% } else { %>
-                <div class="flex items-center">
+                <div class="flex items-center pt-2 md:pt-0 lg:pt-0">
-                    <div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div class="shrink-0 z-10 w-[115px] inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border rounded-s-lg focus:ring-4 focus:outline-none bg-gray-700 focus:ring-gray-700 text-white border-gray-600">
                         <img src="/static/svgs/flags/<%= geoData.country %>.svg" id="yourFlag" class="h-4 w-4 me-2" alt="<%= geoData.country %>"> (<%= geoData.country %>)
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm border-s-0 border bg-gray-700 border-s-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
                             $1.00 = $<%= (1 * geoData.toCurrencyRates["USD"]).toFixed(2) %>
                         </p>
                     </div>
-                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
+                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 w-[115px] z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center border rounded-e-lg focus:ring-4 focus:outline-none bg-gray-700 hover:bg-gray-600 focus:ring-gray-700 text-white border-gray-600" type="button">
                         <img src="/static/svgs/flags/USD.svg" class="h-4 w-4 me-2" alt="USD"> (USD)
                         <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
                         </svg>
                     </button>
-                    <div id="dropdown-country" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                    <div id="dropdown-country" class="overflow-y-auto h-40 z-10 hidden divide-y divide-gray-100 rounded-lg shadow-sm w-32 bg-gray-700">
-                        <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-country-button">
+                        <ul id="dropdown" class="py-2 text-sm text-gray-200" aria-labelledby="dropdown-country-button">
                             <% let countries = Object.keys(geoData.toCurrencyRates);%>
                             <% countries.forEach(item => { %>
                                 <li>
-                                    <button onclick="switchButton(this)" type="button" value="<%= geoData.toCurrencyRates[item] %>" class="countryButton inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
+                                    <button onclick="switchButton(this)" type="button" value="<%= geoData.toCurrencyRates[item] %>" class="countryButton inline-flex w-full px-4 py-2 text-sm text-gray-200 hover:bg-gray-600 hover:text-white" role="menuitem">
                                         <span class="inline-flex items-center">
                                             <img src="/static/svgs/flags/<%= item %>.svg" class="h-4 w-4 me-2" alt="<%= item %>"> (<%= item %>)
                                         </span>
@@ -73,25 +73,68 @@
                     </div>
                 </div>
             <% } %>
-            <div class="hidden w-full lg:block lg:w-auto" id="navbar-solid-bg">
+            <div class="hidden w-full lg:block lg:w-[320px]" id="navbar-solid-bg">
-                <ul class="flex flex-col font-medium mt-4 rounded-lg bg-gray-50 lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0 lg:bg-transparent dark:bg-gray-800 lg:dark:bg-transparent dark:border-gray-700">
+                <ul class="flex flex-col font-medium mt-4 rounded-lg lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0 bg-gray-800 lg:bg-transparent border-gray-700">
-                    <li>
+                    <li class="flex items-center justify-center">
-                        <a href="/home" 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">Dashboard</a>
+                        <a href="/home" class="block w-full text-center py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Dashboard</a>
+                    </li>
+                    <li class="flex items-center justify-center">
+                        <a href="/assets" class="block w-full text-center py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Assets</a>
+                    </li>
+                    <li class="flex items-center justify-center">
+                        <a href="/plans" class="block w-full text-center py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Plans</a>
                     </li>
                     <li>
-                        <a href="/assets" 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">Assets</a>
+                        <div class="text-center">
-                    </li>
+                            <button class="flex flex-row text-white hover:bg-blue-700 focus:ring-4 font-medium rounded-full text-sm focus:outline-none focus:ring-blue-800" type="button" id="drawer-toggle" data-drawer-target="drawer-navigation" data-drawer-placement="right" aria-controls="drawer-navigation">
-                    <li>
+                                <svg class="w-[30px] h-[30px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-                        <a href="/plans" 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">Plans</a>
+                                    <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
-                    </li>
+                                </svg>
-                    <li>
+                                <svg class="w-[30px] h-[30px] text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <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>
+                                    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M5 7h14M5 12h14M5 17h14"/>
-                    </li>
+                                </svg>
-                    <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>
+                            </button>
+                        </div>
                     </li>
                 </ul>
             </div>
+
+            <!-- drawer component -->
         </div>
     </nav>
+    <div id="drawer-navigation" class="lg:block fixed top-0 right-0 z-60 w-64 h-screen p-4 overflow-y-auto transition-transform translate-x-full bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
+        <h5 id="drawer-navigation-label" class="text-base font-semibold uppercase text-gray-400"><%= user.name %></h5>
+        <button type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent rounded-lg text-sm p-1.5 absolute top-2.5 end-2.5 inline-flex items-center hover:bg-gray-600 hover:text-white" >
+            <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
+            <span class="sr-only">Close menu</span>
+        </button>
+        <div class="">
+            <div class="w-full pt-5 pl-2.5">
+                <a href="/logout" class="text-white focus:outline-none focus:ring-4 font-medium rounded-full text-sm px-20 py-2.5 text-center me-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:ring-blue-800">
+                    Logout
+                </a>
+            </div>
+        </div>
+        <div class="py-4 overflow-y-auto">
+            <ul class="space-y-2 font-medium">
+                <li>
+                    <a href="/profile" class="flex items-center p-2 rounded-lg text-white hover:bg-gray-700 group">
+                    <svg class="w-5 h-5 text-gray-500 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
+                        <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
+                    </svg>
+                    <span class="ms-3">Profile</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="aboutUs" class="flex items-center p-2 rounded-lg text-white hover:bg-gray-700 group">
+                    <svg class="shrink-0 w-5 h-5 transition duration-75 text-gray-400 group-hover:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">
+                        <path d="M14 2a3.963 3.963 0 0 0-1.4.267 6.439 6.439 0 0 1-1.331 6.638A4 4 0 1 0 14 2Zm1 9h-1.264A6.957 6.957 0 0 1 15 15v2a2.97 2.97 0 0 1-.184 1H19a1 1 0 0 0 1-1v-1a5.006 5.006 0 0 0-5-5ZM6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Z"/>
+                    </svg>
+                    <span class="flex-1 ms-3 whitespace-nowrap">About Us</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
 </header>

src/views/partials/headerStart.ejs

@@ -1,12 +1,12 @@
 <header>
     <nav class="bg-gray-800 border-b border-gray-700">
-        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+        <div class="w-screen flex flex-wrap items-center justify-between p-4">
             <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
-                <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>
+                <span class="self-center text-2xl font-semibold whitespace-nowrap text-white">RCalculator</span>
             </a>
             <button data-collapse-toggle="navbar-solid-bg" type="button"
-                class="inline-flex items-center justify-center text-sm text-gray-500 rounded-lg lg:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
+                class="inline-flex items-center justify-center text-sm rounded-lg lg:hidden focus:outline-none focus:ring-2 text-gray-400 hover:bg-gray-700 focus:ring-gray-600"
                 aria-controls="navbar-solid-bg" aria-expanded="false">
                 <span class="sr-only">Open main menu</span>
                 <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" viewBox="0 0 17 14">
@@ -15,15 +15,15 @@
                 </svg>
             </button>
             <div class="hidden w-full lg:block lg:w-auto" id="navbar-solid-bg">
-                <ul class="flex flex-col font-medium mt-4 rounded-lg bg-gray-50 lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0 lg:bg-transparent dark:bg-gray-800 lg:dark:bg-transparent dark:border-gray-700">
+                <ul class="flex flex-col font-medium mt-4 rounded-lg lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0  bg-gray-800 lg:bg-transparent border-gray-700">
                     <li>
-                        <a href="/" 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">Home</a>
+                        <a href="/" class="block py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Home</a>
                     </li>
                     <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>
+                        <a href="/login" class="block py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Login</a>
                     </li>
                     <li>
-                        <a href="mailto:rcalculator@gmail.com" 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">Contact us</a>
+                        <a href="mailto:rcalculator@gmail.com" class="block py-2 px-3 lg:p-0 rounded lg:border-0 text-white lg:hover:text-blue-500 hover:bg-gray-700 hover:text-white lg:hover:bg-transparent">Contact us</a>
                     </li>
                 </ul>
             </div>

src/views/partials/navBar.ejs

@@ -1,20 +1,20 @@
-<div class="fixed bottom-0 z-50 lg:hidden w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 text-sm">
+<div class="fixed block bottom-0 left-0 z-50 lg:hidden w-full h-16 bg-gray-800 border-t border-gray-700 text-gray-400 text-sm">
-    <div class="grid h-16 max-w-lg grid-cols-4 mx-auto font-medium">
+    <div class="grid h-16 grid-cols-4 mx-auto font-medium">
-        <a href="/home" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group">
+        <a href="/home" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-800 group">
             <img src="/static/svgs/dashboard.svg" alt="dashboard">
-            <span class="text-gray-500 dark:text-gray-400 text-sm">Dashboard</span>
+            <span class="text-gray-400 text-sm">Dashboard</span>
         </a>
-        <a href="/assets" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group">
+        <a href="/assets" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-800 group">
             <img src="/static/svgs/assets.svg" alt="assets">
-            <span class="text-gray-500 dark:text-gray-400 text-sm">Assets</span>
+            <span class="text-gray-400 text-sm">Assets</span>
         </a>
-        <a href="/plans" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group">
+        <a href="/plans" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-800 group">
             <img src="/static/svgs/plans.svg" alt="plans">
-            <span class="text-gray-500 dark:text-gray-400 text-sm">Plans</span>
+            <span class="text-gray-400 text-sm">Plans</span>
         </a>
-        <a href="/more" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-50 dark:hover:bg-gray-800 group">
+        <a href="/more" class="inline-flex flex-col items-center justify-center px-5 hover:bg-gray-800 group">
             <img src="/static/svgs/more.svg" alt="more">
-            <span class="text-gray-500 dark:text-gray-400 text-sm">More</span>
+            <span class="text-gray-400 text-sm">More</span>
         </a>
     </div>
 </div>

src/views/planDetail.ejs

@@ -1,75 +1,102 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
+    <div class="max-w-lg mx-auto p-6 sm:p-8 rounded-xl shadow-lg space-y-6 bg-gray-800">
-    <div class="max-w-lg mx-auto bg-white p-6 sm:p-8 rounded-xl shadow-lg space-y-6 dark:bg-gray-800">
-        
         <div class="text-center">
-            <h3 class="text-2xl font-bold text-gray-800 dark:text-white"><%= plan.name %></h3>
+            <h3 class="text-2xl font-bold text-white"><%= plan.name %></h3>
         </div>
 
         <div>
             <div class="flex justify-between mb-1">
-                <span class="text-sm font-medium text-blue-700 dark:text-blue-400">Progress</span>
+                <span class="text-sm font-medium text-blue-400">Progress</span>
-                <span class="text-sm font-medium text-blue-700 dark:text-blue-400"><%= plan.progress %>%</span>
+                <span class="text-sm font-medium text-blue-400"><%-plan.progress > 100 ? 100 : plan.progress%>%</span>
             </div>
-            <div class="w-full bg-gray-200 rounded-full h-3 dark:bg-gray-700">
+            <div class="w-full rounded-full h-3 bg-gray-700">
-                <div class="bg-blue-600 h-3 rounded-full dark:bg-blue-500" style="width: <%= plan.progress %>%;"></div>
+                <div class="h-3 rounded-full bg-blue-500" style="width: <%= plan.progress > 100 ? 100 : plan.progress %>%;"></div>
             </div>
         </div>
 
-        <div class="border-t border-gray-200 dark:border-gray-700 pt-6 space-y-4">
+        <div>
-            <h4 class="text-lg font-semibold text-gray-700 dark:text-gray-300 mb-3">Assets:</h4>
+            <div class="flex justify-between mb-1">
+                <span class="text-sm font-medium text-blue-400">Calculated Monthly Investment</span>
+                <span class="text-sm font-medium text-blue-400"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.monthlyInvestment > 0 ? progress.monthlyInvestment : 0) %></span>
+            </div>
+        </div>
+
+        <div class="border-t border-gray-700 pt-6 space-y-4">
+            <h4 class="text-lg font-semibold text-gray-300 mb-3">Assets:</h4>
             
             <div class="grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-4">
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Number of Assets:</label>
+                    <label class="block text-sm font-medium text-gray-400">Number of Assets:</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= assets.length %></p>
+                    <p class="mt-1 text-md text-white"><%= assets.length %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Total Value:</label>
+                    <label class="block text-sm font-medium text-gray-400">Total Value:</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= assets.reduce((total, asset) => total + asset.value, 0) %></p>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(totalUserAssetValue) %></p>
                 </div>
             </div>
         </div>
 
-        <div class="border-t border-gray-200 dark:border-gray-700 pt-6 space-y-4">
+        <div class="border-t border-gray-700 pt-6 space-y-4">
-            <h4 class="text-lg font-semibold text-gray-700 dark:text-gray-300 mb-3">Plan Details:</h4>
+            <h4 class="text-lg font-semibold text-gray-300 mb-3">Plan Details:</h4>
             
             <div class="grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-4">
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Retirement Age:</label>
+                    <label class="block text-sm font-medium text-gray-400">Retirement Age:</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementAge %></p>
+                    <p class="mt-1 text-md text-white"><%= plan.retirementAge %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Monthly Expenses:</label>
+                    <label class="block text-sm font-medium text-gray-400">Target Monthly Expenses (Minus Liabilities):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementExpenses %></p>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementExpenses) %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Assets:</label>
+                    <label class="block text-sm font-medium text-gray-400">Target Retirement Assets (Total):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementAssets %></p>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementAssets) %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Liabilities:</label>
+                    <label class="block text-sm font-medium text-gray-400">Target Retirement Liabilities (Monthly):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementLiabilities %></p>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementLiabilities) %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-400">Years Until Retirement:</label>
+                    <p class="mt-1 text-md text-white"><%- progress.yearsUntilRetirement %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-400">Years Retired:</label>
+                    <p class="mt-1 text-md text-white"><%- progress.yearsRetired %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-400">Total Cost of Retirement:</label>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.totalCostOfRetirement) %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-400">Total amount needed (Assets + Retirement Expenses): </label>
+                    <p class="mt-1 text-md text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.totalCostOfRetirement + progress.monthlyInvestment * progress.monthsUntilRetirement) %></p>
                 </div>
             </div>
         </div>
 
-        <div class="border-t border-gray-200 dark:border-gray-700 pt-6 space-y-4">
+        <div class="border-t border-gray-700 pt-6 space-y-4">
-            <h4 class="text-lg font-semibold text-gray-700 dark:text-gray-300 mb-3">Suggestions:</h4>
+            <h4 class="text-lg font-semibold text-gray-300 mb-3">Suggestions:</h4>
             
-            <div class="mt-6 p-4 bg-blue-50 border border-blue-200 rounded-lg dark:bg-gray-700 dark:border-gray-600">
+            <div class="mt-6 p-4 border rounded-lg bg-gray-700 border-gray-600">
-                <p class="text-sm text-blue-700 dark:text-blue-300">
+                <p class="text-sm text-blue-300">
                     <%= suggestions %>
                 </p>
             </div>
         </div>
+        <div class="flex items-center justify-center space-x-2">
+            <button type="button" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer" onclick="editPlan('<%= plan._id %>')">Edit Plan</button>
+            <button type="button" class="py-2 px-4 border border-red-600 rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 cursor-pointer" onclick="deletePlan('<%= plan._id %>')">Delete Plan</button>
+        </div>
 
     </div>
 </main>
 
+<script src="/static/scripts/planManager.js"></script>
+
 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
 <%- include("./partials/footer") %>

src/views/plans.ejs

@@ -1,25 +1,69 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md space-y-4">
         <h3 class="text-lg font-medium mb-6">My Retirement Plans</h3>
-        <a href="/newPlan" class="block max-w-sm p-2"><div class="text-center bg-blue-600 text-white py-1 w-full rounded-md hover:bg-blue-700 hover:text-white font-semibold">New Plan</div></a>
+        <!-- Changed link to a button to open modal -->
+        <button id="openNewPlanModalBtn" class="block w-full max-w-sm p-2"><div class="text-center bg-blue-600 text-white py-1 w-full rounded-md hover:bg-blue-700 hover:text-white font-semibold">New Plan</div></button>
         <hr class="mt-3">
         <% plans.forEach(plan => { %>
-            <a href="/plans/<%= plan._id %>" class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow-sm hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700">
+            <a href="/plans/<%= plan._id %>" class="block max-w-sm p-6 border rounded-lg shadow-sm bg-gray-800 border-gray-700 hover:bg-gray-700">
-                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white"><%= plan.name %></h5>
+                <h5 class="mb-2 text-2xl font-bold tracking-tight text-white"><%= plan.name %></h5>
-                <div class="w-full bg-black rounded-full h-2.5 mb-4 dark:bg-black">
+                <div class="w-full rounded-full h-2.5 mb-4 bg-black">
-                    <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500" style="width: <%= plan.progress %>%;"></div>
+                    <div class=" h-2.5 rounded-full bg-green-500" style="width: <%= plan.progress > 100 ? 100 : plan.progress %>%;"></div>
                 </div>
-                <p class="font-normal text-gray-700 dark:text-gray-400"><%= plan.description %></p>
+                <p class="font-normal text-gray-400"><%= plan.description %></p>
             </a>
         <% }) %>
     </div>
-    
+
+    <!-- New Plan Modal - Styled like createAsset.ejs -->
+    <dialog id="newPlanDialog" class="w-lg mx-auto bg-white p-8 mt-10 rounded-lg shadow-md">
+        <!-- Header: Title and Cancel button -->
+        <div class="flex flex-row justify-between items-center">
+            <h3 class="text-lg font-bold text-gray-900">Create New Retirement Plan</h3>
+            <form method="dialog" id="cancelNewPlanDialogForm">
+                <button type="submit" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer">Cancel</button>
+            </form>
+        </div>
+
+        <!-- Form Content -->
+        <div> 
+            <form id="newPlanForm" class="space-y-4">
+                <p class="text-sm text-gray-400 text-left mb-4"><span class="text-red-500">*</span> Indicates a required field</p>
+                <div>
+                    <label for="name" class="block text-sm font-medium text-gray-700 text-left">Plan Name <span class="text-red-500">*</span></label>
+                    <input type="text" name="name" id="planName" placeholder="e.g., My Awesome Plan" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm" required>
+                </div>
+                <div>
+                    <label for="retirementAge" class="block text-sm font-medium text-gray-700 text-left">Desired Retirement Age <span class="text-red-500">*</span></label>
+                    <input type="number" name="retirementAge" id="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-blue-500 focus:border-blue-500 sm:text-sm" required>
+                </div>
+                <div>
+                    <label for="retirementExpenses" class="block text-sm font-medium text-gray-700 text-left">Estimated Monthly Retirement Expenses <span class="text-red-500">*</span></label>
+                    <input title="Ongoing spending. Rent, bills, subscriptions, etc." type="number" name="retirementExpenses" id="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-blue-500 focus:border-blue-500 sm:text-sm" required>
+                </div>
+                <div>
+                    <label for="retirementAssets" class="block text-sm font-medium text-gray-700 text-left">Estimated Retirement Assets <span class="text-red-500">*</span></label>
+                    <input title="Owned valuables. Physical items, investments, etc." type="number" name="retirementAssets" id="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-blue-500 focus:border-blue-500 sm:text-sm" required>
+                </div>
+                <div>
+                    <label for="retirementLiabilities" class="block text-sm font-medium text-gray-700 text-left">Estimated Retirement Liabilities <span class="text-red-500">*</span></label>
+                    <input title="Owed amounts. Loans, credit card balance, etc." type="number" name="retirementLiabilities" id="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-blue-500 focus:border-blue-500 sm:text-sm" required>
+                </div>
+                <div id="newPlanError" class="text-red-500 text-sm mt-2" style="display: none;"></div>
+                <!-- Form Buttons: Save Plan and Reset -->
+                <div class="mt-6 flex flex-row justify-between">
+                    <button type="button" id="resetNewPlanFormBtn" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">Reset</button>
+                    <button id="submitNewPlanBtn" type="submit" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">Save Plan</button>
+                </div>
+            </form>
+        </div>
+    </dialog>
 </main>
 
 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
+<script src="/static/scripts/planModals.js"></script>
 <%- include("./partials/footer") %>

src/views/profile.ejs

@@ -1,26 +1,26 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
+<main class="pt-24">
     <!-- Confirm delete account modal -->
     <dialog id="delete-warning-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
         <div class="relative p-4 w-full max-w-md h-full md:h-auto">
             <!-- Modal content -->
-            <div class="relative p-4 text-center bg-white rounded-lg shadow dark:bg-gray-800 sm:p-5">
+            <div class="relative p-4 text-center rounded-lg shadow bg-gray-800 sm:p-5">
                 <form method="dialog">
-                    <button type="submit" class="text-gray-400 absolute top-2.5 right-2.5 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white">
+                    <button type="submit" class="text-gray-400 absolute top-2.5 right-2.5 bg-transparent rounded-lg text-sm p-1.5 ml-auto inline-flex items-center hover:bg-gray-600 hover:text-white">
                         <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path></svg>
                         <span class="sr-only">Close modal</span>
                     </button>
                 </form>
-                <svg class="text-gray-400 dark:text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
+                <svg class="text-gray-500 w-11 h-11 mb-3.5 mx-auto" aria-hidden="true" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>
-                <p class="mb-4 text-gray-500 dark:text-gray-300">Are you sure you want to delete you account? This process cannot be undone.</p>
+                <p class="mb-4 text-gray-300">Are you sure you want to delete you account? This process cannot be undone.</p>
                 <div class="flex justify-center items-center space-x-4">
                     <div style="width: 100%;">
                         <form method="dialog" style="width: 100%;">
                             <button
                                 type="submit" 
-                                class="py-2 px-3 text-sm font-medium text-gray-500 bg-white rounded-lg border border-gray-200 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-primary-300 hover:text-gray-900 focus:z-10 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-500 dark:hover:text-white dark:hover:bg-gray-600 dark:focus:ring-gray-600"
+                                class="py-2 px-3 text-sm font-medium rounded-lg border focus:ring-4 focus:outline-none focus:z-10 bg-gray-700 text-gray-300 border-gray-500 hover:text-white hover:bg-gray-600 focus:ring-gray-600"
                             >
                                 No, cancel
                             </button>
@@ -31,7 +31,7 @@
                             <input id="id" name="id" type="text" hidden value="<%= user._id %>">
                             <button 
                                 type="submit" 
-                                class="py-2 px-3 text-sm font-medium text-center text-white bg-red-600 rounded-lg hover:bg-red-700 focus:ring-4 focus:outline-none focus:ring-red-300 dark:bg-red-500 dark:hover:bg-red-600 dark:focus:ring-red-900"
+                                class="py-2 px-3 text-sm font-medium text-center rounded-lg focus:ring-4 focus:outline-none focus:ring-red-300 bg-red-500 hover:bg-red-600 focus:ring-red-900"
                             >
                                 Yes, I'm sure
                             </button>
@@ -51,28 +51,120 @@
     <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>
+            <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-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-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="email" 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">
+            <input id="email" disabled type="email" 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-blue-500 focus:border-blue-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">
+            <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-blue-500 focus:border-blue-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">
+            <input id="password" disabled type="password" name="password" minlength="8" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-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">
+            <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-blue-500 focus:border-blue-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>
+                <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-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-not-allowed">Save</button>
             </div>
         </form>
     </div>
 
+    <!-- Questionnare details -->
+    <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>
+            <% if (user.financialData) { %>
+                <button id="edit-personal" onclick="unlockPersonal()" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">Edit</button>
+            <% } %>
+        </div>
+
+        <% if (user.financialData) { %>
+            <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 
+                        disabled 
+                        id="dob" 
+                        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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none"
+                        <% let year  = typeof(user.dob) == "object" ? user.dob.getFullYear() : user.dob.split('-')[0]; %>
+                        <% let month = typeof(user.dob) == "object" ? user.dob.getMonth()    : user.dob.split('-')[1] - 1;  %>
+                        <% let day   = typeof(user.dob) == "object" ? user.dob.getDate() + 1 : user.dob.split('-')[2].split('T')[0];%>
+                        <% let d = new Date(parseInt(year), parseInt(month), parseInt(day)); %>
+                        value="<%= d.getFullYear() + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2); %>"
+                        <% let d1 = new Date(); %>
+                        max="<%= (d1.getFullYear() - 18) + "-" +("0"+(d1.getMonth()+1)).slice(-2) + "-" + ("0" + d1.getDate()).slice(-2); %>"
+                    >
+                </div>
+                <div>
+                    <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
+                    <select disabled id="education" 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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                        <option <%= user.education == "primary"      ? 'selected' : '' %> value="primary">Primary (Elementary)</option>
+                        <option <%= user.education == "secondary"    ? 'selected' : '' %> value="secondary">Secondary (High School)</option>
+                        <option <%= user.education == "tertiary"     ? 'selected' : '' %> value="tertiary">Tertiary (College/University)</option>
+                        <option <%= user.education == "postgraduate" ? 'selected' : '' %> 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 <%= user.maritalStatus == "single" ? 'checked' : '' %> id="ms-single" type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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 <%= user.maritalStatus == "married" ? 'checked' : '' %> id="ms-married" type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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 <%= user.maritalStatus == "divorced" ? 'checked' : '' %> id="ms-divorced" type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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 <%= user.maritalStatus == "widowed" ? 'checked' : '' %> id="ms-widowed" type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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>
+                    <label for="income" class="block text-sm font-medium text-gray-700">Annual Gross Income</label>
+                    <input disabled value="<%= user.income %>" id="income" 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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                </div>
+                
+                <div>
+                    <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses</label>
+                    <input disabled value="<%= user.expenses %>" id="expenses" 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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                </div>
+                
+                <div>
+                    <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth</label>
+                    <input disabled value="<%= user.assets %>" id="assets" 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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                </div>
+                
+                <div>
+                    <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities</label>
+                    <input disabled value="<%= user.liabilities %>" id="liabilities" 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-blue-500 focus:border-blue-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+                </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-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-not-allowed">Save</button>
+                </div>
+            </form>
+        <% } else { %>
+            <div>
+                <a href="/questionnaire?profile" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 cursor-pointer">Answer Questionnare</a>
+            </div>
+        <% } %>
+
+    </div>
+
+    <!-- Delete account -->    
     <div class="flex flex-row justify-center mx-auto p8">
         <button
             type="submit"
@@ -83,55 +175,6 @@
         </button>
     </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>
 

src/views/questionnaire.ejs

@@ -1,18 +1,19 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.name %></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>
+        <p class="text-sm text-gray-400 text-left mb-4"><span class="text-red-500">*</span> Indicates a required field</p>
         <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>
+                <label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth <span class="text-red-500">*</span></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">
+                <% let d = new Date(); %>
+                <input max="<%= (d.getFullYear() - 18) + "-" + ("0"+(d.getMonth()+1)).slice(-2) + "-" + ("0" + d.getDate()).slice(-2); %>" 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-blue-500 focus:border-blue-500 sm:text-sm">
             </div>
             <div>
-                <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
+                <label for="education" class="block text-sm font-medium text-gray-700">Education <span class="text-red-500">*</span></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">
+                <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-blue-500 focus:border-blue-500 sm:text-sm">
                     <option value="primary">Primary (Elementary)</option>
                     <option value="secondary">Secondary (High School)</option>
                     <option value="tertiary">Tertiary (College/University)</option>
@@ -20,49 +21,49 @@
                 </select>
             </div>
             <div>
-                <label class="block text-sm font-medium text-gray-700">Marital Status</label>
+                <label class="block text-sm font-medium text-gray-700">Marital Status <span class="text-red-500">*</span></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">
+                        <input type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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">
+                        <input type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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">
+                        <input type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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">
+                        <input type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-blue-600 border-gray-300 focus:ring-blue-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>
+                <label for="income" class="block text-sm font-medium text-gray-700">Annual Gross Income <span class="text-red-500">*</span></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">
+                <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-blue-500 focus:border-blue-500 sm:text-sm">
             </div>
             
             <div>
-                <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses</label>
+                <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses <span class="text-red-500">*</span></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">
+                <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-blue-500 focus:border-blue-500 sm:text-sm">
             </div>
             
             <div>
-                <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth</label>
+                <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth <span class="text-red-500">*</span></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">
+                <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-blue-500 focus:border-blue-500 sm:text-sm">
             </div>
             
             <div>
-                <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities</label>
+                <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities <span class="text-red-500">*</span></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">
+                <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-blue-500 focus:border-blue-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>
+                <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-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">Submit Questionnaire</button>
             </div>
         </form>
     </div>

src/views/resetPass.ejs

@@ -26,7 +26,7 @@
                         <% } %>
                             <div class="mt-5">
                                 <button type="submit"
-                                    class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Change
+                                    class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-blue-700 font-semibold">Change
                                     Password</button>
                             </div>
                 </div>

src/views/signup.ejs

@@ -1,46 +1,51 @@
 <%- include("./partials/fileHeader") %>
-    <%- include("./partials/headerStart") %>
+<%- include("./partials/headerStart") %>
 
-        <main>
+<main class="pt-12">
-            <div class="flex justify-center items-center h-screen">
+    <div class="flex justify-center items-center py-10">
-                <form action="/signup" method="POST">
+        <form action="/signup" method="POST">
-                    <div class="w-96 p-6 shadow-1g bg-white rounded-md">
+            <div class="w-96 p-8 bg-white rounded-lg shadow-xl border border-slate-200">
-                        <h1 class="text-3xl block text-center font-semibold">Signup</h1>
+                <h1 class="text-3xl block text-center font-semibold text-slate-700">Signup</h1>
-                        <hr class="mt-3">
+                <hr class="mt-4 mb-4 border-slate-300">
-                        <div class="mt-3">
+                <p class="text-sm text-gray-400 text-left mb-4"><span class="text-red-500">*</span> Indicates a required field</p>
-                            <label for="name" class="block text-base mb-2">Name</label>
+                <div class="mt-4">
-                            <input type="text" id="name" name="name"
+                    <label for="name" class="block text-base mb-2 text-slate-600">Name <span class="text-red-500">*</span></label>
-                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                    <input required type="text" id="name" name="name"
-                                placeholder="Enter Name" />
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
-                        </div>
+                        placeholder="Enter Name" value="<%= typeof name != 'undefined' ? name : '' %>"/>
-                        <div class="mt-3">
+                </div>
-                            <label for="email" class="block text-base mb-2">Email</label>
+                <div class="mt-4">
-                            <input type="email" id="email" name="email"
+                    <label for="email" class="block text-base mb-2 text-slate-600">Email <span class="text-red-500">*</span></label>
-                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                    <input required type="email" id="email" name="email"
-                                placeholder="Enter Email" />
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
-                        </div>
+                        placeholder="Enter Email" value="<%= typeof email != 'undefined' ? email : '' %>"/>
-                        <div class="mt-3">
+                </div>
-                            <label for="password" class="block text-base mb-2">Password</label>
+                <div class="mt-4">
-                            <input type="password" id="password" name="password"
+                    <label for="password" class="block text-base mb-2 text-slate-600">Password <span class="text-red-500">*</span></label>
-                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                    <input required type="password" id="password" name="password"
-                                placeholder="Enter Password" />
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
-                            <label for="password" class="block text-base mb-2 mt-3">Re-type Password</label>
+                        placeholder="Enter Password" />
-                            <input type="password" id="repassword" name="repassword"
+                    <label for="repassword" class="block text-base mb-2 mt-3 text-slate-600">Re-type Password <span class="text-red-500">*</span></label>
-                                class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                    <input required type="password" id="repassword" name="repassword"
-                                placeholder="Enter Password" />
+                        class="border border-slate-300 focus:border-blue-500 w-full rounded-md text-base px-3 py-2 focus:outline-none focus:ring-1 focus:ring-blue-500 transition-colors duration-200"
-                        </div>
+                        placeholder="Enter Password" />
-                        <div class="text-red-800 font-bold " id="forgor">
+                </div>
-                            <%= errMessage %>
+                <% if (errMessage && errMessage.length > 0) { %>
-                        </div>
+                    <div class="mt-3 text-red-600 font-semibold text-sm" id="forgor"> <%= errMessage %></div>
-                        <div class="mt-5">
+                <% } else { %>
-                            <button type="submit"
+                    <div class="mt-3 h-5" id="forgor"></div> <% /* Placeholder to maintain layout when no error */ %>
-                                class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Signup</button>
+                <% } %>
-                        </div>
+                <div class="mt-6">
-                        <div class="mt-5 block justify-between items-center">
+                    <button type="submit"
-                            <label>Already have an account?</label>
+                        class="border-2 border-blue-600 bg-blue-600 text-white py-2 w-full rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2">Signup</button>
-                            <a href="/login" class="text-indigo-600 font-semibold">Login</a>
+                </div>
-                        </div>
+                <div class="mt-6 text-center">
-                    </div>
+                    <span class="text-sm text-slate-600">Already have an account?</span>
-        </main>
+                    <a href="/login" class="text-sm text-blue-600 hover:text-blue-500 font-semibold ml-1 transition-colors duration-200">Login</a>
+                </div>
+            </div>
+        </form>
+    </div>
+</main>
 
-        <%- include("./partials/footer") %>
+<%- include("./partials/footer") %>