From ca9a53bde98cd3a9de28dfb25cde65c2916ef75a Mon Sep 17 00:00:00 2001
From: Mo Tarbin <mhed.t91@gmail.com>
Date: Sun, 17 Aug 2025 22:26:04 -0400
Subject: [PATCH] CalendarView component: add priority color to show in the
 calendar cell,  legend display to show two columns instead of one

---
 src/utils/Colors.jsx                  |  2 +-
 src/views/components/CalendarView.jsx | 88 ++++++++++++++++-----------
 2 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/utils/Colors.jsx b/src/utils/Colors.jsx
index 4e93d73..09fa0fb 100644
--- a/src/utils/Colors.jsx
+++ b/src/utils/Colors.jsx
@@ -95,7 +95,7 @@ export const TASK_COLOR = {
   PRIORITY_3: '#0288d1',
   // PRIORITY_4: '#388e3c',
   PRIORITY_4: '#90a4ae',
-  // NO_PRIORITY: '#90a4ae80',
+  NO_PRIORITY: '#90a4ae80',
 }
 export default LABEL_COLORS
 
diff --git a/src/views/components/CalendarView.jsx b/src/views/components/CalendarView.jsx
index a296f2a..aaed132 100644
--- a/src/views/components/CalendarView.jsx
+++ b/src/views/components/CalendarView.jsx
@@ -9,12 +9,25 @@ import { useCircleMembers, useUserProfile } from '../../queries/UserQueries'
 import { TASK_COLOR } from '../../utils/Colors'
 import './Calendar.css'
 
+const getPriorityColor = priority => {
+  switch (priority) {
+    case 1:
+      return TASK_COLOR.PRIORITY_1
+    case 2:
+      return TASK_COLOR.PRIORITY_2
+    case 3:
+      return TASK_COLOR.PRIORITY_3
+    case 4:
+      return TASK_COLOR.PRIORITY_4
+    default:
+      return TASK_COLOR.NO_PRIORITY
+  }
+}
 const getAssigneeColor = (assignee, userProfile) => {
   return assignee === userProfile.id
     ? TASK_COLOR.ASSIGNED_TO_ME
     : TASK_COLOR.ASSIGNED_TO_OTHER
 }
-
 const CalendarView = ({ chores }) => {
   const { data: userProfile } = useUserProfile()
 
@@ -54,10 +67,7 @@ const CalendarView = ({ chores }) => {
             <span
               className='dot-with-line'
               style={{
-                backgroundColor: getAssigneeColor(
-                  dayChores[0].assignedTo,
-                  userProfile,
-                ),
+                backgroundColor: getPriorityColor(dayChores[0].priority),
               }}
             ></span>
           </div>
@@ -72,10 +82,7 @@ const CalendarView = ({ chores }) => {
                 key={index}
                 className='dot'
                 style={{
-                  backgroundColor: getAssigneeColor(
-                    chore.assignedTo,
-                    userProfile,
-                  ),
+                  backgroundColor: getPriorityColor(chore.priority),
                 }}
               ></span>
             )
@@ -134,38 +141,54 @@ const CalendarView = ({ chores }) => {
             justifyContent: 'start',
           }}
         >
-          {/* Show legend with current user first, then other circle members who have assignments */}
+          {/* Show legend with priority colors */}
           {(() => {
-            const assignedUserIds = new Set(
-              chores.map(chore => chore.assignedTo).filter(Boolean),
+            const priorityLevels = new Set(
+              chores.map(chore => chore.priority).filter(p => p !== undefined),
             )
             const legendItems = []
 
-            // Add current user if they have assignments
-            if (assignedUserIds.has(userProfile.id)) {
+            // Add priority levels that exist in the chores
+            if (priorityLevels.has(1)) {
               legendItems.push({
-                name: 'Assigned to me',
-                color: TASK_COLOR.ASSIGNED_TO_ME,
+                name: 'High Priority',
+                color: TASK_COLOR.PRIORITY_1,
+              })
+            }
+            if (priorityLevels.has(2)) {
+              legendItems.push({
+                name: 'Medium Priority',
+                color: TASK_COLOR.PRIORITY_2,
+              })
+            }
+            if (priorityLevels.has(3)) {
+              legendItems.push({
+                name: 'Low Priority',
+                color: TASK_COLOR.PRIORITY_3,
+              })
+            }
+            if (priorityLevels.has(4)) {
+              legendItems.push({
+                name: 'Lowest Priority',
+                color: TASK_COLOR.PRIORITY_4,
+              })
+            }
+            if (
+              chores.some(
+                chore =>
+                  chore.priority === undefined || chore.priority === null,
+              )
+            ) {
+              legendItems.push({
+                name: 'No Priority',
+                color: TASK_COLOR.NO_PRIORITY,
               })
             }
-
-            // Add other circle members who have assignments
-            circleMembers.forEach(member => {
-              if (
-                member.userId !== userProfile.id &&
-                assignedUserIds.has(member.userId)
-              ) {
-                legendItems.push({
-                  name: `Assigned to others`,
-                  color: TASK_COLOR.ASSIGNED_TO_OTHER,
-                })
-              }
-            })
 
             return legendItems.map((item, index) => (
               <Grid
                 key={index}
-                xs={12}
+                xs={6}
                 sx={{
                   display: 'flex',
                   alignItems: 'center',
@@ -272,10 +295,7 @@ const CalendarView = ({ chores }) => {
                       top: 0,
                       bottom: 0,
                       width: '3px',
-                      backgroundColor: getAssigneeColor(
-                        chore.assignedTo,
-                        userProfile,
-                      ),
+                      backgroundColor: getPriorityColor(chore.priority),
                       borderRadius: '2px',
                     },
                   }}