Skip to content

GitLab

Commit 70f71d05 authored by 우지원's avatar 우지원
Browse files

e

parent d856284e
Hide whitespace changes
Inline Side-by-side
client/src/Components/Chat.js
View file @ 70f71d05
...@@ -87,7 +87,7 @@ function Chat(props) { ...@@ -87,7 +87,7 @@ function Chat(props) {
return ( return (
<> <>
<Container id="chat" style={{ overflow: 'auto', padding: '20px', border: "2px solid", height: "500px", margin: "1%", borderColor: "#BDBDBD", background: '' }}> <Container id="chat" style={{ overflow: 'auto', padding: '20px', border: "2px solid", height: "500px", margin: "1%", borderColor: "#BDBDBD", background: '' }}>
<Row class="d-flex justify-content-center" style={{ border: "2px solid", borderWidth: "medium", borderColor: "#FFD75F", height: "80px", margin: "1%" }}> <Row className="d-flex justify-content-center" style={{ border: "2px solid", borderWidth: "medium", borderColor: "#FFD75F", height: "80px", margin: "1%" }}>
<Col md="auto"> <Col md="auto">
<Button variant="light" onClick={props.handleChatc} >{`<`}</Button> <Button variant="light" onClick={props.handleChatc} >{`<`}</Button>
</Col> </Col>
......
client/src/Components/OpenList.js
View file @ 70f71d05
...@@ -18,7 +18,8 @@ function OpenList(props) { ...@@ -18,7 +18,8 @@ function OpenList(props) {
function enterChatRoomCH(e) { function enterChatRoomCH(e) {
console.log('e확인', e.target) console.log('e확인', e.target)
const roomCode = e.target.name const roomCode = e.target.name
props.enterChatRoom(roomCode) // 각각의 room으로 들어가도록 설정해야 함 // props.enterChatRoom(roomCode) // 각각의 room으로 들어가도록 설정해야 함
props.openListroom(roomCode)
props.setRoomCode(roomCode) props.setRoomCode(roomCode)
// props.clearChat() // props.clearChat()
} }
......
client/src/Pages/HomePage.js
View file @ 70f71d05
...@@ -14,157 +14,159 @@ import axios from 'axios'; ...@@ -14,157 +14,159 @@ import axios from 'axios';
const socket = io(); const socket = io();
const INIT_ROOM = { const INIT_ROOM = {
roomName: '', roomName: '',
interest: '', interest: '',
roomId: '', roomId: '',
member: '', member: '',
} }
function Home() { function Home() {
const userName = sessionStorage.getItem('name') const userName = sessionStorage.getItem('name')
const [showModal, setShowModal] = useState(false); const [showModal, setShowModal] = useState(false);
const [showEnter, setEnter] = useState(false); const [showEnter, setShowEnter] = useState(false);
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 [show, setShow] = useState(true)
//소켓 //소켓
const [singleChat, setSingleChat] = useState('') const [singleChat, setSingleChat] = useState('')
const [recievedMsg, setRecievedMsg] = useState('') const [recievedMsg, setRecievedMsg] = useState('')
const [roomCode, setRoomCode] = useState('') const [roomCode, setRoomCode] = useState('')
const [newUser, setNewUser] = useState('') const [newUser, setNewUser] = useState('')
const [singleUser, setSingleUser] = useState('') const [singleUser, setSingleUser] = useState('')
const [recievedUser, setRecievedUser] = useState('') const [recievedUser, setRecievedUser] = useState('')
const [singleImg, setSingleImg] = useState('') const [singleImg, setSingleImg] = useState('')
const [recievedImg, setRecievedImg] = useState('') const [recievedImg, setRecievedImg] = useState('')
//SOCKET 관련 시작 //SOCKET 관련 시작
function enterChatRoom(rCode) { //방 입장하기 function enterChatRoom(rCode) { //방 입장하기
socket.emit('joinRoom', rCode) socket.emit('joinRoom', rCode)
socket.emit('newUser', { rmIf: rCode, userInfo: userName }) socket.emit('newUser', { rmIf: rCode, userInfo: userName })
console.log(`joinRoom : ${rCode} 입장`) console.log(`joinRoom : ${rCode} 입장`)
} }
const [roomName, setRoomName] = useState('') const [roomName, setRoomName] = useState('')
const handleCloseModal = () => setShowModal(false); const handleCloseModal = () => setShowModal(false);
const handleShowModal = () => setShowModal(true); const handleShowModal = () => setShowModal(true);
const handleCloseEnter = () => setEnter(false); const handleCloseEnter = () => setShowEnter(false);
const handleShowEnter = () => setEnter(true); const handleShowEnter = () => setShowEnter(true);
const handleChato = () => setChat(true); const handleChato = () => setChat(true);
const handleChatc = () => setChat(false); const handleChatc = () => setOpen(true);
socket.on("sendUser", (data) => { socket.on("sendUser", (data) => {
setNewUser(data) setNewUser(data)
}) })
//오픈채팅방에서 참가하기 //오픈채팅방에서 참가하기
async function openListroom(roomId) { async function openListroom(roomId) {
console.log(roomId) console.log(roomId)
const roomInf = await axios.get('/room/changeMem', { params: { 'roomId': roomId } }) const roomInf = await axios.get('/room/changeMem', { params: { 'roomId': roomId } })
console.log(roomInf) console.log(roomInf)
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) setOpen(true)
} setShow(false)
async function attendListRoom() {
const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴
const roomId = room.roomId
const tf = await axios.put('/room/changeMem', { userId: userId, roomId: roomId })
if (tf.data) {
alert('참가되었습니다.')
} else {
alert('이미 참가된 방입니다.')
} }
}
async function attendListRoom() {
function enterButton() { const userId = sessionStorage.getItem('userId'); //sessionStorage에 저장된 userId가져옴
setOpen(false) const roomId = room.roomId
} const tf = await axios.put('/room/changeMem', { userId: userId, roomId: roomId })
const sendMsg = (e) => { if (tf.data) {
e.preventDefault() alert('참가되었습니다.')
} } else {
alert('이미 참가된 방입니다.')
useEffect(() => {
if (!(singleChat == '')) {
socket.emit("chat", {
roomInfo: roomCode,
sendInfo: {
msg: singleChat,
sender: singleUser,
img: singleImg
} }
})
setSingleChat([''])
} }
}, [singleChat])
function enterButton() {
setOpen(false)
}
const sendMsg = (e) => {
e.preventDefault()
}
useEffect(() => {
socket.on("sendedMSG", (sendInfo) => { useEffect(() => {
setRecievedImg(sendInfo.img) if (!(singleChat == '')) {
setRecievedUser(sendInfo.sender) socket.emit("chat", {
setRecievedMsg(sendInfo.msg) roomInfo: roomCode,
}) sendInfo: {
}, []) msg: singleChat,
sender: singleUser,
return ( img: singleImg
<> }
<Menu /> })
<Row className="mr-0"> setSingleChat([''])
<Col className="list" md={5}> }
<Tabs defaultActiveKey="closed" id="uncontrolled-tab-example"> }, [singleChat])
<Tab eventKey="closed" title="내 채팅" onClick={handleChato} >
<ClosedList enterChatRoom={enterChatRoom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
</Tab> useEffect(() => {
<Tab eventKey="open" title="공개방" onClick={handleChato}> socket.on("sendedMSG", (sendInfo) => {
<OpenList enterChatRoom={enterChatRoom} openListroom={openListroom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} /> setRecievedImg(sendInfo.img)
</Tab> setRecievedUser(sendInfo.sender)
</Tabs> setRecievedMsg(sendInfo.msg)
</Col> })
<Col style={{ padding: "0" }}> }, [])
{show ? <>
{chat ? return (
<Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} newUser={newUser} setSingleChat={setSingleChat} roomCode={roomCode} singleImg={singleImg} setSingleImg={setSingleImg} recievedImg={recievedImg} singleUser={singleUser} setSingleUser={setSingleUser} recievedUser={recievedUser} /> <>
: <div style={{ position: "fixed", bottom: "20px", right: "30px" }}> <Menu />
<Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button> <Row className="mr-0">
<Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button> <Col className="list" md={5}>
</div>} <Tabs defaultActiveKey="closed" id="uncontrolled-tab-example">
</> : <> <Tab eventKey="closed" title="내 채팅" onClick={handleChato} >
{open ? <ClosedList enterChatRoom={enterChatRoom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
<div className="vh-90 flex-column align-items-center justify-content-center mt-2" variant="dark"> </Tab>
<div className="d-flex justify-content-center"> <Tab eventKey="open" title="공개방" onClick={handleChatc}>
<div className="mt-5 p-5 shadow w-75"> <OpenList openListroom={openListroom} setRoomCode={setRoomCode} setRoomName={setRoomName} roomCode={roomCode} />
<h2 className="d-flex justify-content-center mb-3">현재 {room.roomName}방 입니다.</h2> </Tab>
<h5>▷ 관심분야 : {room.interest}</h5> </Tabs>
<h5>▷ 참여인원 : {room.member.length}</h5> </Col>
<h5 className="mb-3">▷ 방코드(방코드를 통해서도 참여할 수 있습니다.) : {room.roomId}</h5> <Col style={{ padding: "0" }}>
<Row className='justify-content-center'> <>
<Button variant="outline-warning" size="sm" className="mr-4" onClick={enterButton}>뒤로가기</Button> {(show || chat) ?
<Button variant="outline-warning" size="sm" className="ml-4" type='submit' onClick={attendListRoom}>참가</Button> null
</Row> : <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>
</div> <Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button>
</div> <Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button>
</div> : </div>
<div style={{ position: "fixed", bottom: "20px", right: "30px" }}> }
<Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button> {chat ?
<Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button> <Chat handleChatc={handleChatc} sendMsg={sendMsg} singleChat={singleChat} recievedMsg={recievedMsg} setSingleChat={setSingleChat} roomCode={roomCode} roomName={roomName} />
</div>} : null}
</>} {(!show && open) ? null : <div style={{ position: "fixed", bottom: "20px", right: "30px" }}>
</Col> <Button variant="primary" onClick={handleShowModal} size="lg" block>생성</Button>
</Row> <Button variant="secondary" onClick={handleShowEnter} size="lg" block>참가</Button>
<RoomMake showModal={showModal} handleCloseModal={handleCloseModal} /> </div>}
<EnterRoom showEnter={showEnter} enterChatRoom={enterChatRoom} handleCloseEnter={handleCloseEnter} handleChato={handleChato} setRoomCode={setRoomCode} setRoomName={setRoomName} /> </>
</> {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> : null}
</Col>
</Row>
<RoomMake showModal={showModal} handleCloseModal={handleCloseModal} />
<EnterRoom showEnter={showEnter} enterChatRoom={enterChatRoom} handleCloseEnter={handleCloseEnter} handleChato={handleChato} setRoomCode={setRoomCode} setRoomName={setRoomName} />
</>
);
} }
export default Home; export default Home;
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