feature/ calculations done, being displayed dynamically in the plan card

Fix/plan detail padding

app.js

@@ -70,8 +70,18 @@ app.get('/login', (req, res) => {
 });
 
 app.get('/aboutUs', (req, res) => {
-    res.render('aboutUs');
+    if (!req.session.authenticated) {
-    return res.status(status.Ok);
+        res.render('aboutUs', {
+            geoData: undefined
+        });
+        return res.status(status.Ok);
+    } else {
+        res.render('aboutUs', {
+            user: req.session.user,
+            geoData: req.session.geoData
+        });
+        return res.status(status.Ok);
+    }
 });
 
 app.get('/forgotPassword', (req, res) => {

src/public/scripts/footer.js

@@ -3,6 +3,13 @@ const factMenu = document.getElementById("factMenu");
 const factInput = document.getElementById("factInput");
 const factSubmitButton = document.getElementById("factSubmitButton");
 
+var path = window.location.pathname;
+var page = path.split("/").pop();
+
+if(page !== "login" && page !== "signup" && page !== "forgotPassword" && page !== "") {
+    factButton.classList.remove("hidden");
+}
+
 factButton.addEventListener("click", () => {
     factMenu.classList.toggle("hidden");
 });
@@ -25,3 +32,39 @@ factSubmitButton.addEventListener("click", () => {
         Swal.fire('Error fetching fact', 'Please try again later', 'error');
     });
 });
+
+document.addEventListener("DOMContentLoaded", () => {
+    const drawer = document.getElementById("drawer-navigation");
+    const toggle = document.getElementById("drawer-toggle");
+
+    function openDrawer() {
+        drawer.classList.remove("translate-x-full");
+
+        // Add backdrop
+        const backdrop = document.createElement("div");
+        backdrop.className = "fixed inset-0 bg-gray-900/50 z-30 drawer-backdrop";
+        document.body.appendChild(backdrop);
+
+        // Optional: prevent scroll
+        document.body.classList.add("overflow-hidden");
+
+        backdrop.addEventListener("click", closeDrawer);
+    }
+
+    function closeDrawer() {
+        drawer.classList.add("translate-x-full");
+
+        const backdrop = document.querySelector(".drawer-backdrop");
+        if (backdrop) backdrop.remove();
+
+        document.body.classList.remove("overflow-hidden");
+    }
+
+    toggle.addEventListener("click", openDrawer);
+
+    // Also close on X button if needed
+    const closeBtn = drawer.querySelector("[data-drawer-hide]");
+    if (closeBtn) {
+        closeBtn.addEventListener("click", closeDrawer);
+    }
+});

src/router/user.js

@@ -1,5 +1,5 @@
 const getRates = require("../util/exchangeRate");
-const { calculatePlanProgress, updatePlanProgressInDB } = require("../util/calculations");
+const { calculateProgress, updatePlanProgressInDB } = require("../util/calculations");
 const suggestions = require("../util/suggestions");
 const status = require("../util/statuses");
 const ObjectId = require('mongodb').ObjectId;
@@ -86,10 +86,19 @@ module.exports = (middleware, users, plans, assets) => {
                 toCurrencyRates: [],
             };
         }
-        let planSchema = await plans.find({ userId: new ObjectId(user) }).project({
+        const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
-            name: 1, retirementAssets: 1, progress: 1, _id: 1,
+
-        }).toArray();
+        for (const plan of userPlansFromDB) {
-        res.render('dashboard', { user: req.user, geoData: req.session.geoData, plans: planSchema, });
+            const progress = await calculateProgress(plan, assets, users, req.session.user._id);
+            await updatePlanProgressInDB(plan._id, progress.percentage, plans);
+        }
+
+        const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
+
+        res.render('dashboard', { 
+            user: req.session.user,
+            geoData: req.session.geoData,
+            plans: updatedUserPlans, });
 
         return res.status(status.Ok);
     });
