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
739fc48f
Commit
739fc48f
authored
Jan 15, 2021
by
JeongYeonwoo
Browse files
D
parent
d80d2238
Changes
4
Show whitespace changes
Inline
Side-by-side
client/src/Components/Chat.js
View file @
739fc48f
...
@@ -3,7 +3,8 @@ import { Form, Button, Row } from 'react-bootstrap';
...
@@ -3,7 +3,8 @@ import { Form, Button, Row } from 'react-bootstrap';
function
Chat
(
props
)
{
function
Chat
(
props
)
{
let
defaultname
=
sessionStorage
.
getItem
(
'
name
'
);
let
defaultname
=
''
// let defaultname = sessionStorage.getItem('name');
function
handleChange
(
e
)
{
function
handleChange
(
e
)
{
e
.
preventDefault
()
e
.
preventDefault
()
...
@@ -24,7 +25,7 @@ function Chat(props) {
...
@@ -24,7 +25,7 @@ function Chat(props) {
<
h2
>
현재
{
props
.
roomName
}
입니다
.
<
/h2
>
<
h2
>
현재
{
props
.
roomName
}
입니다
.
<
/h2
>
{
props
.
chatmsg
.
map
((
value
,
index
)
=>
(
{
props
.
chatmsg
.
map
((
value
,
index
)
=>
(
<
Row
key
=
{
index
}
className
=
'
ml-3
'
>
<
Row
key
=
{
index
}
className
=
'
ml-3
'
>
{
props
.
roomName
}
에서
{
defaultname
}
님이
보낸
메세지
:
{
value
}
{
props
.
roomName
}
에서
{
props
.
namelist
}
님이
보낸
메세지
:
{
value
}
<
/Row
>
<
/Row
>
))}
))}
...
...
client/src/Pages/HomePage.js
View file @
739fc48f
...
@@ -13,7 +13,10 @@ import { io } from "socket.io-client"; //모듈 가져오기
...
@@ -13,7 +13,10 @@ import { io } from "socket.io-client"; //모듈 가져오기
const
socket
=
io
();
const
socket
=
io
();
function
Home
()
{
function
Home
()
{
const
[
namelist
,
setNamelist
]
=
useState
([])
const
[
username
,
setUsername
]
=
useState
(
'
defaultUser
'
)
const
[
username
,
setUsername
]
=
useState
(
'
defaultUser
'
)
const
[
show
,
setShow
]
=
useState
(
false
);
const
[
show
,
setShow
]
=
useState
(
false
);
...
@@ -35,11 +38,13 @@ function Home() {
...
@@ -35,11 +38,13 @@ function Home() {
const
sendMsg
=
(
e
)
=>
{
const
sendMsg
=
(
e
)
=>
{
e
.
preventDefault
()
e
.
preventDefault
()
const
name
=
sessionStorage
.
getItem
(
'
name
'
)
console
.
log
(
'
sendMsg
'
,
inner
)
console
.
log
(
'
sendMsg
'
,
inner
)
console
.
log
(
roomName
)
console
.
log
(
roomName
)
socket
.
emit
(
"
chat
"
,
{
socket
.
emit
(
"
chat
"
,
{
roomName
:
roomName
,
roomName
:
roomName
,
msg
:
inner
msg
:
inner
,
name
:
name
});
});
}
}
...
@@ -53,8 +58,11 @@ function Home() {
...
@@ -53,8 +58,11 @@ function Home() {
console
.
log
(
'
msg
'
,
msg
)
console
.
log
(
'
msg
'
,
msg
)
console
.
log
(
'
inner :
'
,
inner
)
console
.
log
(
'
inner :
'
,
inner
)
setChatmsg
([...
chatmsg
,
msg
])
setChatmsg
([...
chatmsg
,
msg
[
0
]
])
console
.
log
(
'
useeffect2
'
,
chatmsg
)
console
.
log
(
'
useeffect2
'
,
chatmsg
)
console
.
log
(
msg
[
1
])
setNamelist
([...
namelist
,
msg
[
1
]])
console
.
log
(
namelist
)
})
})
console
.
log
(
'
useeffect2
'
,
chatmsg
)
console
.
log
(
'
useeffect2
'
,
chatmsg
)
},
[
chatmsg
])
},
[
chatmsg
])
...
@@ -75,7 +83,7 @@ function Home() {
...
@@ -75,7 +83,7 @@ function Home() {
<
/Tabs
>
<
/Tabs
>
<
/Col
>
<
/Col
>
<
Col
style
=
{{
padding
:
"
0
"
}}
>
<
Col
style
=
{{
padding
:
"
0
"
}}
>
{
chat
?
<
Chat
handleChatc
=
{
handleChatc
}
sendMsg
=
{
sendMsg
}
setInner
=
{
setInner
}
chatmsg
=
{
chatmsg
}
roomName
=
{
roomName
}
/> : null
}
{
chat
?
<
Chat
handleChatc
=
{
handleChatc
}
sendMsg
=
{
sendMsg
}
setInner
=
{
setInner
}
chatmsg
=
{
chatmsg
}
roomName
=
{
roomName
}
namelist
=
{
namelist
}
/> : null
}
<
Button
variant
=
"
primary
"
onClick
=
{
handleShow
}
style
=
{{
position
:
"
fixed
"
,
bottom
:
"
10px
"
,
right
:
"
10px
"
}}
>
<
Button
variant
=
"
primary
"
onClick
=
{
handleShow
}
style
=
{{
position
:
"
fixed
"
,
bottom
:
"
10px
"
,
right
:
"
10px
"
}}
>
생성
생성
...
...
client/src/Pages/ProfilePage.js
View file @
739fc48f
...
@@ -27,7 +27,7 @@ function ProfilePage() {
...
@@ -27,7 +27,7 @@ function ProfilePage() {
async
function
getLoginedUser
()
{
//email로 db에서 찾아오기 ㅇㅇㅇㅇㅇ
async
function
getLoginedUser
()
{
//email로 db에서 찾아오기 ㅇㅇㅇㅇㅇ
const
userid
=
sessionStorage
.
getItem
(
'
userId
'
)
const
userid
=
sessionStorage
.
getItem
(
'
userId
'
)
const
response
=
await
axios
.
post
(
`/users/
${
userid
}
`
,
{
'
email
'
:
userid
})
const
response
=
await
axios
.
post
(
`/users/
${
userid
}
`
,
{
'
_id
'
:
userid
})
setUser
(
response
.
data
)
setUser
(
response
.
data
)
}
}
...
@@ -81,6 +81,7 @@ function ProfilePage() {
...
@@ -81,6 +81,7 @@ function ProfilePage() {
}
}
useEffect
(()
=>
{
useEffect
(()
=>
{
getLoginedUser
()
getLoginedUser
()
console
.
log
(
user
)
},
[])
},
[])
return
(
return
(
...
...
server/server.js
View file @
739fc48f
...
@@ -30,7 +30,7 @@ io.on("connection", (socket) => { // 기본 연결
...
@@ -30,7 +30,7 @@ io.on("connection", (socket) => { // 기본 연결
socket
.
on
(
'
chat
'
,
(
data
)
=>
{
socket
.
on
(
'
chat
'
,
(
data
)
=>
{
console
.
log
(
`chat실행 :`
,
data
.
roomName
,
data
.
msg
)
console
.
log
(
`chat실행 :`
,
data
.
roomName
,
data
.
msg
)
io
.
to
(
data
.
roomName
).
emit
(
'
broadcast
'
,
data
.
msg
);
//roomName에 존재하는 모든 소켓들에게
io
.
to
(
data
.
roomName
).
emit
(
'
broadcast
'
,
[
data
.
msg
,
data
.
name
]
);
//roomName에 존재하는 모든 소켓들에게
})
})
socket
.
on
(
'
disconnect
'
,
()
=>
{
socket
.
on
(
'
disconnect
'
,
()
=>
{
...
...
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