Merge branch 'dev' of github.com:JoaquinPar/2800-202510-BBY14 into dev

2025-05-09 10:07:16 -07:00
commit 18bee21941
@@ -0,0 +1,68 @@
+const express = require('express');
+const crypto = require('crypto');
+const joi = require('joi');
+const nodeMail = require('nodemailer');
+require('dotenv').config();
+
+const transporter = nodeMail.createTransport({
+    service: 'gmail',
+    auth: {
+        user: process.env.EMAIL_USER,
+        pass: process.env.PASS,
+    }
+});
+// users info
+module.exports = (users) => {
+    const router = express.Router();
+
+    router.post('/auth/resetPass', async (req, res) => {
+        console.log("we are inside of the post");
+        const resetSchema = joi.object({
+            email: joi.string().email().required(),
+        });
+        req.session.error = '';
+        req.session.reset = '';
+
+        const valid = resetSchema.validate(req.body);
+        if (valid.error) {
+            req.session.error = 'invalid email';
+            return res.redirect('/forgotPassword')
+        }
+        const { email } = req.body;
+        const user = await users.findOne({ email });
+
+        if (!user) {
+            req.session.error = 'No user found'
+            return res.redirect('/forgotPassword');
+        }
+
+        const token = crypto.randomBytes(32).toString('hex');
+        console.log(`The reset token is ${token}`)
+        const expiration = Date.now() + 360000;
+
+        await users.updateOne({ email }, {
+            $set: { resetToken: token, resetTokenExpires: expiration }
+        });
+
+        const resetUrl = `http://localhost:3000/reset/${token}`;
+
+        const mailSend = {
+            from: process.env.EMAIL_USER,
+            to: email,
+            subject: 'Password reset',
+            text: `reset your password here ${resetUrl}   this link will expire within 1 hour`,
+
+        };
+
+        try {
+            await transporter.sendMail(mailSend);
+            req.session.reset = 'Reset link sent Check your email';
+            res.redirect('/forgotPassword');
+        } catch (err) {
+            console.log('there was an error', err);
+            res.status(500).send('email failed to send try again');
+        }
+    });
+    return router;
+}
+
@@ -86,7 +86,7 @@ module.exports = (middleware, users, plans, assets) => {

    router.get('/assets', async (req, res) => {
        let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
-        res.render('assets', { 
+        res.render('assets', {
            user: req.session.user,
            errMessage: req.session.errMessage,
            assets: userAssets,
@@ -98,14 +98,14 @@ module.exports = (middleware, users, plans, assets) => {

    router.get('/plans', async (req, res) => {
        try {
-            const userPlansFromDB = await plans.find({userId: new ObjectId(req.session.user._id) }).toArray();
-            
+            const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
+
            // Use a for...of loop for proper async/await behavior in series for updates
            for (const plan of userPlansFromDB) {
                const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
                await updatePlanProgressInDB(plan._id, percentage, plans); // Pass the 'plans' collection
            }
-            
+
            // Re-fetch plans to get updated progress for rendering
            const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();

@@ -122,12 +122,12 @@ module.exports = (middleware, users, plans, assets) => {
    });

    router.get('/plans/:id', async (req, res) => {
-    
+
        try {
            const planId = req.params.id;
            let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
-        
-            
+
+
            if (!ObjectId.isValid(planId)) {
                req.session.errMessage = "Invalid plan ID format.";
                return res.status(status.BadRequest).redirect('/plans');
@@ -140,7 +140,7 @@ 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');
            }
-            
+
            // The plan.progress should be up-to-date from the database as it was updated in the /plans route
            // or when assets/plans are modified. If an immediate recalculation for this specific view is absolutely needed,
            // (e.g., if assets were modified without an immediate plan progress update elsewhere),
@@ -148,13 +148,13 @@ module.exports = (middleware, users, plans, assets) => {
            // const currentProgress = await calculatePlanProgress(plan, assets, req.session.user._id);
            // plan.progress = currentProgress; // This would only update the 'plan' object for this render, not in DB

-            res.render('planDetail', { 
+            res.render('planDetail', {
                user: req.session.user,
                plan: plan, // This plan object will have the progress from the database
                geoData: req.session.geoData,
                assets: userAssets,
            });
-    
+
        } catch (err) {
            console.error("Error fetching plan:", err);
            req.session.errMessage = "Could not load your plan. Please try again.";
@@ -163,13 +163,13 @@ module.exports = (middleware, users, plans, assets) => {
    });

    router.get('/newPlan', (req, res) => {
-        if(!req.session.user.financialData){
+        if (!req.session.user.financialData) {
            req.session.errMessage = "Please complete your financial data before creating a plan.";
            return res.status(status.Unauthorized).redirect('/questionnaire');
        }
        const errMessage = req.session.errMessage;
-        req.session.errMessage = ""; 
-        res.render('newPlan', { 
+        req.session.errMessage = "";
+        res.render('newPlan', {
            user: req.session.user,
            errMessage: errMessage,
            geoData: req.session.geoData
@@ -185,14 +185,14 @@ module.exports = (middleware, users, plans, assets) => {
            retirementLiabilities: joi.number().min(0).required(),
        });

-        const validationOptions = { convert: true, abortEarly: false }; 
+        const validationOptions = { convert: true, abortEarly: false };
        const { error, value } = planSchema.validate(req.body, validationOptions);

-        if (error) { 
+        if (error) {
            console.error("Plan validation error:", error.details);
-            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', '); 
-            res.status(status.BadRequest).redirect("/newPlan"); 
-            return; 
+            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
+            res.status(status.BadRequest).redirect("/newPlan");
+            return;
        }
        const newPlan = {
            userId: new ObjectId(req.session.user._id),
@@ -204,12 +204,12 @@ module.exports = (middleware, users, plans, assets) => {
            progress: "0"
        };

-        try{
-            await plans.insertOne({userId: new ObjectId(req.session.user._id), ...newPlan});
-            req.session.errMessage = ""; 
-            res.redirect('/plans'); 
+        try {
+            await plans.insertOne({ userId: new ObjectId(req.session.user._id), ...newPlan });
+            req.session.errMessage = "";
+            res.redirect('/plans');
        }
-        catch(err){
+        catch (err) {
            console.error("Error saving plan:", err);
            req.session.errMessage = "An error occurred while saving your plan. Please try again.";
            res.status(status.InternalServerError).redirect("/newPlan");
@@ -217,7 +217,7 @@ module.exports = (middleware, users, plans, assets) => {
    });

    router.get('/more', (req, res) => {
-        res.render('more', { 
+        res.render('more', {
            user: req.session.user,
            geoData: req.session.geoData
        });
@@ -225,7 +225,7 @@ module.exports = (middleware, users, plans, assets) => {
    });

    router.get('/profile', (req, res) => {
-        res.render('profile', { 
+        res.render('profile', {
            user: req.session.user,
            errMessage: req.session.errMessage,
            geoData: req.session.geoData
@@ -234,7 +234,7 @@ module.exports = (middleware, users, plans, assets) => {
    });

    router.get('/settings', (req, res) => {
-        res.render('settings', { 
+        res.render('settings', {
            user: req.session.user,
            geoData: req.session.geoData
        });
@@ -243,15 +243,15 @@ module.exports = (middleware, users, plans, assets) => {

    router.get('/questionnaire', (req, res) => {
        const errMessage = req.session.errMessage;
-        req.session.errMessage = ""; 
-        res.render('questionnaire', { 
+        req.session.errMessage = "";
+        res.render('questionnaire', {
            user: req.session.user,
            errMessage: errMessage,
            geoData: req.session.geoData
        });
    });

-    router.post('/questionnaire', (req, res) => {  
+    router.post('/questionnaire', (req, res) => {
        const questionnaireSchema = joi.object({
            dob: joi.date().required(),
            education: joi.string().valid('primary', 'secondary', 'tertiary', 'postgraduate').required(),
@@ -261,22 +261,22 @@ module.exports = (middleware, users, plans, assets) => {
            assets: joi.number().min(0).required(),
            liabilities: joi.number().min(0).required(),
        });
-    
-        const validationOptions = { convert: true, abortEarly: false }; 
+
+        const validationOptions = { convert: true, abortEarly: false };
        const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
-    
-        if (error) { 
+
+        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; 
+            req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
+            res.status(status.BadRequest).redirect("/questionnaire");
+            return;
        }
-    
-        users.updateOne( 
-            { _id: new ObjectId(req.session.user._id) }, 
-            { 
-                $set: { 
-                    financialData: true, 
+
+        users.updateOne(
+            { _id: new ObjectId(req.session.user._id) },
+            {
+                $set: {
+                    financialData: true,
                    dob: value.dob,
                    education: value.education,
                    maritalStatus: value.maritalStatus,
@@ -284,27 +284,27 @@ module.exports = (middleware, users, plans, assets) => {
                    expenses: value.expenses,
                    assets: value.assets,
                    liabilities: value.liabilities,
-                } 
+                }
            }
-        ).then((result) => { 
+        ).then((result) => {
            if (result.matchedCount === 0) {
                console.log(`User not found during questionnaire update: ${req.session.user.email}`);
-                req.session.errMessage = "User session invalid. Please log in again."; 
-                res.status(status.NotFound).redirect("/login"); 
+                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.user.email}`);
            }
-        
+
            req.session.user.financialData = true;
-            req.session.errMessage = ""; 
-            res.status(status.Ok).redirect("/home"); 
-    
-        }).catch(err => { 
+            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"); 
+            res.status(status.InternalServerError).redirect("/questionnaire");
        });
    });

@@ -320,7 +320,7 @@ module.exports = (middleware, users, plans, assets) => {

        if (valid.err) {
            req.session.errMessage = "Invalid input",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
            return res.redirect("/profile");
        }

@@ -343,20 +343,20 @@ module.exports = (middleware, users, plans, assets) => {
        ).then((result) => {
            if (result.matchedCount === 0) {
                console.log(`User not found during account update: ${req.session.email}`);
-                req.session.errMessage = "User session invalid. Please log in again."; 
-                res.status(status.NotFound).redirect("/login"); 
+                req.session.errMessage = "User session invalid. Please log in again.";
+                res.status(status.NotFound).redirect("/login");
                return;
            }
            if (result.modifiedCount === 0 && result.matchedCount === 1) {
                console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
            }
-        
-            req.session.errMessage = ""; 
-            return res.status(status.Ok).redirect("/profile"); 
-        }).catch(err => { 
+
+            req.session.errMessage = "";
+            return res.status(status.Ok).redirect("/profile");
+        }).catch(err => {
            console.error("Error updating account in database:", err);
            req.session.errMessage = "An error occurred while saving your information. Please try again.";
-            return res.status(status.InternalServerError).redirect("/profile"); 
+            return res.status(status.InternalServerError).redirect("/profile");
        });
    });

@@ -375,7 +375,7 @@ module.exports = (middleware, users, plans, assets) => {

        if (valid.err) {
            req.session.errMessage = "Invalid input",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
            return res.redirect("/assets");
        }

@@ -402,7 +402,7 @@ module.exports = (middleware, users, plans, assets) => {
            }
        });

-        req.session.errMessage = ""; 
+        req.session.errMessage = "";
        return res.status(status.Ok).redirect("/assets");
    });

@@ -415,18 +415,18 @@ module.exports = (middleware, users, plans, assets) => {
            req.session.errMessage = "Invalid input";
            return res.status(status.BadRequest).redirect("/assets");
        }
-        
+
        const valid = assetSchema.validate(req.body);

        if (valid.err) {
            req.session.errMessage = "Invalid input",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
            return res.redirect("/assets");
        }

        if (req.body.userId != req.session.user._id) {
            req.session.errMessage = "Cannot change asset owner",
-            res.status(status.BadRequest);
+                res.status(status.BadRequest);
            return res.redirect("/assets");
        }

@@ -440,11 +440,11 @@ module.exports = (middleware, users, plans, assets) => {
        update.value = parseFloat(update.value);
        delete update.id;
        delete update.userId;
-        
+
        assets.updateOne(
            { "_id": new ObjectId(req.body.id) },
            { $set: update },
-        ).then((result) => { 
+        ).then((result) => {
            if (result.matchedCount === 0) {
                console.log(`Asset not found: ${req.body.id}`);
                req.session.errMessage = "Unable to update asset";
@@ -453,14 +453,14 @@ module.exports = (middleware, users, plans, assets) => {
            if (result.modifiedCount === 0 && result.matchedCount === 1) {
                console.log(`Asset data unchanged (already up-to-date): ${req.body.id}`);
            }
-        
-            req.session.errMessage = ""; 
-            return res.status(status.Ok).redirect("/assets"); 
-    
-        }).catch((err) => { 
+
+            req.session.errMessage = "";
+            return res.status(status.Ok).redirect("/assets");
+
+        }).catch((err) => {
            console.error("Error updating asset: ", err);
            req.session.errMessage = "An error occurred while saving your information. Please try again.";
-            return res.status(status.InternalServerError).redirect("/assets"); 
+            return res.status(status.InternalServerError).redirect("/assets");
        });
    });

@@ -469,7 +469,7 @@ module.exports = (middleware, users, plans, assets) => {

        assets.deleteOne(
            { "_id": id }
-        ).then((result) => { 
+        ).then((result) => {
            if (result.deletedCount === 0) {
                console.error(`Asset not found: ${req.body.id}`);
                req.session.errMessage = "Unable to delete asset. Please try again.";
@@ -481,11 +481,11 @@ module.exports = (middleware, users, plans, assets) => {
                req.session.errMessage = "An error occurred while deleting an asset. Please try again.";
                return res.status(status.InternalServerError).redirect("/assets");
            }
-        
-            req.session.errMessage = ""; 
-            return res.status(status.Ok).redirect("/assets"); 
-    
-        }).catch((err) => { 
+
+            req.session.errMessage = "";
+            return res.status(status.Ok).redirect("/assets");
+
+        }).catch((err) => {
            console.error("Error deleting asset: ", err);
            req.session.errMessage = "An error occurred while deleting an asset. Please try again.";
            return res.status(status.InternalServerError).redirect("/assets");
@@ -535,7 +535,7 @@ module.exports = (middleware, users, plans, assets) => {
        if (!req.session.geoData.country) {
            const response = await fetch(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${req.params.lat},${req.params.lon}&result_type=country&key=${process.env.GEOLOCATION_API}`);
            const data = await response.json();
-            
+
            country = data.results[0].formatted_address;
            let results = await getRates(country);
            req.session.geoData = {
@@ -1,5 +1,5 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/header") %>
+    <%- include("./partials/header") %>

 <main>
    <!-- Buttons -->
@@ -22,74 +22,94 @@
                class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
                $53k</h4>
            </div>
-            <div class="border-t border-blue-gray-50 p-10">
-            <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                <strong class="text-green-500">Make this percent bar or graph or something </strong>&nbsp;than lastweek
-            </p>
-            </div>
-        </div>
-        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-            <div class="p-4 flex items-center justify-between">
-            <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                Retirement goal</p>
-            <h4
-                class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                $53k</h4>
-            </div>
-            <div class="border-t border-blue-gray-50 p-10">
-            <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                <strong class="text-green-500">Make this percent bar or graph or something </strong>&nbsp;than last
-                week
-            </p>
-            </div>
-        </div>
-        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-            <!-- <div -->
-            <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-green-600 to-green-400 text-white shadow-green-500/40 shadow-lg absolute -mt-4 grid h-16 w-16 place-items-center"> -->
-            <!--   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" -->
-            <!--     class="w-6 h-6 text-white"> -->
-            <!--     <path -->
-            <!--       d="M6.25 6.375a4.125 4.125 0 118.25 0 4.125 4.125 0 01-8.25 0zM3.25 19.125a7.125 7.125 0 0114.25 0v.003l-.001.119a.75.75 0 01-.363.63 13.067 13.067 0 01-6.761 1.873c-2.472 0-4.786-.684-6.76-1.873a.75.75 0 01-.364-.63l-.001-.122zM19.75 7.5a.75.75 0 00-1.5 0v2.25H16a.75.75 0 000 1.5h2.25v2.25a.75.75 0 001.5 0v-2.25H22a.75.75 0 000-1.5h-2.25V7.5z"> -->
-            <!--     </path> -->
-            <!--   </svg> -->
-            <!-- </div> -->
-            <!-- we can use this later if needed not sure what it shoudl be for right now. -->
-            <!--   <div class="p-4 text-right"> -->
-            <!--     <p class="block antialiased font-sans text-sm leading-normal font-normal text-blue-gray-600">New Clients -->
-            <!--     </p> -->
-            <!--     <h4 -->
-            <!--       class="block antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900"> -->
-            <!--       3,462</h4> -->
-            <!--   </div> -->
-            <!--   <div class="border-t border-blue-gray-50 p-4"> -->
-            <!--     <p class="block antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600"> -->
-            <!--       <strong class="text-red-500">-2%</strong>&nbsp;than yesterday -->
-            <!--     </p> -->
-            <!--   </div> -->
-            <!-- </div> -->
-            <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-            <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
-            <div class="p-4 flex items-center justify-between">
-                <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
-                Retirement goal</p>
-                <h4
-                class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
-                $53k</h4>
-            </div>
-            <div class="border-t border-blue-gray-50 p-10">
-                <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
-                <strong class="text-green-500">Make this percent bar or graph or something </strong>&nbsp;than last
-                week
-                </p>
-            </div>
-            </div>
-            </div>
-        </div>
-    </div>
-    <div class="text-blue-gray-600">
-    </div>
-</main>
+            <!--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 lastweek
+                            </p>
+                        </div>
+                    </div>
+                    <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                        <div class="p-4 flex items-center justify-between">
+                            <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                                Retirement goal</p>
+                            <h4
+                                class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
+                                $53k</h4>
+                        </div>
+                        <div class="border-t border-blue-gray-50 p-10">
+                            <p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
+                                <strong class="text-green-500">Make this percent bar or graph or something
+                                </strong>&nbsp;than last
+                                week
+                            </p>
+                        </div>
+                    </div>
+                    <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                        <!-- <div -->
+                        <!--   class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-green-600 to-green-400 text-white shadow-green-500/40 shadow-lg absolute -mt-4 grid h-16 w-16 place-items-center"> -->
+                        <!--   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" -->
+                        <!--     class="w-6 h-6 text-white"> -->
+                        <!--     <path -->
+                        <!--       d="M6.25 6.375a4.125 4.125 0 118.25 0 4.125 4.125 0 01-8.25 0zM3.25 19.125a7.125 7.125 0 0114.25 0v.003l-.001.119a.75.75 0 01-.363.63 13.067 13.067 0 01-6.761 1.873c-2.472 0-4.786-.684-6.76-1.873a.75.75 0 01-.364-.63l-.001-.122zM19.75 7.5a.75.75 0 00-1.5 0v2.25H16a.75.75 0 000 1.5h2.25v2.25a.75.75 0 001.5 0v-2.25H22a.75.75 0 000-1.5h-2.25V7.5z"> -->
+                        <!--     </path> -->
+                        <!--   </svg> -->
+                        <!-- </div> -->
+                        <!-- we can use this later if needed not sure what it shoudl be for right now. -->
+                        <!--   <div class="p-4 text-right"> -->
+                        <!--     <p class="block antialiased font-sans text-sm leading-normal font-normal text-blue-gray-600">New Clients -->
+                        <!--     </p> -->
+                        <!--     <h4 -->
+                        <!--       class="block antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900"> -->
+                        <!--       3,462</h4> -->
+                        <!--   </div> -->
+                        <!--   <div class="border-t border-blue-gray-50 p-4"> -->
+                        <!--     <p class="block antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600"> -->
+                        <!--       <strong class="text-red-500">-2%</strong>&nbsp;than yesterday -->
+                        <!--     </p> -->
+                        <!--   </div> -->
+                        <!-- </div> -->
+                        <div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                            <div
+                                class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
+                                <div class="p-4 flex items-center justify-between">
+                                    <p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
+                                        Retirement goal</p>
+                                    <h4
+                                        class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
+                                        $53k</h4>
+                                </div>
+                                <div class="border-t border-blue-gray-50 p-10">
+                                    <p
+                                        class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
+                                        <strong class="text-green-500">Make this percent bar or graph or something
+                                        </strong>&nbsp;than last
+                                        week
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="text-blue-gray-600">
+                </div>
+        </main>

 <%- include("./partials/navBar") %>
 <%- include("./partials/scriptLoader") %>
-<%- include("./partials/footer") %>
+<%- include("./partials/footer") %>
@@ -0,0 +1,38 @@
+<%- include("./partials/fileHeader") %>
+
+    <main>
+        <div class="flex justify-center items-center h-screen">
+            <form action="/auth/resetPass" method="POST">
+                <div class="w-96 p-6 shadow-1g bg-white rounded-md">
+                    <h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
+                    <hr class="mt-3">
+                    <% 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">
+                                    <%= error%>
+                                </div>
+                                <% if (reset==='' ) { %>
+                                    <div class="mt-5">
+                                        <button type="submit"
+                                            class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Send
+                                            reset Link</button>
+                                    </div>
+                                    <% } %>
+                </div>
+            </form>
+        </div>
+    </main>
+
+    <%- include("./partials/footer") %> <%- include("./partials/footer") %>
@@ -25,7 +25,7 @@
                        <label>Remember me</label>
                    </div>
                    <div>
-                        <a href="#" class="text-indigo-600 font-semibold">Forgot Password? </a>
+                        <a href="/forgotPassword" class="text-indigo-600 font-semibold">Forgot Password? </a>
                    </div>
                </div>
                <div class="mt-5">
@@ -41,4 +41,4 @@
    </div>
 </main>

-<%- include("./partials/footer") %>
+<%- include("./partials/footer") %>
@@ -0,0 +1,36 @@
+<%- include("./partials/fileHeader") %>
+
+    <main>
+        <div class="flex justify-center items-center h-screen">
+            <form action="/resetLink" method="POST">
+                <div class="w-96 p-6 shadow-1g bg-white rounded-md">
+                    <h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
+                    <hr class="mt-3">
+                    <input type="hidden" name="token" value="<%=token %>">
+                    <div class="mt-3">
+                        <label for="password" class="block text-base mb-2">New Password:</label>
+                        <input type="text" 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 "
+                            placeholder="Enter Password" />
+                    </div>
+                    <div class="mt-3">
+                        <label for="password" class="block text-base mb-2">Confirm Password:</label>
+                        <input type="text" id="Repassword" name="confirmPassword"
+                            class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
+                            placeholder="ReType Password" />
+                    </div>
+                    <% if (typeof errMessage !=='undefined' ) { %>
+                        <div class="text-red-800 font-bold" id="forgor">
+                            <%= errMessage %>
+                        </div>
+                        <% } %>
+                            <div class="mt-5">
+                                <button type="submit"
+                                    class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Change
+                                    Password</button>
+                            </div>
+                </div>
+            </form>
+        </div>
+    </main>
+    <%- include("./partials/footer") %>
@@ -1,46 +1,46 @@
 <%- include("./partials/fileHeader") %>
-<%- include("./partials/headerStart") %>
+    <%- include("./partials/headerStart") %>

-<main>
-    <div class="flex justify-center items-center h-screen">
-        <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>
-                <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 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 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 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>
-                <div class="mt-5">
-                    <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>
-                <div class="mt-5 block justify-between items-center">
-                    <label>Already have an account?</label>
-                    <a href="/login" class="text-indigo-600 font-semibold">Login</a>
-                </div>
-            </div>
-        </form>
-    </div>
-</main>
+        <main>
+            <div class="flex justify-center items-center h-screen">
+                <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>
+                        <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 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 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 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>
+                        <div class="mt-5">
+                            <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>
+                        <div class="mt-5 block justify-between items-center">
+                            <label>Already have an account?</label>
+                            <a href="/login" class="text-indigo-600 font-semibold">Login</a>
+                        </div>
+                    </div>
+        </main>

-<%- include("./partials/footer") %>
+        <%- include("./partials/footer") %>