@@ -111,8 +120,8 @@ module.exports = (middleware, users, plans, assets) => {
             const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
 
             for (const plan of userPlansFromDB) {
-                const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
+                const progress = await calculateProgress(plan, assets, users, req.session.user._id);
-                await updatePlanProgressInDB(plan._id, percentage, plans);
+                await updatePlanProgressInDB(plan._id, progress.percentage, plans);
             }
 
             const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
@@ -148,12 +157,15 @@ module.exports = (middleware, users, plans, assets) => {
                 req.session.errMessage = "Plan not found or you do not have permission to view it.";
                 return res.status(status.NotFound).redirect('/plans');
             }
+            const progress = await calculateProgress(plan, assets, users, req.session.userId);
+
 
             res.render('planDetail', {
                 user: req.session.user,
                 plan: plan,
                 geoData: req.session.geoData,
                 assets: userAssets,
+                progress: progress,
                 suggestions: await suggestions.generateSuggestions(),
             });
 

src/util/calculations.js

@@ -42,4 +42,72 @@ async function updatePlanProgressInDB(planId, percentage, plans) {
     }
 }
 
-module.exports = { calculatePlanProgress, updatePlanProgressInDB };
+
+async function calculateProgress(plan, assets, users, userId) {
+    if (!plan || typeof plan !== 'object') {
+        console.error("Error with the plan");
+        return;
+    }
+    if (!assets || typeof assets.find !== 'function') {
+        console.error("Error with the assets collection");
+        return;
+    }
+    if (!users || typeof users.findOne !== 'function') {
+        console.error("Error with the users collection");
+        return;
+    }
+    if (!userId) {
+        console.error("No user ID provided");
+        return;
+    }
+
+    try {
+        const userAssets = await assets.find({ userId: new ObjectId(userId) }).toArray();
+        const totalUserAssetValue = userAssets.reduce((total, asset) => total + asset.value, 0);
+        const totalUserPlanValue = plan.retirementAssets;
+        
+        const userDoc = await users.findOne({ _id: new ObjectId(userId) });
+        if (!userDoc || !userDoc.dob) {
+            console.error("User document or DOB not found for userId:", userId);
+            return { monthlyInvestment: NaN, totalCostOfRetirement: NaN, monthsUntilRetirement: NaN, yearsRetired: NaN, percentage: NaN };
+        }
+        const userDob = new Date(userDoc.dob);
+
+        if (isNaN(userDob.getTime())) {
+            console.error("userDob is an invalid date. Aborting calculation.");
+            return { monthlyInvestment: NaN, totalCostOfRetirement: NaN, monthsUntilRetirement: NaN, yearsRetired: NaN, percentage: NaN };
+        }
+
+        const today = new Date();
+        const userUnalivedBy = new Date(userDob);
+        userUnalivedBy.setFullYear(userUnalivedBy.getFullYear() + 90);
+        const yearOfRetirement = userDob.getFullYear() + plan.retirementAge;
+        const monthsUntilRetirement = (yearOfRetirement - today.getFullYear()) * 12;
+        const yearsRetired = userUnalivedBy.getFullYear() - yearOfRetirement;
+        
+        const totalCostOfRetirement = ((plan.retirementExpenses + plan.retirementLiabilities) * 12) * yearsRetired;
+        
+        const monthlyInvestment = (totalUserPlanValue - totalUserAssetValue + totalCostOfRetirement) / monthsUntilRetirement;
+        
+        const percentageCalculated = (totalUserAssetValue / (totalUserPlanValue + totalCostOfRetirement)) * 100;
+        
+        const progress = {};
+
+        progress.monthlyInvestment = Math.round(monthlyInvestment);
+        progress.totalCostOfRetirement = totalCostOfRetirement;
+        progress.monthsUntilRetirement = monthsUntilRetirement;
+        progress.yearsRetired = yearsRetired;
+        progress.yearsUntilRetirement = (yearOfRetirement - today.getFullYear());
+        progress.percentage = percentageCalculated;
+        
+        return progress;
+
+    } catch (err) {
+        console.error("Error in calculateProgress:", err);
+        return;
+    }
+}
+    
+
+
+module.exports = { calculatePlanProgress, updatePlanProgressInDB, calculateProgress};

src/views/aboutUs.ejs

@@ -1,7 +1,12 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
 
-<main>
+<% if (!geoData) { %>
+    <%- include("./partials/headerStart") %>
+<% } else { %>
+    <%- include("./partials/header") %>
+<% } %>
+
+<main class="pt-24 pb-16">
     <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>
@@ -25,15 +30,23 @@
                 </p>
             </div>
         </div>
