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
reservation-service
Commits
7053b1a3
Commit
7053b1a3
authored
Sep 25, 2020
by
Kim, Subin
Browse files
Merge remote-tracking branch 'origin/rkyoung7' into kimpen
parents
683d4436
13a6ac56
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
server/client/package-lock.json
View file @
7053b1a3
...
@@ -7798,6 +7798,11 @@
...
@@ -7798,6 +7798,11 @@
}
}
}
}
},
},
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"js-tokens": {
"js-tokens": {
"version": "4.0.0",
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
...
@@ -9432,6 +9437,11 @@
...
@@ -9432,6 +9437,11 @@
"ts-pnp": "^1.1.6"
"ts-pnp": "^1.1.6"
}
}
},
},
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
},
"portfinder": {
"portfinder": {
"version": "1.0.28",
"version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
...
...
server/client/src/Pages/Home.js
0 → 100644
View file @
7053b1a3
server/client/src/Pages/Login.js
0 → 100644
View file @
7053b1a3
import
React
,
{
}
from
'
react
'
;
import
styled
from
'
styled-components
'
;
import
{
Link
}
from
'
react-router-dom
'
;
const
Log
=
styled
.
div
`
background-color: #981e1e;
`
const
Logo
=
styled
.
div
`
background-color: #E76A6A;
`
function
Login
()
{
return
(
<
div
className
=
"
container-fluid
"
>
<
div
className
=
"
row
"
>
<
Logo
className
=
"
col-md-5 col-12
"
>
<
h2
>
고려대학교
<
/h2
>
<
h4
>
대관
시스템
<
/h4
>
<
/Logo
>
<
Log
className
=
"
col-md-7 col-12
"
>
<
form
encType
=
'
multipart/form-data
'
className
=
"
mt-4
"
style
=
{{
height
:
"
100%
"
}}
>
<
div
className
=
"
form-group
"
>
<
label
for
=
"
title_input
"
>
학번
<
/label
>
<
input
className
=
"
form-control
"
id
=
"
title_input
"
name
=
"
title
"
type
=
"
text
"
required
/>
<
/div
>
<
div
className
=
"
form-group
"
>
<
label
for
=
"
author_input
"
>
비밀번호
<
/label
>
<
input
className
=
"
form-control
"
id
=
"
author_input
"
name
=
"
author
"
type
=
"
text
"
required
/>
<
/div
>
<
div
className
=
"
form-group
"
>
<
Link
to
=
"
/home
"
>
<
button
className
=
"
btn
"
type
=
"
submit
"
>
로그인
<
/button
>
<
/Link
>
<
/div
>
<
/form
>
<
/Log
>
<
/div
>
<
/div
>
)
}
export
default
Login
server/package-lock.json
View file @
7053b1a3
This diff is collapsed.
Click to expand it.
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