From 54566f05b749bad66f2767978fc6d70c4c4ed218 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Mon, 5 May 2025 21:56:47 -0700 Subject: [PATCH] feature/fully implemented ejs inclusion to main files --- src/views/aboutUs.ejs | 7 ++++--- src/views/assets.ejs | 2 +- src/views/home.ejs | 24 ++++++++---------------- src/views/index.ejs | 18 ++++++------------ src/views/landing.ejs | 2 +- src/views/login.ejs | 11 +++++------ src/views/more.ejs | 24 ++++++++---------------- src/views/partials/fileHeader.ejs | 2 +- src/views/partials/headerStart.ejs | 2 +- src/views/plans.ejs | 23 +++++++---------------- src/views/signup.ejs | 20 ++++++-------------- src/views/template.ejs | 9 +++++++++ 12 files changed, 57 insertions(+), 87 deletions(-) create mode 100644 src/views/template.ejs diff --git a/src/views/aboutUs.ejs b/src/views/aboutUs.ejs index 1977166..32ded54 100644 --- a/src/views/aboutUs.ejs +++ b/src/views/aboutUs.ejs @@ -1,6 +1,6 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> - +<%- include("./partials/fileHeader") %> <%- include("./partials/headerStart") %> +
@@ -26,7 +26,7 @@
- + Get started
+ <%- include("./partials/footer") %> \ No newline at end of file diff --git a/src/views/assets.ejs b/src/views/assets.ejs index 58cd89d..a926f36 100644 --- a/src/views/assets.ejs +++ b/src/views/assets.ejs @@ -1,4 +1,4 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> +<%- include("./partials/fileHeader") %> <%- include("./partials/header") %>
diff --git a/src/views/home.ejs b/src/views/home.ejs index e8219bc..840dc07 100644 --- a/src/views/home.ejs +++ b/src/views/home.ejs @@ -1,18 +1,10 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> +<%- include("./partials/fileHeader") %> +<%- include("./partials/header") %> - -
- <%- include("./partials/header") %> - Welcome: <%= user.email %> - The Dashboard Page -
-
-
-
-

© 2025 RCalculator. All rights reserved.

-
-
-
- +
+ Welcome: <%= user.email %> + The Dashboard Page +
- +<%- include("./partials/navBar") %> +<%- include("./partials/footer") %> \ No newline at end of file diff --git a/src/views/index.ejs b/src/views/index.ejs index 21b69f8..935b4a0 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -1,15 +1,9 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> +<%- include("./partials/fileHeader") %> +<%- include("./partials/header") %> - +
The Index Page -
-
-
-

© 2025 RCalculator. All rights reserved.

-
-
- <%- include("./partials/navBar") %> -
- +
- +<%- include("./partials/navBar") %> +<%- include("./partials/footer") %> \ No newline at end of file diff --git a/src/views/landing.ejs b/src/views/landing.ejs index dfd408a..d7a24d1 100644 --- a/src/views/landing.ejs +++ b/src/views/landing.ejs @@ -7,7 +7,7 @@

Plan now, live better.

Planning your retirement is a crucial step towards financial security and a happy future.

- + Get started -
+
+

Login

@@ -39,7 +39,6 @@
- - +
- +<%- include("./partials/footer") %> \ No newline at end of file diff --git a/src/views/more.ejs b/src/views/more.ejs index 50414f0..59e3acf 100644 --- a/src/views/more.ejs +++ b/src/views/more.ejs @@ -1,18 +1,10 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> +<%- include("./partials/fileHeader") %> +<%- include("./partials/header") %> - - <%- include("./partials/header") %> -
- The More Page -
-
-
-
-

© 2025 RCalculator. All rights reserved.

-
-
- <%- include("./partials/navBar") %> -
- +
+ The More Page +
- +<%- include("./partials/navBar") %> +<%- include("./partials/footer") %> + \ No newline at end of file diff --git a/src/views/partials/fileHeader.ejs b/src/views/partials/fileHeader.ejs index 8218bb4..35b60ed 100644 --- a/src/views/partials/fileHeader.ejs +++ b/src/views/partials/fileHeader.ejs @@ -5,6 +5,6 @@ - <%= title %> + RCalculator \ No newline at end of file diff --git a/src/views/partials/headerStart.ejs b/src/views/partials/headerStart.ejs index 5e07c61..b2b4f4b 100644 --- a/src/views/partials/headerStart.ejs +++ b/src/views/partials/headerStart.ejs @@ -20,7 +20,7 @@ Home
  • - About Us + Login
  • Contact us diff --git a/src/views/plans.ejs b/src/views/plans.ejs index c2c0337..7f6e699 100644 --- a/src/views/plans.ejs +++ b/src/views/plans.ejs @@ -1,18 +1,9 @@ -<%- include("./partials/fileHeader", {title: "RCalculator"}) %> +<%- include("./partials/fileHeader") %> +<%- include("./partials/header") %> - - <%- include("./partials/header") %> -
    - The Plans Page -
    -
    -
    -
    -

    © 2025 RCalculator. All rights reserved.

    -
    -
    - <%- include("./partials/navBar") %> -
    - +
    + The Plans Page +
    - +<%- include("./partials/navBar") %> +<%- include("./partials/footer") %> diff --git a/src/views/signup.ejs b/src/views/signup.ejs index 7ea5239..7411268 100644 --- a/src/views/signup.ejs +++ b/src/views/signup.ejs @@ -1,15 +1,8 @@ - - +<%- include("./partials/fileHeader") %> +<%- include("./partials/headerStart") %> - - - - - Signup - - - -
    +
    +

    Signup

    @@ -42,7 +35,6 @@
    - - +
    - +<%- include("./partials/footer") %> \ No newline at end of file diff --git a/src/views/template.ejs b/src/views/template.ejs new file mode 100644 index 0000000..868ca17 --- /dev/null +++ b/src/views/template.ejs @@ -0,0 +1,9 @@ +<%- include("./partials/fileHeader") %> +<%- include("./partials/header") %> + +
    + +
    + +<%- include("./partials/navBar") %> +<%- include("./partials/footer") %> \ No newline at end of file