From d5bc4bfdc69cef43a209f536d940cfe23ad92ffe Mon Sep 17 00:00:00 2001
From: Anneshu Nag <132702983+NK-Works@users.noreply.github.com>
Date: Sun, 10 Nov 2024 16:16:05 +0530
Subject: [PATCH] added sorting based on event end time (#183)

---
 frontend/src/appComponents/EventCard.tsx |  2 +-
 frontend/src/appComponents/Events.tsx    | 39 ++++++++++++------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/src/appComponents/EventCard.tsx b/frontend/src/appComponents/EventCard.tsx
index 3a911f1..5011e30 100644
--- a/frontend/src/appComponents/EventCard.tsx
+++ b/frontend/src/appComponents/EventCard.tsx
@@ -20,7 +20,7 @@ const EventCard: React.FC<EventCardProps> = ({ name, description, time }) => {
         </div>
         <button onClick={()=>{
           window.location.href = "https://forms.gle/u9s7BXa2onvAoVkr9";
-        }} className="px-4 py-2 text-sm font-bold text-white transition duration-300 bg-black rounded-md hover:bg-gray-800">
+        }} className="px-5 py-2 text-sm font-bold text-white transition duration-300 bg-black rounded-md hover:bg-gray-800 ml-10">
           Register
         </button>
       </div>
diff --git a/frontend/src/appComponents/Events.tsx b/frontend/src/appComponents/Events.tsx
index 36a19c2..b1c78d1 100644
--- a/frontend/src/appComponents/Events.tsx
+++ b/frontend/src/appComponents/Events.tsx
@@ -29,40 +29,34 @@ const Events = () => {
     ];
 
     // Get the day, month, year, hours and minutes
-    let day = start.getDate();
-    let month = monthNames[start.getMonth()];
-    let year = start.getFullYear();
-    let startHours = start.getHours();
-    let startMinutes: string | number = start.getMinutes();
+    let day = end.getDate();
+    let month = monthNames[end.getMonth()];
+    let year = end.getFullYear();
+    // let startHours = end.getHours();
+    // let startMinutes: string | number = end.getMinutes();
     let endHours = end.getHours();
     let endMinutes: string | number = end.getMinutes();
 
-    // Convert hours from 24-hour format to 12-hour format
-    let startPeriod = startHours >= 12 ? "PM" : "AM";
-    startHours = startHours % 12;
-    startHours = startHours ? startHours : 12; // the hour '0' should be '12'
+    // // Convert hours from 24-hour format to 12-hour format
+    // let startPeriod = startHours >= 12 ? "PM" : "AM";
+    // startHours = startHours % 12;
+    // startHours = startHours ? startHours : 12; // the hour '0' should be '12'
     let endPeriod = endHours >= 12 ? "PM" : "AM";
     endHours = endHours % 12;
     endHours = endHours ? endHours : 12; // the hour '0' should be '12'
 
-    // Pad minutes with a zero if needed
-    startMinutes = startMinutes < 10 ? "0" + startMinutes : startMinutes;
+    // // Pad minutes with a zero if needed
+    // startMinutes = startMinutes < 10 ? "0" + startMinutes : startMinutes;
     endMinutes = endMinutes < 10 ? "0" + endMinutes : endMinutes;
 
     // Return the formatted date and time range
-    return (
+    return ("ET: " +
       day +
       "/" +
       month +
       "/" +
       year +
       " " +
-      startHours +
-      ":" +
-      startMinutes +
-      " " +
-      startPeriod +
-      " to " +
       endHours +
       ":" +
       endMinutes +
@@ -74,7 +68,14 @@ const Events = () => {
   useEffect(() => {
     const getAllEvents = async () => {
       const response = await axios.get("/api/events/getAllEventData");
-      setEvents(response.data);
+      const currentDate = new Date();      
+      // Filter out events that have already ended
+      const upcomingEvents = response.data.filter((event: any) => {
+        const eventEndDate = new Date(event.EndDateTime);
+        return eventEndDate >= currentDate;
+      });
+
+      setEvents(upcomingEvents);
     };
     getAllEvents();
   }, []);