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

client/src/Components/Chat.js

@@ -87,7 +87,7 @@ function Chat(props) {
       <Container id="chat" style={{ overflow: 'auto', padding: '20px', border: "2px solid", height: "500px", margin: "1%", borderColor: "#BDBDBD", background: '' }}>
         <Row className="d-flex justify-content-center" style={{ border: "2px solid", borderWidth: "medium", borderColor: "#FFD75F", height: "80px", margin: "1%" }}>
           <Col md="auto">
-            <Button variant="light" onClick={props.handleChatc} >{`<`}</Button>
+            <Button variant="light" onClick={handleClick} >{`<`}</Button>
           </Col>
           <Col>
             <Row style={{ fontWeight: "bold", fontSize: "x-large" }}> {roomName} </Row>
@@ -128,8 +128,6 @@ function Chat(props) {
         })
         }
 
-        <Button variant="light" onClick={handleClick} >{`<`}</Button>
-
       </Container >
       <Form onSubmit={sendMsgCH} fluid>
         <Form.Group className='d-flex flex-wrap-nowrap justify-content-center m-3'>

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('')
@@ -125,17 +125,13 @@ function Home() {
             <Tab eventKey="closed" title="내 채팅" onClick={handleChato} >
               <ClosedList enterChatRoom={enterChatRoom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
             </Tab>
-            <Tab eventKey="open" title="공개방" onClick={handleChato}>
+            <Tab eventKey="open" title="공개방" onClick={handleChatc}>
               <OpenList enterChatRoom={enterChatRoom} openListroom={openListroom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
             </Tab>
           </Tabs>
         </Col>
         <Col style={{ padding: "0" }}>
           <>
-          <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>
             {(show || chat) ?
               null
               : <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>

server/controllers/room.controller.js

@@ -39,7 +39,7 @@ const makeRoom = async (req, res) => {
 const getClosedList = async (req, res) => {
     try {
         console.log('req확인', req.query._id)
-        let list = await Room.find({ member: [req.query._id] })
+        let list = await Room.find({ member: req.query._id })
         console.log('c_list가져오기', list)
         return res.json(list)
     } catch (error) {
@@ -50,7 +50,7 @@ const getClosedList = async (req, res) => {
 const getOpenList = async (req, res) => {
     try {
         let list = await Room.find({ isOpen: true })
-        console.log('o_list가져오기', list.roomName)
+        console.log('o_list가져오기', list)
         return res.json(list)
     } catch (error) {
         res.status(500).send('리스트 불러오기를 실패하였습니다!')