From 19fd4af14f44603383692acc421a2e6eac49ea5e Mon Sep 17 00:00:00 2001
From: glazk0 <43091603+glazk0@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:12:44 +0200
Subject: [PATCH] Added better redirection

---
 .../components/layout/navbar/navbar-user.svelte   | 12 ++++++++----
 src/lib/components/layout/navbar/navbar.svelte    |  2 +-
 src/routes/(auth)/login/+page.svelte              | 13 ++++++++++---
 src/routes/(auth)/register/+page.svelte           |  5 ++++-
 src/routes/(auth)/reset-password/+page.server.ts  | 15 +++++++++------
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/lib/components/layout/navbar/navbar-user.svelte b/src/lib/components/layout/navbar/navbar-user.svelte
index cbe9865..0c63c87 100644
--- a/src/lib/components/layout/navbar/navbar-user.svelte
+++ b/src/lib/components/layout/navbar/navbar-user.svelte
@@ -4,14 +4,14 @@
 	import Boring from 'svelte-boring-avatars';
 
 	import Award from 'lucide-svelte/icons/award';
+	import Code from 'lucide-svelte/icons/code';
 	import Github from 'lucide-svelte/icons/github';
 	import LifeBuoy from 'lucide-svelte/icons/life-buoy';
 	import LogOut from 'lucide-svelte/icons/log-out';
-	import Settings from 'lucide-svelte/icons/settings';
-	import Users from 'lucide-svelte/icons/users';
-	import Shield from 'lucide-svelte/icons/shield';
+	import RectangleEllipsis from 'lucide-svelte/icons/rectangle-ellipsis';
 	import ScrollText from 'lucide-svelte/icons/scroll-text';
-	import Code from 'lucide-svelte/icons/code';
+	import Settings from 'lucide-svelte/icons/settings';
+	import Shield from 'lucide-svelte/icons/shield';
 
 	import * as Avatar from '$lib/components/ui/avatar';
 	import { Button } from '$lib/components/ui/button';
@@ -61,6 +61,10 @@
 			</DropdownMenu.Sub>
 		{/if}
 		<DropdownMenu.Separator />
+		<DropdownMenu.Item href="/reset-password">
+			<RectangleEllipsis class="mr-2 h-4 w-4" />
+			<span>Réinitialiser le mot de passe</span>
+		</DropdownMenu.Item>
 		<DropdownMenu.Item href="/settings">
 			<Settings class="mr-2 h-4 w-4" />
 			<span>Paramètres</span>
diff --git a/src/lib/components/layout/navbar/navbar.svelte b/src/lib/components/layout/navbar/navbar.svelte
index 00048fb..87f69f5 100644
--- a/src/lib/components/layout/navbar/navbar.svelte
+++ b/src/lib/components/layout/navbar/navbar.svelte
@@ -7,7 +7,7 @@
 <nav class="w-full border-b border-muted p-4">
 	<div class="flex items-center justify-between">
 		<Breadcrumb />
-		<div class="flex items-center gap-2">
+		<div class="flex items-center gap-4">
 			<NavbarUser />
 			<MobileNav />
 		</div>
diff --git a/src/routes/(auth)/login/+page.svelte b/src/routes/(auth)/login/+page.svelte
index f06a4d8..98b5fe7 100644
--- a/src/routes/(auth)/login/+page.svelte
+++ b/src/routes/(auth)/login/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { page } from '$app/stores';
 	import type { PageData } from './$types';
 
 	import Loader from 'lucide-svelte/icons/loader-circle';
@@ -9,7 +10,7 @@
 	import Input from '$lib/components/ui/input/input.svelte';
 
 	import { loginSchema } from '$lib/validations/auth';
-
+	
 	export let data: PageData;
 
 	const form = superForm(data.form, {
@@ -61,12 +62,18 @@
 			</form>
 			<ul class="flex justify-between">
 				<li>
-					<a class="font-medium text-muted-foreground hover:text-primary" href="/register">
+					<a
+						class="font-medium text-muted-foreground hover:text-primary"
+						href="/register{$page.url.search}"
+					>
 						S'inscrire
 					</a>
 				</li>
 				<li>
-					<a class="font-medium text-muted-foreground hover:text-primary" href="/reset-password">
+					<a
+						class="font-medium text-muted-foreground hover:text-primary"
+						href="/reset-password{$page.url.search}"
+					>
 						Mot de passe oublié
 					</a>
 				</li>
diff --git a/src/routes/(auth)/register/+page.svelte b/src/routes/(auth)/register/+page.svelte
index 8f31588..88585a4 100644
--- a/src/routes/(auth)/register/+page.svelte
+++ b/src/routes/(auth)/register/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { page } from '$app/stores';
 	import { fade } from 'svelte/transition';
 	import type { PageData } from './$types';
 
@@ -219,7 +220,9 @@
 			{/if}
 			<ul class="flex justify-between">
 				<li>
-					<a class="text-muted-foreground hover:text-primary" href="/login">Se connecter</a>
+					<a class="text-muted-foreground hover:text-primary" href="/login{$page.url.search}"
+						>Se connecter</a
+					>
 				</li>
 			</ul>
 		</div>
diff --git a/src/routes/(auth)/reset-password/+page.server.ts b/src/routes/(auth)/reset-password/+page.server.ts
index afbe2b5..d555a1a 100644
--- a/src/routes/(auth)/reset-password/+page.server.ts
+++ b/src/routes/(auth)/reset-password/+page.server.ts
@@ -10,18 +10,16 @@ import { setError, superValidate } from 'sveltekit-superforms/server';
 
 import { requestPasswordResetSchema, resetPasswordSchema } from '$lib/validations/auth';
 
-export const load = (async ({ locals: { user } }) => {
-	if (user) redirect(302, '/');
-
+export const load: PageServerLoad = async () => {
 	const requestPasswordResetForm = await superValidate(zod(requestPasswordResetSchema));
 	const resetPasswordForm = await superValidate(zod(resetPasswordSchema));
 
 	return {
-		title: 'Mot de passe oublié',
+		title: 'Réinitialisation de mot de passe',
 		requestPasswordResetForm,
 		resetPasswordForm
 	};
-}) satisfies PageServerLoad;
+}
 
 export const actions: Actions = {
 	request: async ({ request, fetch }) => {
@@ -46,7 +44,7 @@ export const actions: Actions = {
 			form
 		}
 	},
-	confirmation: async ({ request, cookies, fetch }) => {
+	confirmation: async ({ request, cookies, fetch, url: { searchParams } }) => {
 		const form = await superValidate(request, zod(resetPasswordSchema));
 
 		if (!form.valid) {
@@ -75,6 +73,11 @@ export const actions: Actions = {
 				sameSite: 'strict'
 			});
 
+			const redirectTo = searchParams.get('redirectTo');
+
+			if (redirectTo)
+				redirect(302, `/${redirectTo.slice(1)}`);
+
 			redirect(302, '/');
 		}