From 24a626bbeb2cb7823d997338c508739229198e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <43091603+glazk0@users.noreply.github.com> Date: Sun, 24 Sep 2023 21:57:30 +0200 Subject: [PATCH 1/4] fix: semantic & target blank --- src/lib/components/Sidenav.svelte | 163 ++++++++++++++---------------- 1 file changed, 77 insertions(+), 86 deletions(-) diff --git a/src/lib/components/Sidenav.svelte b/src/lib/components/Sidenav.svelte index 81c4621..ec07dd7 100644 --- a/src/lib/components/Sidenav.svelte +++ b/src/lib/components/Sidenav.svelte @@ -80,32 +80,30 @@ }} href={item.slug} class={cn( - 'flex justify-center rounded-md px-3 py-3 text-sm transition-colors duration-150 lg:justify-start', + 'flex items-center justify-center gap-2 rounded-md px-3 py-3 text-sm transition-colors duration-150 lg:justify-start', { 'bg-primary-700': isActive(item.slug), 'group hover:bg-primary-700': !isActive(item.slug) } )} > -
- - - {item.name} - -
+ + + {item.name} + {/each} @@ -118,22 +116,17 @@ -- 2.39.5 From c27b6bda9c1aacfc8424d01db5f03b785daa93c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <43091603+glazk0@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:11:01 +0200 Subject: [PATCH 2/4] fix: other semantic and possible issue on sign-up --- src/routes/sign-in/+page.svelte | 14 +++++++++++--- src/routes/sign-up/+page.server.ts | 3 ++- src/routes/sign-up/+page.svelte | 24 +++++++++++++++++++----- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/routes/sign-in/+page.svelte b/src/routes/sign-in/+page.svelte index 85eb140..f39017a 100644 --- a/src/routes/sign-in/+page.svelte +++ b/src/routes/sign-in/+page.svelte @@ -9,6 +9,8 @@ export let data: PageData; + let submitting = false; + const { form, errors, enhance } = superForm(data.form, { onSubmit() { submitting = true; @@ -17,8 +19,6 @@ submitting = false; } }); - - let submitting = false;
@@ -27,7 +27,14 @@

Connexion

- + {#if $errors.pseudo}{$errors.pseudo}{/if} @@ -37,6 +44,7 @@ type="password" required bind:value={$form.passwd} + aria-invalid={$errors.passwd ? 'true' : undefined} /> {#if $errors.passwd}{$errors.passwd}{/if} diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/sign-up/+page.server.ts index 8b33486..f64757b 100644 --- a/src/routes/sign-up/+page.server.ts +++ b/src/routes/sign-up/+page.server.ts @@ -84,9 +84,10 @@ export const actions = { } if (res.status === 400) { - const { email_valid } = await res.json(); + const { email_valid, username_valid } = await res.json(); if (!email_valid) form.errors.email = ['Un compte avec cette adresse email existe déjà']; + if (!username_valid) form.errors.pseudo = ['Ce pseudo est déjà utilisé']; return fail(400, { form }); } diff --git a/src/routes/sign-up/+page.svelte b/src/routes/sign-up/+page.svelte index 66ccc46..760cf77 100644 --- a/src/routes/sign-up/+page.svelte +++ b/src/routes/sign-up/+page.svelte @@ -10,6 +10,9 @@ export let data: PageData; + let submitting = false; + let confirmation = false; + const { form, errors, enhance } = superForm(data.form, { onSubmit() { submitting = true; @@ -28,9 +31,6 @@ } }); - let submitting = false; - let confirmation = false; - export const snapshot: Snapshot = { capture: () => confirmation, restore: (value) => (confirmation = value) @@ -57,6 +57,7 @@ placeholder="philipzcwbarlow@peerat.dev" autocomplete="off" required + aria-invalid={$errors.email ? 'true' : undefined} /> {#if $errors.email}{$errors.email}{/if} @@ -68,6 +69,7 @@ placeholder="Philip" autocomplete="off" required + aria-invalid={$errors.firstname ? 'true' : undefined} /> {#if $errors.firstname}{$errors.firstname}{/if} @@ -79,6 +81,7 @@ placeholder="Barlow" autocomplete="off" required + aria-invalid={$errors.lastname ? 'true' : undefined} /> {#if $errors.lastname}{$errors.lastname}{/if} @@ -90,6 +93,7 @@ placeholder="Cypher Wolf" autocomplete="off" required + aria-invalid={$errors.pseudo ? 'true' : undefined} /> {#if $errors.pseudo}{$errors.pseudo}{/if} @@ -101,11 +105,21 @@ }} > - + {#if $errors.passwd}{$errors.passwd}{/if} - + {#if $errors.code}{$errors.code}{/if}
{/if} -- 2.39.5 From efe4f1569f1d1f9d1b18f5f589ad7d3179aa264b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <43091603+glazk0@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:19:17 +0200 Subject: [PATCH 3/4] fix: change error return name --- src/routes/sign-up/+page.server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/sign-up/+page.server.ts index f64757b..5344239 100644 --- a/src/routes/sign-up/+page.server.ts +++ b/src/routes/sign-up/+page.server.ts @@ -140,7 +140,7 @@ export const actions = { return fail(400, { form }); } - form.errors.code = [`Une erreur s'est produite (${res.status} ${res.statusText})`]; + form.errors.code = [`Le code envoyé est invalide.`]; return fail(400, { form -- 2.39.5 From 17bff677aca68fe5c5734ddc755dedebf6b81296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o?= <43091603+glazk0@users.noreply.github.com> Date: Sun, 24 Sep 2023 22:31:19 +0200 Subject: [PATCH 4/4] fix: signup errors ? --- src/routes/+layout.svelte | 4 ++++ src/routes/dashboard/+layout.svelte | 1 - src/routes/sign-up/+page.server.ts | 4 ++-- src/routes/sign-up/+page.svelte | 13 ++++++++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b39ba53..9e55fd0 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,6 +3,8 @@ import { page } from '$app/stores'; + import Toaster from '$lib/components/Toaster.svelte'; + $: origin = $page.url.origin; $: domain = $page.url.hostname; @@ -38,4 +40,6 @@ + + diff --git a/src/routes/dashboard/+layout.svelte b/src/routes/dashboard/+layout.svelte index 336aeaf..1df6ab0 100644 --- a/src/routes/dashboard/+layout.svelte +++ b/src/routes/dashboard/+layout.svelte @@ -11,7 +11,6 @@
-
diff --git a/src/routes/sign-up/+page.server.ts b/src/routes/sign-up/+page.server.ts index 5344239..0dd4691 100644 --- a/src/routes/sign-up/+page.server.ts +++ b/src/routes/sign-up/+page.server.ts @@ -134,8 +134,8 @@ export const actions = { if (res.status === 400) { const { email_valid, username_valid } = await res.json(); - if (!email_valid) form.errors.email = ['Un compte avec cette adresse email existe déjà']; - if (!username_valid) form.errors.pseudo = ['Ce pseudo est déjà utilisé']; + if (email_valid) form.errors.email = ['Un compte avec cette adresse email existe déjà']; + if (username_valid) form.errors.pseudo = ['Ce pseudo est déjà utilisé']; return fail(400, { form }); } diff --git a/src/routes/sign-up/+page.svelte b/src/routes/sign-up/+page.svelte index 760cf77..463379d 100644 --- a/src/routes/sign-up/+page.svelte +++ b/src/routes/sign-up/+page.svelte @@ -1,12 +1,13 @@