-        <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
+
-            <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+        <% if (!geoData) { %>
-                Get started
+            <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
+                <a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
+                    Get started
-                </svg>
+                    <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
-            </a>
+                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
-        </div>
+                    </svg>
+                </a>
+            </div>
+        <% } %>
     </section>
 </main>
 
+<% if (!geoData) { %>
+<% } else { %>
+    <%- include("./partials/navBar") %>
+<% } %>
+
 <%- include("./partials/footer") %>

src/views/assets.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
+<main class="pt-26">
     <%- include("./partials/createAsset", { icons: icons }) %>
 
     <% if (errMessage != "") { %>

src/views/dashboard.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
     <%- include("./partials/header") %>
 
-        <main class="">
+        <main class="pt-24 pb-14">
             <!-- Buttons -->
             <div class="flex justify-end gap-4 px-5 py-6">
                 <a href="/assets?popup"
@@ -11,15 +11,17 @@
                     class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
                     type="button">Create new plan </a>
             </div>
-            <div class="flex justify-center">
+            <div class="flex justify-center sm:px-6 w-full ">
-                <div class="mb-12 grid gap-y-4 gap-x-6 md:grid-cols-2 mr-3 ml-3 ">
+                <div class="mb-12  grid gap-y-4 gap-x-6 md:grid-cols-2  ">
                     <% plans.forEach(plan=> { %>
                         <%- include('./partials/dashboardBox.ejs', {plan: plan}) %>
                             <% }); %>
                 </div>
             </div>
         </main>
+
+        <script src="/static/scripts/dollarFormat.js"></script>
+
         <%- include("./partials/navBar") %>
             <%- include("./partials/scriptLoader") %>
                 <%- include("./partials/footer") %>
-                    <script src="/static/scripts/dollarFormat.js"></script>

src/views/forgotPass.ejs

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

src/views/login.ejs

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

src/views/more.ejs

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

src/views/newPlan.ejs

@@ -1,8 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-30">
-    <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">

src/views/partials/dashboardBox.ejs

@@ -1,7 +1,7 @@
 <div class="mt-12">
     <a href="/plans/<%=plan._id%>">
-        <div class=" relative flex flex-col bg-clip-border  rounded-xl bg-white text-gray-700 shadow-md w-full min-h-[150px] min-w-[500px] 
+        <div class=" relative flex flex-col bg-clip-border  rounded-xl bg-white text-gray-700 shadow-md w-full min-h-[130px] min-w-[340px] 
-        md:min-h-[220px] ">
+        md:min-h-[220px] md:min-w-[500px]">
             <!-- <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> -->
@@ -15,17 +15,18 @@
                 </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">
                 <div class="float-left font-bold">
-                    Status bar:
+                    <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
+                        Status bar:
+                    </p>
                 </div>
                 <strong class="text-green-500">
                     <div class="float-right mb-2">
-                        <%=Math.floor(plan.progress) %>% complete
+                        <%=Math.floor(plan.progress) > 100 ? 100 : Math.floor(plan.progress) %>% complete
                     </div>
                     <div class="bg-gray-400 mt-7">
                         <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500"
-                            style="width: <%= plan.progress %>%;"></div>
+                            style="width: <%= plan.progress > 100 ? 100 : plan.progress %>%;"></div>
 
                     </div>
             </div>

src/views/partials/fileHeader.ejs

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

src/views/partials/footer.ejs

@@ -6,22 +6,23 @@
                 <button type="button" id="factSubmitButton" class="mt-3 w-full px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 dark:focus:ring-offset-gray-700">Submit</button>
             </div>
         </div>
-        <button type="button" id="factButton" class="flex items-center justify-center text-white bg-blue-700 rounded-full w-14 h-14 hover:bg-blue-800 dark:bg-blue-600 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 focus:outline-none dark:focus:ring-blue-800">
+        <button type="button" id="factButton" class="flex items-center justify-center text-white bg-blue-700 rounded-full w-14 h-14 hover:bg-blue-800 dark:bg-blue-600 dark:hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 focus:outline-none dark:focus:ring-blue-800 hidden">
             <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"></path></svg>
             <span class="sr-only">Get a Fact</span>
         </button>
     </div>
 
     <footer class="mt-16">
-        <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
+        <div class="fixed bottom-0 left-0 z-30 hidden lg:block w-full h-16 bg-gray-800 border-t border-gray-700 p-6 text-center text-gray-400 text-sm">
             <div class="container mx-auto">
                 <p>&copy; 2025 RCalculator. All rights reserved.</p>
             </div>
         </div>
     </footer>
     
+    <script src="/static/scripts/footer.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/flowbite@3.1.2/dist/flowbite.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-    <script src="/static/scripts/footer.js"></script>
+    
 </body>
 </html>

src/views/partials/header.ejs

@@ -1,8 +1,8 @@
 
 <header>
-    <nav class="bg-gray-800 border-b border-gray-700">
+    <nav class="fixed bg-gray-800 border-b border-gray-700 z-30">
-        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+        <div class="w-screen flex flex-col md:flex-row flex-wrap items-center justify-between p-3">
-            <a href="/home" class="flex items-center space-x-3 rtl:space-x-reverse">
+            <a href="/home" class="flex xl:w-[320px] items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
                 <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>
             </a>
@@ -16,13 +16,13 @@
                     <span class="sr-only">Loading...</span>
                 </div>
                 
-                <div style="display: none;" class="flex items-center" id="currencyExchange">
+                <div style="display: none;" class="flex items-center pt-2 md:pt-0 lg:pt-0" id="currencyExchange">
-                    <div id="exFrom" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div id="exFrom" class="shrink-0 z-10 inline-flex w-[115px] items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
                         <img src="" id="yourFlag" class="h-4 w-4 me-2" alt="">
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
                         </p>
                     </div>
                     <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
@@ -32,7 +32,7 @@
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
                         </svg>
                     </button>
-                    <div id="dropdown-country" class="overflow-y-auto h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
+                    <div id="dropdown-country" class="overflow-y-auto w-[115px] h-40 z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow-sm w-32 dark:bg-gray-700">
                         <ul id="dropdown" class="py-2 text-sm text-gray-700 dark:text-gray-200" aria-labelledby="dropdown-country-button">
 
                         </ul>
@@ -41,17 +41,17 @@
             <% } else if(geoData.message == "error") { %>
                 <p>error</p>
             <% } else { %>
-                <div class="flex items-center">
+                <div class="flex items-center pt-2 md:pt-0 lg:pt-0">
-                    <div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
+                    <div class="shrink-0 z-10 w-[115px] inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
                         <img src="/static/svgs/flags/<%= geoData.country %>.svg" id="yourFlag" class="h-4 w-4 me-2" alt="<%= geoData.country %>"> (<%= geoData.country %>)
                         <p id="flagTag"></p>
                     </div>
                     <div class="relative w-full">
-                        <p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
+                        <p id="exchange" class="block text-center p-2.5 w-35 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
                             $1.00 = $<%= (1 * geoData.toCurrencyRates["USD"]).toFixed(2) %>
                         </p>
                     </div>
-                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
+                    <button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 w-[115px] z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
                         <img src="/static/svgs/flags/USD.svg" class="h-4 w-4 me-2" alt="USD"> (USD)
                         <svg class="w-2.5 h-2.5 ms-2.5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
                             <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
@@ -73,25 +73,77 @@
                     </div>
                 </div>
             <% } %>
