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 ( -
+
나의 크루
{ - if (!notification || !notification.isActive) { + if (!notification) { updateNotiMutation.mutate( - { isActive: true, duration: notification?.duration || "IMMEDIATELY" }, + { isActive: true, duration: "IMMEDIATELY" }, { onSuccess: (data: notification) => { setNotification(data) @@ -165,7 +165,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) diff --git a/src/pages/AnalysisDashboard.tsx b/src/pages/AnalysisDashboard.tsx index 41c524b..6515fa0 100644 --- a/src/pages/AnalysisDashboard.tsx +++ b/src/pages/AnalysisDashboard.tsx @@ -10,20 +10,21 @@ import TailBoneSitImage from "@/assets/images/tail-bone-sit.png" import TurtleNeckImage from "@/assets/images/tutle-neck.png" import PoseAnalysisChart from "@/components/Dashboard/Chart" import Datepicker, { DateValueType } from "react-tailwindcss-datepicker" +import CalendarToolTip from "@assets/icons/dashboard-calendar-tooltip.svg?react" const START_FROM = new Date() START_FROM.setMonth(START_FROM.getMonth() - 1) const AnalysisDashboard = () => { 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 (
-

오늘의 자세 분석

+
오늘의 자세 분석