From 2319d03bdfbcf6be8e2a37d9eea8a9c34ec911d8 Mon Sep 17 00:00:00 2001 From: G-hoon Date: Wed, 25 Sep 2024 15:33:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[feat/#58]=20=EC=95=8C=EB=9E=8C=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=BD=94=EB=93=9C=EB=A5=BC=20=EB=8D=94=20=EB=AA=85?= =?UTF-8?q?=ED=99=95=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Posture/PostrueCrew.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Posture/PostrueCrew.tsx b/src/components/Posture/PostrueCrew.tsx index 28f40bc..3374d7d 100644 --- a/src/components/Posture/PostrueCrew.tsx +++ b/src/components/Posture/PostrueCrew.tsx @@ -148,9 +148,9 @@ export default function PostrueCrew(props: PostureCrewProps): ReactElement { } const onClickNotiAlarm = (): void => { - if (!notification || !notification.isActive) { + if (!notification) { updateNotiMutation.mutate( - { isActive: true, duration: notification?.duration || "IMMEDIATELY" }, + { isActive: true, duration: "IMMEDIATELY" }, { onSuccess: (data: notification) => { setNotification(data) @@ -159,7 +159,7 @@ export default function PostrueCrew(props: PostureCrewProps): ReactElement { ) } else { updateNotiMutation.mutate( - { isActive: !notification?.isActive, duration: notification?.duration }, + { isActive: !notification?.isActive, duration: notification?.duration || "IMMEDIATELY" }, { onSuccess: (data: notification) => { setNotification(data) From ba464514b3adaa8294129fc3c9dc1ca14280faa4 Mon Sep 17 00:00:00 2001 From: G-hoon Date: Thu, 26 Sep 2024 01:32:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[feat/#58]=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?QA=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../icons/dashboard-calendar-tooltip.svg | 19 ++++++++++++++ src/components/Crew/MyCrew/MyCrewHeader.tsx | 2 +- src/pages/AnalysisDashboard.tsx | 25 ++++++++++++++++--- 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 src/assets/icons/dashboard-calendar-tooltip.svg diff --git a/src/assets/icons/dashboard-calendar-tooltip.svg b/src/assets/icons/dashboard-calendar-tooltip.svg new file mode 100644 index 0000000..12ec27d --- /dev/null +++ b/src/assets/icons/dashboard-calendar-tooltip.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Crew/MyCrew/MyCrewHeader.tsx b/src/components/Crew/MyCrew/MyCrewHeader.tsx index 590bbe9..b6825a0 100644 --- a/src/components/Crew/MyCrew/MyCrewHeader.tsx +++ b/src/components/Crew/MyCrew/MyCrewHeader.tsx @@ -7,7 +7,7 @@ interface MyCrewHeaderProps { export default function MyCrewHeader(props: MyCrewHeaderProps) { const { openCreateModal } = props return ( -
+
나의 크루
{ const carouselRef = useRef(null) + const datePickerRef = useRef(null) const [currentIndex, setCurrentIndex] = useState(0) const [dateRange, setDateRange] = useState({ startDate: null, endDate: null, }) - const [isLargeViewport, setIsLargeViewport] = useState(false) - + const [showTooltip, setShowTooltip] = useState(false) const { todayAnalysis, totalAnalysis, isLoading, isError } = usePoseAnalysis(dateRange) useEffect(() => { @@ -70,7 +71,7 @@ const AnalysisDashboard = () => { return (
-

오늘의 자세 분석

+
오늘의 자세 분석