From 6cc39fb7eb193fd12844aea93237c9ede61e44d4 Mon Sep 17 00:00:00 2001
From: Yihan Yang <yihanyang2026@u.northwestern.edu>
Date: Tue, 11 Feb 2025 04:05:20 +0800
Subject: [PATCH 1/3] feat:list task by priority

---
 src/components/Home/Calendar/CalendarComponent.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/Home/Calendar/CalendarComponent.tsx b/src/components/Home/Calendar/CalendarComponent.tsx
index 41953eb..14ac410 100644
--- a/src/components/Home/Calendar/CalendarComponent.tsx
+++ b/src/components/Home/Calendar/CalendarComponent.tsx
@@ -36,6 +36,18 @@ const CalendarComponent = ({ schedule, setSelectedDate }: ScheduleCalendarProps)
   const highlightedDays = useMemo(() => computeHighlightedDays(schedule), [schedule])
   const timeRange = useMemo(() => computeTimeRange(schedule, '08:00:00', '22:00:00'), [schedule])
 
+  const eventOrder = (a: Task, b: Task): number => {
+    if (a.priority === 'medium' && b.priority === 'high') {
+      return 1
+    }
+    else if (a.priority === 'low' && b.priority === 'medium') {
+      return 0
+    }
+    else {
+      return -1
+    }
+  }
+
   return (
     <Box sx={calendarStyles}>
       <FullCalendar
@@ -47,6 +59,7 @@ const CalendarComponent = ({ schedule, setSelectedDate }: ScheduleCalendarProps)
           right: 'dayGridMonth,timeGridWeek',
         }}
         events={highlightedDays}
+        eventOrder={eventOrder as (a: any, b: any) => number}
         editable
         selectable
         height="auto"

From 0e502af464ced9dca489a0ede6780276f8af10fe Mon Sep 17 00:00:00 2001
From: Yihan Yang <yihanyang2026@u.northwestern.edu>
Date: Wed, 12 Feb 2025 11:13:27 +0800
Subject: [PATCH 2/3] feat: update priority order+fix bug

---
 .../Home/Calendar/CalendarComponent.tsx           |  2 +-
 .../Home/Calendar/TaskInputDialog/index.tsx       | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/Home/Calendar/CalendarComponent.tsx b/src/components/Home/Calendar/CalendarComponent.tsx
index 14ac410..0d2f9b0 100644
--- a/src/components/Home/Calendar/CalendarComponent.tsx
+++ b/src/components/Home/Calendar/CalendarComponent.tsx
@@ -41,7 +41,7 @@ const CalendarComponent = ({ schedule, setSelectedDate }: ScheduleCalendarProps)
       return 1
     }
     else if (a.priority === 'low' && b.priority === 'medium') {
-      return 0
+      return 1
     }
     else {
       return -1
diff --git a/src/components/Home/Calendar/TaskInputDialog/index.tsx b/src/components/Home/Calendar/TaskInputDialog/index.tsx
index 125fa49..110bce0 100644
--- a/src/components/Home/Calendar/TaskInputDialog/index.tsx
+++ b/src/components/Home/Calendar/TaskInputDialog/index.tsx
@@ -29,15 +29,16 @@ const TaskInputDialog = ({
   const [actionHappening, setActionHappening] = useState(false)
 
   const handleTaskSubmitted = useCallback(async () => {
+    const taskId = await generateUniqueId([
+      state.title,
+      state.description,
+      state.category,
+      state.priority,
+    ])
     dispatch({
       type: 'SET_FIELD',
       field: 'taskId',
-      value: await generateUniqueId([
-        state.title,
-        state.description,
-        state.category,
-        state.priority,
-      ]),
+      value: taskId,
     })
 
     const newTask: Task = {
@@ -59,7 +60,7 @@ const TaskInputDialog = ({
       setActionHappening(true)
       if (action === 'Add') {
         const addTask = useScheduleStore.getState().addTask
-        await addTask(newTask)
+        await addTask({ ...newTask, taskId })
       }
       else if (action === 'Edit') {
         const updateTask = useScheduleStore.getState().updateTask

From 43517c7f345fa38205bd392326d0beea57267737 Mon Sep 17 00:00:00 2001
From: Yihan Yang <yihanyang2026@u.northwestern.edu>
Date: Wed, 12 Feb 2025 12:32:24 +0800
Subject: [PATCH 3/3] feat: improvecode

---
 src/components/Home/Calendar/CalendarComponent.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/Home/Calendar/CalendarComponent.tsx b/src/components/Home/Calendar/CalendarComponent.tsx
index 0d2f9b0..0e08a0d 100644
--- a/src/components/Home/Calendar/CalendarComponent.tsx
+++ b/src/components/Home/Calendar/CalendarComponent.tsx
@@ -37,15 +37,8 @@ const CalendarComponent = ({ schedule, setSelectedDate }: ScheduleCalendarProps)
   const timeRange = useMemo(() => computeTimeRange(schedule, '08:00:00', '22:00:00'), [schedule])
 
   const eventOrder = (a: Task, b: Task): number => {
-    if (a.priority === 'medium' && b.priority === 'high') {
-      return 1
-    }
-    else if (a.priority === 'low' && b.priority === 'medium') {
-      return 1
-    }
-    else {
-      return -1
-    }
+    const priorityMap = { high: 3, medium: 2, low: 1 }
+    return priorityMap[b.priority] - priorityMap[a.priority]
   }
 
   return (