feature/fully implemented ejs inclusion to main files

Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/layoutPage
feature/completed most of ejs implementation into other pages
2025-05-05 21:56:47 -07:00 · 2025-05-05 21:17:50 -07:00 · 2025-05-05 21:12:52 -07:00 · 2025-05-05 18:59:59 -07:00 · 2025-05-05 18:45:59 -07:00 · 2025-05-05 18:39:43 -07:00
18 changed files with 106 additions and 223 deletions
@@ -60,25 +60,11 @@ app.get('/login', (req, res) => {
    return res.status(status.Ok);
 });

-app.get('/home', (req, res) => {
-    res.render('home', { session: req.session });
-    return res.status(status.Ok);
-});
-
 app.get('/aboutUs', (req, res) => {
    res.render('aboutUs');
    return res.status(status.Ok);
 });

-app.get('/logout', (req, res) => {
-    req.session.destroy();
-    return res.redirect('/login');
-});
-
-app.get('/*splat', (req, res) => {
-    res.send('404 Not Found');
-    return res.status(status.NotFound);
-});

 // Initialize database and start app
 initDatabase().then(() => {
@@ -89,7 +75,7 @@ initDatabase().then(() => {

    // Import middleware & apply to user routes
    const middleware = require("./src/auth/middleware")(users);
-    app.use(require("./src/router/user")(middleware));
+    app.use(require('./src/router/user')(middleware));

    // 404 handler
    app.get('/*splat', (req, res) => {
@@ -13,6 +13,12 @@ module.exports = (users) => {
    });
    
    router.post("/login", async (req, res) => {
+
+        if (req.session.authenticated) {
+            res.redirect("/home");
+            return res.status(status.Ok);        
+        }
+
        const credentialSchema = joi.object({
            email: joi.string().email().required(),
            password: joi.string().max(20).required(),
@@ -3,37 +3,39 @@ const status = require("../util/statuses");
 module.exports = (middleware) => {
    const router = require("express").Router();
    
-    router.get('/home', middleware, async (req, res) => {
+    router.use(middleware);
+
+    router.get('/home', async (req, res) => {
        res.render('home', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/assets', middleware, (req, res) => {
+    router.get('/assets', (req, res) => {
        res.render('assets', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/plans', middleware, (req, res) => {
+    router.get('/plans', (req, res) => {
        res.render('plans', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/more', middleware, (req, res) => {
+    router.get('/more', (req, res) => {
        res.render('more', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/profile', middleware, (req, res) => {
+    router.get('/profile', (req, res) => {
        res.render('profiles', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/settings', middleware, (req, res) => {
+    router.get('/settings', (req, res) => {
        res.render('settings', { user: req.user });
        return res.status(status.Ok);
    });

-    router.get('/logout', middleware, (req, res) => {
+    router.get('/logout', (req, res) => {
        req.session.destroy();
        return res.redirect('/login');
    });
@@ -1,12 +1,7 @@
-<html>
-    <head>
-        <title>RCalculator</title>
-        <link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
-        <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
-    </head>
-    <body class="bg-white dark:bg-gray-900">
-        <%- include("./partials/headerStart") %>
-        <main>
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
+
+<main>
    <section class="bg-white dark:bg-gray-900 py-12 md:py-20">
        <div class="max-w-screen-lg mx-auto px-4 text-center">
            <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-gray-900 md:text-5xl lg:text-6xl dark:text-white">About RCalculator</h1>
@@ -31,7 +26,7 @@
            </div>
        </div>
        <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                    <a href="/login" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+            <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">
                Get started
                <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
@@ -39,18 +34,6 @@
            </a>
        </div>
    </section>
-        </main>
-        <footer>
-            <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-                <div class="container mx-auto">
-                    <p>&copy; 2025 RCalculator. All rights reserved.</p>
-                 </div>
-            </div>
-        </footer>
-        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
-    </body>
-</html>
+</main>

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

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

-</html>
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
@@ -1,23 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>

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

-</html>
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
@@ -1,18 +1,13 @@
-<html>
-    <head>
-        <title>RCalculator</title>
-        <link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
-        <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
-    </head>
-    <body class="bg-white dark:bg-gray-900">
-        <%- include("./partials/headerStart") %>
-        <main>
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>
+
+<main>
    <section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
        <div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
            <h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">Plan now, live better.</h1>
            <p class="mb-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">Planning your retirement is a crucial step towards financial security and a happy future.</p>
            <div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
-                        <a href="/login" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
+                <a href="/signup" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
                    Get started
                    <svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
@@ -24,15 +19,6 @@
            </div>
        </div>
    </section>
-        </main>
-        <footer>
-            <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-                <div class="container mx-auto">
-                    <p>&copy; 2025 RCalculator. All rights reserved.</p>
-                 </div>
-            </div>
-        </footer>
-        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
-    </body>
-</html>
+</main>
+
+<%- include("./partials/footer") %>
@@ -1,19 +1,7 @@
-<!DOCTYPE html>
-<html lang="en">
+<%- include("./partials/fileHeader") %>

-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Login Page</title>
-    <link rel="stylesheet" href="/static/css/style.css" <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
-    <link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
-</head>
-
-<body>
-    <div class="flex justify-center items-center h-screen bg-gray-700">
+<main>
+    <div class="flex justify-center items-center h-screen">
        <form action="/login" method="POST">
            <div class="w-96 p-6 shadow-1g bg-white rounded-md">
                <h1 class="text-3xl block text-center font-semibold"> Login </h1>
@@ -51,7 +39,6 @@
            </div>
        </form>
    </div>
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-</body>
+</main>

-</html>
+<%- include("./partials/footer") %>
@@ -1,25 +1,10 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-    <title>Document</title>
-</head>
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>

-<body>
-    <%- include("./partials/header") %>
-    <main>
+<main>
    The More Page
-    </main>
-    <footer>
-        <div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
-            <div class="container mx-auto">
-                <p>&copy; 2025 RCalculator. All rights reserved.</p>
-             </div>
-        </div>
-        <%- include("./partials/navBar") %>
-    </footer>
-</body>
+</main>
+
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
    
-</html>
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+        <title>RCalculator</title>
+    </head>
+    <body class="bg-white dark:bg-gray-900">
@@ -0,0 +1,10 @@
+
+<footer>
+    <div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
+        <div class="container mx-auto">
+            <p>&copy; 2025 RCalculator. All rights reserved.</p>
+            </div>
+    </div>
+</footer>
+</body>
+</html>
@@ -19,15 +19,9 @@
                    <li>
                        <a href="/more" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">More</a>
                    </li>
-                    <% if (session.authenticated) { %>
                    <li>
                        <a href="/logout" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Logout</a>
                    </li>
-                    <% } else { %>
-                    <li>
-                        <a href="/login" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Login</a>
-                    </li>
-                    <% } %>
                </ul>
            </div>
        </div>
@@ -20,7 +20,7 @@
                        <a href="/" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Home</a>
                    </li>
                    <li>
-                        <a href="/aboutUs" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">About Us</a>
+                        <a href="/login" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Login</a>
                    </li>
                    <li>
                        <a href="mailto:rcalculator@gmail.com" class="block py-2 px-3 lg:p-0 text-gray-900 rounded hover:bg-gray-100 lg:hover:bg-transparent lg:border-0 lg:hover:text-blue-700 dark:text-white lg:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white lg:dark:hover:bg-transparent">Contact us</a>
@@ -27,4 +27,3 @@
        </a>
    </div>
 </div>
-
@@ -1,26 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>

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

-</html>
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
@@ -1,19 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/headerStart") %>

-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Signup</title>
-    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"
-        integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" />
-</head>
-
-<body>
-    <div class="flex justify-center items-center h-screen bg-gray-700">
+<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>
@@ -46,7 +35,6 @@
            </div>
        </form>
    </div>
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
-</body>
+</main>

-</html>
+<%- include("./partials/footer") %>
@@ -0,0 +1,9 @@
+<%- include("./partials/fileHeader") %>
+<%- include("./partials/header") %>
+
+<main>
+    <!-- Your content here -->
+</main>
+
+<%- include("./partials/navBar") %>
+<%- include("./partials/footer") %>
Author	SHA1	Message	Date
Joaquin	54566f05b7	feature/fully implemented ejs inclusion to main files	2025-05-05 21:56:47 -07:00
Joaquin	decdb299b7	Merge branch 'dev' of https://github.com/JoaquinPar/2800-202510-BBY14 into feature/layoutPage	2025-05-05 21:17:50 -07:00
Joaquin	c8bf2e49ab	feature/completed most of ejs implementation into other pages	2025-05-05 21:12:52 -07:00
nicoagostini	f39b8555fa	fix/session check fixed	2025-05-05 18:59:59 -07:00
nicoagostini	fef7184404	fix/home.ejs include fix	2025-05-05 18:45:59 -07:00
SowinskiBraeden	6a8595d24b	fix/impliment middleware	2025-05-05 18:39:43 -07:00
SowinskiBraeden	7c7098636a	fix/middleware authentication + bad merge	2025-05-05 18:34:19 -07:00
Nícolas Agostini	a446943d4a	Merge pull request #2 from JoaquinPar/feature/questionnaire Just a bug fix	2025-05-05 18:18:55 -07:00
Joaquin	f6640b23cf	feature/some progress made on layouts	2025-05-05 17:07:51 -07:00
Joaquin	4be7ca3a8e	Merge branch 'dev' into feature/layoutPage	2025-05-05 16:30:51 -07:00
Joaquin	8b6ff1354b	resolved merge conflict	2025-05-05 14:27:24 -07:00
Joaquin	4bcf8dd812	feature/started work on layout.ejs	2025-05-05 14:21:30 -07:00