diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index 774bcaf5..1286c041 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -3,8 +3,8 @@ import { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { ScrollMenu } from 'react-horizontal-scrolling-menu'; import vectors from '../components/atoms/Vectors'; -import Blocks from '../components/lobby/Blocks'; -import Search from '../components/lobby/Search'; +import Blocks from '../components/main/Blocks'; +import Search from '../components/main/Search'; import InputNickname from '../components/login/InputNickname'; import Modal from '../components/atoms/Modal'; diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx index 03552120..1bf17472 100644 --- a/src/pages/Main.tsx +++ b/src/pages/Main.tsx @@ -1,10 +1,16 @@ +import { useState } from 'react'; import styled from 'styled-components'; import Scrolls from '../components/main/Scrolls'; import Header from '../components/main/Header'; import Title from '../components/main/TitleContainer'; -import Modal from '../components/layout/Modal'; +import Modal from '../components/atoms/Modal'; +import InputNickname from '../components/login/InputNickname'; export default function Main() { + const [isModal, setIsModal] = useState(true); + const modalHandler = () => { + setIsModal(false); + }; return ( <> @@ -12,7 +18,11 @@ export default function Main() { <Scrolls /> </Container> - <Modal /> + {isModal && ( + <Modal modalHandler={modalHandler}> + <InputNickname /> + </Modal> + )} </> ); }