From 4c78ee4a21600839ca8867e8f3dbf8573bc9063b Mon Sep 17 00:00:00 2001
From: glazk0 <43091603+glazk0@users.noreply.github.com>
Date: Thu, 28 Mar 2024 21:52:15 +0100
Subject: [PATCH] Feat event

---
 src/routes/(app)/+page.server.ts           | 34 ++--------------------
 src/routes/(app)/+page.svelte              | 29 ++++++++++++++++--
 src/routes/(auth)/register/+page.server.ts |  4 +--
 src/routes/(auth)/register/+page.svelte    |  4 +--
 4 files changed, 34 insertions(+), 37 deletions(-)

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 @@
 			<Card title="Badges obtenus" data={user?.badges?.length ?? 'Aucun'} />
 			<Card title="Rang actuel" data={user?.rank ?? 'Non classé'} />
 		</div>
-		{#if data.daily && data.daily.puzzle}
+		{#if data.event}
+			<header>
+				<h1 class="text-lg font-semibold">Événement en cours ou à venir</h1>
+				<p class="text-muted-foreground">
+					Partipiez à l&apos;événement en équipe en résolvant des puzzles
+				</p>
+			</header>
+			<div
+				class="flex items-center justify-between gap-4 rounded border border-primary bg-card px-4 py-2"
+			>
+				<div class="flex w-full flex-col justify-between md:flex-row md:items-center md:gap-4">
+					<span class="text-lg font-semibold">{data.event.name}</span>
+					{#if data.event.start && data.event.end}
+						<span class="text-muted-foreground">
+							{new Date(data.event.start).toLocaleDateString()} - {new Date(
+								data.event.end
+							).toLocaleDateString()}
+						</span>
+					{:else}
+						<span class="text-muted-foreground">Aucune date</span>
+					{/if}
+				</div>
+				<Button href="/chapters/{data.event.id}">Participer</Button>
+			</div>
+		{/if}
+		<!-- {#if data.daily && data.daily.puzzle}
 			<header>
 				<h1 class="text-lg font-semibold">Puzzle du jour</h1>
 				<p class="text-muted-foreground">
@@ -42,7 +67,7 @@
 					{data.daily.puzzle.score ? 'Voir' : 'Jouer'}
 				</Button>
 			</div>
-		{/if}
+		{/if} -->
 		<div class="grid grid-cols-1 gap-4">
 			<div class="flex flex-col gap-4">
 				<header>
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
 					</Form.Button>
 
-					<Button variant="link" formaction="?/register" on:click={() => toast('Code renvoyé')}>
+					<!-- <Button variant="link" formaction="?/register" on:click={() => toast('Code renvoyé')}>
 						Renvoyer le code
-					</Button>
+					</Button> -->
 				</form>
 			{:else}
 				<h1 class="mx-auto text-xl font-bold">Inscription</h1>
-- 
2.39.5