fix/delete assets + plans on account delete

fix/middleware preventing 404 redirect

app.js

@@ -28,27 +28,34 @@ app.set('views', path.join(__dirname, 'src/views'));
 app.use(express.urlencoded({ extended: true }));
 app.use("/static", express.static("./src/public"));
 app.use("/images", express.static("./src/public/images"));
+app.use(express.json());
 
 /*** Database ***/
 const { connectMongo, getCollection } = require("./src/database/connection");
 
 let users;
+let assets;
+let plans;
 async function initDatabase() {
     const db = await connectMongo(mongoURI, database);
 
     // For any collection, init here
     users  = await getCollection(db, "users");
+    assets = await getCollection(db, "assets");
+    plans  = await getCollection(db, "plans");
 }
 
 /*** ROUTINGS ***/
 
 app.get('/', (req, res) => {
     if (!req.session.errMessage) req.session.errMessage = "";
-    res.render('dashboard');
+    res.render('landing');
     return res.status(status.Ok);
 });
 
 app.get('/signup', (req, res) => {
+    const ignore = ["User not found", "Incorrect password"];
+    if (ignore.includes(req.session.errMessage)) req.session.errMessage = "";
     res.render('signup', { errMessage: req.session.errMessage });
     return res.status(status.Ok);
 });
@@ -67,6 +74,21 @@ app.get('/aboutUs', (req, res) => {
     return res.status(status.Ok);
 });
 
