diff --git a/frontend/src/components/Layout/index.tsx b/frontend/src/components/Layout/index.tsx index 815f9dd5..7b691b79 100644 --- a/frontend/src/components/Layout/index.tsx +++ b/frontend/src/components/Layout/index.tsx @@ -32,7 +32,6 @@ const Layout = ({ children }: LayoutProps) => { const mapContainer = useRef(null); const { width } = useContext(LayoutWidthContext); const isLogined = localStorage.getItem('userToken'); - const user = JSON.parse(localStorage.getItem('user') || ''); const loginButtonClick = () => { window.location.href = 'https://mapbefine.kro.kr/api/oauth/kakao'; @@ -60,25 +59,20 @@ const Layout = ({ children }: LayoutProps) => { - - - - {isLogined ? ( - - ) : ( - - )} - - + + + { - const [myInfoTopics, setMyInfoTopics] = useState([]); + const [myInfoTopics, setMyInfoTopics] = useState([]); const getMyInfoListFromServer = async () => { - const serverMyInfoTopics = await getApi( + const serverMyInfoTopics = await getApi( 'default', '/members/my/topics', ); @@ -28,11 +28,16 @@ const MyInfoList = () => { return ( ); diff --git a/frontend/src/pages/Profile.tsx b/frontend/src/pages/Profile.tsx index e8f2a5c8..275218d9 100644 --- a/frontend/src/pages/Profile.tsx +++ b/frontend/src/pages/Profile.tsx @@ -7,9 +7,12 @@ import MyInfo from '../components/MyInfo'; import MyInfoContainer from '../components/MyInfoContainer'; import useNavigator from '../hooks/useNavigator'; import useSetNavbarHighlight from '../hooks/useSetNavbarHighlight'; +import useSetLayoutWidth from '../hooks/useSetLayoutWidth'; +import { FULLSCREEN } from '../constants'; const Profile = () => { const { routePage } = useNavigator(); + const { width: _ } = useSetLayoutWidth(FULLSCREEN); const { navbarHighlights: __ } = useSetNavbarHighlight('profile'); const goToPopularTopics = () => {