feature/completed getting geolocation data

app.js

@@ -28,6 +28,7 @@ app.set('views',path.join(__dirname, 'src/views'));
 app.use(express.urlencoded({ extended: true }));
 app.use("/static", express.static("./src/public"));
 app.use("/images", express.static("./src/public/images"));
+app.use(express.json());
 
 /*** Database ***/
 const { connectMongo, getCollection } = require("./src/database/connection");
@@ -38,7 +39,6 @@ async function initDatabase() {
     
     // For any collection, init here
     users = await getCollection(db, "users");
-    plans = await getCollection(db, "plans");
 }
 
 /*** ROUTINGS ***/
@@ -70,6 +70,15 @@ app.get('/aboutUs', (req, res) => {
     return res.status(status.Ok);
 });
 
+app.post('/api/location', async (req,res) => {
+    const { latitude, longitude } = req.body;
+
+    const response = await fetch(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&result_type=country&key=${process.env.geolocation_api}`);
+
+    const data = await response.json();
+
+    res.json(data);
+});
 
 // Initialize database and start app
 initDatabase().then(() => {
@@ -79,8 +88,8 @@ initDatabase().then(() => {
     app.use(require("./src/auth/authentication")(users));
 
     // Import middleware & apply to user routes
-    const middleware = require("./src/auth/middleware")(users, plans);
+    const middleware = require("./src/auth/middleware")(users);
-    app.use(require('./src/router/user')(middleware, users, plans));
+    app.use(require('./src/router/user')(middleware, users));
 
     // 404 handler
     app.get('/*splat', (req, res) => {

src/auth/authentication.js

@@ -40,7 +40,6 @@ module.exports = (users) => {
             }
 
             req.session.authenticated = true;
-            req.session.userId = user._id;
             req.session.email = req.body.email;
             req.session.errMessage = "";
             res.redirect("/home");
@@ -85,7 +84,6 @@ module.exports = (users) => {
 
             req.session.authenticated = true;
             req.session.email = req.body.email;
-            req.session.userId = results.insertedId;
 
             req.session.errMessage = "";
             return res.status(status.Ok).redirect("/home");

src/public/scripts/geolocation.js

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

src/router/user.js

@@ -3,7 +3,7 @@ const bcrypt = require('bcrypt');
 const joi = require("joi");
 const salt = 12;
 
-module.exports = (middleware, users, plans) => {
+module.exports = (middleware, users) => {
     const router = require("express").Router();
     
     router.use(middleware);
@@ -18,78 +18,11 @@ module.exports = (middleware, users, plans) => {
         return res.status(status.Ok);
     });
 
-    router.get('/plans', async (req, res) => {
+    router.get('/plans', (req, res) => {
-        if (!req.session.email) {
+        res.render('plans', { user: req.user });
-            return res.status(status.Unauthorized).redirect('/login');
+        return res.status(status.Ok);
-        }
-    
-        try {
-
-            // console.log(req.user.email);
-            const userPlans = await plans.find({userEmail: req.user.email }).toArray();
-            // console.log(userPlans);
-            res.render('plans', {
-                user: req.user,
-                plans: userPlans
-            });
-    
-        } catch (err) {
-            console.error("Error fetching plans:", err);
-            req.session.errMessage = "Could not load your plans. Please try again.";
-            res.status(status.InternalServerError).redirect('/home');
-        }
     });
 
-    router.get('/newPlan', (req, res) => {
-        const errMessage = req.session.errMessage;
-        req.session.errMessage = ""; 
-        res.render('newPlan', { user: req.user, errMessage: errMessage });
-    });
-
-    router.post('/newPlan', async (req, res) => {
-        if (!req.session.email) {
-            return res.status(status.Unauthorized).redirect('/login');
-        }
-
-            const planSchema = joi.object({
-                name: joi.string().min(3).max(100).required(),
-                retirementAge: joi.number().min(18).max(120).required(),
-                retirementExpenses: joi.number().min(0).required(),
-                retirementAssets: joi.number().min(0).required(),
-                retirementLiabilities: joi.number().min(0).required(),
-            });
-
-            const validationOptions = { convert: true, abortEarly: false }; 
-            const { error, value } = planSchema.validate(req.body, validationOptions);
-
-            if (error) { 
-                console.error("Plan validation error:", error.details);
-                req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', '); 
-                res.status(status.BadRequest).redirect("/newPlan"); 
-                return; 
-            }
-            const newPlan = {
-                userEmail: req.user.email,
-                name: value.name,
-                retirementAge: value.retirementAge,
-                retirementExpenses: value.retirementExpenses,
-                retirementAssets: value.retirementAssets,
-                retirementLiabilities: value.retirementLiabilities,
-                progress: "0%"
-            };
-
-            try{
-                await plans.insertOne(newPlan);
-                req.session.errMessage = ""; 
-                res.redirect('/plans'); 
-            }
-            catch(err){
-                console.error("Error saving plan:", err);
-                req.session.errMessage = "An error occurred while saving your plan. Please try again.";
-                res.status(status.InternalServerError).redirect("/newPlan");
-            }
-        });
-
     router.get('/more', (req, res) => {
         res.render('more', { user: req.user });
         return res.status(status.Ok);
@@ -112,8 +45,6 @@ module.exports = (middleware, users, plans) => {
     });
 
     router.post('/questionnaire', (req, res) => {
-        // console.log("Questionnaire POST body:", req.body);
-  
         const questionnaireSchema = joi.object({
             dob: joi.date().required(),
             education: joi.string().valid('primary', 'secondary', 'tertiary', 'postgraduate').required(),
@@ -122,6 +53,10 @@ module.exports = (middleware, users, plans) => {
             expenses: joi.number().min(0).required(),
             assets: joi.number().min(0).required(),
             liabilities: joi.number().min(0).required(),
+            retirementAge: joi.number().min(18).max(120).required(),
+            retirementExpenses: joi.number().min(0).required(),
+            retirementAssets: joi.number().min(0).required(),
+            retirementLiabilities: joi.number().min(0).required(),
         });
     
         const validationOptions = { convert: true, abortEarly: false }; 
@@ -146,6 +81,10 @@ module.exports = (middleware, users, plans) => {
                     expenses: value.expenses,
                     assets: value.assets,
                     liabilities: value.liabilities,
+                    retirementAge: value.retirementAge,
+                    retirementExpenses: value.retirementExpenses,
+                    retirementAssets: value.retirementAssets,
+                    retirementLiabilities: value.retirementLiabilities,
                 } 
             }
         ).then((result) => { 

src/views/newPlan.ejs

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

src/views/partials/footer.ejs

@@ -6,5 +6,6 @@
             </div>
     </div>
 </footer>
+<script src="/static/scripts/geolocation.js"></script>
 </body>
 </html>

src/views/plans.ejs

@@ -1,23 +1,8 @@
 <%- include("./partials/fileHeader") %>
 <%- include("./partials/header") %>
 
-<main class="container mx-auto p-4">
+<main>
-    <h2 class="text-xl text-white font-semibold mb-4">Welcome: <%= user.email %></h2>
+    The Plans Page
-    <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="border-2 text-center border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">New Plan</div></a>
-        <hr class="mt-3">
-        <% plans.forEach(plan => { %>
-            <a href="<%= plan.link %>" class="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow-sm hover:bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700">
-                <h5 class="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white"><%= plan.name %></h5>
-                <div class="w-full bg-gray-200 rounded-full h-2.5 mb-4 dark:bg-gray-700">
-                    <div class="bg-green-600 h-2.5 rounded-full dark:bg-green-500" style="width: <%= plan.progress %> "></div>
-                </div>
-                <p class="font-normal text-gray-700 dark:text-gray-400"><%= plan.description %></p>
-            </a>
-        <% }) %>
-    </div>
-    
 </main>
 
 <%- include("./partials/navBar") %>

src/views/questionnaire.ejs

@@ -61,6 +61,26 @@
                 <input type="number" name="liabilities" min="0" placeholder="Estimated Liabilities" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
             </div>
         
+            <div>
+                <label for="retirementAge" class="block text-sm font-medium text-gray-700">Desired Retirement Age</label>
+                <input type="number" name="retirementAge" placeholder="e.g., 65" min="18" max="120" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementExpenses" class="block text-sm font-medium text-gray-700">Estimated Monthly Retirement Expenses</label>
+                <input type="number" name="retirementExpenses" min="0" placeholder="e.g., 3000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementAssets" class="block text-sm font-medium text-gray-700">Estimated Retirement Assets</label>
+                <input type="number" name="retirementAssets" min="0" placeholder="e.g., 500000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+
+            <div>
+                <label for="retirementLiabilities" class="block text-sm font-medium text-gray-700">Estimated Retirement Liabilities</label>
+                <input type="number" name="retirementLiabilities" min="0" placeholder="e.g., 50000" class="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
+            </div>
+            
             <div>
                 <button type="submit" class="w-full flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">Submit Questionnaire</button>
             </div>