From 929a3094ae057237586231344635ec5bcd2c7032 Mon Sep 17 00:00:00 2001
From: aryap9162 <aryap9162@gmail.com>
Date: Sat, 9 Nov 2024 20:23:30 -0500
Subject: [PATCH 1/5] feat: changed TBD to WAC To The Future for theme change
 and removed Farmer's Edge Logo

---
 src/routes/(other)/+page.svelte  | 2 +-
 src/routes/(other)/Footer.svelte | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/routes/(other)/+page.svelte b/src/routes/(other)/+page.svelte
index 9a1c2538..5610f1b6 100644
--- a/src/routes/(other)/+page.svelte
+++ b/src/routes/(other)/+page.svelte
@@ -64,7 +64,7 @@
 		class="text-[1.4rem] sm:text-[1.6rem] lg:text-[1.9rem] uppercase mb-2.5 lg:mb-3.5 text-transparent bg-clip-text bg-gradient-to-r from-primary to-secondary px-3"
 	>
 		<span>Theme</span>
-		<span class="italic">TBD</span>
+		<span class="italic">WAC To The Future</span>
 	</h2>
 	<div class="w-5/6 mx-auto">
 		<h1
diff --git a/src/routes/(other)/Footer.svelte b/src/routes/(other)/Footer.svelte
index 9fa9d326..dcc7501b 100644
--- a/src/routes/(other)/Footer.svelte
+++ b/src/routes/(other)/Footer.svelte
@@ -3,7 +3,6 @@
 
 	import branksomeLogo from "$lib/assets/images/logos/branksome.webp";
 	import uccLogo from "$lib/assets/images/logos/ucc.webp";
-	import famersEdgeLogo from "$lib/assets/images/logos/farmers-edge.webp";
 
 	interface Social {
 		name: string;

From 36e47f712e0c244e6807319599ab68f0d5a6a4f5 Mon Sep 17 00:00:00 2001
From: aryap9162 <aryap9162@gmail.com>
Date: Sun, 10 Nov 2024 10:53:00 -0500
Subject: [PATCH 2/5] feat: removed merch pop-up file

---
 src/lib/components/AnnouncementBanner.svelte | 76 --------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 src/lib/components/AnnouncementBanner.svelte

diff --git a/src/lib/components/AnnouncementBanner.svelte b/src/lib/components/AnnouncementBanner.svelte
deleted file mode 100644
index 297a1d0e..00000000
--- a/src/lib/components/AnnouncementBanner.svelte
+++ /dev/null
@@ -1,76 +0,0 @@
-<script lang="ts">
-	import { onMount } from "svelte";
-	import { browser } from "$app/environment";
-	import waterBottleImage from "$lib/assets/images/merch/water-bottles.png";
-	import pinImage from "$lib/assets/images/merch/pins.png";
-
-	export let isOpen = false;
-
-	$: isOpen, updateBodyOverflow();
-
-	// Prevents the body from scrolling when the modal is open
-	const updateBodyOverflow = () => {
-		if (!browser) return;
-
-		if (isOpen) {
-			document.body.style.overflow = "hidden";
-		} else {
-			document.body.style.overflow = "auto";
-		}
-	};
-
-	onMount(() => {
-		const wasAnnouncementShownAlready = localStorage.getItem(
-			"wasAnnouncementShownAlready"
-		);
-		const wasAnnouncementShown = wasAnnouncementShownAlready === "true";
-
-		if (!wasAnnouncementShown) {
-			setTimeout(() => {
-				isOpen = true;
-				localStorage.setItem("wasAnnouncementShownAlready", "true");
-			}, 2000);
-		}
-	});
-</script>
-
-<div
-	class="fixed inset-0 flex items-center justify-center z-50 bg-zinc-950/20 backdrop-blur-md {!isOpen &&
-		'invisible opacity-0'} transition-all duration-300 ease-in"
->
-	<div
-		class="bg-zinc-700 border-2 border-zinc-500 rounded-2xl py-9 px-6 sm:px-16 max-w-screen-sm m-4 relative"
-	>
-		<button
-			class="text-[1.7rem] absolute right-5 top-5 text-zinc-300"
-			on:click={() => (isOpen = false)}
-		>
-			<i class="fa-solid fa-xmark"></i>
-		</button>
-		<div
-			class="text-[3.5rem] sm:text-[4.25rem] text-primary text-center mb-2"
-		>
-			<i class="fa fa-bullhorn" aria-hidden="true"></i>
-		</div>
-		<h1
-			class="text-white text-3xl sm:text-4xl text-center font-semibold tracking-tight mb-4 sm:mb-5"
-		>
-			WAC Merch is Available!
-		</h1>
-		<p class="text-zinc-400 mb-5">
-			To support sustainability, WAC will not provide single use water
-			bottles this year. You can either bring your own water bottle or
-			support WAC by purchasing a WAC-branded water bottle at the
-			conference. You can also buy other merchandise like pins and
-			stickers on conference day with cash or credit card.
-		</p>
-		<div class="flex justify-center gap-10 items-center">
-			<img
-				src={waterBottleImage}
-				alt="WAC Water Bottles"
-				class="h-32 sm:h-36"
-			/>
-			<img src={pinImage} alt="WAC Water Bottles" class="h-20 sm:h-24" />
-		</div>
-	</div>
-</div>

