Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Joaquin
|
54566f05b7 | ||
|
Joaquin
|
decdb299b7 | ||
|
Joaquin
|
c8bf2e49ab | ||
|
nicoagostini
|
f39b8555fa | ||
|
nicoagostini
|
fef7184404 | ||
 SowinskiBraeden
|
6a8595d24b
|
||
|
SowinskiBraeden
|
7c7098636a
|
||
|
Nícolas Agostini
|
a446943d4a | ||
|
Joaquin
|
f6640b23cf | ||
|
Joaquin
|
4be7ca3a8e | ||
|
Joaquin
|
8b6ff1354b | ||
|
Joaquin
|
4bcf8dd812 |
No files matched your search
@@ -60,25 +60,11 @@ app.get('/login', (req, res) => {
|
|||||||
return res.status(status.Ok);
|
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) => {
|
app.get('/aboutUs', (req, res) => {
|
||||||
res.render('aboutUs');
|
res.render('aboutUs');
|
||||||
return res.status(status.Ok);
|
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
|
// Initialize database and start app
|
||||||
initDatabase().then(() => {
|
initDatabase().then(() => {
|
||||||
@@ -89,7 +75,7 @@ initDatabase().then(() => {
|
|||||||
|
|
||||||
// Import middleware & apply to user routes
|
// Import middleware & apply to user routes
|
||||||
const middleware = require("./src/auth/middleware")(users);
|
const middleware = require("./src/auth/middleware")(users);
|
||||||
app.use(require("./src/router/user")(middleware));
|
app.use(require('./src/router/user')(middleware));
|
||||||
|
|
||||||
// 404 handler
|
// 404 handler
|
||||||
app.get('/*splat', (req, res) => {
|
app.get('/*splat', (req, res) => {
|
||||||
|
|||||||
@@ -13,6 +13,12 @@ module.exports = (users) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
router.post("/login", async (req, res) => {
|
router.post("/login", async (req, res) => {
|
||||||
|
|
||||||
|
if (req.session.authenticated) {
|
||||||
|
res.redirect("/home");
|
||||||
|
return res.status(status.Ok);
|
||||||
|
}
|
||||||
|
|
||||||
const credentialSchema = joi.object({
|
const credentialSchema = joi.object({
|
||||||
email: joi.string().email().required(),
|
email: joi.string().email().required(),
|
||||||
password: joi.string().max(20).required(),
|
password: joi.string().max(20).required(),
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ const createMiddleware = (users) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let user = await users.findOne({ "email": req.session.email }).then((user) => user);
|
let user = await users.findOne({ "email": req.session.email }).then((user) => user);
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
req.session.errMessage = "User not found";
|
req.session.errMessage = "User not found";
|
||||||
res.redirect("/login");
|
res.redirect("/login");
|
||||||
|
|||||||
+9
-7
@@ -2,38 +2,40 @@ const status = require("../util/statuses");
|
|||||||
|
|
||||||
module.exports = (middleware) => {
|
module.exports = (middleware) => {
|
||||||
const router = require("express").Router();
|
const router = require("express").Router();
|
||||||
|
|
||||||
|
router.use(middleware);
|
||||||
|
|
||||||
router.get('/home', middleware, async (req, res) => {
|
router.get('/home', async (req, res) => {
|
||||||
res.render('home', { user: req.user });
|
res.render('home', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/assets', middleware, (req, res) => {
|
router.get('/assets', (req, res) => {
|
||||||
res.render('assets', { user: req.user });
|
res.render('assets', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/plans', middleware, (req, res) => {
|
router.get('/plans', (req, res) => {
|
||||||
res.render('plans', { user: req.user });
|
res.render('plans', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/more', middleware, (req, res) => {
|
router.get('/more', (req, res) => {
|
||||||
res.render('more', { user: req.user });
|
res.render('more', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/profile', middleware, (req, res) => {
|
router.get('/profile', (req, res) => {
|
||||||
res.render('profiles', { user: req.user });
|
res.render('profiles', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/settings', middleware, (req, res) => {
|
router.get('/settings', (req, res) => {
|
||||||
res.render('settings', { user: req.user });
|
res.render('settings', { user: req.user });
|
||||||
return res.status(status.Ok);
|
return res.status(status.Ok);
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/logout', middleware, (req, res) => {
|
router.get('/logout', (req, res) => {
|
||||||
req.session.destroy();
|
req.session.destroy();
|
||||||
return res.redirect('/login');
|
return res.redirect('/login');
|
||||||
});
|
});
|
||||||
|
|||||||
+36
-53
@@ -1,56 +1,39 @@
|
|||||||
<html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<head>
|
<%- include("./partials/headerStart") %>
|
||||||
<title>RCalculator</title>
|
|
||||||
<link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
|
|
||||||
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
<body class="bg-white dark:bg-gray-900">
|
|
||||||
<%- include("./partials/headerStart") %>
|
|
||||||
<main>
|
|
||||||
<section class="bg-white dark:bg-gray-900 py-12 md:py-20">
|
|
||||||
<div class="max-w-screen-lg mx-auto px-4 text-center">
|
|
||||||
<h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-gray-900 md:text-5xl lg:text-6xl dark:text-white">About RCalculator</h1>
|
|
||||||
<p class="mb-12 text-lg font-normal text-gray-500 lg:text-xl sm:px-16 dark:text-gray-400">Welcome to RCalculator, your partner in building a secure and fulfilling financial future.</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="max-w-screen-md mx-auto px-4">
|
<main>
|
||||||
<h2 class="mb-4 text-3xl font-bold tracking-tight text-gray-900 dark:text-white text-center">Our Mission</h2>
|
<section class="bg-white dark:bg-gray-900 py-12 md:py-20">
|
||||||
<p class="mb-6 font-normal text-gray-600 dark:text-gray-400 text-lg text-center">
|
<div class="max-w-screen-lg mx-auto px-4 text-center">
|
||||||
Our mission is to empower you with the tools and insights needed to take control of your long-term financial goals.
|
<h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-gray-900 md:text-5xl lg:text-6xl dark:text-white">About RCalculator</h1>
|
||||||
</p>
|
<p class="mb-12 text-lg font-normal text-gray-500 lg:text-xl sm:px-16 dark:text-gray-400">Welcome to RCalculator, your partner in building a secure and fulfilling financial future.</p>
|
||||||
<div class="prose lg:prose-lg dark:prose-invert mx-auto text-gray-600 dark:text-gray-400">
|
</div>
|
||||||
<p class="mb-4">
|
|
||||||
We believe that planning for your desired future, especially retirement, shouldn't be daunting. It doesn't matter what your current age or career status is – starting now is what counts.
|
<div class="max-w-screen-md mx-auto px-4">
|
||||||
</p>
|
<h2 class="mb-4 text-3xl font-bold tracking-tight text-gray-900 dark:text-white text-center">Our Mission</h2>
|
||||||
<p class="mb-4">
|
<p class="mb-6 font-normal text-gray-600 dark:text-gray-400 text-lg text-center">
|
||||||
At RCalculator, we help you trace a personalized plan that suits your unique aspirations. We provide clear, actionable advice and projections to guide you on how to get there, whether you're just starting your career, mid-way through, or nearing retirement.
|
Our mission is to empower you with the tools and insights needed to take control of your long-term financial goals.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<div class="prose lg:prose-lg dark:prose-invert mx-auto text-gray-600 dark:text-gray-400">
|
||||||
Let us help you navigate the path to financial independence and achieve the retirement lifestyle you envision.
|
<p class="mb-4">
|
||||||
</p>
|
We believe that planning for your desired future, especially retirement, shouldn't be daunting. It doesn't matter what your current age or career status is – starting now is what counts.
|
||||||
</div>
|
</p>
|
||||||
</div>
|
<p class="mb-4">
|
||||||
<div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
|
At RCalculator, we help you trace a personalized plan that suits your unique aspirations. We provide clear, actionable advice and projections to guide you on how to get there, whether you're just starting your career, mid-way through, or nearing retirement.
|
||||||
<a href="/login" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
|
</p>
|
||||||
Get started
|
<p>
|
||||||
<svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
|
Let us help you navigate the path to financial independence and achieve the retirement lifestyle you envision.
|
||||||
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
|
</p>
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</div>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
<div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
|
<a href="/signup" class="inline-flex justify-center items-center mt-4 py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
|
||||||
</body>
|
Get started
|
||||||
</html>
|
<svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
|
||||||
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
|
||||||
|
</svg>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<%- include("./partials/footer") %>
|
||||||
<!--fixed bottom-0 left-0 z-50 lg:hidden w-full h-16 bg-white border-t border-gray-200 dark:bg-gray-400-->
|
|
||||||
+9
-23
@@ -1,23 +1,9 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/header") %>
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
<main>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
The Assets Page
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
</main>
|
||||||
<title>Document</title>
|
|
||||||
</head>
|
<%- include("./partials/navBar") %>
|
||||||
<body>
|
<%- include("./partials/footer") %>
|
||||||
<%- include("./partials/header") %>
|
|
||||||
<main>
|
|
||||||
The Assets Page
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- include("./partials/navBar") %>
|
|
||||||
</footer>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
+8
-25
@@ -1,27 +1,10 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/header") %>
|
||||||
|
|
||||||
<head>
|
<main>
|
||||||
<meta charset="UTF-8">
|
Welcome: <%= user.email %>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
The Dashboard Page
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
</main>
|
||||||
<title>Document</title>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
<%- include("./partials/navBar") %>
|
||||||
<%- include("./partials/header") %>
|
<%- include("./partials/footer") %>
|
||||||
<% if (session.authenticated) { console.log(session.email); } else { console.log("No user"); } %>
|
|
||||||
<main>
|
|
||||||
The Dashboard Page
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- include("./partials/navBar") %>
|
|
||||||
</footer>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
+6
-20
@@ -1,23 +1,9 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/header") %>
|
||||||
|
|
||||||
<head>
|
<main>
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
|
||||||
<title>Document</title>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
The Index Page
|
The Index Page
|
||||||
<footer>
|
</main>
|
||||||
<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>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- include("./partials/navBar") %>
|
|
||||||
</footer>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
<%- include("./partials/navBar") %>
|
||||||
|
<%- include("./partials/footer") %>
|
||||||
+23
-37
@@ -1,38 +1,24 @@
|
|||||||
<html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<head>
|
<%- include("./partials/headerStart") %>
|
||||||
<title>RCalculator</title>
|
|
||||||
<link rel="icon" href="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/rekor.png">
|
<main>
|
||||||
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
|
<section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
|
||||||
</head>
|
<div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
|
||||||
<body class="bg-white dark:bg-gray-900">
|
<h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">Plan now, live better.</h1>
|
||||||
<%- include("./partials/headerStart") %>
|
<p class="mb-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">Planning your retirement is a crucial step towards financial security and a happy future.</p>
|
||||||
<main>
|
<div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
|
||||||
<section class="bg-center bg-no-repeat bg-cover bg-[url('/images/bg1.jpg')] bg-gray-400 bg-blend-multiply">
|
<a href="/signup" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
|
||||||
<div class="px-4 mx-auto max-w-screen-xl text-center py-24 lg:py-56">
|
Get started
|
||||||
<h1 class="mb-4 text-4xl font-extrabold tracking-tight leading-none text-white md:text-5xl lg:text-6xl">Plan now, live better.</h1>
|
<svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
|
||||||
<p class="mb-8 text-lg font-normal text-gray-300 lg:text-xl sm:px-16 lg:px-48">Planning your retirement is a crucial step towards financial security and a happy future.</p>
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
|
||||||
<div class="flex flex-col space-y-4 sm:flex-row sm:justify-center sm:space-y-0">
|
</svg>
|
||||||
<a href="/login" class="inline-flex justify-center items-center py-3 px-5 text-base font-medium text-center text-white rounded-lg bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 dark:focus:ring-blue-900">
|
</a>
|
||||||
Get started
|
<a href="/aboutUs" class="inline-flex justify-center hover:text-gray-900 items-center py-3 px-5 sm:ms-4 text-base font-medium text-center text-white rounded-lg border border-white hover:bg-gray-100 focus:ring-4 focus:ring-gray-400">
|
||||||
<svg class="w-3.5 h-3.5 ms-2 rtl:rotate-180" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 10">
|
Learn more
|
||||||
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 5h12m0 0L9 1m4 4L9 9"/>
|
</a>
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a href="/aboutUs" class="inline-flex justify-center hover:text-gray-900 items-center py-3 px-5 sm:ms-4 text-base font-medium text-center text-white rounded-lg border border-white hover:bg-gray-100 focus:ring-4 focus:ring-gray-400">
|
|
||||||
Learn more
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</div>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
</section>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/2.3.0/flowbite.min.js"></script>
|
</main>
|
||||||
</body>
|
|
||||||
</html>
|
<%- include("./partials/footer") %>
|
||||||
+5
-18
@@ -1,19 +1,7 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
<main>
|
||||||
<meta charset="UTF-8">
|
<div class="flex justify-center items-center h-screen">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Login Page</title>
|
|
||||||
<link rel="stylesheet" href="/static/css/style.css" <link rel="stylesheet" href="/static/css/style.css">
|
|
||||||
<link rel="stylesheet" href="/static/css/style.css">
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css">
|
|
||||||
<link href="https://cdn.jsdelivr.net/npm/tailwindcss@3.3.2/dist/tailwind.min.css" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="flex justify-center items-center h-screen bg-gray-700">
|
|
||||||
<form action="/login" method="POST">
|
<form action="/login" method="POST">
|
||||||
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
||||||
<h1 class="text-3xl block text-center font-semibold"> Login </h1>
|
<h1 class="text-3xl block text-center font-semibold"> Login </h1>
|
||||||
@@ -51,7 +39,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
</main>
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
<%- include("./partials/footer") %>
|
||||||
+8
-23
@@ -1,25 +1,10 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/header") %>
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
|
||||||
<title>Document</title>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
<main>
|
||||||
<%- include("./partials/header") %>
|
The More Page
|
||||||
<main>
|
</main>
|
||||||
The More Page
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- include("./partials/navBar") %>
|
|
||||||
</footer>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
<%- include("./partials/navBar") %>
|
||||||
|
<%- include("./partials/footer") %>
|
||||||
|
|
||||||
@@ -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>© 2025 RCalculator. All rights reserved.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -19,15 +19,9 @@
|
|||||||
<li>
|
<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>
|
<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>
|
</li>
|
||||||
<% if (session.authenticated) { %>
|
|
||||||
<li>
|
<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>
|
<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>
|
</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>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
<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>
|
||||||
<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>
|
||||||
<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>
|
<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>
|
||||||
|
|||||||
@@ -26,5 +26,4 @@
|
|||||||
<span class="text-gray-500 dark:text-gray-400 text-sm">More</span>
|
<span class="text-gray-500 dark:text-gray-400 text-sm">More</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
+7
-24
@@ -1,26 +1,9 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/header") %>
|
||||||
|
|
||||||
<head>
|
<main>
|
||||||
<meta charset="UTF-8">
|
The Plans Page
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
</main>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
|
||||||
<title>Document</title>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
<%- include("./partials/navBar") %>
|
||||||
<%- include("./partials/header") %>
|
<%- include("./partials/footer") %>
|
||||||
<main>
|
|
||||||
The Plans Page
|
|
||||||
</main>
|
|
||||||
<footer>
|
|
||||||
<div class="fixed bottom-0 left-0 z-50 sm:hidden lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
|
|
||||||
<div class="container mx-auto">
|
|
||||||
<p>© 2025 RCalculator. All rights reserved.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<%- include("./partials/navBar") %>
|
|
||||||
</footer>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
+6
-18
@@ -1,19 +1,8 @@
|
|||||||
<!DOCTYPE html>
|
<%- include("./partials/fileHeader") %>
|
||||||
<html lang="en">
|
<%- include("./partials/headerStart") %>
|
||||||
|
|
||||||
<head>
|
<main>
|
||||||
<meta charset="UTF-8">
|
<div class="flex justify-center items-center h-screen">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Signup</title>
|
|
||||||
<link rel="stylesheet" href="/static/css/style.css">
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"
|
|
||||||
integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg=="
|
|
||||||
crossorigin="anonymous" referrerpolicy="no-referrer" />
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="flex justify-center items-center h-screen bg-gray-700">
|
|
||||||
<form action="/signup" method="POST">
|
<form action="/signup" method="POST">
|
||||||
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
||||||
<h1 class="text-3xl block text-center font-semibold"> Signup </h1>
|
<h1 class="text-3xl block text-center font-semibold"> Signup </h1>
|
||||||
@@ -46,7 +35,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
</main>
|
||||||
</body>
|
|
||||||
|
|
||||||
</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") %>
|
||||||
Reference in new issue
Block a user