From c2b1432deb0d399b1662d929b56cfc8d5b2cd094 Mon Sep 17 00:00:00 2001 From: wrryu09 Date: Wed, 17 Jul 2024 22:51:25 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20targetDate=20string=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/tasks/getTask/GetTasksType.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apis/tasks/getTask/GetTasksType.ts b/src/apis/tasks/getTask/GetTasksType.ts index 7799903b..7f853ef9 100644 --- a/src/apis/tasks/getTask/GetTasksType.ts +++ b/src/apis/tasks/getTask/GetTasksType.ts @@ -1,5 +1,5 @@ export interface GetTasksType { isTotal?: boolean; sortOrder?: string; - targetDate?: Date; + targetDate?: string; } From d57909dfff19fd18a7d64870e6dbc240c94d0d2c Mon Sep 17 00:00:00 2001 From: wrryu09 Date: Wed, 17 Jul 2024 22:56:34 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20targetArea=20api=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../targetArea/TargetTaskSection.tsx | 61 +++++++++++-------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/src/components/targetArea/TargetTaskSection.tsx b/src/components/targetArea/TargetTaskSection.tsx index 3280fa15..79d67119 100644 --- a/src/components/targetArea/TargetTaskSection.tsx +++ b/src/components/targetArea/TargetTaskSection.tsx @@ -3,6 +3,7 @@ import { Draggable } from 'react-beautiful-dnd'; import BtnTask from '../common/BtnTask/BtnTask'; import BtnTaskContainer from '../common/BtnTaskContainer'; +import useGetTasks from '@/apis/tasks/getTask/query'; import { TaskType } from '@/types/tasks/taskType'; interface TargetTaskSectionProps { @@ -11,35 +12,41 @@ interface TargetTaskSectionProps { tasks: TaskType[]; } function TargetTaskSection(props: TargetTaskSectionProps) { - const { handleSelectedTarget, selectedTarget, tasks } = props; - + const { handleSelectedTarget, selectedTarget } = props; + const targetDate = '2024-07-17'; + const { isFetched, data } = useGetTasks({ targetDate }); + console.log(data); return ( - {tasks.map((task, index) => ( - - {(provided, snapshot) => ( -
- -
- )} -
- ))} + {isFetched && ( + <> + {data.data.tasks.map((task: TaskType, index: number) => ( + + {(provided, snapshot) => ( +
+ +
+ )} +
+ ))} + + )}
); } From 1cc788397e621e95c6e4977de185f58e1663d7f8 Mon Sep 17 00:00:00 2001 From: wrryu09 Date: Wed, 17 Jul 2024 23:11:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20targetArea=20task=20get=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/targetArea/TargetArea.tsx | 4 ++-- src/components/targetArea/TargetTaskSection.tsx | 8 ++++---- src/utils/formatDatetoLocalDate.ts | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 src/utils/formatDatetoLocalDate.ts diff --git a/src/components/targetArea/TargetArea.tsx b/src/components/targetArea/TargetArea.tsx index a1016262..33f845a9 100644 --- a/src/components/targetArea/TargetArea.tsx +++ b/src/components/targetArea/TargetArea.tsx @@ -14,7 +14,7 @@ interface TargetAreaProps { tasks: TaskType[]; } -function TargetArea({ handleSelectedTarget, selectedTarget, tasks }: TargetAreaProps) { +function TargetArea({ handleSelectedTarget, selectedTarget }: TargetAreaProps) { const [targetDate, setTargetDate] = useState(new Date()); const handlePrevBtn = () => { @@ -59,7 +59,7 @@ function TargetArea({ handleSelectedTarget, selectedTarget, tasks }: TargetAreaP {provided.placeholder} diff --git a/src/components/targetArea/TargetTaskSection.tsx b/src/components/targetArea/TargetTaskSection.tsx index 79d67119..05bbf592 100644 --- a/src/components/targetArea/TargetTaskSection.tsx +++ b/src/components/targetArea/TargetTaskSection.tsx @@ -5,17 +5,17 @@ import BtnTaskContainer from '../common/BtnTaskContainer'; import useGetTasks from '@/apis/tasks/getTask/query'; import { TaskType } from '@/types/tasks/taskType'; +import formatDatetoLocalDate from '@/utils/formatDatetoLocalDate'; interface TargetTaskSectionProps { handleSelectedTarget: (task: TaskType | null) => void; selectedTarget: TaskType | null; - tasks: TaskType[]; + selectedDate: Date | null; } function TargetTaskSection(props: TargetTaskSectionProps) { - const { handleSelectedTarget, selectedTarget } = props; - const targetDate = '2024-07-17'; + const { handleSelectedTarget, selectedTarget, selectedDate } = props; + const targetDate = formatDatetoLocalDate(selectedDate); const { isFetched, data } = useGetTasks({ targetDate }); - console.log(data); return ( {isFetched && ( diff --git a/src/utils/formatDatetoLocalDate.ts b/src/utils/formatDatetoLocalDate.ts new file mode 100644 index 00000000..04dd6fe6 --- /dev/null +++ b/src/utils/formatDatetoLocalDate.ts @@ -0,0 +1,12 @@ +/** Date 형식을 0000-00-00 형식 string 으로 반환합니다 */ +const formatDatetoLocalDate = (date: Date | null) => { + if (date) { + const year = date.getFullYear(); + const month = '0'.concat((date.getMonth() + 1).toString()).slice(-2); + const day = '0'.concat(date.getDate().toString()).slice(-2); + return `${year}-${month}-${day}`; + } + return ''; +}; + +export default formatDatetoLocalDate;