From 02a8374a58c2c98b38a5b1097aeef7bdf9d7107c Mon Sep 17 00:00:00 2001 From: Joaquin Paredes Date: Fri, 2 May 2025 13:15:38 -0700 Subject: [PATCH 1/3] feature/most nav bar functionality done --- src/views/aboutUs.ejs | 9 ++++++--- src/views/assets.ejs | 18 +++++++++++++++++ src/views/home.ejs | 18 +++++++++++++++++ src/views/index.ejs | 6 +++++- src/views/more.ejs | 18 +++++++++++++++++ src/views/partials/navBar.ejs | 37 +++++++++++++++++++++++++++++++++++ src/views/plans.ejs | 18 +++++++++++++++++ 7 files changed, 120 insertions(+), 4 deletions(-) create mode 100644 src/views/assets.ejs create mode 100644 src/views/home.ejs create mode 100644 src/views/more.ejs create mode 100644 src/views/partials/navBar.ejs create mode 100644 src/views/plans.ejs diff --git a/src/views/aboutUs.ejs b/src/views/aboutUs.ejs index 63108a0..e9fd578 100644 --- a/src/views/aboutUs.ejs +++ b/src/views/aboutUs.ejs @@ -69,10 +69,13 @@ - diff --git a/src/views/index.ejs b/src/views/index.ejs index bf561fb..975b566 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -9,10 +9,15 @@ -
- <%- include("./partials/navBar") %> -
The Index Page + diff --git a/src/views/landing.ejs b/src/views/landing.ejs index bce6438..325ad13 100644 --- a/src/views/landing.ejs +++ b/src/views/landing.ejs @@ -5,35 +5,7 @@ -
- -
+ <%- include("./partials/headerStart") %>
@@ -53,9 +25,11 @@
- diff --git a/src/views/partials/header.ejs b/src/views/partials/header.ejs new file mode 100644 index 0000000..301fedc --- /dev/null +++ b/src/views/partials/header.ejs @@ -0,0 +1,26 @@ +
+ +
\ No newline at end of file diff --git a/src/views/partials/headerStart.ejs b/src/views/partials/headerStart.ejs new file mode 100644 index 0000000..011bbc0 --- /dev/null +++ b/src/views/partials/headerStart.ejs @@ -0,0 +1,32 @@ +
+ +
\ No newline at end of file diff --git a/src/views/partials/navBar.ejs b/src/views/partials/navBar.ejs index 56176fb..edc5772 100644 --- a/src/views/partials/navBar.ejs +++ b/src/views/partials/navBar.ejs @@ -1,37 +1,30 @@ -
-
-
- - - - -
-
+
+
+ + + + + Dashboard + + + + Assets + + + + + + Plans + + + + More + +
diff --git a/src/views/plans.ejs b/src/views/plans.ejs index 70b4a22..9645deb 100644 --- a/src/views/plans.ejs +++ b/src/views/plans.ejs @@ -9,10 +9,18 @@ -
+ <%- include("./partials/header") %> +
+ The Plans Page +
+
+
+
+

© 2025 RCalculator. All rights reserved.

+
+
<%- include("./partials/navBar") %> -
- The Plans Page + From d0aa7a0fbd5a44d0778dad1a69846552f27ba467 Mon Sep 17 00:00:00 2001 From: nicoagostini Date: Mon, 5 May 2025 16:46:16 -0700 Subject: [PATCH 3/3] Landing moved to be the index page, routes added and landing page image route fixed --- app.js | 36 +++++++++++++++++++++++++----- src/views/partials/header.ejs | 2 +- src/views/partials/headerStart.ejs | 4 ++-- src/views/signup.ejs | 1 - 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app.js b/app.js index f95b832..cc6a71b 100644 --- a/app.js +++ b/app.js @@ -25,6 +25,7 @@ app.set('view engine', 'ejs'); 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")); /*** Database ***/ const { connectMongo, getCollection } = require("./src/database/connection"); @@ -52,11 +53,6 @@ initDatabase().then(() => { app.get('/', (req, res) => { if (!req.session.errMessage) req.session.errMessage = ""; - res.render('index'); - return res.status(status.Ok); -}); - -app.get('/landing', (req, res) => { res.render('landing'); return res.status(status.Ok); }); @@ -75,11 +71,41 @@ app.get('/login', (req, res) => { return res.status(status.Ok); }); +app.get('/home', (req, res) => { + res.render('home'); + return res.status(status.Ok); +}); + app.get('/aboutUs', (req, res) => { res.render('aboutUs'); return res.status(status.Ok); }); +app.get('/assets', (req, res) => { + res.render('assets'); + return res.status(status.Ok); +}); + +app.get('/plans', (req, res) => { + res.render('plans'); + return res.status(status.Ok); +}); + +app.get('/more', (req, res) => { + res.render('more'); + return res.status(status.Ok); +}); + +app.get('/profile', (req, res) => { + res.render('profile'); + return res.status(status.Ok); +}); + +app.get('/settings', (req, res) => { + res.render('settings'); + return res.status(status.Ok); +}); + app.get('/*splat', (req, res) => { res.send('404 Not Found'); return res.status(status.NotFound); diff --git a/src/views/partials/header.ejs b/src/views/partials/header.ejs index 301fedc..ef3c1a1 100644 --- a/src/views/partials/header.ejs +++ b/src/views/partials/header.ejs @@ -1,7 +1,7 @@