Fixing events listings with date range not showing on events page aft…

…er the current date passed the start date of the event

src/app/events/page.js

@@ -1,14 +1,13 @@
-import * as React from "react";
+import Container from "@/components/Container/Container";
+import EventCard from "@/components/EventList/EventCard";
 import meta from "@/components/Meta/Meta";
-import seo from "@/data/events/seo";
 import { eventData } from "@/data/events/event";
-import EventCard from "@/components/EventList/EventCard";
-import Container from "@/components/Container/Container";
-import { Row, Col } from "@/macros/Grids";
-import { Display, Body, Heading } from "@/macros/Copy";
+import seo from "@/data/events/seo";
+import { Body, Display, Heading } from "@/macros/Copy";
+import { Col, Row } from "@/macros/Grids";
 import Icon from "@/macros/Icons/Icon";
-import ArrowLongSVG from "@/macros/SVGs/ArrowLongSVG";
 import Link from "@/macros/Link/Link";
+import ArrowLongSVG from "@/macros/SVGs/ArrowLongSVG";
 
 export const metadata = meta(seo);
 
@@ -21,8 +20,19 @@ const EventsPage = () => {
 			// Handle date-based events
 			try {
 				if (!event.startDate.includes("-")) return true;
-				const eventDate = new Date(event.startDate);
-				return eventDate >= new Date();
+				const eventStartDate = new Date(event.startDate);
+				const eventEndDate = event.endDate ? new Date(event.endDate) : eventStartDate;
+
+				// Normalize current date to remove time component
+				const currentDate = new Date();
+				currentDate.setHours(0, 0, 0, 0);
+				eventStartDate.setHours(0, 0, 0, 0);
+				eventEndDate.setHours(0, 0, 0, 0);
+
+				// Event is upcoming/ongoing if:
+				// - Current date is within the event date range (inclusive) OR
+				// - Start date is in the future
+				return (currentDate >= eventStartDate && currentDate <= eventEndDate) || eventStartDate >= currentDate;
 			} catch (e) {
 				console.error("Invalid date format:", event.startDate);
 				return false;

src/app/past-events/page.js

@@ -1,11 +1,10 @@
-import * as React from "react";
+import Container from "@/components/Container/Container";
+import EventCard from "@/components/EventList/EventCard";
 import meta from "@/components/Meta/Meta";
-import seo from "@/data/events/past-events-seo";
 import { eventData } from "@/data/events/event";
-import EventCard from "@/components/EventList/EventCard";
-import Container from "@/components/Container/Container";
-import { Row, Col } from "@/macros/Grids";
-import { Display, Body } from "@/macros/Copy";
+import seo from "@/data/events/past-events-seo";
+import { Body, Display } from "@/macros/Copy";
+import { Col, Row } from "@/macros/Grids";
 
 export const metadata = meta(seo);
 
@@ -18,7 +17,17 @@ const PastEventsPage = () => {
 			// Handle date-based events
 			try {
 				if (!event.startDate.includes("-")) return false;
-				return new Date(event.startDate) < new Date();
+				const eventStartDate = new Date(event.startDate);
+				const eventEndDate = event.endDate ? new Date(event.endDate) : eventStartDate;
+
+				// Normalize current date to remove time component
+				const currentDate = new Date();
+				currentDate.setHours(0, 0, 0, 0);
+				eventStartDate.setHours(0, 0, 0, 0);
+				eventEndDate.setHours(0, 0, 0, 0);
+
+				// Event is past only if it's completely over
+				return currentDate > eventEndDate;
 			} catch (e) {
 				console.error("Invalid date format:", event.startDate);
 				return false;