-            <div class="hidden w-full lg:block lg:w-auto" id="navbar-solid-bg">
+            <div class="hidden w-full lg:block lg:w-[320px]" id="navbar-solid-bg">
                 <ul class="flex flex-col font-medium mt-4 rounded-lg bg-gray-50 lg:space-x-8 rtl:space-x-reverse lg:flex-row lg:mt-0 lg:border-0 lg:bg-transparent dark:bg-gray-800 lg:dark:bg-transparent dark:border-gray-700">
-                    <li>
+                    <li class="flex items-center justify-center">
-                        <a href="/home" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Dashboard</a>
+                        <a href="/home" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Dashboard</a>
+                    </li>
+                    <li class="flex items-center justify-center">
+                        <a href="/assets" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Assets</a>
+                    </li>
+                    <li class="flex items-center justify-center">
+                        <a href="/plans" class="block w-full text-center py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Plans</a>
                     </li>
                     <li>
-                        <a href="/assets" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Assets</a>
+                        <div class="text-center">
-                    </li>
+                            <button class="flex flex-row text-white hover:bg-blue-700 focus:ring-4 focus:ring-blue-300 font-medium rounded-full text-sm focus:outline-none dark:focus:ring-blue-800" type="button" id="drawer-toggle" data-drawer-target="drawer-navigation" data-drawer-placement="right" aria-controls="drawer-navigation">
-                    <li>
+                                <svg class="w-[30px] h-[30px] text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-                        <a href="/plans" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Plans</a>
+                                    <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
-                    </li>
+                                </svg>
-                    <li>
+                                <svg class="w-[30px] h-[30px] text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
-                        <a href="/more" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">More</a>
+                                    <path stroke="currentColor" stroke-linecap="round" stroke-width="2" d="M5 7h14M5 12h14M5 17h14"/>
-                    </li>
+                                </svg>
-                    <li>
+
-                        <a href="/logout" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Logout</a>
+                            </button>
+                        </div>
                     </li>
                 </ul>
             </div>
