Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2021-1-capstone-design1
/
GCL_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
안형욱
2021-06-13 15:34:01 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f125f274e11f1a36076653ae65a5e9035140430c
f125f274
1 parent
679698fc
chore: login form 로고 추가
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
8 deletions
frontend/src/components/Logo.js
frontend/src/components/document/index.js
frontend/src/components/login/LoginForm.js
frontend/src/components/Logo.js
0 → 100644
View file @
f125f27
import
React
from
'react'
;
import
styled
from
'styled-components'
;
const
LogoWrap
=
styled
.
div
`
display: flex;
margin-top: 11%;
width: 100%;
align-items: center;
justify-content: center;
`
;
function
Logo
()
{
return
(
<
LogoWrap
>
<
img
src
=
"eDrive_logo.png"
alt
=
""
/>
<
/LogoWrap>
);
}
export
default
Logo
;
frontend/src/components/document/index.js
View file @
f125f27
...
...
@@ -26,11 +26,10 @@ const Document = ({
<
Container
style
=
{{
padding
:
'2rem 2rem'
,
margin
:
'2rem 4rem'
,
border
:
'1px solid black'
,
margin
:
'0 4rem'
,
}}
>
<
div
style
=
{{
display
:
'flex'
}}
>
<
div
style
=
{{
display
:
'flex'
,
margin
:
'0.5rem 0'
}}
>
<
File
filename
=
{
filename
}
filepath
=
{
filePath
}
/
>
<
Popover
opened
=
{
opened
}
...
...
@@ -39,7 +38,13 @@ const Document = ({
<
FaSearchPlus
onMouseEnter
=
{()
=>
setOpened
(
true
)}
onMouseLeave
=
{()
=>
setOpened
(
false
)}
style
=
{{
marginTop
:
3
,
marginLeft
:
3
,
color
:
'#868e96'
}}
style
=
{{
marginTop
:
3
,
marginLeft
:
3
,
color
:
'#868e96'
,
border
:
'none'
,
outline
:
'none'
,
}}
/
>
}
position
=
"bottom-start"
...
...
frontend/src/components/login/LoginForm.js
View file @
f125f27
...
...
@@ -4,6 +4,7 @@ import { useForm } from '@mantine/hooks';
import
styled
from
'styled-components'
;
import
{
Link
}
from
'react-router-dom'
;
import
palette
from
'../../lib/styles/palette'
;
import
Logo
from
'../Logo'
;
const
LoginFormBlock
=
styled
.
div
`
display: flex;
...
...
@@ -15,7 +16,9 @@ const ButtonBlock = styled.div`
justify-content: space-between;
margin-top: 2rem;
`
;
const
FormBlock
=
styled
.
div
``
;
const
FormBlock
=
styled
.
div
`
padding-top: 2rem;
`
;
const
LoginForm
=
()
=>
{
const
{
onSubmit
,
errors
,
values
,
setFieldValue
}
=
useForm
({
initialValues
:
{
...
...
@@ -31,16 +34,16 @@ const LoginForm = () => {
<
LoginFormBlock
>
<
Container
size
=
{
CONTAINER_SIZES
.
xs
}
padding
=
"xs"
padding
=
{
20
}
style
=
{{
display
:
'block'
,
width
:
CONTAINER_SIZES
.
xs
,
padding
:
'5rem'
,
border
:
`1px
${
palette
.
gray
3
}
solid`
,
border
:
`1px
${
palette
.
gray
5
}
solid`
,
borderRadius
:
'5px'
,
}}
>
<
h2
>
Logo
<
/h2
>
<
Logo
/
>
<
FormBlock
>
<
TextInput
required
...
...
Please
register
or
login
to post a comment