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

client/src/Components/Chat.js

@@ -89,7 +89,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>
@@ -130,8 +130,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/Pages/HomePage.js

@@ -74,8 +74,6 @@ function Home() {
     setShow(false)
   }
 
-
-
   async function attendListRoom() {
     const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴
     const roomId = room.roomId
@@ -94,6 +92,22 @@ 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)
@@ -111,7 +125,7 @@ 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>
@@ -126,7 +140,7 @@ function Home() {
               </div>
             }
             {chat ?
-                            <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} setSingleChat={setSingleChat} roomCode={roomCode} roomName={roomName} />
+              <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} singleUser={singleUser} singleImg={singleImg} recievedMsg={recievedMsg} recievedUser={recievedUser} recievedImg={recievedImg} setSingleChat={setSingleChat} setSingleUser={setSingleUser} setSingleImg={setSingleImg} roomCode={roomCode} roomName={roomName} />
               : null}
             {open ?
               <div className="vh-90 flex-column align-items-center justify-content-center mt-2" variant="dark">
@@ -153,4 +167,4 @@ function Home() {
   );
 }
 
-export default Home
\ No newline at end of file
+export default Home;

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('리스트 불러오기를 실패하였습니다!')