From 73e46d95c93b8c0353865ba06420369f5647f029 Mon Sep 17 00:00:00 2001
From: Antoine Phan <antoine.phan@mail.mcgill.ca>
Date: Fri, 20 Jun 2025 10:59:12 -0400
Subject: [PATCH] Add goofy picture, use <Button>, and minor formatting

---
 src/components/Button.svelte       | 17 +++++-
 src/routes/council/+page.server.js |  7 ++-
 src/routes/council/+page.svelte    | 93 ++++++++++++++++--------------
 3 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/src/components/Button.svelte b/src/components/Button.svelte
index c4ceb83..17ce62c 100644
--- a/src/components/Button.svelte
+++ b/src/components/Button.svelte
@@ -1,3 +1,14 @@
-<button class="btn bg-ecsess-600 text-ecsess-200 px-4 py-2 m-1 rounded-lg border-none hover:shadow-lg hover:shadow-ecsess-800 active:bg-ecsess-800 transition-all">
-    <slot />
-</button>
\ No newline at end of file
+<script lang="ts">
+	let { children, onclick } = $props();
+</script>
+
+<button
+	class="bg-ecsess-600 hover:bg-ecsess-400 active:bg-ecsess-800
+            m-1 inline-block rounded-lg border-none px-4
+            py-2 text-white transition-all
+            duration-200 ease-out
+            hover:shadow-2xl"
+	{onclick}
+>
+	{@render children()}
+</button>
diff --git a/src/routes/council/+page.server.js b/src/routes/council/+page.server.js
index b5662e2..c9fce06 100644
--- a/src/routes/council/+page.server.js
+++ b/src/routes/council/+page.server.js
@@ -9,8 +9,13 @@ const query = `*[_type == "members"]{
   yearProgram
 }`;
 
+const councilGoofyPicQuery = `*[_type == "homepage"]{
+  "url": councilGoofyPic.asset->url+"?h=1000&fm=webp" 
+}[0]`;
+
 export const load = async () => {
 	return {
-		members: await getFromCMS(query)
+		members: await getFromCMS(query),
+    councilGoofyPic: await getFromCMS(councilGoofyPicQuery),
 	};
 };
diff --git a/src/routes/council/+page.svelte b/src/routes/council/+page.svelte
index 614f1a9..aa42043 100644
--- a/src/routes/council/+page.svelte
+++ b/src/routes/council/+page.svelte
@@ -3,30 +3,31 @@
 	import Section from 'components/Section.svelte';
 	import CardCouncilBase from 'components/CouncilCardBase.svelte';
 	import CouncilCardBase from 'components/CouncilCardBase.svelte';
-	import type CouncilMember from 'utils/schemas'
+	import type CouncilMember from 'utils/schemas';
 
 	let { data } = $props();
-	let years = ["U4", "U3", "U2", "U1", "U0"]
-	let vps : CouncilMember[] = []
-	let ureps : CouncilMember[] = []
+	let years = ['U4', 'U3', 'U2', 'U1', 'U0'];
+	let vps: CouncilMember[] = [];
+	let ureps: CouncilMember[] = [];
 	// svelte-ignore non_reactive_update
-		let president: CouncilMember | null = null;
+	let president: CouncilMember | null = null;
 	data.members.forEach((member: CouncilMember) => {
-		if (member.position.includes("VP") || member.position.includes("Equity and Mental Health Officer")){
-			vps.push(member); 
-		}
-		else if (member.position.includes("Representative")){
-			ureps.push(member)
+		if (
+			member.position.includes('VP') ||
+			member.position.includes('Equity and Mental Health Officer')
+		) {
+			vps.push(member);
+		} else if (member.position.includes('Representative')) {
+			ureps.push(member);
 			ureps.sort((a, b) => {
-				const aYear = years.findIndex(y => a.position.includes(y))
-				const bYear = years.findIndex(y => b.position.includes(y))
-				return aYear - bYear
-			})
+				const aYear = years.findIndex((y) => a.position.includes(y));
+				const bYear = years.findIndex((y) => b.position.includes(y));
+				return aYear - bYear;
+			});
+		} else if (member.position.includes('President')) {
+			president = member;
 		}
-		else if (member.position.includes("President")){
-			president = member
-		}
-	})
+	});
 
 	let selectedMember = $state<CouncilMember | null>(null);
 
@@ -35,15 +36,18 @@
 	}
 
 	// svelte-ignore state_referenced_locally
-		console.log(selectedMember)
+	// console.log(selectedMember);
 </script>
 
 <title> ECSESS council </title>
 <Section>
 	<p class="page-title">Meet the council!</p>
-	<p>Group picture!</p>
+	<div>
+		<h1>Our Student Council</h1>
+		<img src={data.councilGoofyPic.url} alt="ECSESS Council, but we are goofy" />
+	</div>
 </Section>
-<Section >
+<Section>
 	<div class="president">
 		{#if president}
 			<CouncilCardBase
@@ -55,30 +59,31 @@
 		{/if}
 	</div>
 	<div class="flex justify-center">
-		<div class="flex flex-row flex-wrap justify-center align-middle gap-10 p-4">
-		{#each vps as councilMember}
-			<CardCouncilBase
-				name={councilMember.name}
-				position={councilMember.position}
-				image={councilMember.image}
-				onViewProfile={() => handleViewProfile(councilMember)}
-			></CardCouncilBase>
-		{/each}
-		{#each ureps as councilMember}
-		<CardCouncilBase
-			name={councilMember.name}
-			position={councilMember.position}
-			image={councilMember.image}
-			onViewProfile={() => handleViewProfile(councilMember)}
-		></CardCouncilBase>
-		{/each}
+		<div class="flex flex-row flex-wrap justify-center gap-10 p-4 align-middle">
+			{#each vps as councilMember}
+				<CardCouncilBase
+					name={councilMember.name}
+					position={councilMember.position}
+					image={councilMember.image}
+					onViewProfile={() => handleViewProfile(councilMember)}
+				></CardCouncilBase>
+			{/each}
+			{#each ureps as councilMember}
+				<CardCouncilBase
+					name={councilMember.name}
+					position={councilMember.position}
+					image={councilMember.image}
+					onViewProfile={() => handleViewProfile(councilMember)}
+				></CardCouncilBase>
+			{/each}
 		</div>
 		<!-- svelte-ignore a11y_no_static_element_interactions -->
 		{#if selectedMember}
-		<!-- svelte-ignore a11y_click_events_have_key_events -->
-		<div class="fixed inset-0 bg-black/60 flex justify-center items-center z-50"
-		onclick={() => (selectedMember = null)}
-		>
+			<!-- svelte-ignore a11y_click_events_have_key_events -->
+			<div
+				class="fixed inset-0 z-50 flex items-center justify-center bg-black/60"
+				onclick={() => (selectedMember = null)}
+			>
 				<CouncilCard
 					name={selectedMember.name}
 					position={selectedMember.position}
@@ -86,8 +91,8 @@
 					positionDescription={selectedMember.positionDescription}
 					yearProgram={selectedMember.yearProgram}
 					image={selectedMember.image}
-			/>
-		</div>
+				/>
+			</div>
 		{/if}
 	</div>
 </Section>