Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
messenger
Commits
ae4c0309
Commit
ae4c0309
authored
Jan 25, 2021
by
Choi Ga Young
Browse files
수정중
parent
1cea3fef
Changes
3
Hide whitespace changes
Inline
Side-by-side
client/src/Components/RoomMake.js
View file @
ae4c0309
import
React
,
{
useState
,
useEffect
}
from
'
react
'
import
React
,
{
useState
}
from
'
react
'
import
axios
from
'
axios
'
;
import
axios
from
'
axios
'
;
import
{
Row
,
Col
,
Modal
,
Button
,
Form
,
Alert
}
from
'
react-bootstrap
'
;
import
{
Row
,
Col
,
Modal
,
Button
,
Form
,
Alert
}
from
'
react-bootstrap
'
;
import
catchErrors
from
'
../utils/catchErrors
'
;
import
catchErrors
from
'
../utils/catchErrors
'
;
...
...
client/src/Pages/HomePage.js
View file @
ae4c0309
...
@@ -102,7 +102,7 @@ function Home() {
...
@@ -102,7 +102,7 @@ function Home() {
}
}
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
!
(
singleChat
==
""
))
{
if
(
!
(
singleChat
==
=
""
))
{
socket
.
emit
(
"
chat
"
,
{
socket
.
emit
(
"
chat
"
,
{
roomInfo
:
roomCode
,
roomInfo
:
roomCode
,
sendInfo
:
{
sendInfo
:
{
...
@@ -117,7 +117,7 @@ function Home() {
...
@@ -117,7 +117,7 @@ function Home() {
},
[
singleChat
])
},
[
singleChat
])
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
!
(
sysmsg
==
''
))
{
if
(
!
(
sysmsg
==
=
''
))
{
socket
.
emit
(
"
chat
"
,
{
socket
.
emit
(
"
chat
"
,
{
roomInfo
:
roomCode
,
roomInfo
:
roomCode
,
sendInfo
:
{
sendInfo
:
{
...
...
server/controllers/room.controller.js
View file @
ae4c0309
...
@@ -172,4 +172,4 @@ const dbChat = async (req, res) => {
...
@@ -172,4 +172,4 @@ const dbChat = async (req, res) => {
res
.
json
(
chatlist
)
res
.
json
(
chatlist
)
}
}
export
default
{
makeRoom
,
getClosedList
,
getOpenList
,
getRoomName
,
changemember
,
roomInf
,
unreadMessage
,
dbChat
}
export
default
{
makeRoom
,
getClosedList
,
getOpenList
,
getRoomName
,
changemember
,
roomInf
,
unreadMessage
,
dbChat
,
deleteUserId
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment