Compare commits

..

No commits in common. "3614fcfbd5faeab17615d68f8e8f6a858e1c0036" and "e44cb8d18536b03b24b167627628932b55e29efa" have entirely different histories.

5 changed files with 14 additions and 31 deletions

View file

@ -4,14 +4,14 @@
import Boring from 'svelte-boring-avatars'; import Boring from 'svelte-boring-avatars';
import Award from 'lucide-svelte/icons/award'; import Award from 'lucide-svelte/icons/award';
import Code from 'lucide-svelte/icons/code';
import Github from 'lucide-svelte/icons/github'; import Github from 'lucide-svelte/icons/github';
import LifeBuoy from 'lucide-svelte/icons/life-buoy'; import LifeBuoy from 'lucide-svelte/icons/life-buoy';
import LogOut from 'lucide-svelte/icons/log-out'; import LogOut from 'lucide-svelte/icons/log-out';
import RectangleEllipsis from 'lucide-svelte/icons/rectangle-ellipsis';
import ScrollText from 'lucide-svelte/icons/scroll-text';
import Settings from 'lucide-svelte/icons/settings'; import Settings from 'lucide-svelte/icons/settings';
import Users from 'lucide-svelte/icons/users';
import Shield from 'lucide-svelte/icons/shield'; import Shield from 'lucide-svelte/icons/shield';
import ScrollText from 'lucide-svelte/icons/scroll-text';
import Code from 'lucide-svelte/icons/code';
import * as Avatar from '$lib/components/ui/avatar'; import * as Avatar from '$lib/components/ui/avatar';
import { Button } from '$lib/components/ui/button'; import { Button } from '$lib/components/ui/button';
@ -61,10 +61,6 @@
</DropdownMenu.Sub> </DropdownMenu.Sub>
{/if} {/if}
<DropdownMenu.Separator /> <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"> <DropdownMenu.Item href="/settings">
<Settings class="mr-2 h-4 w-4" /> <Settings class="mr-2 h-4 w-4" />
<span>Paramètres</span> <span>Paramètres</span>

View file

@ -7,7 +7,7 @@
<nav class="w-full border-b border-muted p-4"> <nav class="w-full border-b border-muted p-4">
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<Breadcrumb /> <Breadcrumb />
<div class="flex items-center gap-4"> <div class="flex items-center gap-2">
<NavbarUser /> <NavbarUser />
<MobileNav /> <MobileNav />
</div> </div>

View file

@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores';
import type { PageData } from './$types'; import type { PageData } from './$types';
import Loader from 'lucide-svelte/icons/loader-circle'; import Loader from 'lucide-svelte/icons/loader-circle';
@ -10,7 +9,7 @@
import Input from '$lib/components/ui/input/input.svelte'; import Input from '$lib/components/ui/input/input.svelte';
import { loginSchema } from '$lib/validations/auth'; import { loginSchema } from '$lib/validations/auth';
export let data: PageData; export let data: PageData;
const form = superForm(data.form, { const form = superForm(data.form, {
@ -62,18 +61,12 @@
</form> </form>
<ul class="flex justify-between"> <ul class="flex justify-between">
<li> <li>
<a <a class="font-medium text-muted-foreground hover:text-primary" href="/register">
class="font-medium text-muted-foreground hover:text-primary"
href="/register{$page.url.search}"
>
S'inscrire S'inscrire
</a> </a>
</li> </li>
<li> <li>
<a <a class="font-medium text-muted-foreground hover:text-primary" href="/reset-password">
class="font-medium text-muted-foreground hover:text-primary"
href="/reset-password{$page.url.search}"
>
Mot de passe oublié Mot de passe oublié
</a> </a>
</li> </li>

View file

@ -1,5 +1,4 @@
<script lang="ts"> <script lang="ts">
import { page } from '$app/stores';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
import type { PageData } from './$types'; import type { PageData } from './$types';
@ -220,9 +219,7 @@
{/if} {/if}
<ul class="flex justify-between"> <ul class="flex justify-between">
<li> <li>
<a class="text-muted-foreground hover:text-primary" href="/login{$page.url.search}" <a class="text-muted-foreground hover:text-primary" href="/login">Se connecter</a>
>Se connecter</a
>
</li> </li>
</ul> </ul>
</div> </div>

View file

@ -10,16 +10,18 @@ import { setError, superValidate } from 'sveltekit-superforms/server';
import { requestPasswordResetSchema, resetPasswordSchema } from '$lib/validations/auth'; import { requestPasswordResetSchema, resetPasswordSchema } from '$lib/validations/auth';
export const load: PageServerLoad = async () => { export const load = (async ({ locals: { user } }) => {
if (user) redirect(302, '/');
const requestPasswordResetForm = await superValidate(zod(requestPasswordResetSchema)); const requestPasswordResetForm = await superValidate(zod(requestPasswordResetSchema));
const resetPasswordForm = await superValidate(zod(resetPasswordSchema)); const resetPasswordForm = await superValidate(zod(resetPasswordSchema));
return { return {
title: 'Réinitialisation de mot de passe', title: 'Mot de passe oublié',
requestPasswordResetForm, requestPasswordResetForm,
resetPasswordForm resetPasswordForm
}; };
} }) satisfies PageServerLoad;
export const actions: Actions = { export const actions: Actions = {
request: async ({ request, fetch }) => { request: async ({ request, fetch }) => {
@ -44,7 +46,7 @@ export const actions: Actions = {
form form
} }
}, },
confirmation: async ({ request, cookies, fetch, url: { searchParams } }) => { confirmation: async ({ request, cookies, fetch }) => {
const form = await superValidate(request, zod(resetPasswordSchema)); const form = await superValidate(request, zod(resetPasswordSchema));
if (!form.valid) { if (!form.valid) {
@ -73,11 +75,6 @@ export const actions: Actions = {
sameSite: 'strict' sameSite: 'strict'
}); });
const redirectTo = searchParams.get('redirectTo');
if (redirectTo)
redirect(302, `/${redirectTo.slice(1)}`);
redirect(302, '/'); redirect(302, '/');
} }