From cf252c3ec4bbdcae47aa9694ffa2cdcfa8247581 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sat, 31 May 2025 19:40:23 -0400 Subject: [PATCH] refactor: Clean up unused code and improve layout in CompactChoreCard, MyChores, and AddTaskModal components --- src/views/Chores/CompactChoreCard.jsx | 6 +-- src/views/Chores/MyChores.jsx | 6 ++- src/views/components/AddTaskModal.jsx | 67 +++++++++++++-------------- 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/views/Chores/CompactChoreCard.jsx b/src/views/Chores/CompactChoreCard.jsx index ed4a4ec..78063bd 100644 --- a/src/views/Chores/CompactChoreCard.jsx +++ b/src/views/Chores/CompactChoreCard.jsx @@ -464,7 +464,7 @@ const CompactChoreCard = ({ ...sx, display: 'flex', alignItems: 'center', - px: 1, + // px: 1, // py: 0.75, minHeight: 56, // More compact height cursor: 'pointer', @@ -594,11 +594,11 @@ const CompactChoreCard = ({ } }} style={{ - display: 'inline-block', cursor: 'pointer', - // remove any padding or margin: padding: 0, margin: 0, + display: 'flex', + alignItems: 'center', }} key={`compact-chorecard-${chore.id}-label-${l.id}`} > diff --git a/src/views/Chores/MyChores.jsx b/src/views/Chores/MyChores.jsx index 1e64b24..e9dc758 100644 --- a/src/views/Chores/MyChores.jsx +++ b/src/views/Chores/MyChores.jsx @@ -721,7 +721,11 @@ const MyChores = () => { *']: { + // px: 0.5, + px: 0.5, + // pr: 0, + }, }} > {section.content?.map(chore => renderChoreCard(chore))} diff --git a/src/views/components/AddTaskModal.jsx b/src/views/components/AddTaskModal.jsx index 7c4afdf..55d6f38 100644 --- a/src/views/components/AddTaskModal.jsx +++ b/src/views/components/AddTaskModal.jsx @@ -20,12 +20,7 @@ import { useCreateChore } from '../../queries/ChoreQueries' import { useCircleMembers } from '../../queries/UserQueries' import { isPlusAccount } from '../../utils/Helpers' import { useLabels } from '../Labels/LabelQueries' -import { - parseAssignees, - parseLabels, - parsePriority, - parseRepeatV2, -} from './CustomParsers' +import { parseLabels, parsePriority, parseRepeatV2 } from './CustomParsers' import SmartTaskTitleInput from './SmartTaskTitleInput' import LearnMoreButton from './LearnMore' @@ -212,33 +207,32 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { cleanedSentence = repeat.cleanedSentence } // Parse assignees using circle members - const circleMembersList = circleMembers?.res || [] - const assigneesForParsing = circleMembersList.map(member => ({ - userId: member.userId, - username: - member.username || - member.displayName?.toLowerCase().replace(/\s+/g, ''), - displayName: member.displayName, - name: member.displayName, - id: member.userId, - })) + // const circleMembersList = circleMembers?.res || [] + // const assigneesForParsing = circleMembersList.map(member => ({ + // userId: member.userId, + // username: + // member.username || + // member.displayName?.toLowerCase().replace(/\s+/g, ''), + // displayName: member.displayName, + // name: member.displayName, + // id: member.userId, + // })) - const assigneesResult = parseAssignees(sentence, assigneesForParsing) - if (assigneesResult.result) { - cleanedSentence = assigneesResult.cleanedSentence - setAssignees(assigneesResult.result) - } else { - // Default to current user if no assignees parsed - setAssignees([ - { - userId: userProfile.id, - username: userProfile.username, - displayName: userProfile.displayName, - name: userProfile.displayName, - id: userProfile.id, - }, - ]) - } + // const assigneesResult = parseAssignees(sentence, assigneesForParsing) + // if (assigneesResult.result) { + // cleanedSentence = assigneesResult.cleanedSentence + // setAssignees( + // assigneesResult.result.map(assignee => ({ + // userId: assignee.userId, + // })), + // ) + // } else { + // setAssignees([ + // { + // userId: userProfile.id, + // }, + // ]) + // } const parsedDueDate = chrono.parse(sentence, new Date(), { forwardDate: true, }) @@ -327,7 +321,8 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { const createChore = () => { const chore = { name: taskTitle, - assignees: assignees.map(assignee => ({ userId: assignee.userId })), + assignees: + assignees.length > 0 ? assignees : [{ userId: userProfile.id }], dueDate: dueDate ? new Date(dueDate).toISOString() : null, assignedTo: assignees.length > 0 ? assignees[0].userId : userProfile.id, assignStrategy: 'random', @@ -590,7 +585,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { gap: 2, }} > - + {/* Assignees {assignees.length > 0 ? ( @@ -598,7 +593,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { {assignee.displayName || assignee.username} @@ -610,7 +605,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { )} - + */} Frequency