diff --git a/src/views/aboutUs.ejs b/src/views/aboutUs.ejs index 6561f12..7888461 100644 --- a/src/views/aboutUs.ejs +++ b/src/views/aboutUs.ejs @@ -6,7 +6,7 @@ <%- include("./partials/header") %> <% } %> -
+

About RCalculator

diff --git a/src/views/assets.ejs b/src/views/assets.ejs index 764e6bd..5a76898 100644 --- a/src/views/assets.ejs +++ b/src/views/assets.ejs @@ -1,7 +1,7 @@ <%- include("./partials/fileHeader") %> <%- include("./partials/header") %> -
+
diff --git a/src/views/dashboard.ejs b/src/views/dashboard.ejs index 86539d0..8405a09 100644 --- a/src/views/dashboard.ejs +++ b/src/views/dashboard.ejs @@ -1,30 +1,92 @@ <%- include("./partials/fileHeader") %> - <%- include("./partials/header") %> +<%- include("./partials/header") %> -
- - - -
+
+ + + +
+ + + + + +
+
- - - - -
-
- -
- - - +
+ + + +
+

+ Retirement goal

+

+ $53k

+
+
+

+ Make this percent bar or graph or + something +  than lastweek +

+
+
+
+
+

+ Retirement goal

+

+ $53k

+
+
+

+ Make this percent bar or graph or + something +  than last + week +

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+

Retirement goal

@@ -35,82 +97,22 @@

- Make this percent bar or graph or - something -  than lastweek -

-
-
-
-
-

- Retirement goal

-

- $53k

-
-
-

- Make this percent bar or graph or - something + Make this percent bar or + graph or something  than last week

-
- - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

- Retirement goal

-

- $53k

-
-
-

- Make this percent bar or - graph or something -  than last - week -

-
-
-
-
-
-
-
+
+
+
+
+
+ +
- <%- include("./partials/navBar") %> - <%- include("./partials/scriptLoader") %> - <%- include("./partials/footer") %> +<%- include("./partials/navBar") %> +<%- include("./partials/scriptLoader") %> +<%- include("./partials/footer") %> diff --git a/src/views/more.ejs b/src/views/more.ejs index 27e07e9..52e11d4 100644 --- a/src/views/more.ejs +++ b/src/views/more.ejs @@ -1,8 +1,52 @@ <%- include("./partials/fileHeader") %> <%- include("./partials/header") %> -
- The More Page +
+
<%- include("./partials/navBar") %> diff --git a/src/views/newPlan.ejs b/src/views/newPlan.ejs index 5370290..22a5093 100644 --- a/src/views/newPlan.ejs +++ b/src/views/newPlan.ejs @@ -1,7 +1,7 @@ <%- include("./partials/fileHeader") %> <%- include("./partials/header") %> -
+

Welcome: <%= user.name %>

Retirement Plan

diff --git a/src/views/partials/fileHeader.ejs b/src/views/partials/fileHeader.ejs index b15b69c..fed6087 100644 --- a/src/views/partials/fileHeader.ejs +++ b/src/views/partials/fileHeader.ejs @@ -6,5 +6,18 @@ RCalculator + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/partials/footer.ejs b/src/views/partials/footer.ejs index 89ad2dd..3058891 100644 --- a/src/views/partials/footer.ejs +++ b/src/views/partials/footer.ejs @@ -1,33 +1,33 @@ -
- -
- -
-
- - -` +
+ +
+ + + + diff --git a/src/views/partials/header.ejs b/src/views/partials/header.ejs index 45b2f8d..e3a7227 100644 --- a/src/views/partials/header.ejs +++ b/src/views/partials/header.ejs @@ -1,8 +1,8 @@
-