Skip to content

Merge from Dev #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hib4 merged 2 commits into from
May 22, 2025
Merged

Merge from Dev #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e46766
style: reset password contents
hib4 May 22, 2025
f3a0af5
Merge pull request #32 from GarudaHacks/style/reset-password-contents
hib4 May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions functions/src/controllers/auth_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,17 +445,7 @@ const createMailOptions = (email: string, link: string): MailOptions => ({
</head>
<body style="font-family: Arial, sans-serif; line-height: 1.6; color: #fff; max-width: 600px; margin: 0 auto; padding: 20px; background-color: #1a1a1a;">
<div style="background-color: #2d2d2d; border-radius: 8px; padding: 30px; text-align: center; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);">
<div style="margin-bottom: 20px;">
<img
src="https://garudahacks.com/images/logo/ghq.png"
alt="Garuda Hacks Logo"
style="max-width: 80px;"
loading="eager"
decoding="async"
importance="high"
/>
</div>
<h1 style="color: #fff; margin-bottom: 20px; font-size: 24px;">Reset Your Password</h1>
<h1 style="color: #fff; margin-bottom: 20px; font-size: 32px;">Reset Your Password</h1>
<p style="color: #e2e8f0; margin-bottom: 25px;">You requested a password reset. Click the button below to choose a new password:</p>
<a href="${link}" style="background-color: #4299e1; color: white; padding: 12px 24px; text-decoration: none; border-radius: 6px; display: inline-block; font-weight: bold; margin-bottom: 25px;">Reset Password</a>
<p style="color: #a0aec0; font-size: 14px; margin-top: 30px; border-top: 1px solid #4a5568; padding-top: 20px;">
Expand All @@ -469,7 +459,7 @@ const createMailOptions = (email: string, link: string): MailOptions => ({
<p>© ${new Date().getFullYear()} Garuda Hacks. All rights reserved.</p>
<p style="margin-top: 10px;">
<a href="https://garudahacks.com" style="color: #718096; text-decoration: none;">Visit our website</a> |
<a href="mailto:support@garudahacks.com" style="color: #718096; text-decoration: none;">Contact Support</a>
<a href="mailto:hiba@garudahacks.com" style="color: #718096; text-decoration: none;">Contact Support</a>
</p>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion functions/src/routes/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const router = express.Router();

router.post("/login", (req: Request, res: Response) => login(req, res));
router.post("/register", (req: Request, res: Response) => register(req, res));
router.post("/request-reset", requestPasswordReset);
router.post("/reset-password", requestPasswordReset);
router.post("/session-login", (req: Request, res: Response) =>
sessionLogin(req, res)
);
Expand Down