From 74cb0ed7b9450142d81e3d8b8c5b42804fab1d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C5=A1per=20Dobrovoljc?= <gasper.dobrovoljc1@gmail.com>
Date: Thu, 15 Aug 2024 00:09:24 +0200
Subject: [PATCH] Added subtitles and tab titles

---
 src/lib/components/Subtitle.svelte            |  3 ++
 src/lib/components/Title.svelte               |  9 ++----
 src/routes/+layout.server.ts                  |  2 +-
 src/routes/+layout.svelte                     | 32 ++++++++++---------
 src/routes/games/[gameId]/+page.svelte        | 15 +++++++++
 .../games/[gameId]/draw-methods/+page.svelte  | 11 ++++++-
 .../participation-methods/+page.svelte        | 10 +++++-
 src/routes/games/[gameId]/prizes/+page.svelte | 11 ++++++-
 src/routes/games/[gameId]/users/+page.svelte  | 10 +++++-
 .../games/[gameId]/won-prizes/+page.svelte    | 10 +++++-
 10 files changed, 86 insertions(+), 27 deletions(-)
 create mode 100644 src/lib/components/Subtitle.svelte

diff --git a/src/lib/components/Subtitle.svelte b/src/lib/components/Subtitle.svelte
new file mode 100644
index 0000000..018d721
--- /dev/null
+++ b/src/lib/components/Subtitle.svelte
@@ -0,0 +1,3 @@
+<p class="text-muted-foreground text-sm">
+	<slot />
+</p>
\ No newline at end of file
diff --git a/src/lib/components/Title.svelte b/src/lib/components/Title.svelte
index 0634e39..8190c08 100644
--- a/src/lib/components/Title.svelte
+++ b/src/lib/components/Title.svelte
@@ -1,6 +1,3 @@
-<div class="flex items-center">
-	<h1 class="text-lg font-semibold md:text-2xl">
-		<slot />
-	</h1>
-</div>
-
+<h1 class="text-lg font-semibold md:text-2xl">
+	<slot />
+</h1>
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 0f9464f..eff549b 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -6,6 +6,6 @@ export const load: LayoutServerLoad = async ({ params }) => {
 
 	return {
 		games: response.data!,
-		selectedGameId: params.gameId,
+		selectedGame: response.data?.find((game) => game.id === params.gameId),
 	};
 };
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ce1589c..3f6dd34 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -17,7 +17,7 @@
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js';
 	import { Input } from '$lib/components/ui/input/index.js';
 	import * as Sheet from '$lib/components/ui/sheet/index.js';
-	import { Gem, Gift, PartyPopper } from 'lucide-svelte';
+	import { Gem, Gift, PartyPopper, Percent, TextCursorInput } from 'lucide-svelte';
 	import { page } from '$app/stores';
 	import NavItem from './NavItem.svelte';
 	import GameDropdown from './GameDropdown.svelte';
@@ -27,9 +27,11 @@
 	export let data: LayoutServerData;
 
 	let path: string = 'dashboard';
