Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2020-1-capstone-design1
/
Triz_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
1
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
sdy
2020-05-28 17:07:11 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2f443851b710fa065a725c9bff4e9bc7a9a7ce1b
2f443851
1 parent
6aa0a9ee
add outcomingMsg, time prop
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
front/src/Routes/Chat/ChatPresenter.js
front/src/Routes/Chat/ChatPresenter.js
View file @
2f44385
...
...
@@ -142,7 +142,14 @@ const StyledLink = styled(Link)`
}
`
;
export
default
({
location
,
message
,
onSubmit
,
outcomingMsg
,
incomingMsg
})
=>
{
export
default
({
location
,
message
,
onSubmit
,
outcomingMsg
,
outcomingTime
,
incomingMsg
,
})
=>
{
const
{
pathname
}
=
location
;
const
roomName
=
pathname
.
slice
(
1
,
pathname
.
length
);
return
(
...
...
@@ -167,7 +174,9 @@ export default ({ location, message, onSubmit, outcomingMsg, incomingMsg }) => {
<
/ChatScreenHeader
>
<
ChatScreenBox
>
{
incomingMsg
&&
<
IncomingMsg
text
=
{
incomingMsg
}
/>
}
{
outcomingMsg
&&
<
OutcomingMsg
text
=
{
outcomingMsg
}
/>
}
{
outcomingMsg
&&
(
<
OutcomingMsg
text
=
{
outcomingMsg
}
time
=
{
outcomingTime
}
/
>
)}
<
InputWrapper
>
<
InputContainer
>
<
form
onSubmit
=
{
onSubmit
}
>
...
...
Please
register
or
login
to post a comment