diff --git a/src/routes/(app)/+page.server.ts b/src/routes/(app)/+page.server.ts index df220ec..aeaef58 100644 --- a/src/routes/(app)/+page.server.ts +++ b/src/routes/(app)/+page.server.ts @@ -11,7 +11,7 @@ export const load = (async ({ fetch, cookies, locals: { user } }) => { const session = cookies.get('session'); - let res = await fetch(`${API_URL}/chapters`, { + const res = await fetch(`${API_URL}/chapters`, { headers: { Authorization: `Bearer ${session}` } @@ -25,38 +25,10 @@ export const load = (async ({ fetch, cookies, locals: { user } }) => { const chapters: Chapter[] = await res.json(); - const lastChapter = chapters.filter((chapter) => chapter.show).pop(); - - if (!lastChapter) { - return { - daily: null - }; - } - - res = await fetch(`${API_URL}/chapter/${lastChapter.id}`, { - headers: { - Authorization: `Bearer ${session}` - } - }); - - if (!res.ok) { - return { - daily: { - chapter: lastChapter, - puzzle: null - } - }; - } - - const chapter = (await res.json()) as Chapter; - - const lastPuzzle = chapter.puzzles.filter((puzzle) => puzzle.show).pop(); + const lastChapter = chapters.filter((chapter) => chapter.start && chapter.end).pop(); return { title: 'Dashboard', - daily: { - chapter: lastChapter, - puzzle: lastPuzzle - } + event: lastChapter, }; }) satisfies PageServerLoad; diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte index 01936b9..d435b6a 100644 --- a/src/routes/(app)/+page.svelte +++ b/src/routes/(app)/+page.svelte @@ -22,7 +22,32 @@ - {#if data.daily && data.daily.puzzle} + {#if data.event} +
+

Événement en cours ou à venir

+

+ Partipiez à l'événement en équipe en résolvant des puzzles +

+
+
+
+ {data.event.name} + {#if data.event.start && data.event.end} + + {new Date(data.event.start).toLocaleDateString()} - {new Date( + data.event.end + ).toLocaleDateString()} + + {:else} + Aucune date + {/if} +
+ +
+ {/if} +
diff --git a/src/routes/(auth)/register/+page.server.ts b/src/routes/(auth)/register/+page.server.ts index 707e4c9..7fd6853 100644 --- a/src/routes/(auth)/register/+page.server.ts +++ b/src/routes/(auth)/register/+page.server.ts @@ -41,8 +41,8 @@ export const actions = { if (res.ok) { return { - form - } + success: true + }; } if (res.status === 400) { diff --git a/src/routes/(auth)/register/+page.svelte b/src/routes/(auth)/register/+page.svelte index 5d320d5..583797d 100644 --- a/src/routes/(auth)/register/+page.svelte +++ b/src/routes/(auth)/register/+page.svelte @@ -163,9 +163,9 @@ Continuer -