From 411610f468a356c7f56681ef0193f88a0bc0302c Mon Sep 17 00:00:00 2001
From: gavinlin24 <gavinlin24@gmail.com>
Date: Tue, 18 Feb 2025 20:12:16 -0800
Subject: [PATCH 1/2] Fix Events Bug

Fixed bug where past events were not displayed correctly
---
 frontend/src/components/Events/Events.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Events/Events.tsx b/frontend/src/components/Events/Events.tsx
index 9f3dc730..cdf09db9 100644
--- a/frontend/src/components/Events/Events.tsx
+++ b/frontend/src/components/Events/Events.tsx
@@ -136,7 +136,7 @@ const Events = () => {
           .sort((a, b) => (b as number) - (a as number)); // Explicit type casting for 'a' and 'b'
         setPastEventYears(years as number[]);
         
-  
+        
         paginate(data, 1, totalPagesPast, 'past');
       } catch (error) {
         console.error('Error fetching past events:', error);
@@ -406,7 +406,7 @@ const Events = () => {
           </div>
         )}
         {/* Buttons for filtering past events */}
-        {displayedPastEvents.length > 0 && (
+        {(
           <Grid item container mb={4} ml={4} justifyContent="flex-start">
             {/* <Button size="medium" text="2023" infocus={is2023Clicked} onClick={handle2023}></Button> */}
             

From bb4466728d52bd464751bdcd144a0a25f2f2abca Mon Sep 17 00:00:00 2001
From: gavinlin24 <gavinlin24@gmail.com>
Date: Tue, 4 Mar 2025 20:19:26 -0800
Subject: [PATCH 2/2] Fix 2025 Button

Fixed bug where an event button for the current year wouldn't appear if there were no events
---
 frontend/src/components/Events/Events.tsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Events/Events.tsx b/frontend/src/components/Events/Events.tsx
index cdf09db9..4490f86e 100644
--- a/frontend/src/components/Events/Events.tsx
+++ b/frontend/src/components/Events/Events.tsx
@@ -130,10 +130,20 @@ const Events = () => {
         const data = await response.json();
         setTotalPagesPast(Math.ceil(data.length / 6));
         setPastEvents(data);
-  
-        // Extract years from past events and sort in descending order
-        const years = Array.from(new Set(data.map((event: EventData) => new Date(event.end_time).getFullYear())))
-          .sort((a, b) => (b as number) - (a as number)); // Explicit type casting for 'a' and 'b'
+
+        // Get the current year
+        const currentYear = new Date().getFullYear();
+
+        // Extract years from past events
+        const eventYears = new Set(data.map((event: EventData) => new Date(event.end_time).getFullYear()));
+
+        // Add the current year only if it's not already in the event years
+        if (!eventYears.has(currentYear)) {
+          eventYears.add(currentYear);
+        }
+
+        // Convert Set to an array and sort in descending order
+        const years = Array.from(eventYears).sort((a, b) => (b as number) - (a as number));
         setPastEventYears(years as number[]);