dashboard page with cards to fill in and add asset and new plan button

feature/questionnaire page create + saving to MongoDb

app.js

@@ -3,14 +3,16 @@ const MongoStore = require("connect-mongo");
 const session = require("express-session");
 const express = require('express');
 const path = require('path');
+const joi = require('joi');
 require('dotenv').config();
 
+
 const app = express();
 const port = process.env.PORT || 3000;
 
 const mongoURI = process.env.mongoURI || "mongodb://localhost:27017/";
 const database = process.env.database || "knoldus"; // Database name
-const secret   = process.env.secret   || "123-secret-xyz";
+const secret = process.env.secret || "123-secret-xyz";
 
 /*** Sessions ***/
 app.use(session({
@@ -18,11 +20,11 @@ app.use(session({
     store: MongoStore.create({ mongoUrl: `${mongoURI}${database}`, crypto: { secret: secret } }),
     resave: true,
     saveUninitialized: false,
-    cookie: { maxAge: 60000 },
+    cookie: { maxAge: 3600000 },
 }));
 
 app.set('view engine', 'ejs');
-app.set('views',path.join(__dirname, 'src/views'));
+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"));
@@ -33,7 +35,7 @@ const { connectMongo, getCollection } = require("./src/database/connection");
 let users;
 async function initDatabase() {
     const db = await connectMongo(mongoURI, database);
-    
+
     // For any collection, init here
     users = await getCollection(db, "users");
 }
@@ -42,7 +44,7 @@ async function initDatabase() {
 
 app.get('/', (req, res) => {
     if (!req.session.errMessage) req.session.errMessage = "";
-    res.render('landing');
+    res.render('dashboard');
     return res.status(status.Ok);
 });
 
@@ -54,31 +56,17 @@ app.get('/signup', (req, res) => {
 app.get('/login', (req, res) => {
     if (req.session.authenticated) {
         res.redirect("/home");
-        return res.status(status.Ok);        
+        return res.status(status.Ok);
     }
     res.render('login', { errMessage: req.session.errMessage });
     return res.status(status.Ok);
 });
 
-app.get('/home', (req, res) => {
-    res.render('home', { session: req.session });
-    return res.status(status.Ok);
-});
-
 app.get('/aboutUs', (req, res) => {
     res.render('aboutUs');
     return res.status(status.Ok);
 });
 
-app.get('/logout', (req, res) => {
-    req.session.destroy();
-    return res.redirect('/login');
-});
-
-app.get('/*splat', (req, res) => {
-    res.send('404 Not Found');
-    return res.status(status.NotFound);
-});
 
 // Initialize database and start app
 initDatabase().then(() => {
@@ -89,16 +77,16 @@ initDatabase().then(() => {
 
     // Import middleware & apply to user routes
     const middleware = require("./src/auth/middleware")(users);
-    app.use(require("./src/router/user")(middleware));
+    app.use(require('./src/router/user')(middleware, users));
 
     // 404 handler
     app.get('/*splat', (req, res) => {
         res.send('404 Not Found');
         return res.status(status.NotFound);
-    });    
+    });
 
     // Start app
     app.listen(port, () => {
         console.log(`Server listening on port ${port}`);
-    });    
+    });
 });

package-lock.json

@@ -354,27 +354,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/chalk/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -549,6 +528,7 @@
       "version": "16.5.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
       "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },
@@ -580,6 +560,7 @@
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
       "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -969,13 +950,12 @@
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-symbols": {
@@ -1479,6 +1459,29 @@
         "url": "https://opencollective.com/nodemon"
       }
     },
+    "node_modules/nodemon/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/nodemon/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/nopt": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -1976,16 +1979,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
+      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/tar": {

src/auth/authentication.js

@@ -8,11 +8,11 @@ module.exports = (users) => {
 
     router.get("/logout", (req, res) => {
         req.session.destroy();
-        // res.status(status.Unauthorized);
         return res.redirect('/login');
     });
     
     router.post("/login", async (req, res) => {
+      
         const credentialSchema = joi.object({
             email: joi.string().email().required(),
             password: joi.string().max(20).required(),
@@ -39,9 +39,10 @@ module.exports = (users) => {
                 return res.redirect("/login");
             }
 
+            console.log("User logged in successfully");
+            console.log("User email: " + req.body.email);
             req.session.authenticated = true;
             req.session.email = req.body.email;
-
             req.session.errMessage = "";
             res.redirect("/home");
             return res.status(status.Ok);

src/auth/middleware.js

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

src/database/connection.js

@@ -16,6 +16,7 @@ const connectMongo = async (mongoURI, databaseName) => {
  * getCollection object to interact with MongoDB
  * @param {MongoClient} dbo
  * @param {string} collection 
+ * @return {MongoClient.collection}
  */
 const getCollection = async (dbo, collection) => {
     return await dbo.collection(collection);

src/router/user.js

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

src/views/aboutUs.ejs

@@ -1,56 +1,39 @@
-<html>
+<%- include("./partials/fileHeader") %>
-    <head>
+<%- include("./partials/headerStart") %>
-        <title>RCalculator</title>
-        <link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
-        <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
-    </head>
-    <body class="bg-white dark:bg-gray-900">
-        <%- include("./partials/headerStart") %>
-        <main>
-            <section class="bg-white dark: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>
-                    <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>
-                </div>
 
-                <div class="max-w-screen-md mx-auto px-4">
+<main>
-                    <h2 class="mb-4 text-3xl font-bold tracking-tight text-gray-900 dark:text-white text-center">Our Mission</h2>
+    <section class="bg-white dark:bg-gray-900 py-12 md:py-20">
-                    <p class="mb-6 font-normal text-gray-600 dark:text-gray-400 text-lg text-center">
+        <div class="max-w-screen-lg mx-auto px-4 text-center">
-                        Our mission is to empower you with the tools and insights needed to take control of your long-term financial goals.
+            <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>
-                    </p>
+            <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>
-                    <div class="prose lg:prose-lg dark:prose-invert mx-auto text-gray-600 dark:text-gray-400">
+        </div>
-                        <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.
+        <div class="max-w-screen-md mx-auto px-4">
-                        </p>
+            <h2 class="mb-4 text-3xl font-bold tracking-tight text-gray-900 dark:text-white text-center">Our Mission</h2>
-                        <p class="mb-4">
+            <p class="mb-6 font-normal text-gray-600 dark:text-gray-400 text-lg text-center">
-                            At RCalculator, we help you trace a personalized plan that suits your unique aspirations. We provide clear, actionable advice and projections to guide you on how to get there, whether you're just starting your career, mid-way through, or nearing retirement.
+                Our mission is to empower you with the tools and insights needed to take control of your long-term financial goals.
-                        </p>
+            </p>
-                        <p>
+            <div class="prose lg:prose-lg dark:prose-invert mx-auto text-gray-600 dark:text-gray-400">
-                            Let us help you navigate the path to financial independence and achieve the retirement lifestyle you envision.
+                <p class="mb-4">
-                        </p>
+                    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.
-                    </div>
+                </p>
-                </div>
+                <p class="mb-4">
-                <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
+                    At RCalculator, we help you trace a personalized plan that suits your unique aspirations. We provide clear, actionable advice and projections to guide you on how to get there, whether you're just starting your career, mid-way through, or nearing retirement.
-                    <a href="/login" 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">
+                </p>
-                        Get started
+                <p>
-                        <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">
+                    Let us help you navigate the path to financial independence and achieve the retirement lifestyle you envision.
-                            <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
+                </p>
-                        </svg>
-                    </a>
-                </div>
-            </section>
-        </main>
-        <footer>
-            <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>
+        </div>
-        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+        <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
+            <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">
-    </body>
+                Get started
-</html>
+                <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>
+        </div>
+    </section>
+</main>
 
-
+<%- include("./partials/footer") %>
-<!--fixed bottom-0 left-0 z-50 lg:hidden w-full h-16 bg-white border-t border-gray-200 dark:bg-gray-400-->

src/views/assets.ejs

@@ -1,23 +1,9 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
+<%- include("./partials/header") %>
-    <head>
+
-        <meta charset="UTF-8">
+<main>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    The Assets Page
-        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+</main>
-        <title>Document</title>
+
-    </head>
+<%- include("./partials/navBar") %>
-    <body>
+<%- include("./partials/footer") %>
-        <%- include("./partials/header") %>
-        <main>
-            The Assets Page
-        </main>
-        <footer>
-            <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>
-            <%- include("./partials/navBar") %>
-        </footer>
-    </body>
-</html>

src/views/dashboard.ejs

@@ -0,0 +1,99 @@
+<%- include("./partials/fileHeader") %>
+  <%- include("./partials/header") %>
+
+    <main>
+        <!-- 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">
+            Create new plan 
+          </button>
+        </div>
+        <!--This is the cards for plans and other things-->
+        <div class="mt-12">
+          <div class="mb-12 grid gap-y-10 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-->
+            <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-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 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="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">
+        </div>
+    </main>
+
+    <%- include("./partials/navBar") %>
+      <%- include("./partials/footer") %>

src/views/home.ejs

@@ -1,27 +1,14 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
+<%- include("./partials/header") %>
 
-<head>
+<main>
-    <meta charset="UTF-8">
+    Welcome: <%= user.email %>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    The Dashboard Page
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+    <% if(user.authenticated) { %>
-    <title>Document</title>
+        <%= user.email %>
-</head>
+        <%= user.errMessage %>
+    <% } %>
+</main>
 
-<body>
+<%- include("./partials/navBar") %>
-    <%- include("./partials/header") %>
+<%- include("./partials/footer") %>
-    <% if (session.authenticated) { console.log(session.email); } else { console.log("No user"); } %>
-    <main>
-        The Dashboard Page
-    </main>
-    <footer>
-        <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-             </div>
-        </div>
-        <%- include("./partials/navBar") %>
-    </footer>
-</body>
-
-</html>

src/views/index.ejs

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-    <title>Document</title>
-</head>
-
-<body>
-    The Index Page
-    <footer>
-        <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-             </div>
-        </div>
-        <%- include("./partials/navBar") %>
-    </footer>
-</body>
-
-</html>

src/views/landing.ejs

@@ -1,38 +1,24 @@
-<html>
+<%- include("./partials/fileHeader") %>
-    <head>
+<%- include("./partials/headerStart") %>
-        <title>RCalculator</title>
+
-        <link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
+<main>
-        <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
+    <section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
-    </head>
+        <div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
-    <body class="bg-white dark:bg-gray-900">
+            <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>
-        <%- include("./partials/headerStart") %>
+            <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>
-        <main>
+            <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-            <section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
+                <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">
-                <div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
+                    Get started
-                    <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>
+                    <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">
-                    <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>
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
-                    <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
+                    </svg>
-                        <a href="/login" 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>
-                            Get started
+                <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">
-                            <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">
+                    Learn more
-                                <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
+                </a>  
-                            </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>
-        <footer>
-            <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-                <div class="container mx-auto">
-                    <p>&copy; 2025 RCalculator. All rights reserved.</p>
-                 </div>
             </div>
-        </footer>
+        </div>
-        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+    </section>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
+</main>
-    </body>
+
-</html>
+<%- include("./partials/footer") %>

src/views/login.ejs

@@ -1,33 +1,21 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
 
-<head>
+<main>
-    <meta charset="UTF-8">
+    <div class="flex justify-center items-center h-screen">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Login Page</title>
-    <link rel="stylesheet" href="/static/css/style.css" <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
-    <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="flex justify-center items-center h-screen bg-gray-700">
         <form action="/login" method="POST">
             <div class="w-96 p-6 shadow-1g bg-white rounded-md">
-                <h1 class="text-3xl block text-center font-semibold"> Login </h1>
+                <h1 class="text-3xl block text-center font-semibold">Login</h1>
                 <hr class="mt-3">
                 <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 text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        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>
                 <div class="mt-3">
                     <label for="password" class="block text-base mb-2">Password</label>
                     <input type="password" id="password" name="password"
-                        class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                         placeholder="Enter Password" />
                 </div>
                 <div class="text-red-800 font-bold" id="forgor"> <%= errMessage %></div>
@@ -51,7 +39,6 @@
             </div>
         </form>
     </div>
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+</main>
-</body>
 
-</html>
+<%- include("./partials/footer") %>

src/views/more.ejs

@@ -1,25 +1,10 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
+<%- include("./partials/header") %>
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-    <title>Document</title>
-</head>
 
-<body>
+<main>
-    <%- include("./partials/header") %>
+    The More Page
-    <main>
+</main>
-        The More Page
-    </main>
-    <footer>
-        <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-             </div>
-        </div>
-        <%- include("./partials/navBar") %>
-    </footer>
-</body>
 
-</html>
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
+    

src/views/partials/fileHeader.ejs

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <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>
+    </head>
+    <body class="bg-white dark:bg-gray-900">

src/views/partials/footer.ejs

@@ -0,0 +1,10 @@
+
+<footer>
+    <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>
+</body>
+</html>

src/views/partials/header.ejs

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

src/views/partials/headerStart.ejs

@@ -20,7 +20,7 @@
                         <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>
                     </li>
                     <li>
-                        <a href="/aboutUs" 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">About Us</a>
+                        <a href="/login" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Login</a>
                     </li>
                     <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>

src/views/partials/navBar.ejs

@@ -26,5 +26,4 @@
             <span class="text-gray-500 dark:text-gray-400 text-sm">More</span>
         </a>
     </div>
-</div>
+</div>
-

src/views/plans.ejs

@@ -1,26 +1,9 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
+<%- include("./partials/header") %>
 
-<head>
+<main>
-    <meta charset="UTF-8">
+    The Plans Page
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+</main>
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-    <title>Document</title>
-</head>
 
-<body>
+<%- include("./partials/navBar") %>
-    <%- include("./partials/header") %>
+<%- include("./partials/footer") %>
-    <main>
-        The Plans Page
-    </main>
-    <footer>
-        <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-             </div>
-        </div>
-        <%- include("./partials/navBar") %>
-    </footer>
-</body>
-
-</html>

src/views/questionnaire.ejs

@@ -0,0 +1,91 @@
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>
+
+<main class="container mx-auto p-4">
+    <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.email %></h2>
+    <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
+        <h3 class="text-lg font-medium mb-6">Financial Questionnaire</h3>
+        <form action="/questionnaire" method="post" class="space-y-4">
+            <div>
+                <label for="dob" class="block text-sm font-medium text-gray-700">Date of Birth</label>
+                <input type="date" name="dob" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            <div>
+                <label for="education" class="block text-sm font-medium text-gray-700">Education</label>
+                <select name="education" id="education" class="mt-1 block w-full px-3 py-2 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+                    <option value="primary">Primary (Elementary)</option>
+                    <option value="secondary">Secondary (High School)</option>
+                    <option value="tertiary">Tertiary (College/University)</option>
+                    <option value="postgraduate">Postgraduate (Master's/PhD)</option>
+                </select>
+            </div>
+            <div>
+                <label class="block text-sm font-medium text-gray-700">Marital Status</label>
+                <div class="mt-1 space-x-4">
+                    <label class="inline-flex items-center">
+                        <input type="radio" name="maritalStatus" value="single" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                        <span class="ml-2 text-sm text-gray-700">Single</span>
+                    </label>
+                    <label class="inline-flex items-center">
+                        <input type="radio" name="maritalStatus" value="married" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                            <span class="ml-2 text-sm text-gray-700">Married</span>
+                    </label>
+                        <label class="inline-flex items-center">
+                        <input type="radio" name="maritalStatus" value="divorced" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                            <span class="ml-2 text-sm text-gray-700">Divorced</span>
+                    </label>
+                        <label class="inline-flex items-center">
+                        <input type="radio" name="maritalStatus" value="widowed" class="form-radio h-4 w-4 text-indigo-600 border-gray-300 focus:ring-indigo-500">
+                            <span class="ml-2 text-sm text-gray-700">Widowed</span>
+                    </label>
+                </div>
+            </div>
+            
+            <div>
+                <label for="income" class="block text-sm font-medium text-gray-700">Annual Gross Income</label>
+                <input type="number" name="income" min="0" placeholder="e.g., 50000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            
+            <div>
+                <label for="expenses" class="block text-sm font-medium text-gray-700">Monthly Expenses</label>
+                <input type="number" name="expenses" min="0" placeholder="e.g., 2000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            
+            <div>
+                <label for="assets" class="block text-sm font-medium text-gray-700">Net Worth</label>
+                <input type="number" name="assets" min="0" placeholder="Estimated Net Worth" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            
+            <div>
+                <label for="liabilities" class="block text-sm font-medium text-gray-700">Liabilities</label>
+                <input type="number" name="liabilities" min="0" placeholder="Estimated Liabilities" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+        
+            <div>
+                <label for="retirementAge" class="block text-sm font-medium text-gray-700">Desired Retirement Age</label>
+                <input type="number" name="retirementAge" placeholder="e.g., 65" min="18" max="120" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementExpenses" class="block text-sm font-medium text-gray-700">Estimated Monthly Retirement Expenses</label>
+                <input type="number" name="retirementExpenses" min="0" placeholder="e.g., 3000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementAssets" class="block text-sm font-medium text-gray-700">Estimated Retirement Assets</label>
+                <input type="number" name="retirementAssets" min="0" placeholder="e.g., 500000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementLiabilities" class="block text-sm font-medium text-gray-700">Estimated Retirement Liabilities</label>
+                <input type="number" name="retirementLiabilities" min="0" placeholder="e.g., 50000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            
+            <div>
+                <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Submit Questionnaire</button>
+            </div>
+        </form>
+    </div>
+</main>
+
+<%- include("./partials/footer") %>

src/views/signup.ejs

@@ -1,37 +1,32 @@
-<!DOCTYPE html>
+<%- include("./partials/fileHeader") %>
-<html lang="en">
+<%- include("./partials/headerStart") %>
 
-<head>
+<main>
-    <meta charset="UTF-8">
+    <div class="flex justify-center items-center h-screen">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Signup</title>
-    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"
-        integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" />
-</head>
-
-<body>
-    <div class="flex justify-center items-center h-screen bg-gray-700">
         <form action="/signup" method="POST">
             <div class="w-96 p-6 shadow-1g bg-white rounded-md">
-                <h1 class="text-3xl block text-center font-semibold"> Signup </h1>
+                <h1 class="text-3xl block text-center font-semibold">Signup</h1>
                 <hr class="mt-3">
+                <div class="mt-3">
+                    <label for="name" class="block text-base mb-2">Name</label>
+                    <input type="text" id="name" name="name"
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        placeholder="Enter Name" />
+                </div>
                 <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 text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        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>
                 <div class="mt-3">
                     <label for="password" class="block text-base mb-2">Password</label>
                     <input type="password" id="password" name="password"
-                        class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                         placeholder="Enter Password" />
                     <label for="password" class="block text-base mb-2 mt-3">Re-type Password</label>
                     <input type="password" id="repassword" name="repassword"
-                        class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                        class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
                         placeholder="Enter Password" />
                 </div>
                 <div class="text-red-800 font-bold " id="forgor"> <%= errMessage %></div>
@@ -46,7 +41,6 @@
             </div>
         </form>
     </div>
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+</main>
-</body>
 
-</html>
+<%- include("./partials/footer") %>

src/views/template.ejs

@@ -0,0 +1,9 @@
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>
+
+<main>
+    <!-- Your content here -->
+</main>
+
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>