Fixed Stages, fixed icons, moved to Bootstrap

cs-soc-tudublin · Sep 11, 2023 · 7c3a139 · 7c3a139
1 parent 84b2510
commit 7c3a139
Show file tree

Hide file tree

Showing 21 changed files with 11,594 additions and 115 deletions.
diff --git a/src/app.html b/src/app.html
@@ -6,7 +6,8 @@
 		<meta name="viewport" content="width=device-width" />
 		<link href="http://fonts.googleapis.com/css?family=IBM+Plex+Sans" />
 		<link href="http://fonts.googleapis.com/css?family=IBM+Plex+Mono" />
-		<link href="/style.css" rel="stylesheet" />
+		<link href="%sveltekit.assets%/bootstrap.min.css" rel="stylesheet" />
+		<link href="%sveltekit.assets%/style.css" rel="stylesheet" />
 
 		%sveltekit.head%
 	</head>

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -44,49 +44,65 @@
 
 <Toasts />
 
-<Thumb />
+<div class="container">
+	<Thumb />
 
-<h1 class="title verylarge nogap">BitHunt</h1>
+	<h1 class="title verylarge nogap">BitHunt</h1>
 
-{#if data.status == 200}
-	<h2 class="subtitle medium nogap"><strong>Today's Event:</strong> {data.event.name}</h2>
+	{#if data.status == 200}
+		<div class="row justify-content-center">
+			<div class="col">
+				<h2 class="subtitle medium nogap"><strong>Today's Event:</strong> {data.event.name}</h2>
 
-	<h2 class="subtitle medium nogap">
-		<strong>Today's Prize:</strong> One of {data.event.prizecount}
-		{prize}!
-	</h2>
-
-	{#if data.validCookie == false}
-		<div class="buttons">
-			<button class="cspp" on:click={() => register()}>
-				<UserPlus color="var(--green)" />
-				Register
-			</button>
-
-			<button class="cspp" on:click={() => login()}>
-				<LogIn color="var(--green)" />
-				Login
-			</button>
+				<h2 class="subtitle medium nogap">
+					<strong>Today's Prize:</strong> One of {data.event.prizecount}
+					{prize}!
+				</h2>
+			</div>
 		</div>
-	{:else}
-		<div class="buttons">
-			<button class="cspp" on:click={() => (window.location.href = '/stage')}>
-				<DoorOpen color="var(--green)" />
-				Enter Event
-			</button>
 
-			<button class="cspp" on:click={() => (window.location.href = '/leaderboard')}>
-				<Crown color="var(--green)" />
-				Leaderboard
-			</button>
-
-			<button class="cspp" on:click={() => (window.location.href = '/logout')}>
-				<LogOut color="var(--green)" />
-				Logout
-			</button>
-		</div>
+		{#if data.validCookie == false}
+			<div class="row justify-content-center">
+				<div class="container">
+					<div class="row justify-content-center">
+						<div class="col-md-6">
+							<button class="cspp" on:click={() => register()}>
+								<UserPlus color="var(--green)" size="32"/>
+								Register
+							</button>
+						</div>
+						<div class="col-md-6">
+							<button class="cspp" on:click={() => login()}>
+								<LogIn color="var(--green)" size="32"/>
+								Login
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		{:else}
+			<div class="row justify-content-center">
+				<div class="container-fluid">
+					<div class="row justify-content-center">
+						<div class="col-lg-6">
+							<button class="cspp" on:click={() => (window.location.href = '/stage')}>
+								<DoorOpen color="var(--green)" size="32"/>
+								Enter Event
+							</button>
+						</div>
+
+						<div class="col-lg-6">
+							<button class="cspp" on:click={() => (window.location.href = '/logout')}>
+								<LogOut color="var(--green)" size="32"/>
+								Logout
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		{/if}
+	{:else}
+		<h2 class="subtitle large nogap"><strong>No Event Today</strong></h2>
+		<p class="subtitle medium nogap">Please check back later.</p>
 	{/if}
-{:else}
-	<h2 class="subtitle large nogap"><strong>No Event Today</strong></h2>
-	<p class="subtitle medium nogap">Please check back later.</p>
-{/if}
+</div>
diff --git a/src/routes/admin/+page.server.ts b/src/routes/admin/+page.server.ts
@@ -1,4 +1,3 @@
-import { redirect } from '@sveltejs/kit';
 import { databaseIntegrity } from '$lib/server/database';
 import type { PageServerLoad, Actions } from './$types';
 
@@ -64,13 +63,10 @@ export const actions = {
 		}
 	},
 	logout: async ({ cookies }) => {
-		console.log('logging out');
 		// Set cookie to false, with age of -1 (expires immediately)
 		cookies.set('admin', 'false', {
 			maxAge: -1,
 			path: '/'
 		});
-
-		throw redirect(307, '/admin');
 	}
 } satisfies Actions;
diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte
@@ -66,47 +66,59 @@
 	<form method="POST" action="?/login">
 		<input type="password" name="password" class="form-medium" placeholder="Password" />
 		<button class="cspp form-element" type="submit">
-			<LogIn color="var(--green)" />
+			<LogIn color="var(--green)" size="32" />
 			Log in
 		</button>
 		<button class="cspp" type="button" on:click={() => (window.location.href = '/')}>
-			<Home color="var(--green)" />
+			<Home color="var(--green)" size="32" />
 			Go Home
 		</button>
 	</form>
 {:else}
 	<h2 class="subtitle medium">Chose an option:</h2>
 
-	<div class="buttons">
-		<button class="cspp" on:click={() => (window.location.href = '/admin/events')}>
-			<Calendar color="var(--green)" />
-			Events
-		</button>
-
-		<button class="cspp" on:click={() => (window.location.href = '/admin/stages')}>
-			<Split color="var(--green)" />
-			Stages
-		</button>
-
-		<button class="cspp" on:click={() => (window.location.href = '/admin/puzzles')}>
-			<Puzzle color="var(--green)" />
-			Puzzles
-		</button>
-
-		<button class="cspp" on:click={() => (window.location.href = '/admin/leaderboard')}>
-			<Crown color="var(--green)" />
-			Leaderboard
-		</button>
-
-		<button class="cspp" on:click={() => (window.location.href = '/admin/leaderboard')}>
-			<BookMarked color="var(--green)" />
-			Overall
-		</button>
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-4">
+				<button class="cspp" on:click={() => (window.location.href = '/admin/events')}>
+					<Calendar color="var(--green)" size="32" />
+					Events
+				</button>
+			</div>
+
+			<div class="col-lg-4">
+				<button class="cspp" on:click={() => (window.location.href = '/admin/stages')}>
+					<Split color="var(--green)" size="32" />
+					Stages
+				</button>
+			</div>
+
+			<div class="col-lg-4">
+				<button class="cspp" on:click={() => alert('Puzzles are not complete.')}>
+					<Puzzle color="var(--green)" size="32" />
+					Puzzles (WIP)
+				</button>
+			</div>
+
+			<div class="col-lg-6">
+				<button class="cspp" on:click={() => alert('Leaderboards are not complete.')}>
+					<Crown color="var(--green)" size="32" />
+					Leaderboard (WIP)
+				</button>
+			</div>
+
+			<div class="col-lg-6">
+				<button class="cspp" on:click={() => (window.location.href = '/admin/overall')}>
+					<BookMarked color="var(--green)" size="32" />
+					Overall
+				</button>
+			</div>
+		</div>
 	</div>
 
 	<form method="post" class="nocss" action="?/logout">
-		<button class="cspp" formaction="?/logout">
-			<LogOut color="var(--green)" />
+		<button class="cspp">
+			<LogOut color="var(--green)" size="32" />
 			Log Out
 		</button>
 	</form>

diff --git a/src/routes/admin/events/+page.svelte b/src/routes/admin/events/+page.svelte
@@ -53,11 +53,11 @@
 
 <div class="buttons">
 	<button class="cspp" on:click={() => (window.location.href = '/admin')}>
-		<ChevronLeft color="var(--green)" />
+		<ChevronLeft color="var(--green)" size="32" />
 		Go Back
 	</button>
 	<button class="cspp" on:click={() => (window.location.href = '/admin/events/create')}>
-		<PlusCircle color="var(--green)" />
+		<PlusCircle color="var(--green)" size="32" />
 		Add New
 	</button>
 </div>
@@ -88,10 +88,10 @@
 				<td>
 					<div class="actions">
 						<button class="action" on:click={() => eventView(event.id)}>
-							<Eye color="var(--green)" />
+							<Eye color="var(--green)" size="32" />
 						</button>
 						<button class="action" on:click={() => eventRemove(event.id)}>
-							<Trash2 color="var(--green)" />
+							<Trash2 color="var(--green)" size="32" />
 						</button>
 					</div>
 				</td>

diff --git a/src/routes/admin/events/create/+page.svelte b/src/routes/admin/events/create/+page.svelte
@@ -30,7 +30,7 @@
 <h1 class="title large">Create an Event</h1>
 
 <button class="cspp form-element" on:click={() => (window.location.href = '/admin/events')}>
-	<ChevronLeft color="var(--green)" />
+	<ChevronLeft color="var(--green)" size="32" />
 	Back
 </button>
 
@@ -81,7 +81,7 @@
 	</select>
 
 	<button type="submit" class="cspp form-element primary">
-		<PlusCircle color="var(--green)" />
+		<PlusCircle color="var(--green)" size="32" />
 		Create Event
 	</button>
 </form>
diff --git a/src/routes/admin/events/view/[slug]/+page.svelte b/src/routes/admin/events/view/[slug]/+page.svelte
@@ -27,12 +27,12 @@
 
 <div class="buttons">
 	<button class="cspp" on:click={() => (window.location.href = '/admin/events')}>
-		<ChevronLeft color="var(--green)" />
+		<ChevronLeft color="var(--green)" size="32" />
 		Back
 	</button>
 
 	<button class="cspp" on:click={() => toggleEdit()}>
-		<Pencil color="var(--green)" />
+		<Pencil color="var(--green)" size="32" />
 		Edit {data.event.name}
 	</button>
 </div>
@@ -102,7 +102,7 @@
 	</select>
 
 	<button class="cspp" {disabled}>
-		<Save color="var(--green)" />
+		<Save color="var(--green)" size="32" />
 		Save
 	</button>
 </form>
diff --git a/src/routes/admin/overall/+page.server.ts b/src/routes/admin/overall/+page.server.ts
@@ -0,0 +1,5 @@
+import type { PageServerLoad } from './$types';
+
+export const load = (async () => {
+    return {};
+}) satisfies PageServerLoad;
diff --git a/src/routes/admin/overall/+page.svelte b/src/routes/admin/overall/+page.svelte
@@ -0,0 +1,5 @@
+<script lang="ts">
+    import type { PageData } from './$types';
+    
+    export let data: PageData;
+</script>
diff --git a/src/routes/admin/stages/+page.svelte b/src/routes/admin/stages/+page.svelte
@@ -34,11 +34,11 @@
 
 <div class="buttons">
 	<button class="cspp" on:click={() => (window.location.href = '/admin')}>
-		<ChevronLeft color="var(--green)" />
+		<ChevronLeft color="var(--green)" size="32" />
 		Go Back
 	</button>
 	<button class="cspp" on:click={() => (window.location.href = '/admin/stages/create')}>
-		<PlusCircle color="var(--green)" />
+		<PlusCircle color="var(--green)" size="32" />
 		Add New
 	</button>
 </div>
@@ -63,13 +63,13 @@
 				<td>
 					<div class="actions">
 						<button class="action" on:click={() => stageView(stage.id)}>
-							<Eye color="var(--green)" />
+							<Eye color="var(--green)" size="32" />
 						</button>
 						<button class="action" on:click={() => stageRemove(stage.id)}>
-							<Trash2 color="var(--green)" />
+							<Trash2 color="var(--green)" size="32" />
 						</button>
 						<button class="action" on:click={() => stageQR(stage.id)}>
-							<QrCode color="var(--green)" />
+							<QrCode color="var(--green)" size="32" />
 						</button>
 					</div>
 				</td>

diff --git a/src/routes/admin/stages/create/+page.svelte b/src/routes/admin/stages/create/+page.svelte
@@ -31,7 +31,7 @@
 <h1 class="title large">Create a Stage</h1>
 
 <button class="cspp form-element" on:click={() => (window.location.href = '/admin/stages')}>
-	<ChevronLeft color="var(--green)" />
+	<ChevronLeft color="var(--green)" size="32" />
 	Back
 </button>
 
@@ -59,7 +59,7 @@
 	</select>
 
 	<button type="submit" class="cspp form-element primary">
-		<PlusCircle color="var(--green)" />
+		<PlusCircle color="var(--green)" size="32" />
 		Create Event
 	</button>
 </form>
diff --git a/src/routes/admin/stages/qr/[slug]/+page.svelte b/src/routes/admin/stages/qr/[slug]/+page.svelte
@@ -32,7 +32,7 @@
 </head>
 
 <button class="cspp" on:click={() => (window.location.href = '/admin/stages')}>
-	<ChevronLeft color="var(--green)" />
+	<ChevronLeft color="var(--green)" size="32" />
 	Go Back
 </button>
 

diff --git a/src/routes/admin/stages/view/[slug]/+page.svelte b/src/routes/admin/stages/view/[slug]/+page.svelte
@@ -25,12 +25,12 @@
 
 <div class="buttons">
 	<button class="cspp" on:click={() => (window.location.href = '/admin/stages')}>
-		<ChevronLeft color="var(--green)" />
+		<ChevronLeft color="var(--green)" size="32" />
 		Back
 	</button>
 
 	<button class="cspp" on:click={() => toggleEdit()}>
-		<Pencil color="var(--green)" />
+		<Pencil color="var(--green)" size="32" />
 		Edit {data.stage.name}
 	</button>
 </div>
@@ -61,7 +61,7 @@
 	</select>
 
 	<button class="cspp" {disabled}>
-		<Save color="var(--green)" />
+		<Save color="var(--green)" size="32" />
 		Save
 	</button>
 </form>