+
+            <!-- drawer component -->
         </div>
     </nav>
+    <div id="drawer-navigation" class="lg:block fixed top-0 right-0 z-60 w-64 h-screen p-4 overflow-y-auto transition-transform translate-x-full bg-white dark:bg-gray-800" tabindex="-1" aria-labelledby="drawer-navigation-label">
+        <h5 id="drawer-navigation-label" class="text-base font-semibold text-gray-500 uppercase dark:text-gray-400"><%= user.name %></h5>
+        <button type="button" data-drawer-hide="drawer-navigation" aria-controls="drawer-navigation" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 absolute top-2.5 end-2.5 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 menu</span>
+        </button>
+        <div class="">
+            <div class="w-full pt-5 pl-2.5">
+                <a href="/logout" class="text-white bg-blue-700 hover:bg-blue-800 focus:outline-none focus:ring-4 focus:ring-blue-300 font-medium rounded-full text-sm px-20 py-2.5 text-center me-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">
+                    Logout
+                </a>
+            </div>
+        </div>
+        <div class="py-4 overflow-y-auto">
+            <ul class="space-y-2 font-medium">
+                <li>
+                    <a href="/profile" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
+                    <svg class="w-5 h-5 text-gray-500 dark:text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
+                        <path fill-rule="evenodd" d="M12 20a7.966 7.966 0 0 1-5.002-1.756l.002.001v-.683c0-1.794 1.492-3.25 3.333-3.25h3.334c1.84 0 3.333 1.456 3.333 3.25v.683A7.966 7.966 0 0 1 12 20ZM2 12C2 6.477 6.477 2 12 2s10 4.477 10 10c0 5.5-4.44 9.963-9.932 10h-.138C6.438 21.962 2 17.5 2 12Zm10-5c-1.84 0-3.333 1.455-3.333 3.25S10.159 13.5 12 13.5c1.84 0 3.333-1.455 3.333-3.25S13.841 7 12 7Z" clip-rule="evenodd"/>
+                    </svg>
+                    <span class="ms-3">Profile</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="/settings" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
+                    <svg class="w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
+                        <path d="M16.975 11H10V4.025a1 1 0 0 0-1.066-.998 8.5 8.5 0 1 0 9.039 9.039.999.999 0 0 0-1-1.066h.002Z"/>
+                        <path d="M12.5 0c-.157 0-.311.01-.565.027A1 1 0 0 0 11 1.02V10h8.975a1 1 0 0 0 1-.935c.013-.188.028-.374.028-.565A8.51 8.51 0 0 0 12.5 0Z"/>
+                    </svg>
+                    <span class="ms-3">Settings</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="aboutUs" class="flex items-center p-2 text-gray-900 rounded-lg dark:text-white hover:bg-gray-100 dark:hover:bg-gray-700 group">
+                    <svg class="shrink-0 w-5 h-5 text-gray-500 transition duration-75 dark:text-gray-400 group-hover:text-gray-900 dark:group-hover:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">
+                        <path d="M14 2a3.963 3.963 0 0 0-1.4.267 6.439 6.439 0 0 1-1.331 6.638A4 4 0 1 0 14 2Zm1 9h-1.264A6.957 6.957 0 0 1 15 15v2a2.97 2.97 0 0 1-.184 1H19a1 1 0 0 0 1-1v-1a5.006 5.006 0 0 0-5-5ZM6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Z"/>
+                    </svg>
+                    <span class="flex-1 ms-3 whitespace-nowrap">About Us</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
 </header>

src/views/partials/headerStart.ejs

