Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default function NoteDetailPage({

const tripTitle = data?.result?.tripTitle || '';
const notes = data?.result?.details || [];
// tasktitle์„ detail ๋ฐฐ์—ด ์•ˆ์—๋งŒ ๋‚ด๋ ค์ค˜์„œ ์ด๋ ‡๊ฒŒ ์ž‘์„ฑํ•  ์ˆ˜ ๋ฐ–์— ์—†์Šต๋‹ˆ๋‹ค.. ์ˆ˜์ •ํ•„์š”
const taskTitle = data?.result?.taskTitle || '';

return (
Expand Down
1 change: 1 addition & 0 deletions src/model/task.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export type TGetTaskResponse = {
taskId: number;
tripName: string;
taskTitle: string;
ownerId: number;
taskFilePath?: string;
taskStatus: TTaskStatus;
taskDDay: string;
Expand Down
2 changes: 2 additions & 0 deletions src/ui/card/taskCard/TaskItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function TaskItem({
tripId,
taskId,
taskTitle,
ownerId,
taskFilePath,
taskStatus,
taskDDay,
Expand Down Expand Up @@ -139,6 +140,7 @@ function TaskItem({
{taskTitle}
</CheckBox>
<ButtonIconGroup
ownerId={ownerId}
taskAssignees={taskAssignees}
taskId={taskId}
hasFilePath={!!taskFilePath}
Expand Down
1 change: 1 addition & 0 deletions src/ui/card/taskCard/TaskList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default function TaskList({ tripId, tasks }: ITaskListProps) {
key={task.taskId}
tripId={tripId ? tripId : 0}
taskId={task.taskId}
ownerId={task.ownerId}
taskTitle={task.taskTitle}
taskFilePath={task.taskFilePath}
taskStatus={task.taskStatus}
Expand Down
3 changes: 3 additions & 0 deletions src/ui/common/ButtonIconGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface IButtonIconGroupProps {
onEditTaskClick: () => void;
onDeleteTaskClick: () => void;
registrantId: number;
ownerId: number;
className?: string;
taskAssignees: TTaskAssignee[];
}
Expand All @@ -35,6 +36,7 @@ export default function ButtonIconGroup({
taskId,
hasFilePath,
onFileClick,
ownerId,
taskAssignees,
registrantId,
onEditTaskClick,
Expand All @@ -48,6 +50,7 @@ export default function ButtonIconGroup({

//์˜ค๋„ˆ response๋กœ ๋ฐ›์•„์„œ์ถ”๊ฐ€์ฒ˜๋ฆฌ
const showDropdownMenu =
ownerId === user?.user.id ||
registrantId === user?.user.id ||
taskAssignees.some((assignee) => assignee.userId === user?.user.id);

Expand Down
2 changes: 0 additions & 2 deletions src/ui/trip/TripTask.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default function TripTask({ id }: TTripTaskProps) {
});

const { data, isLoading } = useGetTasks(params);

const { showModal } = useModalStore();
const postTask = usePostTask();
const handleAddTaskClick = () => {
Expand All @@ -43,7 +42,6 @@ export default function TripTask({ id }: TTripTaskProps) {
};

return (
// <div className="flex w-full flex-col gap-4 rounded-xl bg-white py-6 desktop:px-6"></div>
<div className="section-box flex flex-1 flex-col gap-5 px-0 pr-0 desktop:px-6">
<div className="flex flex-col gap-5 px-6 desktop:px-0">
<h4 className="text-lg font-semibold leading-7 text-slate-800">Todo</h4>
Expand Down
Loading