Compare commits

..
Author SHA1 Message Date
Joaquin Paredes a7bb955c8a Merge pull request #39 from JoaquinPar/dev
Merge dev into main
2025-05-22 11:14:30 -07:00
Joaquin Paredes 7c34094a93 Merge pull request #36 from JoaquinPar/dev
Sprint 3 completed
2025-05-20 09:02:27 -07:00
2 changed files with 11 additions and 13 deletions

No files matched your search

+1 -1
View File
@@ -47,7 +47,7 @@ module.exports = (users) => {
$set: { resetToken: token, resetTokenExpires: expiration } $set: { resetToken: token, resetTokenExpires: expiration }
}); });
const resetUrl = `https://rcalculator.sowinski.dev/${PORT}/reset/${token}`; const resetUrl = `http://localhost:${PORT}/reset/${token}`;
const mailSend = { const mailSend = {
from: process.env.EMAIL_USER, from: process.env.EMAIL_USER,
+10 -12
View File
@@ -3,7 +3,7 @@
<main class="pt-24 pb-14"> <main class="pt-24 pb-14">
<!-- Buttons --> <!-- Buttons -->
<div class="flex md:justify-end justify-center gap-4 px-5 py-6 md:py-0"> <div class="flex justify-end gap-4 px-5 py-6">
<a href="/assets?popup" <a href="/assets?popup"
id="addAss" class="text-center cursor-pointer min-w-[150px] bg-green-600 px-4 py-2 text-white rounded hover:bg-green-800" id="addAss" 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> type="button">Add Asset</a>
@@ -14,17 +14,15 @@
<div class="w-full"> <div class="w-full">
<div class="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-y-4 gap-x-6"> <div class="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-y-4 gap-x-6">
<% if (plans.length === 0) { %> <% if (plans.length === 0) { %>
<div class="flex justify-center md:col-start-2"> <div class="col-span-1 col-start-2 ml-28 mt-25">
<div class="col-span-1 mt-25"> <div class="w-86 p-4 bg-white rounded-lg shadow-xl border border-slate-200">
<div class="w-86 p-4 bg-white rounded-lg shadow-xl border border-slate-200"> <h1 class="text-2xl block text-center font-semibold text-slate-700">Don't have any retirement plans? </h1>
<h1 class="text-2xl block text-center font-semibold text-slate-700">Don't have any retirement plans? </h1> <div class="mt-4 flex justify-center items-center">
<div class="mt-4 flex justify-center items-center"> <div class="mt-4 flex justify-center">
<div class="mt-4 flex justify-center"> <a href="/plans" class="cursor-pointer border-2 border-blue-600 bg-blue-600 text-white py-2 px-6
<a href="/plans" class="cursor-pointer border-2 border-blue-600 bg-blue-600 text-white py-2 px-6 rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold
rounded-md hover:bg-blue-700 hover:border-blue-700 font-semibold transition-colors duration-200 focus:outline-none ">Make one</a>
transition-colors duration-200 focus:outline-none ">Make one</a> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>