Merge branch 'feature/forgotPass' into dev
This commit is contained in:
knighthawk4227 committed
commit
f3b121fc71
4 files changed
+27
-26
No files matched your search
@@ -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);
|
||||
});
|
||||
|
||||
@@ -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
|
||||
|
||||
+22
-21
@@ -1,27 +1,22 @@
|
||||
<%- include("./partials/fileHeader") %>
|
||||
<%- include("./partials/header") %>
|
||||
|
||||
<main>
|
||||
<main>
|
||||
<!-- Buttons -->
|
||||
<div class="flex justify-end gap-4 px-5 py-6">
|
||||
<a href="/assets?popup" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">Add Asset</a>
|
||||
<a href="/newPlan" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" type="button">Create new plan </a>
|
||||
<a href="/assets?popup"
|
||||
class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
|
||||
type="button">Add Asset</a>
|
||||
<a href="/newPlan"
|
||||
class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800"
|
||||
type="button">Create new plan </a>
|
||||
</div>
|
||||
<!--This is the cards for plans and other things-->
|
||||
<div class="mt-12">
|
||||
<div class="mb-12 grid gap-y-10 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
|
||||
<!--box to put logo icon if we want on in a box-->
|
||||
<div class=" relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
|
||||
<!-- <div -->
|
||||
<!-- class="bg-clip-border mx-4 rounded-xl overflow-hidden bg-gradient-to-tr from-blue-600 to-blue-400 text-white shadow-blue-500/40 shadow-lg absolute mt-2 grid h-16 w-16 place-items-center"> -->
|
||||
<!-- </div> -->
|
||||
<div class="p-4 flex items-center justify-between">
|
||||
<p class="font-sans text-2xl leading-normal font-normal text-blue-gray-600">
|
||||
Retirement goal</p>
|
||||
<h4
|
||||
class="block text-right antialiased tracking-normal font-sans text-2xl font-semibold leading-snug text-blue-gray-900">
|
||||
$53k</h4>
|
||||
</div>
|
||||
<!--This is the cards for plans and other things-->
|
||||
<div class="mt-12">
|
||||
<div class="mb-12 grid gap-y-10 gap-x-6 md:grid-cols-2 mr-3 ml-3 xl:grid-cols-4">
|
||||
@@ -38,8 +33,10 @@
|
||||
$53k</h4>
|
||||
</div>
|
||||
<div class="border-t border-blue-gray-50 p-10">
|
||||
<p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
|
||||
<strong class="text-green-500">Make this percent bar or graph or something
|
||||
<p
|
||||
class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
|
||||
<strong class="text-green-500">Make this percent bar or graph or
|
||||
something
|
||||
</strong> than lastweek
|
||||
</p>
|
||||
</div>
|
||||
@@ -53,8 +50,10 @@
|
||||
$53k</h4>
|
||||
</div>
|
||||
<div class="border-t border-blue-gray-50 p-10">
|
||||
<p class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
|
||||
<strong class="text-green-500">Make this percent bar or graph or something
|
||||
<p
|
||||
class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
|
||||
<strong class="text-green-500">Make this percent bar or graph or
|
||||
something
|
||||
</strong> than last
|
||||
week
|
||||
</p>
|
||||
@@ -84,7 +83,8 @@
|
||||
<!-- </p> -->
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
<div class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
|
||||
<div
|
||||
class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
|
||||
<div
|
||||
class="relative flex flex-col bg-clip-border rounded-xl bg-white text-gray-700 shadow-md">
|
||||
<div class="p-4 flex items-center justify-between">
|
||||
@@ -97,7 +97,8 @@
|
||||
<div class="border-t border-blue-gray-50 p-10">
|
||||
<p
|
||||
class=" antialiased font-sans text-base leading-relaxed font-normal text-blue-gray-600">
|
||||
<strong class="text-green-500">Make this percent bar or graph or something
|
||||
<strong class="text-green-500">Make this percent bar or
|
||||
graph or something
|
||||
</strong> than last
|
||||
week
|
||||
</p>
|
||||
@@ -110,6 +111,6 @@
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<%- include("./partials/navBar") %>
|
||||
<%- include("./partials/scriptLoader") %>
|
||||
<%- include("./partials/footer") %>
|
||||
<%- include("./partials/navBar") %>
|
||||
<%- include("./partials/scriptLoader") %>
|
||||
<%- include("./partials/footer") %>
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user