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

client/package.json

@@ -6,6 +6,7 @@
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.2",
     "@testing-library/user-event": "^12.6.0",
+    "axios": "^0.21.1",
     "bootstrap": "^4.5.3",
     "react": "^17.0.1",
     "react-bootstrap": "^1.4.0",

client/src/Components/Chat.js

-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Form, Button, Row } from 'react-bootstrap';
 
 
@@ -6,32 +6,43 @@ function Chat(props) {
   let defaultname=''
   // let defaultname = sessionStorage.getItem('name');
 
+  const [inner, setInner] = useState([''])
+  const [chat, setChat] = useState([inner])   //object로 key는 보낸사람 value는 메세지
+
   function handleChange(e) {
     e.preventDefault()
-    props.setInner(e.target.value)
+    setInner(e.target.value)
     console.log(e.target.value)
   }
 
   function sendMsgCH(e) {
+    e.preventDefault()
+    props.setSingleChat(inner)
     props.sendMsg(e)
+    setInner('')
   }
 
+  useEffect(() => {
+    setChat([...chat, props.singleChat])
+  }, [props.singleChat])
 
   return (
 
     <div className="chat" id="chat" style={{ border: "2px solid", height: "300%", margin: "1%", borderColor: "#BDBDBD" }}>
-      <Button variant="light" onClick={props.handleChatc} >{`<`}</Button>
-
       <h2>현재 {props.roomName} 입니다.</h2>
-      {      props.chatmsg.map((value, index) => (
+      {      chat.map((value, index) => (
         <Row key={index} className='ml-3'>
           {props.roomName}에서 {props.namelist}님이 보낸 메세지 : {value}
         </Row>
       ))}
-
+      <Button variant="light" onClick={props.handleChatc} >{`<`}</Button>
       <Form onSubmit={sendMsgCH}>
-        <Form.Control name='msg' type='text' onChange={handleChange} />
-        <Button variant="primary" type="submit">전송</Button>
+        <Form.Group>
+          <Form.Control name='chat' type="text" value={inner} onChange={handleChange} />
+        </Form.Group>
+        <Button variant="primary" type="submit">
+          전송
+        </Button>
       </Form>
     </div>
 

client/src/Components/ChatForm.js

+import React, { useState } from 'react';
+import { Form, Row, Col, Button } from 'react-bootstrap'
+
+function ChatForm(props) {
+    const INIT_SAYING = ''
+    const [saying, setSaying] = useState(INIT_SAYING);
+
+    function handleChange(event) {
+        const { name, value } = event.target
+        setSaying(value)
+        console.log(saying)
+    }
+
+    function handleSubmit(event) {
+        event.preventDefault()
+        // const response = await axios.post('chat/makeChat', chatR)
+        props.setSingleChat()
+        setSaying(INIT_SAYING)
+    }
+
+    return (
+        <Form onSubmit={handleSubmit}>
+            <Row>
+                <Col>
+                    <Form.Group>
+                        <Form.Control name='chat' type='text' onChange={handleChange}>chat</Form.Control>
+                    </Form.Group>
+                </Col>
+                <Col>
+                    <Form.Group>
+                        <Button type="submit">send</Button>
+                    </Form.Group>
+                </Col>
+            </Row>
+        </Form>
+    )
+}
+
+export default ChatForm
\ No newline at end of file

client/src/Components/ClosedList.js

@@ -6,27 +6,25 @@ function ClosedList(props) {
     { room: '테스트 방1', memnum: 5, admin: '가영' },
     { room: '테스트 방2', memnum: 4, admin: '수현' }]
   );
+
   function enterChatroomCH(e) {
+    console.log(e.target.name)
+    console.log(e.target)
     const roomName = e.target.name
     props.enterChatroom(roomName) // 각각의 room으로 들어가도록 설정해야 함
     props.setRoomName(roomName)
-    props.clearChat()
+    // props.clearChat()
   }
 
   return (
     <div>
-      <Row>
-        {list.map((list, index) =>
-          <ListGroup key={index}>
-            <ListGroup.Item action onClick={enterChatroomCH} name={list.room}>
-              {list.room}
-            </ListGroup.Item>
-          </ListGroup>
-        )}
-      </Row>
-      <Col>
-
-      </Col>
+      {list.map((item, index) =>
+        <ListGroup key={index}>
+          <ListGroup.Item action onClick={enterChatroomCH} name={item.room}>
+          {item.room}
+          </ListGroup.Item>
+        </ListGroup>
+      )}
     </div>
   )
 }

client/src/Components/OpenList.js

 import React, { useState } from 'react'
 import { ListGroup } from 'react-bootstrap';
 
-function OpenList() {
+function OpenList(props) {
   const [list, setList] = useState([
     { room: '테스트 방3', memnum: 7, admin: '가영2' },
     { room: '테스트 방4', memnum: 2, admin: '수현2' }]
   );
+
+  function enterChatroomCH(e) {
+    const roomName = e.target.name
+    props.enterChatroom(roomName) // 각각의 room으로 들어가도록 설정해야 함
+    props.setRoomName(roomName)
+    // props.clearChat()
+  }
+
   return (
     <div>
       {list.map((list, index) =>
         <ListGroup key={index}>
-          <ListGroup.Item action>
+          <ListGroup.Item action onClick={enterChatroomCH} name={list.room}>
             <h2>{list.room}</h2>
           </ListGroup.Item>
         </ListGroup>

client/src/Pages/HomePage.js

 import React, { useState, useEffect } from 'react';
-import { Row, Col, Modal, Button, Navbar, Nav } from 'react-bootstrap';
+import axios from 'axios';
+import { Row, Col, Modal, Button, Form, Alert } from 'react-bootstrap';
 import Tabs from 'react-bootstrap/Tabs';
 import Tab from 'react-bootstrap/Tab';
 import ClosedList from '../Components/ClosedList';
 import OpenList from '../Components/OpenList';
-import Chat from '../Components/Chat';
 import Menu from '../Components/Menu';
-
+import catchErrors from '../utils/catchErrors';
 import { io } from "socket.io-client";   //모듈 가져오기
-
-// const userName = "정연우";
+import Chat from "../Components/Chat";
 
 const socket = io();
 
+const INIT_ROOM = {
+  roomName: '',
+  interest: '',
+  isOpen: false
+}
 
 function Home() {
-  const [namelist, setNamelist] = useState([])
-
-  const [username, setUsername] = useState('defaultUser')
+  // const [namelist, setNamelist] = useState([])
 
   const [show, setShow] = useState(false);
+  const [show2, setShow2] = useState(false);
   const [chat, setChat] = useState(false);
+  const [room, setRoom] = useState(INIT_ROOM);
+  const [disabled, setDisabled] = useState(true);
+  const [error, setError] = useState('');
+
+  const [singleChat, setSingleChat] = useState('')
+  const [roomName, setRoomName] = useState('')
 
   const handleClose = () => setShow(false);
   const handleShow = () => setShow(true);
   const handleChato = () => setChat(true);
   const handleChatc = () => setChat(false);
+  const handleClose2 = () => setShow2(false);
+  const handleShow2 = () => setShow2(true);
+
+  useEffect(() => {
+    const isRoom = Object.values(room).every(el => Boolean(el))
+    isRoom ? setDisabled(false) : setDisabled(true)
+  }, [room])
+
+  function handleChange(event) {
+    const { name, value } = event.target
+    setRoom({ ...room, [name]: value })
+    console.log(room)
+  }
+
+  async function handleSubmit(event) {
+    event.preventDefault()
+    try {
+      setError('')
+      await axios.post('/room/makeRoom', room)
+      setRoom(INIT_ROOM)
+    } catch (error) {
+      catchErrors(error, setError)
+    }
+  }
 
-  const [inner, setInner] = useState(['']) //인풋값
-  const [chatmsg, setChatmsg] = useState([inner]) // 전송된 채팅들 저장하는 배열
-  const [roomName, setRoomName] = useState('dd')   //방 선택이 방1을 눌럿다 방2를 누르면 전체로 전송됨
+  //SOCKET 관련 시작
 
-  function enterChatroom(roomName) {    //방 입장하기
-    socket.emit('joinRoom', roomName)
-    console.log(`joinRoom : ${roomName} 입장`)
+  function enterChatroom(rName) {    //방 입장하기
+    socket.emit('joinRoom', rName)
+    console.log(`joinRoom : ${rName} 입장`)
   }
 
   const sendMsg = (e) => {
     e.preventDefault()
-    const name = sessionStorage.getItem('name')
-    console.log('sendMsg', inner)
-    console.log(roomName)
     socket.emit("chat", {
       roomName: roomName,
       msg: inner,
-      name : name
     });
   }
 
-  function clearChat() {
-    setChatmsg([])
-  }
-
   useEffect(() => {
+    socket.emit("chat", {
+      roomName: roomName,
+      msg: singleChat
+    })
     socket.on('broadcast', (msg) => {
-
-      console.log('msg', msg)
-      console.log('inner :', inner)
-
-      setChatmsg([...chatmsg, msg[0]])
-      console.log('useeffect2', chatmsg)
-      console.log(msg[1])
-      setNamelist([...namelist, msg[1]])
-      console.log(namelist)
+      console.log(msg)
+      setSingleChat(msg)
     })
-    console.log('useeffect2', chatmsg)
-  }, [chatmsg])
-
+  }, [singleChat])
 
   return (
     <>
@@ -75,30 +93,98 @@ function Home() {
         <Col className="list" md={5}>
           <Tabs defaultActiveKey="closed" id="uncontrolled-tab-example">
             <Tab eventKey="closed" title="내 채팅" onClick={handleChato} >
-              <ClosedList enterChatroom={enterChatroom} setRoomName={setRoomName} clearChat={clearChat} />
+              <ClosedList enterChatroom={enterChatroom} setRoomName={setRoomName} />
             </Tab>
             <Tab eventKey="open" title="공개방" >
-              <OpenList />
+              <OpenList enterChatroom={enterChatroom} setRoomName={setRoomName} />
             </Tab>
           </Tabs>
         </Col>
         <Col style={{ padding: "0" }}>
-          {chat ? <Chat handleChatc={handleChatc} sendMsg={sendMsg} setInner={setInner} chatmsg={chatmsg} roomName={roomName} namelist={namelist}/> : null}
+          {chat ? <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} setSingleChat={setSingleChat} roomName={roomName} /> : null}
 
-          <Button variant="primary" onClick={handleShow} style={{ position: "fixed", bottom: "10px", right: "10px" }} >
-            생성
-        </Button>
+          <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>
+            <Button variant="primary" onClick={handleShow} size="lg" block>
+              생성
+                        </Button>
+
+            <Button variant="secondary" onClick={handleShow2} size="lg" block>
+              참가
+                        </Button>
+          </div>
 
           <Modal show={show} onHide={handleClose}>
             <Modal.Header closeButton>
               <Modal.Title>방 생성</Modal.Title>
             </Modal.Header>
-            <Modal.Body>여기에 form 입력</Modal.Body>
-            <Modal.Footer>
-              <Button variant="primary" onClick={handleClose}>
-                생성
-            </Button>
-            </Modal.Footer>
+            {error && <Alert variant='danger'>
+              {error}
+            </Alert>}
+            <Modal.Body>
+              <Form onSubmit={handleSubmit}>
+                <Form.Group as={Row} controlId="chatName">
+                  <Form.Label column sm={4}>방 이름</Form.Label>
+                  <Col>
+                    <Form.Control name='roomName' type='text' value={room.roomName} onChange={handleChange} />
+                  </Col>
+                </Form.Group>
+                <Form.Group as={Row} controlId="chatInterest">
+                  <Form.Label column sm={4}>관심 분야</Form.Label>
+                  <Col>
+                    <Form.Control as="select" defaultValue="Choose..." name='interest' type='text' value={room.interest} onChange={handleChange}>
+                      <option>Choose...</option>
+                      <option>과학</option>
+                      <option>수학</option>
+                      <option>예술</option>
+                      <option>언어</option>
+                      <option>취미</option>
+                    </Form.Control>
+                    {/* <Form.Control type="text" /> */}
+                  </Col>
+                </Form.Group>
+                <Form.Group as={Row} controlId="chatIsOpen">
+                  <Form.Label column sm={4}>공개방</Form.Label>
+                  <Col>
+                    <Form.Check
+                      type="checkbox"
+                      checked={room.isOpen}
+                      name='isOpen'
+                      onChange={() => setRoom({ ...room, isOpen: !room.isOpen })} />
+                  </Col>
+                </Form.Group>
+                {
+                  (room.isOpen)
+                    ? (<p><b>공개방</b>으로 개설되어 공개방 목록에 공개되며, 코드를 공유하여 참가할 수도 있습니다.</p>)
+                    : (<p><b>비밀방</b>으로 개설되며, 참여자들에게 코드를 공유해야합니다.</p>)
+                }
+                <Form.Group as={Row}>
+                  <Col sm={{ span: 5, offset: 4 }}>
+                    <Button type="submit" >방 생성</Button>
+                  </Col>
+                </Form.Group>
+              </Form>
+            </Modal.Body>
+          </Modal>
+
+          <Modal show={show2} onHide={handleClose2}>
+            <Modal.Header closeButton>
+              <Modal.Title>참여 코드로 채팅 참가</Modal.Title>
+            </Modal.Header>
+            <Modal.Body>
+              <Form onSubmit={() => { console.log('제출') }}>
+                <Form.Group as={Row} controlId="formCodeE">
+                  <Form.Label column sm={4}>참여 코드</Form.Label>
+                  <Col>
+                    <Form.Control type="text" />
+                  </Col>
+                </Form.Group>
+                <Form.Group as={Row}>
+                  <Col sm={{ span: 5, offset: 4 }}>
+                    <Button type="submit">참가</Button>
+                  </Col>
+                </Form.Group>
+              </Form>
+            </Modal.Body>
           </Modal>
         </Col>
       </Row>

client/src/utils/catchErrors.js

-function catchErrors(error, displayError) {
+function catchErrors(error, displayError){
     let errorMsg
 
-    if (error.response) {
+    if (error.response){
         errorMsg = error.response.data
         console.log(errorMsg)
     } else if (error.request) {

server/controllers/room.controller.js

+import Room from "../models/Room.js"
+import { customAlphabet } from 'nanoid'
+import isLength from 'validator/lib/isLength.js'
+
+const nanoid = customAlphabet('1234567890abcdef', 10)
+
+const makeRoom = async (req, res) => {
+    console.log(req.body)
+    const { roomName, interest, isOpen } = req.body;
+    console.log(roomName, interest, isOpen)
+
+    const roomId = nanoid()
+    const room = await Room.findOne({ roomId })
+    while (room) {
+        roomId = nanoid()
+        room = await Room.findOne({ roomId })
+    }
+
+    try {
+        if (!isLength(roomName, { min: 3, max: 20 })) {
+            return res.status(422).send('채팅방의 이름은 3-20자여야 합니다.')
+        } else if (interest=='Choose...' || interest==''){
+            return res.status(422).send('분야를 반드시 선택하여야 합니다.')
+        }
+        const newRoom = await new Room({
+            roomId,
+            roomName,
+            interest,
+            isOpen
+        }).save()
+        console.log(newRoom)
+        res.json(newRoom)
+    } catch (error) {
+        console.log(error)
+        res.status(500).send('방생성 에러')
+    }
+}
+
+export default { makeRoom }
\ No newline at end of file

server/models/Room.js

@@ -3,7 +3,12 @@ import mongoose from 'mongoose'
 const {String} = mongoose.Schema.Types
 
 const RoomSchema = new mongoose.Schema({
-    name: {
+    roomId: {
+        type: String,
+        // default:() => nanoid(),
+        unique: true
+    },
+    roomName: {
         type: String,
         required: true,
     },
@@ -13,13 +18,11 @@ const RoomSchema = new mongoose.Schema({
         select: false
     },
     isOpen: {
-        type: String,
+        type: Boolean,
         required: true,
-        default: 'user',
-        enum: ['user', 'admin', 'root']
     }
 }, {
     timestamps: true
 })
 
-export default mongoose.models.RoomSchema || mongoose.model('Room', RoomSchema)
+export default mongoose.models.Room || mongoose.model('Room', RoomSchema)

server/routes/room.routers.js

+import express from 'express'
+import roomCtrl from '../controllers/room.controller.js'
+
+const router = express.Router()
+
+router.route('/room/makeRoom')
+    .post(roomCtrl.makeRoom)
+export default router
\ No newline at end of file

server/server.js

@@ -2,11 +2,11 @@ import express from 'express'
 import connectDb from './utils/connectDb.js'
 import userRouter from './routes/user.routes.js'
 import authRouter from './routes/auth.routes.js'
-
+import roomRouter from './routes/room.routers.js'
 import bodyParser from "body-parser";
 import http from "http";
 import { Server } from 'socket.io';
-
+import cors from "cors"
 
 connectDb()
 
@@ -16,16 +16,12 @@ const server = http.createServer(app);
 
 const io = new Server(server)
 
-
 io.on("connection", (socket) => { // 기본 연결
   console.log("socket connect ok", socket.id)
 
-
-  socket.on('joinRoom', (data) => { // joinRoom을 클라이언트가 emit했을 때
-    let roomName = data;
-    console.log(roomName, "방 입장")
+  socket.on('joinRoom', (data)=>{ // joinRoom을 클라이언트가 emit했을 때
+    let roomName=data;
     socket.join(roomName); //클라이언트에서 data에 적힌 room으로 참여시킴
-
   });
 
   socket.on('chat', (data) => {
@@ -36,25 +32,21 @@ io.on("connection", (socket) => { // 기본 연결
   socket.on('disconnect', () => {
     console.log('disconnected from server id=', socket.id)
   })
-
-
+  
 });
 
 // app.use(express.json())
 //이부분을 body 파싱함
 app.use(bodyParser.json());
+app.use(cors());
 
 app.use(userRouter)
 app.use(authRouter)
-//userRouter로 이동
-
-app.get('/', (req, res) => {
-  res.send('Hello World. 안녕하세요')
-})
+app.use(roomRouter)
 
 server.listen(3030, () => {
   console.log('Listening on port 3030')
 })
 
-
-// export default server
+export default server
+// module.exports = server;

server/utils/catchErrors.js

+function catchErrors(error, displayError){
+    let errorMsg
+
+    if (error.response){
+        errorMsg = error.response.data
+        console.log(errorMsg)
+    } else if (error.request) {
+        errorMsg = error.request
+        console.log(errorMsg)
+    } else {
+        errorMsg = error.message
+        console.log(errorMsg)
+    }
+    displayError(errorMsg)
+}
+
+export default catchErrors
\ No newline at end of file