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
beef68fa
Commit
beef68fa
authored
Jan 27, 2021
by
Soo Hyun Kim
Browse files
Merge remote-tracking branch 'origin/young' into sooModalTest
parents
8dfaaaab
e442acda
Changes
2
Show whitespace changes
Inline
Side-by-side
client/src/Components/Chat.js
View file @
beef68fa
...
@@ -147,7 +147,7 @@ function Chat(props) {
...
@@ -147,7 +147,7 @@ function Chat(props) {
if
(
!
(
value
.
msg
===
''
))
{
if
(
!
(
value
.
msg
===
''
))
{
if
(
value
.
sender
===
"
system
"
)
{
if
(
value
.
sender
===
"
system
"
)
{
return
(
return
(
<
Row
className
=
'
border
'
style
=
{{
background
:
"
#F
FFAFA
"
}}
>
<
Row
style
=
{{
background
:
"
#F
5F5F5
"
,
border
:
"
none
"
}}
>
{
value
.
msg
}
{
value
.
msg
}
<
/Row
>
<
/Row
>
)
)
...
...
client/src/Pages/HomePage.js
View file @
beef68fa
...
@@ -77,7 +77,10 @@ function Home() {
...
@@ -77,7 +77,10 @@ function Home() {
}
}
async
function
exitRoom
(
roomId
)
{
async
function
exitRoom
(
roomId
)
{
const
response
=
await
axios
.
get
(
'
/users/check
'
,
{
params
:
{
'
_id
'
:
userId
}
})
const
userNick
=
response
.
data
.
nickname
;
await
axios
.
put
(
'
/room/deleteMem
'
,
{
userId
:
userId
,
roomId
:
roomId
})
await
axios
.
put
(
'
/room/deleteMem
'
,
{
userId
:
userId
,
roomId
:
roomId
})
setSysmsg
(
`
${
userNick
}
님이 나갔습니다.`
)
console
.
log
(
`
${
roomId
}
방
${
userId
}
탈퇴`
)
console
.
log
(
`
${
roomId
}
방
${
userId
}
탈퇴`
)
setRoomCode
(
""
)
setRoomCode
(
""
)
}
}
...
...
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