diff --git a/src/App.tsx b/src/App.tsx index 9af1ced..fd5a3f4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -40,13 +40,13 @@ import { theme } from "@/styles/Theme"; import BoardDetailPage from "./pages/BoardPage/BoardDetailpage/BoardDetailPage"; import BoardRegisterPage from "./pages/BoardPage/BoardRegisterPage/BoardRegisterPage"; +import HomePageMemberPage from "./pages/HomePage/HomePageMember"; +import HomePageProfile from "./pages/HomePage/HomePageProfile"; import KakaoRedirection from "./pages/LoginPage/KakaoRedirection"; import LoginModal from "./pages/LoginPage/LoginModal"; import InviteSpace from "./pages/SpacePage/InviteSpace"; -import HomePageMemberPage from "./pages/HomePage/HomePageMember"; -import HomePageProfile from "./pages/HomePage/HomePageProfile"; -import SpecialVoiceRoom from "./pages/VoiceRoomPage/SpecialVoiceRoom"; import InviteSpace2 from "./pages/SpacePage/InviteSpace2"; +import SpecialVoiceRoom from "./pages/VoiceRoomPage/SpecialVoiceRoom"; // will we need constant path in later..? // const PATH = { diff --git a/src/pages/HomePage/HomePage.tsx b/src/pages/HomePage/HomePage.tsx index 673f4d2..9985725 100644 --- a/src/pages/HomePage/HomePage.tsx +++ b/src/pages/HomePage/HomePage.tsx @@ -97,11 +97,22 @@ const HomePage = () => { > 로고 + {homeData?.spaceName} - - @@ -125,9 +136,9 @@ const HomePage = () => { - + {/* 로그인 - + */} diff --git a/src/pages/SpacePage/AccountManage.tsx b/src/pages/SpacePage/AccountManage.tsx index 62ad74a..1f237eb 100644 --- a/src/pages/SpacePage/AccountManage.tsx +++ b/src/pages/SpacePage/AccountManage.tsx @@ -1,7 +1,10 @@ -import TopBarText, { LeftEnum } from "@/components/TopBarText"; +import { useState } from "react"; +import { useNavigate } from "react-router-dom"; import styled from "styled-components"; + import right_arrow from "@/assets/Space/icon_right_arrow.svg"; -import { To, useNavigate } from "react-router-dom"; +import TopBarText, { LeftEnum } from "@/components/TopBarText"; +import NotDevelopModal from "@/utils/NotDevelopModal"; const Name = styled.div` display: flex; @@ -26,28 +29,26 @@ const Password = styled.div` const AccountManage = () => { const navigate = useNavigate(); - - const handleNavigate = (path: To) => { - navigate(path); - }; + const [isOpen, setIsOpen] = useState(false); return (
-
- handleNavigate("/")}> +
+ setIsOpen(true)}> 이름 변경 right_arrow - handleNavigate("/")}> + setIsOpen(true)}> 아이디 변경 right_arrow - handleNavigate("/")}> + setIsOpen(true)}> 비밀번호 변경 right_arrow
+
); }; diff --git a/src/pages/SpacePage/SpaceOption.tsx b/src/pages/SpacePage/SpaceOption.tsx index 422ad3d..767b234 100644 --- a/src/pages/SpacePage/SpaceOption.tsx +++ b/src/pages/SpacePage/SpaceOption.tsx @@ -1,10 +1,12 @@ -import TopBarText, { LeftEnum } from "@/components/TopBarText"; -import { To, useNavigate } from "react-router-dom"; import { useState } from "react"; -import right_arrow from "@/assets/Space/icon_right_arrow.svg"; +import { To, useNavigate } from "react-router-dom"; import styled from "styled-components"; + +import right_arrow from "@/assets/Space/icon_right_arrow.svg"; import StopModal from "@/components/StopModal"; import * as S from "@/components/StopModal.styled"; +import TopBarText, { LeftEnum } from "@/components/TopBarText"; +import NotDevelopModal from "@/utils/NotDevelopModal"; const Account = styled.div` display: flex; @@ -51,6 +53,7 @@ const SpaceOption = () => { const [isLogoutModalOpen, setIsLogoutModalOpen] = useState(false); const [isWithdrawModalOpen, setIsWithdrawModalOpen] = useState(false); + const [isNotDevModal, setIsNotDevModal] = useState(false); const handleOpenLogoutModal = () => { setIsLogoutModalOpen(true); @@ -82,12 +85,12 @@ const SpaceOption = () => { return (
-
+
handleNavigate("/space/spaceoption/accountmanage")}> 계정 정보 right_arrow - handleNavigate("/space/spaceoption/profilemanage")}> + setIsNotDevModal(true)}> 프로필 관리 right_arrow @@ -121,6 +124,7 @@ const SpaceOption = () => { confirmButtonText="탈퇴하기" confirmButtonTextColor="#FFFFFF" /> +
); diff --git a/src/pages/SpacePage/SpacePage.tsx b/src/pages/SpacePage/SpacePage.tsx index bc45426..f3b983d 100644 --- a/src/pages/SpacePage/SpacePage.tsx +++ b/src/pages/SpacePage/SpacePage.tsx @@ -41,6 +41,9 @@ const GridItem = styled.div` .space-image { width: 100%; height: 100%; + border-radius: 0.75rem; + max-width: 13.75rem; + max-height: 13.75rem; } .spaceId { diff --git a/src/utils/NotDevelopModal.tsx b/src/utils/NotDevelopModal.tsx index 28c3148..3090551 100644 --- a/src/utils/NotDevelopModal.tsx +++ b/src/utils/NotDevelopModal.tsx @@ -7,8 +7,14 @@ interface ModalType { content?: string[]; } -export const NotDevelopModal = ({ title, content }: ModalType) => { - const [isModalOpen, setIsModalOpen] = useState(false); +export const NotDevelopModal = ({ + isModalOpen, + setIsModalOpen, +}: { + isModalOpen: boolean; + setIsModalOpen: React.Dispatch>; +}) => { + //const [isModalOpen, setIsModalOpen] = useState(false); return (