From 5764f3ff9a78033433b07290a121915a2f6d5ff1 Mon Sep 17 00:00:00 2001
From: Lixian Zhou <charlie32690@gmail.com>
Date: Tue, 17 Mar 2026 16:05:23 -0400
Subject: [PATCH] fix

---
 .../components/center-calendar/CenterCalendar.js  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/src/components/center-calendar/CenterCalendar.js b/client/src/components/center-calendar/CenterCalendar.js
index 24d5a37..2832b69 100644
--- a/client/src/components/center-calendar/CenterCalendar.js
+++ b/client/src/components/center-calendar/CenterCalendar.js
@@ -338,7 +338,12 @@ const EventsCalendar = () => {
 	const getGroupedEvents = () => {
 		const eventsDateMap = new Map();
 		const filteredEvents = getFilteredEvents();
-		for (const eventItem of filteredEvents) {
+		const sortedFilteredEvents = [...filteredEvents].sort((a, b) => {
+			const aTime = moment(a?.start_time).valueOf();
+			const bTime = moment(b?.start_time).valueOf();
+			return aTime - bTime;
+		});
+		for (const eventItem of sortedFilteredEvents) {
 			const dateString = moment(eventItem.start_time).format('MMM Do, YYYY');
 			if (eventsDateMap.has(dateString)) {
 				eventsDateMap.set(dateString, [...eventsDateMap.get(dateString), eventItem]);
@@ -357,7 +362,13 @@ const EventsCalendar = () => {
 			});
 			eventsDateMap.set(key, sortedItems);
 		});
-		return eventsDateMap;
+		return new Map(
+			[...eventsDateMap.entries()].sort((a, b) => {
+				const aDate = moment(a[1]?.[0]?.start_time).valueOf();
+				const bDate = moment(b[1]?.[0]?.start_time).valueOf();
+				return aDate - bDate;
+			})
+		);
 	};