From 99b36d33705cc0ec84560f57afbe1b554bbe8c6b Mon Sep 17 00:00:00 2001 From: knighthawk4227 Date: Fri, 9 May 2025 10:26:18 -0700 Subject: [PATCH 1/2] fixing conflict with dashboard.ejs --- src/views/dashboard.ejs | 199 ++++++++++++++++++++-------------------- 1 file changed, 100 insertions(+), 99 deletions(-) diff --git a/src/views/dashboard.ejs b/src/views/dashboard.ejs index d36b979..86539d0 100644 --- a/src/views/dashboard.ejs +++ b/src/views/dashboard.ejs @@ -1,115 +1,116 @@ <%- include("./partials/fileHeader") %> <%- include("./partials/header") %> -
- -
- Add Asset - Create new plan -
- -
-
- -
- - - -
-

- Retirement goal

-

- $53k

+
+ +
+ Add Asset + Create new plan
-
- -
- - - -
-

- Retirement goal

-

- $53k

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

+ Retirement goal

+

+ $53k

+
+
+

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

+
-
-

- 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

+

+ $53k

+
+
+

+ 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 -

+
+
+

+ 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") %> From 07824e6355032c29a60d922ba65fc62fd644d4a3 Mon Sep 17 00:00:00 2001 From: knighthawk4227 Date: Fri, 9 May 2025 11:02:31 -0700 Subject: [PATCH 2/2] merge cnflicts with dev --- app.js | 4 ++-- src/auth/forgotPass.js | 2 +- src/views/forgotPass.ejs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index ff449a4..37ba38d 100644 --- a/app.js +++ b/app.js @@ -77,8 +77,8 @@ app.get('/aboutUs', (req, res) => { app.get('/forgotPassword', (req, res) => { const error = req.session.error; const reset = req.session.reset; - req.session.reset = ''; - req.session.error = ''; + delete req.session.reset; + delete req.session.error; res.render('forgotPass', { error: error, reset: reset }); return res.status(status.Ok); }); diff --git a/src/auth/forgotPass.js b/src/auth/forgotPass.js index 62260bf..a369dfb 100644 --- a/src/auth/forgotPass.js +++ b/src/auth/forgotPass.js @@ -8,7 +8,7 @@ const transporter = nodeMail.createTransport({ service: 'gmail', auth: { user: process.env.EMAIL_USER, - pass: process.env.PASS, + pass: process.env.EMAIL_PASS, } }); // users info diff --git a/src/views/forgotPass.ejs b/src/views/forgotPass.ejs index 811c32d..d2d749f 100644 --- a/src/views/forgotPass.ejs +++ b/src/views/forgotPass.ejs @@ -6,7 +6,7 @@

Reset Password

- <% if (reset==='' ) { %> + <% if (!reset ) { %>
<%= error%>
- <% if (reset==='' ) { %> + <% if (!reset) { %>