Merge remote-tracking branch 'origin/young' into jiweon827

client/src/Components/EnterRoom.js

@@ -24,6 +24,7 @@ function EnterRoom(props) {
             let res = await axios.post('/room/enterRoom', { enterCode })
             await axios.put('/room/member', { userId: userId, roomId: enterCode })
             props.setRoomName(res.data)
+            props.setRoomCode(enterCode)
             props.enterChatRoom(enterCode)
             props.handleCloseEnter()
             props.handleChato()

client/src/Pages/HomePage.js

@@ -28,7 +28,7 @@ function Home() {
     const [chat, setChat] = useState(false);
     const [open, setOpen] = useState(false);
     const [room, setRoom] = useState(INIT_ROOM)
-    const [show, setShow] = useState(true)
+    const [show, setShow] = useState(false)
 
     //소켓
     const [singleChat, setSingleChat] = useState('')
@@ -56,7 +56,7 @@ function Home() {
     const handleCloseEnter = () => setShowEnter(false);
     const handleShowEnter = () => setShowEnter(true);
     const handleChato = () => setChat(true);
-    const handleChatc = () => setOpen(true);
+    const handleChatc = () => setChat(false);
 
     socket.on("sendUser", (data) => {
         setNewUser(data)
@@ -74,6 +74,8 @@ function Home() {
         setShow(false)
     }
 
+
+
     async function attendListRoom() {
         const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴
         const roomId = room.roomId
@@ -92,22 +94,6 @@ function Home() {
         e.preventDefault()
     }
 
-
-    useEffect(() => {
-        if (!(singleChat == '')) {
-            socket.emit("chat", {
-                roomInfo: roomCode,
-                sendInfo: {
-                    msg: singleChat,
-                    sender: singleUser,
-                    img: singleImg
-                }
-            })
-            setSingleChat([''])
-        }
-    }, [singleChat])
-
-
     useEffect(() => {
         socket.on("sendedMSG", (sendInfo) => {
             setRecievedImg(sendInfo.img)
@@ -125,8 +111,8 @@ function Home() {
                         <Tab eventKey="closed" title="내 채팅" onClick={handleChato} >
                             <ClosedList enterChatRoom={enterChatRoom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
                         </Tab>
-                        <Tab eventKey="open" title="공개방" onClick={handleChatc}>
-                            <OpenList openListroom={openListroom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
+                        <Tab eventKey="open" title="공개방" onClick={handleChato}>
+                            <OpenList enterChatRoom={enterChatRoom} openListroom={openListroom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
                         </Tab>
                     </Tabs>
                 </Col>
@@ -142,25 +128,23 @@ function Home() {
                         {chat ?
                             <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} setSingleChat={setSingleChat} roomCode={roomCode} roomName={roomName} />
                             : null}
-                        {(!show && open) ? null : <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>
-                            <Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button>
-                            <Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button>
-                        </div>}
-                    </>
-                    {open ? <div className="vh-90 flex-column align-items-center justify-content-center mt-2" variant="dark">
-                        <div className="d-flex justify-content-center">
-                            <div className="mt-5 p-5 shadow w-75">
-                                <h2 className="d-flex justify-content-center mb-3">현재 {room.roomName}방 입니다.</h2>
-                                <h5>▷ 관심분야 : {room.interest}</h5>
-                                <h5>▷ 참여인원 : {room.member.length}</h5>
-                                <h5 className="mb-3">▷ 방코드(방코드를 통해서도 참여할 수 있습니다.) : {room.roomId}</h5>
-                                <Row className='justify-content-center'>
-                                    <Button variant="outline-warning" size="sm" className="mr-4" onClick={enterButton}>뒤로가기</Button>
-                                    <Button variant="outline-warning" size="sm" className="ml-4" type='submit' onClick={attendListRoom}>참가</Button>
-                                </Row>
+                        {open ?
+                            <div className="vh-90 flex-column align-items-center justify-content-center mt-2" variant="dark">
+                                <div className="d-flex justify-content-center">
+                                    <div className="mt-5 p-5 shadow w-75">
+                                        <h2 className="d-flex justify-content-center mb-3">현재 {room.roomName}방 입니다.</h2>
+                                        <h5>▷ 관심분야 : {room.interest}</h5>
+                                        <h5>▷ 참여인원 : {room.member.length}</h5>
+                                        <h5 className="mb-3">▷ 방코드(방코드를 통해서도 참여할 수 있습니다.) : {room.roomId}</h5>
+                                        <Row className='justify-content-center'>
+                                            <Button variant="outline-warning" size="sm" className="mr-4" onClick={enterButton}>뒤로가기</Button>
+                                            <Button variant="outline-warning" size="sm" className="ml-4" type='submit' onClick={attendListRoom}>참가</Button>
+                                        </Row>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div> : null}
+                            : null}
+                    </>
                 </Col>
             </Row>
             <RoomMake showModal={showModal} handleCloseModal={handleCloseModal} />
@@ -169,4 +153,4 @@ function Home() {
     );
 }
 
-export default Home;
+export default Home
\ No newline at end of file