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 22:21:50 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
94d3d126f673adfb6df9bcf1fffaa98c86730b5a
94d3d126
1 parent
1d153a87
remove unused component
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
21 deletions
front/src/Routes/Chat/ChatPresenter.js
front/src/Routes/Chat/ChatPresenter.js
View file @
94d3d12
...
...
@@ -7,8 +7,7 @@ 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"
;
import
SendingMsg
from
"../../Components/SendingMsg"
;
const
Wrapper
=
styled
.
div
`
display: grid;
...
...
@@ -93,19 +92,10 @@ const ChatScreenBox = styled.div`
height: 100%;
`
;
const
InputWrapper
=
styled
.
div
`
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 10px;
margin-bottom: 10px;
width: 100%;
`
;
const
InputContainer
=
styled
.
div
`
position: fixed;
bottom: 0;
justify-self: center;
padding: 10px;
margin-bottom: 20px;
display: flex;
...
...
@@ -146,12 +136,13 @@ export default ({
location
,
message
,
onSubmit
,
outcomingMsg
,
outcom
ingTime
,
incomingMsg
,
sendingText
,
send
ingTime
,
sendingMsgObj
,
})
=>
{
const
{
pathname
}
=
location
;
const
roomName
=
pathname
.
slice
(
1
,
pathname
.
length
);
return
(
<
Wrapper
>
<
Header
text
=
{
"KhuChat"
}
/
>
...
...
@@ -173,11 +164,7 @@ export default ({
<
Title
>
Selected
Menu
Title
<
/Title
>
<
/ChatScreenHeader
>
<
ChatScreenBox
>
{
incomingMsg
&&
<
IncomingMsg
text
=
{
incomingMsg
}
/>
}
{
outcomingMsg
&&
(
<
OutcomingMsg
text
=
{
outcomingMsg
}
time
=
{
outcomingTime
}
/
>
)}
<
InputWrapper
>
<
SendingMsg
text
=
{
sendingText
}
time
=
{
sendingTime
}
/
>
<
InputContainer
>
<
form
onSubmit
=
{
onSubmit
}
>
<
Input
...
...
@@ -188,7 +175,6 @@ export default ({
<
Button
text
=
{
"Submit"
}
/
>
<
/form
>
<
/InputContainer
>
<
/InputWrapper
>
<
/ChatScreenBox
>
<
/ChatScreenContainer
>
<
/ChatWrapper
>
...
...
Please
register
or
login
to post a comment