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
0d18a2ca
Commit
0d18a2ca
authored
Jan 20, 2021
by
JeongYeonwoo
Browse files
0120 푸쉬
parent
bd29d142
Changes
3
Hide whitespace changes
Inline
Side-by-side
client/src/Components/Chat.js
View file @
0d18a2ca
...
...
@@ -8,9 +8,7 @@ import catchErrors from '../utils/catchErrors';
function
Chat
(
props
)
{
// let defaultname = sessionStorage.getItem('name');
const
[
name
,
setName
]
=
useState
([
''
])
const
[
sender
,
setSender
]
=
useState
([])
const
[
senderimg
,
setSenderimg
]
=
useState
(
''
)
const
[
inner
,
setInner
]
=
useState
([
''
])
const
[
chat
,
setChat
]
=
useState
([])
//object로 key는 보낸사람 value는 메세지
...
...
@@ -38,8 +36,6 @@ function Chat(props) {
function
sendMsgCH
(
e
)
{
e
.
preventDefault
()
setName
(
sessionStorage
.
getItem
(
'
name
'
))
props
.
setSingleUser
(
sessionStorage
.
getItem
(
'
name
'
))
props
.
setSingleChat
(
inner
)
...
...
@@ -47,9 +43,6 @@ function Chat(props) {
setInner
(
''
)
setDisabled
(
true
)
console
.
log
(
chat
)
}
useEffect
(()
=>
{
getProfile
(
userId
)
...
...
@@ -58,45 +51,38 @@ function Chat(props) {
useEffect
(()
=>
{
setSender
([...
sender
,
props
.
singleUser
])
console
.
log
(
'
UseEffect singleUser
'
,
sender
)
setChat
([...
chat
,
props
.
singleChat
])
// console.log('UseEffect singlechat', chat)
console
.
log
(
'
Chat에 Sing있는 name =
'
,
name
,
props
.
singleUser
)
console
.
log
(
'
Chat에 Sing있는 name =
'
,
props
.
singleUser
)
},
[
props
.
singleChat
,
props
.
singleUser
])
},
[
props
.
singleChat
])
useEffect
(()
=>
{
setSender
([...
sender
,
props
.
recievedUser
])
console
.
log
(
'
UseEffect RecievedUser
'
,
sender
)
console
.
log
(
'
Chat에 Reci있는 name =
'
,
name
)
console
.
log
(
'
Chat에 Reci있는 name =
'
)
setChat
([...
chat
,
props
.
recievedMsg
])
// console.log('UseEffect recievechat', chat)
// setName('')
},
[
props
.
recievedMsg
,
props
.
recievedUser
])
},
[
props
.
recievedMsg
])
const
time
=
new
Date
().
toLocaleTimeString
()
return
(
<
div
className
=
"
chat
"
id
=
"
chat
"
style
=
{{
border
:
"
2px solid
"
,
height
:
"
300%
"
,
margin
:
"
1%
"
,
borderColor
:
"
#BDBDBD
"
,
background
:
''
}}
>
<
Container
className
=
"
chat
"
id
=
"
chat
"
style
=
{{
padding
:
'
20px
'
,
border
:
"
2px solid
"
,
height
:
"
300%
"
,
margin
:
"
1%
"
,
borderColor
:
"
#BDBDBD
"
,
background
:
''
}}
>
<
h2
>
해당
방에
대한
참여코드는
{
props
.
roomCode
}
입니다
.
<
/h2
>
{
/* 상대방이 보낸 메세지 띄우기 + 같은유저면 프로필 이미지는 생략(chat을 object로 보낸사람과 함께 보내서 구분하자) */
}
{
chat
.
map
((
value
,
index
)
=>
{
if
(
!
(
value
==
''
))
{
if
(
!
(
sender
[
index
]
===
sessionStorage
.
getItem
(
'
name
'
)))
{
return
(
<
Row
key
=
{
index
}
className
=
'
m-1
ml-3
'
>
<
Row
key
=
{
index
}
className
=
'
m-1
'
>
<
Col
xs
=
{
2
}
>
{
user
.
profileimg
?
<
Image
src
=
{
user
.
profileimg
&&
`/images/
${
user
.
profileimg
}
`
}
style
=
{{
width
:
"
50px
"
,
height
:
"
50px
"
}}
roundedCircle
/>
:
<
Image
src
=
'
https://www.flaticon.com/svg/vstatic/svg/149/149071.svg?token=exp=1610922596~hmac=f4b972b9db509d4e3cc2eb40543b0b0f
'
style
=
{{
width
:
"
50px
"
,
height
:
"
50px
"
}}
roundedCircle
/>
}
<
/Col
>
<
Col
xs
=
{
8
}
>
<
Row
><
strong
>
{
sender
[
index
]}
{
index
}
<
/strong></
Row
>
<
Row
><
strong
>
{
sender
[
index
]}
<
/strong></
Row
>
<
Row
className
=
'
d-flex flex-wrap-nowrap
'
>
<
Row
className
=
'
border border-dark
'
style
=
{{
width
:
'
max-content
'
,
maxWidth
:
'
300px
'
,
height
:
'
auto
'
,
paddingLeft
:
'
15px
'
,
paddingRight
:
'
15px
'
,
background
:
'
white
'
,
borderRadius
:
'
5px
'
,
fontSize
:
'
x-large
'
}}
>
{
value
}
<
/Row
>
<
Col
className
=
'
ml-1
'
>
{
time
}
<
/Col
>
...
...
@@ -104,23 +90,22 @@ function Chat(props) {
<
/Col
>
<
/Row
>
)
}
else
{
}
else
{
return
(
<
Row
key
=
{
index
}
className
=
'
m-1 justify-content-end
'
>
<
Row
className
=
'
d-flex flex-wrap-nowrap
'
>
<
Col
className
=
'
mr-1
'
>
{
user
.
nickname
}
님
{
time
}
<
/Col
>
<
Row
style
=
{{
width
:
'
max-content
'
,
maxWidth
:
'
300px
'
,
height
:
'
auto
'
,
paddingLeft
:
'
15px
'
,
paddingRight
:
'
15px
'
,
background
:
'
yellow
'
,
borderRadius
:
'
3px
'
,
fontSize
:
'
x-large
'
}}
>
{
value
}
<
/Row
>
<
Col
className
=
'
mr-1
'
>
{
time
}
<
/Col
>
<
Row
className
=
'
mr-2
'
style
=
{{
width
:
'
max-content
'
,
maxWidth
:
'
300px
'
,
height
:
'
auto
'
,
paddingLeft
:
'
15px
'
,
paddingRight
:
'
15px
'
,
background
:
'
yellow
'
,
borderRadius
:
'
3px
'
,
fontSize
:
'
x-large
'
}}
>
{
value
}
<
/Row
>
<
/Row
>
<
/Row
>
)
}
}
else
{
return
null
}
})
}
<
Button
variant
=
"
light
"
onClick
=
{
props
.
handleChatc
}
>
{
`<`
}
<
/Button
>
<
Form
onSubmit
=
{
sendMsgCH
}
>
<
Form
.
Group
className
=
'
d-flex flex-wrap-nowrap justify-content-center ml-2 mr-2
'
>
...
...
@@ -131,7 +116,7 @@ function Chat(props) {
<
/Form.Group
>
<
/Form
>
<
/
div
>
<
/
Container
>
);
...
...
client/src/Pages/HomePage.js
View file @
0d18a2ca
...
...
@@ -57,7 +57,7 @@ function Home() {
})
//setSingleChat([''])
}
},
[
singleChat
,
singleUser
])
},
[
singleChat
])
useEffect
(()
=>
{
...
...
server/routes/user.routes.js
View file @
0d18a2ca
...
...
@@ -10,8 +10,10 @@ router.route('/users/signup')
router
.
route
(
`/users/:userId`
)
.
get
(
userCtrl
.
getProfile
)
.
put
(
userCtrl
.
profileUpload
,
userCtrl
.
update
)
router
.
param
(
'
userId
'
,
userCtrl
.
userById
)
export
default
router
\ No newline at end of file
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