@@ -1,6 +1,6 @@
 <header>
     <nav class="bg-gray-800 border-b border-gray-700">
-        <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+        <div class="w-screen flex flex-wrap items-center justify-between p-4">
             <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
                 <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png" class="h-8" alt="Flowbite Logo" />
                 <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">RCalculator</span>

src/views/partials/navBar.ejs

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

src/views/planDetail.ejs

@@ -1,10 +1,8 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-lg mx-auto 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>
@@ -12,10 +10,17 @@
         <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>
+                <span class="text-sm font-medium text-blue-700 dark:text-blue-400"><%-plan.progress > 100 ? 100 : plan.progress%>%</span>
             </div>
             <div class="w-full bg-gray-200 rounded-full h-3 dark:bg-gray-700">
-                <div class="bg-blue-600 h-3 rounded-full dark:bg-blue-500" style="width: <%= plan.progress %>%;"></div>
+                <div class="bg-blue-600 h-3 rounded-full dark:bg-blue-500" style="width: <%= plan.progress > 100 ? 100 : plan.progress %>%;"></div>
+            </div>
+        </div>
+
+        <div>
+            <div class="flex justify-between mb-1">
+                <span class="text-sm font-medium text-blue-700 dark:text-blue-400">Calculated Monthly Investment</span>
+                <span class="text-sm font-medium text-blue-700 dark:text-blue-400"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.monthlyInvestment > 0 ? progress.monthlyInvestment : 0) %></span>
             </div>
         </div>
 
@@ -29,7 +34,7 @@
                 </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"><%= assets.reduce((total, asset) => total + asset.value, 0) %></p>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(assets.reduce((total, asset) => total + asset.value, 0)) %></p>
                 </div>
             </div>
         </div>
@@ -43,16 +48,32 @@
                     <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>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Monthly Expenses (Minus Liabilities):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementExpenses %></p>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementExpenses) %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Assets:</label>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Assets (Total):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementAssets %></p>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementAssets) %></p>
                 </div>
                 <div>
-                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Liabilities:</label>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Target Retirement Liabilities (Monthly):</label>
-                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%= plan.retirementLiabilities %></p>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(plan.retirementLiabilities) %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Years Until Retirement:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- progress.yearsUntilRetirement %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Years Retired:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- progress.yearsRetired %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Total Cost of Retirement:</label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.totalCostOfRetirement) %></p>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-600 dark:text-gray-400">Total amount needed (Assets + Retirement Expenses): </label>
+                    <p class="mt-1 text-md text-gray-900 dark:text-white"><%- new Intl.NumberFormat('en-US', { style: 'currency', currency: geoData.currency ? geoData.currency : 'CAD' }).format(progress.totalCostOfRetirement + progress.monthlyInvestment * progress.monthsUntilRetirement) %></p>
                 </div>
             </div>
         </div>

src/views/plans.ejs

@@ -1,8 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.name %></h2>
     <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md space-y-4">
         <h3 class="text-lg font-medium mb-6">My Retirement Plans</h3>
         <a href="/newPlan" class="block max-w-sm p-2"><div class="text-center bg-blue-600 text-white py-1 w-full rounded-md hover:bg-blue-700 hover:text-white font-semibold">New Plan</div></a>
@@ -11,7 +10,7 @@
             <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-black rounded-full h-2.5 mb-4 dark:bg-black">
-                    <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500" style="width: <%= plan.progress %>%;"></div>
+                    <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500" style="width: <%= plan.progress > 100 ? 100 : plan.progress %>%;"></div>
                 </div>
                 <p class="font-normal text-gray-700 dark:text-gray-400"><%= plan.description %></p>
             </a>

src/views/profile.ejs

@@ -1,7 +1,7 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main>
+<main class="pt-24">
     <!-- Confirm delete account modal -->
     <dialog id="delete-warning-modal" class="w-lg mx-auto bg-transparent p-8 mt-10 rounded-lg shadow-md">
         <div class="relative p-4 w-full max-w-md h-full md:h-auto">

src/views/questionnaire.ejs

@@ -1,8 +1,8 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main class="container mx-auto p-4 pt-28">
-    <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.name %></h2>
+    <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">Financial Questionnaire</h3>
         <form action="/questionnaire" method="post" class="space-y-4">

src/views/signup.ejs

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