+app.post('/api/location', async (req,res) => {
+    const { latitude, longitude } = req.body;
+
+    const response = await fetch(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&result_type=country&key=${process.env.geolocation_api}`);
+
+    const data = await response.json();
+
+    res.json(data);
+});
+
+// 404 handler - keep the actual notFound route please
+app.get('/notFound', (req, res) => {
+    res.render('notFound');
+    return res.status(status.NotFound);
+});
 
 // Initialize database and start app
 initDatabase().then(() => {
@@ -77,11 +99,11 @@ initDatabase().then(() => {
     
     // Import middleware & apply to user routes
     const middleware = require("./src/auth/middleware")(users);
-    app.use(require('./src/router/user')(middleware, users));
+    app.use(require('./src/router/user')(middleware, users, plans, assets));
 
     // 404 handler
     app.get('/*splat', (req, res) => {
-        res.send('404 Not Found');
+        res.render('notFound');
         return res.status(status.NotFound);
     });
     

src/auth/authentication.js

@@ -1,8 +1,13 @@
 const status = require("../util/statuses");
+const session = require("express-session");
 const bcrypt = require('bcrypt');
 const joi = require("joi");
 const salt = 12;
 
+/**
+ * @param {MongoClient.collection} users db collection
+ * @returns {express.Router} authentication router
+ */
 module.exports = (users) => {
     const router = require("express").Router();
 
@@ -39,9 +44,8 @@ module.exports = (users) => {
                 return res.redirect("/login");
             }
 
-            console.log("User logged in successfully");
-            console.log("User email: " + req.body.email);
             req.session.authenticated = true;
+            req.session.userId = user._id;
             req.session.email = req.body.email;
             req.session.errMessage = "";
             res.redirect("/home");
@@ -52,7 +56,7 @@ module.exports = (users) => {
     router.post("/signup", async (req, res) => {
         const userSchema = joi.object({
             email: joi.string().email().required(),
-            // name: joi.string().alphanum().max(20).required(),
+            name: joi.string().alphanum().max(20).required(),
             password: joi.string().max(20).min(8).required(),
             repassword: joi.string().max(20).min(8).required(),
         });
@@ -75,21 +79,22 @@ module.exports = (users) => {
 
         users.insertOne({
             email: req.body.email,
-            // name: req.body.name,
+            name: req.body.name,
             password: hashedPassword,
+            financialData: false,
         }).then((results, err) => {
             if (err) {
-                res.status(status.InternalServerError);
                 console.error(err);
-                return res.send("Internal server error");
+                res.session.errMessage = "Internal server error";
+                return res.status(status.InternalServerError).redirect("/signup");
             }
 
             req.session.authenticated = true;
             req.session.email = req.body.email;
+            req.session.userId = results.insertedId;
 
             req.session.errMessage = "";
-            res.status(status.Ok);
-            return res.redirect("/home");
+            return res.status(status.Ok).redirect("/home");
         });
     });
 

src/auth/middleware.js

@@ -1,19 +1,29 @@
 const status = require("../util/statuses");
 const session = require("express-session");
 
+// Get all user routes names
+let userRouter = require("../router/user")((req, res, next) => next(), null, null, null);
+userRouter.stack.shift();
+const userRoutes = userRouter.stack.map((layer) => layer.route.path.split("/")[1]);
+
 /**
- * createMiddleware returns a middleware function for express.
- * @param {MongoClient.collection} users
- * @return {async function} 
+ * @param {MongoClient.collection} users db collection
+ * @returns {async function} middleware handler function
 */
 const createMiddleware = (users) => {
     return async (req, res, next) => {
+        // Redirect not found pages to 404 page
+        if (!userRoutes.includes(req.url.substring(1))) {
+            return res.status(status.NotFound).redirect("/notFound");
+        }
+
         if (!req.session.authenticated || !req.session.email) {
             req.session.errMessage = "Please login to view that resource";
             res.redirect("/login");
             return res.status(status.Unauthorized);
         }
     
+        if (!req.session.user) {
             let user = await users.findOne({ "email": req.session.email }).then((user) => user);
         
             if (!user) {
@@ -22,7 +32,9 @@ const createMiddleware = (users) => {
                 return res.status(status.Unauthorized);
             }
         
-        req.user = user;
+            req.session.user = user;
+        }
+
         next();
     };
 }

src/public/scripts/assetManager.js

@@ -0,0 +1,99 @@
+const assetForms = [
+    "create-other-asset-form",
+    "create-saving-asset-form",
+    "create-stock-asset-form"
+];
+
+/**
+ * resetAll asset creation forms
+ */
+function resetAll() {
+    document.getElementById("create-other-asset-form").reset();
+    document.getElementById("create-saving-asset-form").reset();
+    document.getElementById("create-stock-asset-form").reset();
+}
+
+/**
+ * selectAssetForm changes which form is displayed
+ * to create specified assets.
+ * @param {string} assetFormId
+ */
+function selectAssetForm(assetFormId) {
+    for (let i = 0; i < assetForms.length; i++) {
+        if (assetForms[i] == assetFormId) {
+            document.getElementById(assetFormId).style.display = "block";
+        } else {
+            document.getElementById(assetForms[i]).style.display = "none";
+        }
+    }
+}
+
+/**
+ * resetRadio to default to other asset type.
+ */
+function resetRadio() {
+    document.getElementById("asset-other").checked = true;
+    document.getElementById("asset-saving").checked = false;
+    document.getElementById("asset-stock").checked = false;
+}
+
+const assetKeys = {
+    other: [
+        "name",
+        "value",
+        "description",
+        "purchaseDate",
+    ],
+    saving: [
+        "name",
+        "value",
+    ],
+    stock: [
+        "ticker",
+        "price",
+        "quantity",
+        "purchaseDate",
+    ],
+}
+
+/**
+ * lockAsset prevents edits to asset view modal
+ * @param {string} assetId
+ */
+function lockAsset(assetId) {
+    document.getElementById(`${assetId}-form`).reset();
+
+    const type = document.getElementById(`type-${assetId}`).value;
+
+    assetKeys[type].forEach((key) => {
+        document.getElementById(`${key}-${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");
+
+    document.getElementById(`edit-${assetId}`).innerHTML = "Edit";
+    document.getElementById(`edit-${assetId}`).onclick = () => { unlockAsset(assetId) };
+}
+
+/**
+ * unlockAsset allows edits to asset view modal
+ * @param {string} assetId
+ */
+function unlockAsset(assetId) {
+    const type = document.getElementById(`type-${assetId}`).value;
+
+    assetKeys[type].forEach((key) => {
+        document.getElementById(`${key}-${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");
+
+    document.getElementById(`edit-${assetId}`).innerHTML = "Cancel changes";
+    document.getElementById(`edit-${assetId}`).onclick = () => { lockAsset(assetId) };
+}
+
+resetRadio();

src/public/scripts/geolocation.js

@@ -0,0 +1,24 @@
+function getLocation() {
+    if (navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(success, error);
+    }
+}
+
+function success(position) {
+    const { latitude, longitude } = position.coords;
+
+    fetch("api/location" , {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ latitude, longitude })
+    }).then(res => res.json())
+    .then(data => {
+        console.log(data.results[0].formatted_address);
+    })
+}
+
+function error(err) {
+    console.error("Geolocation error: ", err);
+}

src/public/scripts/profile.js

@@ -0,0 +1,75 @@
+/**
+ * lockAccount resets inputs and disabled inputs
+ */
+function lockAccount() {
+  // Clear unsaved inputs on page load (refresh doesnt clear them)
+  document.getElementById("account-form").reset();
+
+  document.getElementById("save-account").disabled = true;
+  document.getElementById("email").disabled = true;
+  document.getElementById("name").disabled = true;
+  document.getElementById("password").disabled = true;
+  document.getElementById("repassword").disabled = true;
+  document.getElementById("save-account").classList.add("cursor-not-allowed");
+
+  document.getElementById("edit-account").innerHTML = "Edit";
+  document.getElementById("edit-account").onclick = unlockAccount;
+}
+
+/**
+ * lockPersonal resets inputs and disabled inputs
+ */
+function lockPersonal() {
+  // Clear unsaved inputs on page load (refresh doesnt clear them)
+  document.getElementById("personal-form").reset();
+
+  document.getElementById("save-personal").disabled = true;
+  document.getElementById("dob").disabled = true;
+  document.getElementById("education").disabled = true;
+  document.getElementById("ms-single").disabled = true;
+  document.getElementById("ms-married").disabled = true;
+  document.getElementById("ms-divorced").disabled = true;
+  document.getElementById("ms-widowed").disabled = true;
+  document.getElementById("save-personal").classList.add("cursor-not-allowed");
+
+  document.getElementById("edit-personal").innerHTML = "Edit";
+  document.getElementById("edit-personal").onclick = unlockPersonal;
+}
+
+/**
+ * unlockAccount removes disabled from inputs and
+ * allows users to edit their profile.
+ */
+function unlockAccount() {
+  document.getElementById("save-account").disabled = false;
+  // document.getElementById("email").disabled = false;
+  document.getElementById("name").disabled = false;
+  document.getElementById("password").disabled = false;
+  document.getElementById("repassword").disabled = false;
+  document.getElementById("save-account").classList.remove("cursor-not-allowed");
+
+  document.getElementById("edit-account").innerHTML = "Cancel changes";
+  document.getElementById("edit-account").onclick = lockAccount;
+}
+
+/**
+ * unlocPersonal removes disabled from inputs and
+ * allows users to edit their personal information.
+ */
+function unlockPersonal() {
+  document.getElementById("save-personal").disabled = false;
+  document.getElementById("dob").disabled = false;
+  document.getElementById("education").disabled = false;
+  document.getElementById("ms-single").disabled = false;
+  document.getElementById("ms-married").disabled = false;
+  document.getElementById("ms-divorced").disabled = false;
+  document.getElementById("ms-widowed").disabled = false;
+  document.getElementById("save-personal").classList.remove("cursor-not-allowed");
+
+  document.getElementById("edit-personal").innerHTML = "Cancel changes";
+  document.getElementById("edit-personal").onclick = lockPersonal;
+}
+
+// On page load, ensure forms are locked and reset
+lockAccount();
+// lockPersonal();

src/router/user.js

@@ -1,49 +1,197 @@
 const status = require("../util/statuses");
+const ObjectId = require('mongodb').ObjectId;
+const session = require("express-session");
+const bcrypt = require("bcrypt");
 const joi = require("joi");
+const salt = 12;
 
-module.exports = (middleware, users) => {
+/**
+ * getAssetSchema returns correct joi object
+ * to validate req.body depending on asset type
+ * @param {string} type of asset
+ * @returns {joi.object} schema
+ */
+const getAssetSchema = (type) => {
+    let assetSchema;
+
+    switch (type) {
+        case "other":
+            assetSchema = joi.object({
+                type: joi.string().valid("other", "stock", "saving").required(),
+                name: joi.string().alphanum().min(3).max(30).required(),
+                value: joi.number().min(0).required(),
+                purchaseDate: joi.date().required(),
+                description: joi.string().alphanum().max(240),
+                id: joi.string().alphanum(), // May be passed when updating existing asset
+            });
+            break;
+        case "saving":
+            assetSchema = joi.object({
+                type: joi.string().valid("other", "stock", "saving").required(),
+                name: joi.string().alphanum().min(3).max(30).required(),
+                value: joi.number().min(0).required(),
+                id: joi.string().alphanum(), // May be passed when updating existing asset
+            });
+            break;
+        case "stock":
+            assetSchema = joi.object({
+                type: joi.string().valid("other", "stock", "saving").required(),
+                ticker: joi.string().alphanum().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
+            });
+            break;
+        default:
+            return null;
+    };
+
+    return assetSchema;
+}
+
+/**
+ * @param {function} middleware handler
+ * @param {MongoClient.collection} users db collection
+ * @param {MongoClient.collection} assets db collection
+ * @returns {express.Router} user protected routes router
+ */
+module.exports = (middleware, users, plans, assets) => {
     const router = require("express").Router();
     
     router.use(middleware);
 
     router.get('/home', async (req, res) => {
-        res.render('home', { user: req.user });
+        res.render('dashboard', { user: req.session.user });
         return res.status(status.Ok);
     });
 
-    router.get('/assets', (req, res) => {
-        res.render('assets', { user: req.user });
+    router.get('/assets', async (req, res) => {
+        let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
+        res.render('assets', { user: req.session.user, errMessage: req.session.errMessage, assets: userAssets });
         return res.status(status.Ok);
     });
 
-    router.get('/plans', (req, res) => {
-        res.render('plans', { user: req.user });
-        return res.status(status.Ok);
+    router.get('/plans', async (req, res) => {
+        try {
+            // console.log(new ObjectId(req.session.user._id));
+            const userPlans = await plans.find({userId: new ObjectId(req.session.user._id) }).toArray();
+            // console.log(userPlans);
+            res.render('plans', {
+                user: req.session.user,
+                plans: userPlans
+            });
+        } catch (err) {
+            console.error("Error fetching plans:", err);
+            req.session.errMessage = "Could not load your plans. Please try again.";
+            res.status(status.InternalServerError).redirect('/home');
+        }
+    });
+
+    router.get('/plans/:id', async (req, res) => {
+    
+        try {
+            const planId = req.params.id;
+
+            
+            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.user._id), _id: new ObjectId(planId) });
+
+            if (!plan) {
+                console.log(`Plan not found with ID: ${planId} for user: ${req.session.user.email}`);
+                req.session.errMessage = "Plan not found or you do not have permission to view it.";
+                return res.status(status.NotFound).redirect('/plans');
+            }
+            // console.log("Found plan:", plan);
+            res.render('planDetail', { 
+                user: req.session.user,
+                plan: plan
+            });
+    
+        } catch (err) {
+            console.error("Error fetching plan:", err);
+            req.session.errMessage = "Could not load your plan. Please try again.";
+            res.status(status.InternalServerError).redirect('/home');
+        }
+    });
+
+    router.get('/newPlan', (req, res) => {
+        if(!req.session.user.financialData){
+            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 });
+    });
+
+    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(),
+            retirementExpenses: joi.number().min(0).required(),
+            retirementAssets: joi.number().min(0).required(),
+            retirementLiabilities: joi.number().min(0).required(),
+        });
+
+        const validationOptions = { convert: true, abortEarly: false }; 
+        const { error, value } = planSchema.validate(req.body, validationOptions);
+
+        if (error) { 
+            console.error("Plan validation error:", error.details);
+            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', '); 
+            res.status(status.BadRequest).redirect("/newPlan"); 
+            return; 
+        }
+        const newPlan = {
+            userId: new ObjectId(req.session.user._id),
+            name: value.name,
+            retirementAge: value.retirementAge,
+            retirementExpenses: value.retirementExpenses,
+            retirementAssets: value.retirementAssets,
+            retirementLiabilities: value.retirementLiabilities,
+            progress: "0%"
+        };
+
+        try{
+            await plans.insertOne({userId: new ObjectId(req.session.user._id), ...newPlan});
+            req.session.errMessage = ""; 
+            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).redirect("/newPlan");
+        }
     });
 
     router.get('/more', (req, res) => {
-        res.render('more', { user: req.user });
+        res.render('more', { user: req.session.user });
         return res.status(status.Ok);
     });
 
     router.get('/profile', (req, res) => {
-        res.render('profiles', { user: req.user });
+        res.render('profile', { user: req.session.user, errMessage: req.session.errMessage });
         return res.status(status.Ok);
     });
 
     router.get('/settings', (req, res) => {
-        res.render('settings', { user: req.user });
+        res.render('settings', { user: req.session.user });
         return res.status(status.Ok);
     });
 
     router.get('/questionnaire', (req, res) => {
         const errMessage = req.session.errMessage;
         req.session.errMessage = ""; 
-        res.render('questionnaire', { user: req.user, errMessage: errMessage });
+        res.render('questionnaire', { user: req.session.user, errMessage: errMessage });
     });
 
     router.post('/questionnaire', (req, res) => {
-        console.log("Questionnaire POST body:", req.body);
+        // console.log("Questionnaire POST body:", req.body);
   
         const questionnaireSchema = joi.object({
             dob: joi.date().required(),
@@ -53,10 +201,6 @@ module.exports = (middleware, users) => {
             expenses: joi.number().min(0).required(),
             assets: joi.number().min(0).required(),
             liabilities: joi.number().min(0).required(),
-            retirementAge: joi.number().min(18).max(120).required(),
-            retirementExpenses: joi.number().min(0).required(),
-            retirementAssets: joi.number().min(0).required(),
-            retirementLiabilities: joi.number().min(0).required(),
         });
     
         const validationOptions = { convert: true, abortEarly: false }; 
@@ -70,7 +214,7 @@ module.exports = (middleware, users) => {
         }
     
         users.updateOne( 
-            { email: req.session.email }, 
+            { _id: new ObjectId(req.session.user._id) }, 
             { 
                 $set: { 
                     financialData: true, 
@@ -81,23 +225,20 @@ module.exports = (middleware, users) => {
                     expenses: value.expenses,
                     assets: value.assets,
                     liabilities: value.liabilities,
-                    retirementAge: value.retirementAge,
-                    retirementExpenses: value.retirementExpenses,
-                    retirementAssets: value.retirementAssets,
-                    retirementLiabilities: value.retirementLiabilities,
                 } 
             }
         ).then((result) => { 
             if (result.matchedCount === 0) {
-                console.log(`User not found during questionnaire update: ${req.session.email}`);
+                console.log(`User not found during questionnaire update: ${req.session.user.email}`);
                 req.session.errMessage = "User session invalid. Please log in again."; 
                 res.status(status.NotFound).redirect("/login"); 
                 return;
             }
             if (result.modifiedCount === 0 && result.matchedCount === 1) {
-                console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.email}`);
+                console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.user.email}`);
             }
         
+            req.session.user.financialData = true;
             req.session.errMessage = ""; 
             res.status(status.Ok).redirect("/home"); 
     
@@ -108,5 +249,226 @@ module.exports = (middleware, users) => {
         });
     });
 
+    router.post("/updateAccount", async (req, res) => {
+        const accountSchema = joi.object({
+            email: joi.string().email(),
+            name: joi.string().alphanum().max(20),
+            password: joi.string().max(20).min(8),
+            repassword: joi.string().max(20).min(8),
+        });
+
+        const valid = accountSchema.validate(req.body);
+
+        if (valid.err) {
+            req.session.errMessage = "Invalid input",
+            res.status(status.BadRequest);
+            return res.redirect("/profile");
+        }
+
+        let update = {
+            name: req.body.name,
+        };
+
+        if ((req.body.password != "") && (req.body.password != req.body.repassword)) {
+            req.session.errMessage = "New passwords must match";
+            res.status(status.BadRequest);
+            return res.redirect("/profile");
+        } else if (req.body.password != "") {
+            let hashedPassword = await bcrypt.hashSync(req.body.password, salt);
+            update.password = hashedPassword;
+        }
+
+        users.updateOne(
+            { email: req.session.email },
+            { $set: update }
+        ).then((result) => {
+            if (result.matchedCount === 0) {
+                console.log(`User not found during account update: ${req.session.email}`);
+                req.session.errMessage = "User session invalid. Please log in again."; 
+                res.status(status.NotFound).redirect("/login"); 
+                return;
+            }
+            if (result.modifiedCount === 0 && result.matchedCount === 1) {
+                console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
+            }
+        
+            req.session.errMessage = ""; 
+            return res.status(status.Ok).redirect("/profile"); 
+        }).catch(err => { 
+            console.error("Error updating account in database:", err);
+            req.session.errMessage = "An error occurred while saving your information. Please try again.";
+            return res.status(status.InternalServerError).redirect("/profile"); 
+        });
+    });
+
+    router.post("/createAsset", async (req, res) => {
+        // Create asset, each asset has different data structure based on type
+        const type = req.body.type;
+        const assetSchema = getAssetSchema(type);
+
+        if (!assetSchema) {
+            console.error("Modified asset type, rejected");
+            req.session.errMessage = "Invalid input";
+            return res.status(status.BadRequest).redirect("/assets");
+        }
+
+        const valid = assetSchema.validate(req.body);
+
+        if (valid.err) {
+            req.session.errMessage = "Invalid input",
+            res.status(status.BadRequest);
+            return res.redirect("/assets");
+        }
+
+        let newAsset = {
+            userId: new ObjectId(req.session.user._id),
+            ...req.body,
+            updatedAt: new Date(),
+        };
+
+        if (type == "stock") {
+            newAsset.quantity = parseInt(newAsset.quantity);
+            newAsset.price = parseFloat(newAsset.price)
+            newAsset.value = newAsset.quantity * newAsset.price;
+            newAsset.name = `${newAsset.ticker} Stock`;
+        }
+        newAsset.value = parseFloat(newAsset.value);
+
+        assets.insertOne(newAsset, (err, _) => {
+            if (err) {
+                console.error("Error creating asset: ", err);
+                req.session.errMessage = "Internal server error";
+                return res.status(status.InternalServerError).redirect("/assets");
+            }
+        });
+
+        req.session.errMessage = ""; 
+        return res.status(status.Ok).redirect("/assets");
+    });
+
+    router.post("/updateAsset", async (req, res) => {
+        const type = req.body.type;
+        const assetSchema = getAssetSchema(type);
+
+        if (!assetSchema) {
+            console.error("Modified asset type, rejected");
+            req.session.errMessage = "Invalid input";
+            return res.status(status.BadRequest).redirect("/assets");
+        }
+        
+        const valid = assetSchema.validate(req.body);
+
+        if (valid.err) {
+            req.session.errMessage = "Invalid input",
+            res.status(status.BadRequest);
+            return res.redirect("/assets");
+        }
+
+        if (req.body.userId != req.session.user._id) {
+            req.session.errMessage = "Cannot change asset owner",
+            res.status(status.BadRequest);
+            return res.redirect("/assets");
+        }
+
+        let update = { ...req.body, updatedAt: new Date() };
+        if (type == "stock") {
+            update.quantity = parseInt(update.quantity);
+            update.price = parseFloat(update.price)
+            update.value = update.quantity * update.price;
+            update.name = `${update.ticker} Stock`;
+        }
+        update.value = parseFloat(update.value);
+        delete update.id
+        
+        assets.updateOne(
+            { "_id": new ObjectId(req.body.id) },
+            { $set: update },
+        ).then((result) => { 
+            if (result.matchedCount === 0) {
+                console.log(`Asset not found: ${req.body.id}`);
+                req.session.errMessage = "Unable to update asset";
+                return res.status(status.NotFound).redirect("/assets");
+            }
+            if (result.modifiedCount === 0 && result.matchedCount === 1) {
+                console.log(`Asset data unchanged (already up-to-date): ${req.body.id}`);
+            }
+        
+            req.session.errMessage = ""; 
+            return res.status(status.Ok).redirect("/assets"); 
+    
+        }).catch((err) => { 
+            console.error("Error updating asset: ", err);
+            req.session.errMessage = "An error occurred while saving your information. Please try again.";
+            return res.status(status.InternalServerError).redirect("/assets"); 
+        });
+    });
+
+    router.post("/deleteAsset", (req, res) => {
+        const id = new ObjectId(req.body.id);
+
+        assets.deleteOne(
+            { "_id": id }
+        ).then((result) => { 
+            if (result.deletedCount === 0) {
+                console.error(`Asset not found: ${req.body.id}`);
+                req.session.errMessage = "Unable to delete asset. Please try again.";
+                return res.status(status.NotFound).redirect("/assets");
+            }
+
+            if (!result.acknowledged) {
+                console.error("Error deleting asset: ", err);
+                req.session.errMessage = "An error occurred while deleting an asset. Please try again.";
+                return res.status(status.InternalServerError).redirect("/assets");
+            }
+        
+            req.session.errMessage = ""; 
+            return res.status(status.Ok).redirect("/assets"); 
+    
+        }).catch((err) => { 
+            console.error("Error deleting asset: ", err);
+            req.session.errMessage = "An error occurred while deleting an asset. Please try again.";
+            return res.status(status.InternalServerError).redirect("/assets");
+        });
+    });
+
+    router.post("/deleteUser", (req, res) => {
+        // not as critical if results aren't as expected only if crashing
+        assets.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
+            console.error("Error deleting user assets: ", err);
+            req.session.errMessage = "An error occured while deleting your account. Please try again.";
+            return res.status(status.InternalServerError).redirect("/profile");
+        });
+
+        plans.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
+            console.error("Error deleting user assets: ", err);
+            req.session.errMessage = "An error occured while deleting your account. Please try again.";
+            return res.status(status.InternalServerError).redirect("/profile");
+        });
+
+        users.deleteOne(
+            { _id: new ObjectId(req.session.user._id) },
+        ).then((result) => {
+            if (result.deletedCount === 0) {
+                console.error(`User not found: ${req.body.id}`);
+                req.session.errMessage = "Unabled to delete account. Please try again.";
+                return res.status(status.NotFound).redirect("/profile");
+            }
+
+            if (!result.acknowledged) {
+                console.error("Error deleting user: ", err);
+                req.session.errMessage = "An error occured while deleting your account. Please try again.";
+                return res.status(status.InternalServerError).redirect("/profile");
+            }
+
+            // Direct to logout to destroy session
+            req.session.destroy();
+            return res.status(status.Ok).redirect("/signup");
+        }).catch((err) => {
+            console.error("Error deleting user: ", err);
+            req.session.errMessage = "An error occured while deleting your account. Please try again.";
+            return res.status(status.InternalServerError).redirect("/profile");
+        });
+    });
+
     return router;
 };

src/views/assets.ejs

@@ -2,8 +2,342 @@
 <%- include("./partials/header") %>
 
 <main>
-    The Assets Page
+
+    <!-- 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-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;" value="other" name="type" type="text">
+
+            <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>
+    <% } %>
+
+    <!-- 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="flex flex-row justify-between text-right">
+                <h1 class="text-2xl font-bold tracking-tight leading-none">Assets:</h1>
+                <h1 class="text-xl font-medium tracking-tight leading-none"><%= 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-xl font-medium tracking-tight leading-none">
+                    <!-- 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}) %>
+                </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">
+                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"
+                onclick="document.getElementById('create-asset-modal').showModal()"
+            >
+                Add New Asset
+            </button>
+        </div>
+    </section>
+
+    <hr class="h-px my-8 bg-gray-500 border-0 mx-10">
+
+    <!-- list each asset and create hidden popup modal for view/edit -->
+    <section class="mt-6">
+        <% if (assets.length == 0) { %>
+            <div class="max-w-md mx-auto mb-10 rounded-lg shadow-md text-white font-bold bg-red-400 py-4 text-center">
+                You have no assets, create a new asset.
+            </div>
+        <% } %>
+        <% assets.forEach((asset) => { %>
+            <!-- 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">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 -->
+            <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 -->
+            <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 %>')" 
+                                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">
+                    <div>
+                        ICON
+                    </div>
+                    <div>
+                        <button
+                            id="edit-<%= asset._id %>"
+                            onclick="unlockAsset('<%= asset._id %>')"
+                            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  cursor-pointer"
+                        >
+                            Edit
+                        </button>
+                    </div>
+                </div>
+
+                <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 %>">
+
+                    <% 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>
 
+<div class="mt-20"></div>
+
+<script src="/static/scripts/assetManager.js"></script>
+<script>
+    // Ensure all assets popup modals are locked and reset on page load
+    let assetIds = [];
+    <% assets.forEach((asset) => { %>
+        assetIds.push("<%= asset._id %>");
+    <% }) %>
+    // EJS or JS may say this is an error above.
+    // I assure you its not, just leave it be.
+
+    assetIds.forEach((id) => lockAsset(id));
+</script>
+
 <%- include("./partials/navBar") %>
 <%- include("./partials/footer") %>

src/views/dashboard.ejs

@@ -2,14 +2,15 @@
   <%- include("./partials/header") %>
 
     <main>
+      <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
         <!-- Buttons -->
         <div class="flex justify-end gap-4 px-5 py-6">
           <button class="cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">
             Add Asset
           </button>
-          <button class="cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">
+          <a href="/newPlan" class="cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">
             Create new plan 
-          </button>
+          </a>
         </div>
         <!--This is the cards for plans and other things-->
         <div class="mt-12">

src/views/home.ejs

@@ -1,14 +0,0 @@
-<%- include("./partials/fileHeader") %>
-<%- include("./partials/header") %>
-
-<main>
-    Welcome: <%= user.email %>
-    The Dashboard Page
-    <% if(user.authenticated) { %>
-        <%= user.email %>
-        <%= user.errMessage %>
-    <% } %>
-</main>
-
-<%- include("./partials/navBar") %>
-<%- include("./partials/footer") %>

src/views/newPlan.ejs

@@ -0,0 +1,40 @@
+<%- 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/footer") %>

src/views/notFound.ejs

@@ -0,0 +1,24 @@
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
+
+<main>
+    <section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
+        <div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
+            <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">
+                    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"/>
+                    </svg>
+                </a>
+                <a href="/aboutUs" class="inline-flex justify-center hover:text-gray-900 items-center py-3 px-5 sm:ms-4 text-base font-medium text-center text-white rounded-lg border border-white hover:bg-gray-100 focus:ring-4 focus:ring-gray-400">
+                    Learn more
+                </a>  
+            </div>
+        </div>
+    </section>
+</main>
+
+<%- include("./partials/footer") %>

src/views/partials/footer.ejs

@@ -1,10 +1,11 @@
 
-<footer>
+<footer class="mt-16">
     <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
         <div class="container mx-auto">
             <p>&copy; 2025 RCalculator. All rights reserved.</p>
             </div>
     </div>
 </footer>
+<script src="/static/scripts/geolocation.js"></script>
 </body>
 </html>

src/views/partials/navBar.ejs

@@ -1,4 +1,4 @@
-<div class="fixed bottom-0 left-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 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="grid h-16 max-w-lg 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">
             <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="currentColor" viewBox="0 0 24 24">

src/views/planDetail.ejs

@@ -0,0 +1,74 @@
+<%- 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-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>
+        </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-700 dark:text-blue-400"><%= plan.progress %></span>
+            </div>
+            <div class="w-full bg-gray-200 rounded-full h-3 dark:bg-gray-700">
+                <div class="bg-blue-600 h-3 rounded-full dark:bg-blue-500" style="width: <%= plan.progress %>;"></div>
+            </div>
+        </div>
+
+        <div class="border-t border-gray-200 dark:border-gray-700 pt-6 space-y-4">
+            <h4 class="text-lg font-semibold text-gray-700 dark: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>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white">16 MOCK</p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Total Value:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white">$165,000 MOCK</p>
+                </div>
+            </div>
+        </div>
+
+        <div class="border-t border-gray-200 dark: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>
+            
+            <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>
+                    <p class="mt-1 text-md text-gray-900 dark: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>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementExpenses %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Assets:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementAssets %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Liabilities:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementLiabilities %></p>
+                </div>
+            </div>
+        </div>
+
+        <div class="border-t border-gray-200 dark: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>
+            
+            <div class="mt-6 p-4 bg-blue-50 border border-blue-200 rounded-lg dark:bg-gray-700 dark:border-gray-600">
+                <p class="text-sm text-blue-700 dark:text-blue-300">
+                    USE YOUR HEAD MOCK
+                </p>
+            </div>
+        </div>
+
+    </div>
+</main>
+
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>

src/views/plans.ejs

@@ -1,8 +1,23 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
-    The Plans Page
+<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 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>
+        <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">
+                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white"><%= plan.name %></h5>
+                <div class="w-full bg-gray-200 rounded-full h-2.5 mb-4 dark:bg-gray-700">
+                    <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500" style="width: <%= plan.progress %> "></div>
+                </div>
+                <p class="font-normal text-gray-700 dark:text-gray-400"><%= plan.description %></p>
+            </a>
+        <% }) %>
+    </div>
+    
 </main>
 
 <%- include("./partials/navBar") %>

src/views/profile.ejs

@@ -0,0 +1,141 @@
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>
+
+<main>
+    <!-- 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">
+                <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 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"
+                            >
+                                No, cancel
+                            </button>
+                        </form>
+                    </div>
+                    <div style="width: 100%;">
+                        <form method="POST" action="/deleteUser">
+                            <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"
+                            >
+                                Yes, I'm sure
+                            </button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </dialog>
+
+    <h2 class="ml-11 mt-5 mb-6 text-xl font-semibold mb-4 text-white">Welcome <%= user.name %></h2>
+
+    <% if (errMessage != "") { %>
+        <div class="max-w-md mx-auto mb-10 rounded-lg shadow-md text-white font-bold bg-red-400 py-4 text-center"><%= errMessage %></div>
+    <% } %>
+
+    <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
+        <div class="flex flex-row justify-between">
+            <h3 class="pt-2 pr-2 pb-2">Account settings</h3>
+            <button id="edit-account" onclick="unlockAccount()" class="py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Edit</button>
+        </div>
+        <form action="/updateAccount" method="post" class="space-y-4 mt-4" id="account-form">
+ 
+            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
+            <input id="email" disabled type="text" name="email" value="<%= user.email %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+
+            <label for="name" class="block text-sm font-medium text-gray-700">Name</label>
+            <input id="name" disabled type="text" name="name" value="<%= user.name %>" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+
+            <label for="password" class="block text-sm font-medium text-gray-700">New password</label>
+            <input id="password" disabled type="password" name="password" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+
+            <label for="repassword" class="block text-sm font-medium text-gray-700">Confirm new password</label>
+            <input id="repassword" disabled type="password" name="repassword" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm disabled:border-gray-200 disabled:bg-gray-50 disabled:text-gray-500 disabled:shadow-none">
+
+            <div>
+                <button id="save-account" disabled type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 cursor-not-allowed">Save</button>
+            </div>
+        </form>
+    </div>
+
+    <div class="flex flex-row justify-center mx-auto p8">
+        <button
+            type="submit"
+            class="w-xs p-3 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('delete-warning-modal').showModal()"
+        >
+            Delete Account
+        </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>
+
+<script src="/static/scripts/profile.js"></script>
+
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>

src/views/questionnaire.ejs

@@ -2,7 +2,7 @@
 <%- include("./partials/header") %>
 
 <main class="container mx-auto p-4">
-    <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.email %></h2>
+    <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>
         <form action="/questionnaire" method="post" class="space-y-4">
@@ -61,26 +61,6 @@
                 <input type="number" name="liabilities" min="0" placeholder="Estimated Liabilities" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
             </div>
             
-            <div>
-                <label for="retirementAge" class="block text-sm font-medium text-gray-700">Desired Retirement Age</label>
-                <input type="number" name="retirementAge" placeholder="e.g., 65" min="18" max="120" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-            </div>
-
-            <div>
-                <label for="retirementExpenses" class="block text-sm font-medium text-gray-700">Estimated Monthly Retirement Expenses</label>
-                <input type="number" name="retirementExpenses" min="0" placeholder="e.g., 3000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-            </div>
-
-            <div>
-                <label for="retirementAssets" class="block text-sm font-medium text-gray-700">Estimated Retirement Assets</label>
-                <input type="number" name="retirementAssets" min="0" placeholder="e.g., 500000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-            </div>
-
-            <div>
-                <label for="retirementLiabilities" class="block text-sm font-medium text-gray-700">Estimated Retirement Liabilities</label>
-                <input type="number" name="retirementLiabilities" min="0" placeholder="e.g., 50000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
-            </div>
-            
             <div>
                 <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Submit Questionnaire</button>
             </div>