diff --git a/src/model/task.model.ts b/src/model/task.model.ts index ed16d35..ab7ff08 100644 --- a/src/model/task.model.ts +++ b/src/model/task.model.ts @@ -1,5 +1,3 @@ -import { TUserModel } from './user.model'; - export type TTaskStatus = 'BEFORE_TRIP' | 'DURING_TRIP' | 'AFTER_TRIP'; export type TTaskScope = 'PUBLIC' | 'PRIVATE'; @@ -28,9 +26,10 @@ export type TGetTaskResponse = { taskScope: TTaskScope; isCompleted: boolean; taskCompletionDate?: string; - createdBy: TUserModel; + registrantId: number; + createdBy: string; createdAt: string; - modifiedBy: TUserModel; + modifiedBy: string; modifiedAt: string; taskAssignees: TTaskAssignee[]; }; diff --git a/src/model/user.model.ts b/src/model/user.model.ts index b1b644f..5e1c0aa 100644 --- a/src/model/user.model.ts +++ b/src/model/user.model.ts @@ -1,9 +1,3 @@ import { TPostRegisterRequest } from './auth.model'; export type TGetUserResponse = Omit; - -export type TUserModel = { - id: number; - username: string; - email: string; -}; diff --git a/src/ui/box/AllTodoBox.tsx b/src/ui/box/AllTodoBox.tsx index 75a6429..6c9ca45 100644 --- a/src/ui/box/AllTodoBox.tsx +++ b/src/ui/box/AllTodoBox.tsx @@ -30,7 +30,7 @@ export default function AllTodoBox() { } return ( -
+
{/* 데이터 렌더링 */} -
+
{displayedTasks.length > 0 ? ( ) : ( diff --git a/src/ui/card/taskCard/TaskItem.tsx b/src/ui/card/taskCard/TaskItem.tsx index 6e5c29c..3824f5f 100644 --- a/src/ui/card/taskCard/TaskItem.tsx +++ b/src/ui/card/taskCard/TaskItem.tsx @@ -32,7 +32,7 @@ function TaskItem({ taskScope, isCompleted, taskCompletionDate, - createdBy, + registrantId, taskAssignees, }: ITaskItemProps) { const [isCompletedTask, setIsCompletedTask] = useState(isCompleted || false); @@ -142,7 +142,7 @@ function TaskItem({ taskAssignees={taskAssignees} taskId={taskId} hasFilePath={!!taskFilePath} - createdBy={createdBy} + registrantId={registrantId} onFileClick={handleFileClick} onEditTaskClick={handleEditTaskClick} onDeleteTaskClick={handleDeleteTaskClick} diff --git a/src/ui/card/taskCard/TaskList.tsx b/src/ui/card/taskCard/TaskList.tsx index b81f1a7..6e33bf6 100644 --- a/src/ui/card/taskCard/TaskList.tsx +++ b/src/ui/card/taskCard/TaskList.tsx @@ -21,6 +21,7 @@ export default function TaskList({ tripId, tasks }: ITaskListProps) { taskStatus={task.taskStatus} taskDDay={task.taskDDay} taskScope={task.taskScope} + registrantId={task.registrantId} isCompleted={task.isCompleted} taskCompletionDate={task.taskCompletionDate} createdBy={task.createdBy} diff --git a/src/ui/common/ButtonIconGroup.tsx b/src/ui/common/ButtonIconGroup.tsx index de27be8..ad1df63 100644 --- a/src/ui/common/ButtonIconGroup.tsx +++ b/src/ui/common/ButtonIconGroup.tsx @@ -2,7 +2,6 @@ import { twMerge } from 'tailwind-merge'; import DropdownMenu from './DropdownMenu'; import Link from 'next/link'; import Image from 'next/image'; -import { TUserModel } from '@model/user.model'; import { useLogin } from '@hooks/auth/useLogin'; import { TTaskAssignee } from '@model/task.model'; @@ -27,7 +26,7 @@ interface IButtonIconGroupProps { onFileClick: () => void; onEditTaskClick: () => void; onDeleteTaskClick: () => void; - createdBy: TUserModel; + registrantId: number; className?: string; taskAssignees: TTaskAssignee[]; } @@ -37,7 +36,7 @@ export default function ButtonIconGroup({ hasFilePath, onFileClick, taskAssignees, - createdBy, + registrantId, onEditTaskClick, onDeleteTaskClick, className, @@ -47,8 +46,9 @@ export default function ButtonIconGroup({ const buttonStyle = 'relative flex h-6 w-6 items-center justify-center rounded-full bg-slate-50'; + //오너 response로 받아서추가처리 const showDropdownMenu = - createdBy.id === user?.user.id || + registrantId === user?.user.id || taskAssignees.some((assignee) => assignee.userId === user?.user.id); return ( diff --git a/src/ui/trip/TripTask.tsx b/src/ui/trip/TripTask.tsx index 7622243..62778ae 100644 --- a/src/ui/trip/TripTask.tsx +++ b/src/ui/trip/TripTask.tsx @@ -45,19 +45,22 @@ export default function TripTask({ id }: TTripTaskProps) { } return ( -
-
+ //
+
+

Todo

- +
+ +
); }