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-24 20:18:22 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6e146afa57161f2eacfbaf933603338280274b78
6e146afa
1 parent
74c48e6a
add in,outcomingMsg component
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletions
front/src/Routes/Chat/ChatPresenter.js
front/src/Routes/Chat/ChatPresenter.js
View file @
6e146af
...
...
@@ -7,6 +7,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import
{
faAddressBook
}
from
"@fortawesome/free-solid-svg-icons"
;
import
{
Link
}
from
"react-router-dom"
;
import
Category
from
"../Category/CategoryContainer"
;
import
IncomingMsg
from
"../../Components/IncomingMsg"
;
import
OutcomingMsg
from
"../../Components/OutcomingMsg"
;
const
Wrapper
=
styled
.
div
`
display: grid;
...
...
@@ -140,7 +142,14 @@ const StyledLink = styled(Link)`
}
`
;
export
default
({
data
,
location
,
message
,
onSubmit
})
=>
{
export
default
({
data
,
location
,
message
,
onSubmit
,
outcomingMsg
,
incomingMsg
,
})
=>
{
const
{
pathname
}
=
location
;
const
roomName
=
pathname
.
slice
(
1
,
pathname
.
length
);
return
(
...
...
@@ -164,6 +173,8 @@ export default ({ data, location, message, onSubmit }) => {
<
Title
>
Selected
Menu
Title
<
/Title
>
<
/ChatScreenHeader
>
<
ChatScreenBox
>
{
incomingMsg
&&
<
IncomingMsg
text
=
{
incomingMsg
}
/>
}
{
outcomingMsg
&&
<
OutcomingMsg
text
=
{
outcomingMsg
}
/>
}
<
InputWrapper
>
<
InputContainer
>
<
form
onSubmit
=
{
onSubmit
}
>
...
...
Please
register
or
login
to post a comment