Skip to content

GitLab

Commit dd9aad40 authored by 우지원's avatar 우지원
Browse files

오픈채팅방

parent fe9a34d8
Hide whitespace changes
Inline Side-by-side
client/src/Pages/HomePage.js
View file @ dd9aad40
...@@ -26,6 +26,7 @@ function Home() { ...@@ -26,6 +26,7 @@ function Home() {
const [chat, setChat] = useState(false); const [chat, setChat] = useState(false);
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [room, setRoom] = useState(INIT_ROOM) const [room, setRoom] = useState(INIT_ROOM)
const [show, setShow] = useState(true)
//소켓 //소켓
const [singleChat, setSingleChat] = useState('') const [singleChat, setSingleChat] = useState('')
...@@ -57,19 +58,24 @@ function Home() { ...@@ -57,19 +58,24 @@ function Home() {
console.log(roomInf.data) console.log(roomInf.data)
console.log(roomInf.data.[0]) console.log(roomInf.data.[0])
setRoom(roomInf.data.[0]) setRoom(roomInf.data.[0])
setShow(false)
} }
async function attendListRoom() { async function attendListRoom() {
const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴 const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴
const roomId = room.roomId const roomId = room.roomId
const tf = await axios.put('/room/changeMem', { userId: userId, roomId: roomId }) const tf = await axios.put('/room/changeMem', { userId: userId, roomId: roomId })
if(tf.data) { if (tf.data) {
alert('참가되었습니다.') alert('참가되었습니다.')
} else { } else {
alert('이미 참가된 방입니다.') alert('이미 참가된 방입니다.')
} }
} }
function enterButton() {
setOpen(false)
}
const sendMsg = (e) => { const sendMsg = (e) => {
e.preventDefault() e.preventDefault()
} }
...@@ -104,29 +110,34 @@ function Home() { ...@@ -104,29 +110,34 @@ function Home() {
</Tabs> </Tabs>
</Col> </Col>
<Col style={{ padding: "0" }}> <Col style={{ padding: "0" }}>
{chat ? {show ? <>
<Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} setSingleChat={setSingleChat} roomName={roomName} /> {chat ?
: <div style={{ position: "fixed", bottom: "20px", right: "30px" }}> <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} setSingleChat={setSingleChat} roomName={roomName} />
<Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button> : <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>
<Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button> <Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button>
</div>} <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"> {open ?
<div className="d-flex justify-content-center"> <div className="vh-90 flex-column align-items-center justify-content-center mt-2" variant="dark">
<div className="mt-5 p-5 shadow w-75"> <div className="d-flex justify-content-center">
<h2 className="d-flex justify-content-center mb-3">현재 {room.roomName}방 입니다.</h2> <div className="mt-5 p-5 shadow w-75">
<h5>▷ 관심분야 : {room.interest}</h5> <h2 className="d-flex justify-content-center mb-3">현재 {room.roomName}방 입니다.</h2>
<h5>▷ 참여인원 : {room.member.length}</h5> <h5>▷ 관심분야 : {room.interest}</h5>
<h5>▷ 방코드(방코드를 통해서도 참여할 수 있습니다.) : {room.roomId}</h5> <h5>▷ 참여인원 : {room.member.length}</h5>
<Button className="d-flex flex-end mt-4" variant="primary" type="submit" onClick={attendListRoom}> 참가 </Button> <h5 className="mb-3">▷ 방코드(방코드를 통해서도 참여할 수 있습니다.) : {room.roomId}</h5>
</div> <Row className='justify-content-center'>
</div> <Button variant="outline-success" size="sm" className="mr-4" onClick={enterButton}>뒤로가기</Button>
</div> : <Button variant="outline-success" size="sm" className="ml-4" type='submit' onClick={attendListRoom}>참가</Button>
<div style={{ position: "fixed", bottom: "20px", right: "30px" }}> </Row>
<Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button> </div>
<Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button> </div>
</div>} </div> :
<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>}
</>}
</Col> </Col>
</Row> </Row>
<RoomMake showModal={showModal} handleCloseModal={handleCloseModal} /> <RoomMake showModal={showModal} handleCloseModal={handleCloseModal} />
......
server/controllers/room.controller.js
View file @ dd9aad40
...@@ -73,29 +73,21 @@ const getOpenList = async (req, res) => { ...@@ -73,29 +73,21 @@ const getOpenList = async (req, res) => {
// } // }
const changemember = async (req, res) => { const changemember = async (req, res) => {
// const memberId = req.memberId
const { userId, roomId } = req.body const { userId, roomId } = req.body
console.log('userId:',userId)
let room = await Room.findOne({ roomId: roomId }).select('member') let room = await Room.findOne({ roomId: roomId }).select('member')
console.log('room.member:',room.member)
const isPresent = room.member.indexOf(userId) const isPresent = room.member.indexOf(userId)
console.log('isPresent',isPresent)
try { try {
if (isPresent<0) { if (isPresent<0) {
// const member = room.member.toString()
// console.log('member:', member)
const memberId = room.member.push(userId) const memberId = room.member.push(userId)
console.log('memberId:',memberId)
await Room.updateOne({ 'roomId': roomId }, { 'member': room.member }) await Room.updateOne({ 'roomId': roomId }, { 'member': room.member })
console.log('room.member 업데이트 완료')
return res.json(true) return res.json(true)
} }
else { else {
return res.json(false) return res.json(false)
} }
res.end() res.end()
} catch (error) { } catch (error) {
console.log(error)
res.status(500).send('멤버 업데이트 실패') res.status(500).send('멤버 업데이트 실패')
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment