From 7fa75457c9c6692b70e53850bb48f691d50095ee Mon Sep 17 00:00:00 2001 From: Joaquin Date: Mon, 5 May 2025 16:24:25 -0700 Subject: [PATCH] feature/completed navbar/header functionality --- src/views/aboutUs.ejs | 37 +++--------------- src/views/assets.ejs | 35 ++++++++++------- src/views/home.ejs | 14 +++++-- src/views/index.ejs | 11 ++++-- src/views/landing.ejs | 38 +++--------------- src/views/more.ejs | 15 +++++-- src/views/partials/header.ejs | 26 ++++++++++++ src/views/partials/headerStart.ejs | 32 +++++++++++++++ src/views/partials/navBar.ejs | 63 +++++++++++++----------------- src/views/plans.ejs | 14 +++++-- 10 files changed, 158 insertions(+), 127 deletions(-) create mode 100644 src/views/partials/header.ejs create mode 100644 src/views/partials/headerStart.ejs diff --git a/src/views/aboutUs.ejs b/src/views/aboutUs.ejs index e9fd578..e5979bd 100644 --- a/src/views/aboutUs.ejs +++ b/src/views/aboutUs.ejs @@ -5,37 +5,8 @@ -
- -
+ <%- include("./partials/headerStart") %>
-

About RCalculator

@@ -70,14 +41,16 @@
+ + + \ No newline at end of file diff --git a/src/views/assets.ejs b/src/views/assets.ejs index 91a207e..acaa431 100644 --- a/src/views/assets.ejs +++ b/src/views/assets.ejs @@ -1,18 +1,23 @@ - - - - - - Document - - - -
- <%- include("./partials/navBar") %> -
- The Assets Page - - + + + + + Document + + + <%- include("./partials/header") %> +
+ The Assets Page +
+ + diff --git a/src/views/home.ejs b/src/views/home.ejs index 232f992..3bb7034 100644 --- a/src/views/home.ejs +++ b/src/views/home.ejs @@ -9,10 +9,18 @@ -
+ <%- include("./partials/header") %> +
+ The Dashboard Page +
+
+
+
+

© 2025 RCalculator. All rights reserved.

+
+
<%- include("./partials/navBar") %> -
- The Home Page + 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 +
+
- The Plans Page +