diff --git a/server/client/src/Components/Menu.js b/server/client/src/Components/Menu.js index d5e63c6465750513c683c06d4d2469ecb45a04d0..098b685cee738dbbeb05fbf601fc5dc7aa4e9289 100644 --- a/server/client/src/Components/Menu.js +++ b/server/client/src/Components/Menu.js @@ -3,28 +3,36 @@ import { Link, Redirect } from 'react-router-dom'; import styled from 'styled-components'; const Nav = styled.nav` - background-color: #981e1e; + background-color: #7B031D; + max-height : 50px; + + a { + color: #ffffff; + } ` function Menu() { const [state, setState] = useState() - + if (state) return ; function logout() { localStorage.removeItem('token'); - alert("로그아웃 되었습니다."); + alert("로그인 화면으로 이동합니다."); setState(true); } return ( diff --git a/server/client/src/Pages/LoginPage.js b/server/client/src/Pages/LoginPage.js index 2c6f7ff0ccbc320c4adb92ffa6d6fc7740eb64b5..72a2d78b3360cbec4868fcc57fad8b05cedae0b4 100644 --- a/server/client/src/Pages/LoginPage.js +++ b/server/client/src/Pages/LoginPage.js @@ -1,74 +1,158 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect, useRef } from 'react'; import styled from 'styled-components'; import { Link, Redirect } from 'react-router-dom'; import { Formik } from 'formik'; import * as Yup from 'yup'; import axios from 'axios'; import 'bootstrap/dist/css/bootstrap.css'; +import Logo from '../icon.png'; -const Log = styled.div` - background-color: #981e1e; -` -const Logo = styled.div` - background-color: #E76A6A; +const Asd = styled.div` + background-color: #7B031D; + + &.web { + display : flex; + align-items: center; + } + + &.mobile { + height : 20vh; + display : flex; + + } + + & .mob-head { + display: flex; + flex-direction: row; + height : 100%; + width: 100%; + justify-content: center; + align-content: center; + } + + & .mob-img { + max-width:100%; + max-height:100%; + } ` +const Asdf = styled.div` + background-color: rgb(239, 218, 200); + a { + color : #7B031D; + } + + &.mob-formik { + height : 80vh; + width: 100%; + padding: 0; + display: flex; + justify-content: center; + align-items: center; + } + + &.web-formik { + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + & .mobb { + height: 30vh; + display: flex; + flex-direction: column; + justify-content: space-around; + } + + & .qwer { + display: flex; + justify-content: space-between; + height: 12vh; + width: 30vw; + margin-bottom: 25px; + } + + & .web-input-form { + width: 80%; + justify-content: space-between; + align-content: space-around; + display: flex; + flex-direction: column; + } + + & .mob-input-form { + + } +` function Login() { - const [state, setState]= useState(false); + const [state, setState] = useState(false); + const [mobile, setMobile] = useState(false); + + useEffect(() => { + if (window.innerWidth < 960) { + setMobile(true) + } else { + setMobile(false) + } + }, []); - if (state) { - return ; - } + if (state) { + return ; + } return ( -
-
- -

고려대학교

-

대관 시스템

-
- - { - axios({ - method: 'post', - url: '/login', - data: values, - }).then(res => { - if (res.status === 404) return alert(res.data.error) - alert("로그인이 완료되었습니다!") - - localStorage.setItem('token', res.data.token); - localStorage.setItem('id', res.data.users._id); - setState(true); - }) - .catch(err => { +
+ +
+ +
+

고려대학교
대관 서비스

+
+
+
+ + { + axios({ + method: 'post', + url: '/login', + data: values, + }).then(res => { + if (res.status === 404) return alert(res.data.error) + + localStorage.setItem('token', res.data.token); + localStorage.setItem('id', res.data.users._id); + setState(true); + }) + .catch(err => { alert(err.error) - }); - - setTimeout(() => { - setSubmitting(false); - }, 400); // finish the cycle in handler - }} - > - {({ - errors, - touched, - handleSubmit, - getFieldProps, // contain values, handleChange, handleBlur - isSubmitting, - }) => ( -
-
-
+ }); + + setTimeout(() => { + setSubmitting(false); + }, 400); // finish the cycle in handler + }} + > + {({ + errors, + touched, + handleSubmit, + getFieldProps, // contain values, handleChange, handleBlur + isSubmitting, + }) => ( + +
+
+
- {touched.id && errors.id ? ( -
{errors.id}
- ) : null}
-
+
- {touched.password && errors.password ? ( -
{errors.password}
- ) : null}
- - -
- 비밀번호를 잊으셨나요? -
- 회원이 아니신가요? - +
+
- )} - - - -
-
+
+ 비밀번호를 잊으셨나요? / + 회원이 아니신가요? +
+ + )} + + +
) } diff --git a/server/client/src/icon.png b/server/client/src/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8da78a17c172838fba97d61f3eead753e60f1449 Binary files /dev/null and b/server/client/src/icon.png differ