merge cnflicts with dev

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);
 });

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

src/views/forgotPass.ejs

@@ -6,7 +6,7 @@
                 <div class="w-96 p-6 shadow-1g bg-white rounded-md">
                     <h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
                     <hr class="mt-3">
-                    <% if (reset==='' ) { %>
+                    <% if (!reset ) { %>
                         <div class="mt-3">
                             <label for="email" class="block text-base mb-2">Email</label>
                             <input type="text" id="email" name="email"
@@ -23,7 +23,7 @@
                                 <div class="text-red-800 font-bold" id="forgor">
                                     <%= error%>
                                 </div>
-                                <% if (reset==='' ) { %>
+                                <% if (!reset) { %>
                                     <div class="mt-5">
                                         <button type="submit"
                                             class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Send