From 46ecb409529a774d6ab885ef73eff8e2c6b9b715 Mon Sep 17 00:00:00 2001
From: ZeendaBean24 <liuzeen999@gmail.com>
Date: Sun, 10 Nov 2024 12:52:04 -0500
Subject: [PATCH 3/5] fix: fix supporter and remove vertical divider

---
 src/routes/(other)/Footer.svelte | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/routes/(other)/Footer.svelte b/src/routes/(other)/Footer.svelte
index dcc7501b..cc7fd02c 100644
--- a/src/routes/(other)/Footer.svelte
+++ b/src/routes/(other)/Footer.svelte
@@ -44,12 +44,12 @@
 		}
 	];
 
-	const supporters: Credit[] = [
-		{
-			name: "Farmers Edge",
-			logo: famersEdgeLogo
-		}
-	];
+	// const supporters: Credit[] = [
+	// 	{
+	// 		name: "Farmers Edge",
+	// 		logo: famersEdgeLogo
+	// 	}
+	// ];
 </script>
 
 <footer class="bg-zinc-950">
@@ -76,10 +76,10 @@
 				</div>
 
 				<!-- Vertical divider -->
-				<div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div>
+				<!-- <div class="w-0.5 bg-zinc-600 my-6 md:my-3"></div> -->
 
 				<div class="grow">
-					<div
+					<!-- <div
 						class="text-zinc-400 mb-3 text-[0.7rem] lg:text-[0.8rem] uppercase"
 					>
 						Supporters
@@ -94,7 +94,7 @@
 								class="h-[2rem] lg:h-[2.25rem]"
 							/>
 						{/each}
-					</div>
+					</div> -->
 				</div>
 			</div>
 

From b1445b08418a28b1c78a6c6739dc8ebe4c608ca0 Mon Sep 17 00:00:00 2001
From: ZeendaBean24 <liuzeen999@gmail.com>
Date: Sun, 10 Nov 2024 12:56:43 -0500
Subject: [PATCH 4/5] fix: remove merch popup dependencies in other files

---
 src/routes/(other)/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(other)/+page.svelte b/src/routes/(other)/+page.svelte
index 5610f1b6..9db1b1cd 100644
--- a/src/routes/(other)/+page.svelte
+++ b/src/routes/(other)/+page.svelte
@@ -8,7 +8,7 @@
 	// Components
 	import Tooltip from "$lib/components/Tooltip.svelte";
 	import ScrollAnimations from "./ScrollAnimations.svelte";
-	import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";
+	// import AnnouncementBanner from "$lib/components/AnnouncementBanner.svelte";
 
 	const user = $page.data.session?.user as User | undefined;
 
@@ -119,7 +119,7 @@
 
 <ScrollAnimations />
 
-<AnnouncementBanner />
+<!-- <AnnouncementBanner /> -->
 
 <!--
 <section

