Merge remote-tracking branch 'origin/rkyoung7' into kimpen

server/client/package-lock.json

@@ -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": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9432,6 +9437,11 @@
         "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": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",

server/client/src/Pages/Login.js

+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