+	let gameSelected = false;
 	$: {
 		const parts = $page.url.pathname.split('/');
 		path = parts.length >= 4 ? parts[3] : 'dashboard';
+		gameSelected = parts.length >= 3;
 	}
 
 	async function handleGameSelect(game?: Game) {
@@ -49,42 +51,42 @@
 			<div class="flex h-14 items-center border-b px-4 lg:h-[60px] lg:px-6">
 				<a href="/" class="flex items-center gap-2 font-semibold">
 					<Gem class="h-6 w-6" />
-					<span class="">Prizer</span>
+					<span>Prizer</span>
 				</a>
 			</div>
 			<div class="px-4 py-2">
 				<GameDropdown
 					games={data.games}
-					selectedId={data.selectedGameId}
+					selectedId={data.selectedGame?.id}
 					onSelect={handleGameSelect}
 				/>
 			</div>
 			<div class="flex-1">
 				<nav class="grid items-start px-2 text-sm font-medium lg:px-4">
-					<NavItem href="/games/{data.selectedGameId}" active={path === 'dashboard'}>
-						<House class="h-4 w-4" />
-						Dashboard
-					</NavItem>
-					{#if data.selectedGameId}
-						<NavItem href="/games/{data.selectedGameId}/prizes" active={path === 'prizes'}>
+					{#if gameSelected}
+						<NavItem href="/games/{data.selectedGame?.id}" active={path === 'dashboard'}>
+							<House class="h-4 w-4" />
+							Dashboard
+						</NavItem>
+						<NavItem href="/games/{data.selectedGame?.id}/prizes" active={path === 'prizes'}>
 							<Gift class="h-4 w-4" />
 							Prizes
 						</NavItem>
-						<NavItem href="/games/{data.selectedGameId}/won-prizes" active={path === 'won-prizes'}>
+						<NavItem href="/games/{data.selectedGame?.id}/won-prizes" active={path === 'won-prizes'}>
 							<PartyPopper class="h-4 w-4" />
 							Won Prizes
 						</NavItem>
-						<NavItem href="/games/{data.selectedGameId}/users" active={path === 'users'}>
+						<NavItem href="/games/{data.selectedGame?.id}/users" active={path === 'users'}>
 							<Users class="h-4 w-4" />
 							Users
 						</NavItem>
-						<NavItem href="/games/{data.selectedGameId}/participation-methods"
+						<NavItem href="/games/{data.selectedGame?.id}/participation-methods"
 										 active={path === 'participation-methods'}>
-							<Users class="h-4 w-4" />
+							<TextCursorInput class="h-4 w-4" />
 							Participation Methods
 						</NavItem>
-						<NavItem href="/games/{data.selectedGameId}/draw-methods" active={path === 'draw-methods'}>
-							<Users class="h-4 w-4" />
+						<NavItem href="/games/{data.selectedGame?.id}/draw-methods" active={path === 'draw-methods'}>
+							<Percent class="h-4 w-4" />
 							Draw Methods
 						</NavItem>
 					{/if}
diff --git a/src/routes/games/[gameId]/+page.svelte b/src/routes/games/[gameId]/+page.svelte
index e69de29..bd0b039 100644
--- a/src/routes/games/[gameId]/+page.svelte
+++ b/src/routes/games/[gameId]/+page.svelte
@@ -0,0 +1,15 @@
+<script lang="ts">
+
+	import Title from '$lib/components/Title.svelte';
+	import Subtitle from '$lib/components/Subtitle.svelte';
+</script>
+
+<svelte:head>
+	<title>Prizer - Dashboard</title>
+</svelte:head>
+
+<div>
+	<Title>Dashboard</Title>
+	<Subtitle>General overview of the game</Subtitle>
+</div>
+
diff --git a/src/routes/games/[gameId]/draw-methods/+page.svelte b/src/routes/games/[gameId]/draw-methods/+page.svelte
index ee88664..9423692 100644
--- a/src/routes/games/[gameId]/draw-methods/+page.svelte
+++ b/src/routes/games/[gameId]/draw-methods/+page.svelte
@@ -2,10 +2,19 @@
 	import Title from '$lib/components/Title.svelte';
 	import DataTable from './DataTable.svelte';
 	import type { PageServerData } from './$types';
+	import Subtitle from '$lib/components/Subtitle.svelte';
 
 	export let data: PageServerData;
 </script>
 
-<Title>Draw Methods</Title>
+<svelte:head>
+	<title>Prizer - Draw Methods</title>
+</svelte:head>
+
+
+<div>
+	<Title>Draw Methods</Title>
+	<Subtitle>Manage how winners are selected</Subtitle>
+</div>
 
 <DataTable drawMethods={data.drawMethods} />
\ No newline at end of file
diff --git a/src/routes/games/[gameId]/participation-methods/+page.svelte b/src/routes/games/[gameId]/participation-methods/+page.svelte
index c9515d8..ab41c3b 100644
--- a/src/routes/games/[gameId]/participation-methods/+page.svelte
+++ b/src/routes/games/[gameId]/participation-methods/+page.svelte
@@ -2,10 +2,18 @@
 	import type { PageServerData } from './$types';
 	import Title from '$lib/components/Title.svelte';
 	import DataTable from './DataTable.svelte';
+	import Subtitle from '$lib/components/Subtitle.svelte';
 
 	export let data: PageServerData;
 </script>
 
-<Title>Participation Methods</Title>
+<svelte:head>
+	<title>Prizer - Participation Methods</title>
+</svelte:head>
+
+<div>
+	<Title>Participation Methods</Title>
+	<Subtitle>Manage how users can participate in the game</Subtitle>
+</div>
 
 <DataTable participationMethods={data.participationMethods} />
\ No newline at end of file
diff --git a/src/routes/games/[gameId]/prizes/+page.svelte b/src/routes/games/[gameId]/prizes/+page.svelte
index 0ff55c2..824528b 100644
--- a/src/routes/games/[gameId]/prizes/+page.svelte
+++ b/src/routes/games/[gameId]/prizes/+page.svelte
@@ -2,11 +2,20 @@
 	import type { PageData } from './$types';
 	import DataTable from './DataTable.svelte';
 	import Title from '$lib/components/Title.svelte';
+	import Subtitle from '$lib/components/Subtitle.svelte';
 
 	export let data: PageData;
 </script>
 
-<Title>Prizes</Title>
+<svelte:head>
+	<title>Prizer - Prizes</title>
+</svelte:head>
+
+<div>
+	<Title>Prizes</Title>
+	<Subtitle>Manage the prizes available for winning in the game</Subtitle>
+</div>
+
 
 <DataTable prizes={data.prizes} />
 
diff --git a/src/routes/games/[gameId]/users/+page.svelte b/src/routes/games/[gameId]/users/+page.svelte
index e46633d..4249ed2 100644
--- a/src/routes/games/[gameId]/users/+page.svelte
+++ b/src/routes/games/[gameId]/users/+page.svelte
@@ -2,10 +2,18 @@
 	import type { PageServerData } from './$types';
 	import DataTable from './DataTable.svelte';
 	import Title from '$lib/components/Title.svelte';
+	import Subtitle from '$lib/components/Subtitle.svelte';
 
 	export let data: PageServerData;
 </script>
 
-<Title>Users</Title>
+<svelte:head>
+	<title>Prizer - Users</title>
+</svelte:head>
+
+<div>
+	<Title>Users</Title>
+	<Subtitle>Users that participated in the game</Subtitle>
+</div>
 
 <DataTable users={data.users} />
\ No newline at end of file
diff --git a/src/routes/games/[gameId]/won-prizes/+page.svelte b/src/routes/games/[gameId]/won-prizes/+page.svelte
index a820da5..db799c3 100644
--- a/src/routes/games/[gameId]/won-prizes/+page.svelte
+++ b/src/routes/games/[gameId]/won-prizes/+page.svelte
@@ -2,10 +2,18 @@
 	import type { PageServerData } from './$types';
 	import Title from '$lib/components/Title.svelte';
 	import DataTable from './DataTable.svelte';
+	import Subtitle from '$lib/components/Subtitle.svelte';
 
 	export let data: PageServerData;
 </script>
 
-<Title>Won Prizes</Title>
+<svelte:head>
+	<title>Prizer - Won Prizes</title>
+</svelte:head>
+
+<div>
+	<Title>Won Prizes</Title>
+	<Subtitle>All prizes that have been won</Subtitle>
+</div>
 
 <DataTable wonPrizes={data.wonPrizes} />
\ No newline at end of file