diff --git a/src/components/Crew/MyCrew/MyCrewHeader.tsx b/src/components/Crew/MyCrew/MyCrewHeader.tsx index b6825a0..6e67d30 100644 --- a/src/components/Crew/MyCrew/MyCrewHeader.tsx +++ b/src/components/Crew/MyCrew/MyCrewHeader.tsx @@ -1,21 +1,24 @@ import CreateCrewIcon from "@assets/icons/crew-create-button-icon.svg?react" interface MyCrewHeaderProps { - openCreateModal: () => void + openCreateModal?: () => void + isDisplayedCreationButton?: boolean } export default function MyCrewHeader(props: MyCrewHeaderProps) { - const { openCreateModal } = props + const { openCreateModal, isDisplayedCreationButton = false } = props return (
나의 크루
-
- -
크루 만들기
-
+ {isDisplayedCreationButton && ( +
+ +
크루 만들기
+
+ )}
) } diff --git a/src/components/Posture/PostrueCrew.tsx b/src/components/Posture/PostrueCrew.tsx index 60f5b33..fd6fd04 100644 --- a/src/components/Posture/PostrueCrew.tsx +++ b/src/components/Posture/PostrueCrew.tsx @@ -1,9 +1,11 @@ import { duration, notification } from "@/api/notification" +import EmptyGroupImage from "@/assets/images/crew-empty.png" +import RoutePath from "@/constants/routes.json" import { useModals } from "@/hooks/useModals" +import useMyGroup from "@/hooks/useMyGroup" import useNotification from "@/hooks/useNotification" import { useModifyNoti } from "@/hooks/useNotiMutation" import usePushNotification from "@/hooks/usePushNotification" -import { useCreateSnaphot } from "@/hooks/useSnapshotMutation" import { useAuthStore } from "@/store" import { useSnapShotStore } from "@/store/SnapshotStore" import CloseCrewPanelIcon from "@assets/icons/crew-panel-close-button.svg?react" @@ -13,11 +15,8 @@ import QuestionIcon from "@assets/icons/question-info-icon.svg?react" import RankingGuideToolTip from "@assets/images/ranking-guide.png" import SelectBox from "@components/SelectBox" import { ReactElement, useCallback, useEffect, useRef, useState } from "react" -import { modals } from "../Modal/Modals" -import useMyGroup from "@/hooks/useMyGroup" -import EmptyGroupImage from "@/assets/images/crew-empty.png" import { useNavigate } from "react-router-dom" -import RoutePath from "@/constants/routes.json" +import { modals } from "../Modal/Modals" interface IPostureCrew { groupUserId: number @@ -128,7 +127,6 @@ export default function PostrueCrew(props: PostureCrewProps): ReactElement { const accessToken = useAuthStore((state) => state.accessToken) const { resetSnapShot } = useSnapShotStore() const { openModal } = useModals() - const createSnapMutation = useCreateSnaphot() const wsUrl = `wss://api.alignlab.site/ws/v1/groups/1/users?X-HERO-AUTH-TOKEN=${accessToken}` const { isConnected, crews } = useWebSocket(wsUrl) @@ -181,9 +179,6 @@ export default function PostrueCrew(props: PostureCrewProps): ReactElement { const onClickReTakeSnapShot = () => { resetSnapShot() - createSnapMutation.mutate({ - points: [], - }) } console.log("notification: ", notification) diff --git a/src/layouts/MonitoringLayout.tsx b/src/layouts/MonitoringLayout.tsx index 1f9fe3b..bd1efb6 100644 --- a/src/layouts/MonitoringLayout.tsx +++ b/src/layouts/MonitoringLayout.tsx @@ -2,7 +2,7 @@ import { Outlet } from "react-router-dom" export default function MonitoringLayout() { return ( -
+
) diff --git a/src/pages/MonitoringPage.tsx b/src/pages/MonitoringPage.tsx index 13eb8ab..8fafe77 100644 --- a/src/pages/MonitoringPage.tsx +++ b/src/pages/MonitoringPage.tsx @@ -41,9 +41,9 @@ const MonitoringPage: React.FC = () => { return (
{/* Main content area */} -
-
-
+
+
+
{!hasPermission && ( diff --git a/src/pages/MyCrew.tsx b/src/pages/MyCrew.tsx index 3bae965..52240ce 100644 --- a/src/pages/MyCrew.tsx +++ b/src/pages/MyCrew.tsx @@ -56,7 +56,7 @@ export default function MyCrew() { return ( <> - {}} /> + {/* {!isLoading && ()} */}
@@ -100,7 +100,7 @@ export default function MyCrew() {
크루 소개 -

{myGroupData?.description}

+

{myGroupData?.description}