From 7adcf0de531cf82f010a5aa892c929b088339af9 Mon Sep 17 00:00:00 2001
From: ZeendaBean24 <liuzeen999@gmail.com>
Date: Sun, 10 Nov 2024 13:00:42 -0500
Subject: [PATCH 5/5] build: add build and fix faq not loading for deployed
 website

---
 src/routes/(other)/+page.svelte            | 38 +++++++++++++---------
 src/routes/(other)/ScrollAnimations.svelte |  4 +--
 src/routes/(other)/team/+page.svelte       |  2 +-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/routes/(other)/+page.svelte b/src/routes/(other)/+page.svelte
index 9db1b1cd..be848709 100644
--- a/src/routes/(other)/+page.svelte
+++ b/src/routes/(other)/+page.svelte
@@ -43,20 +43,7 @@
 
 	const timeUntilConference = calculateDaysUntilDate(new Date(2025, 3, 5)); // Change when the date is confirmed
 </script>
-<style>
-	.glow {
-		text-shadow: 0 0 10px rgba(255, 255, 255, 0.8), 
-			0 0 20px rgba(255, 255, 255, 0.6), 
-			0 0 30px rgba(255, 255, 255, 0.4); 
-		transition: text-shadow 0.3s ease-in-out;
-	}
 
-	.glow:hover {
-		text-shadow: 0 0 15px rgba(255, 255, 255, 1), 
-			0 0 25px rgba(255, 255, 255, 0.8),
-			0 0 35px rgba(255, 255, 255, 0.6);
-	}
-</style>
 <section
 	class="pt-[4rem] md:pt-[6rem] text-center flex flex-col items-center h-screen w-screen absolute inset-0 z-20"
 >
@@ -108,13 +95,17 @@
 		</a>
 	{/if}
 	<div id="statsSection" class="w-full text-center">
-		<h2 class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary">WAC has reached</h2>	
+		<h2
+			class="text-transparent text-2xl sm:text-4xl font-bold mb-4 bg-clip-text bg-gradient-to-br from-white to-secondary"
+		>
+			WAC has reached
+		</h2>
 		<span class="text-white text-lg md:text-2xl glow">10k+ students</span>
 		<span class="text-secondary mx-2">・</span>
 		<span class="text-white text-lg md:text-2xl glow">80+ schools</span>
 		<span class="text-secondary mx-2">・</span>
 		<span class="text-white text-lg md:text-2xl glow">35+ countries</span>
-
+	</div>
 </section>
 
 <ScrollAnimations />
@@ -182,3 +173,20 @@
 		</form>
 	</div>
 </section> -->
+
+<style>
+	.glow {
+		text-shadow:
+			0 0 10px rgba(255, 255, 255, 0.8),
+			0 0 20px rgba(255, 255, 255, 0.6),
+			0 0 30px rgba(255, 255, 255, 0.4);
+		transition: text-shadow 0.3s ease-in-out;
+	}
+
+	.glow:hover {
+		text-shadow:
+			0 0 15px rgba(255, 255, 255, 1),
+			0 0 25px rgba(255, 255, 255, 0.8),
+			0 0 35px rgba(255, 255, 255, 0.6);
+	}
+</style>
diff --git a/src/routes/(other)/ScrollAnimations.svelte b/src/routes/(other)/ScrollAnimations.svelte
index 2cdfb129..0da7e929 100644
--- a/src/routes/(other)/ScrollAnimations.svelte
+++ b/src/routes/(other)/ScrollAnimations.svelte
@@ -391,9 +391,9 @@
 	});
 
 	async function loadVideoSection() {
-  		videoSection = await import("./Video.svelte");
+		videoSection = await import("./Video.svelte");
 	}
-	
+
 	const handleWindowResize = () => {
 		camera.aspect = window.innerWidth / window.innerHeight;
 		camera.updateProjectionMatrix();
diff --git a/src/routes/(other)/team/+page.svelte b/src/routes/(other)/team/+page.svelte
index ca918ca9..cdf29a4d 100644
--- a/src/routes/(other)/team/+page.svelte
+++ b/src/routes/(other)/team/+page.svelte
@@ -71,7 +71,7 @@
 		position: string;
 		image: string;
 	}
-	
+
 	const chairs: TeamMember[] = [
 		{
 			name: "Darwin Li",