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

13a6ac56 · Choi Ga Young · e1b03c3e · 32dcbf22 · 13a6ac56 · 13a6ac56
Commit 13a6ac56 authored Sep 18, 2020 by Choi Ga Young
--- a/server/.gitignore
+++ b/server/.gitignore
--- a/server/app.js
+++ b/server/app.js
@@ -42,4 +42,3 @@ app.use(function(err, req, res, next) {
 });

 module.exports = app;
-
--- a/server/client/package.json
+++ b/server/client/package.json
@@ -24,6 +24,7 @@
    "test": "react-scripts test",
    "eject": "react-scripts eject"
  },
+  "proxy": "http://localhost:3030",
  "eslintConfig": {
    "extends": "react-app"
  },
@@ -38,6 +39,5 @@
      "last 1 firefox version",
      "last 1 safari version"
    ]
-  },
-  "proxy": "http://localhost:3030"
+  }
 }
--- a/server/client/src/Components/Menu.js
+++ b/server/client/src/Components/Menu.js
+import React, { useState, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+const Nav = styled.nav`
+    background-color: #981e1e;
+`
+
+function Menu() {
+    return (
+        <Nav className="navbar sticky-top navbar-expand-md">
+            <Link to="/home" className="navbar-brand">대관 서비스</Link>
+            <button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar" aria-controls="collapsibleNavbar">
+                <span className="navbar-toggler-icon"></span>
+            </button>
+            <div className="collapse navbar-collapse" id="collapsibleNavbar">
+                <ul className="navbar-nav">
+                    <li className="nav-item">
+                        <Link to="/home" className="nav-link">대관 현황</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/apply" className="nav-link">대관 신청</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/check" className="nav-link">대관 확인/취소</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/notice" className="nav-link">공지사항</Link>
+                    </li>
+
+                </ul>
+            </div>
+        </Nav>
+    )
+}
+
+export default Menu
\ No newline at end of file
--- a/server/client/src/Pages/ApplyPage.js
+++ b/server/client/src/Pages/ApplyPage.js
+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Apply() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">apply
+            </div>
+        </div>
+    )
+}
+
+export default Apply
\ No newline at end of file
--- a/server/client/src/Pages/CheckPage.js
+++ b/server/client/src/Pages/CheckPage.js
+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Check() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">check
+            </div>
+        </div>
+    )
+}
+
+export default Check
\ No newline at end of file
--- a/server/client/src/Pages/HomePage.js
+++ b/server/client/src/Pages/HomePage.js
+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Home() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">
+                home
+            </div>
+        </div>
+    )
+}
+
+export default Home
\ No newline at end of file
--- a/server/client/src/Pages/LoginPage.js
+++ b/server/client/src/Pages/LoginPage.js
+import React, { } from 'react';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Formik } from 'formik';
+import * as Yup from 'yup';
+
+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">
+                    <Formik
+                        initialValues={{ email: '', password: '' }}
+                        validationSchema={Yup.object({
+                            email: Yup.string()
+                                .email('이메일형식이 유효하지 않습니다.')
+                                .required('이메일을 입력해주세요.'),
+                            password: Yup.string()
+                                .required('비밀번호를 입력해주세요.')
+                                .min(8, '8자 이상 입력해주세요.'),
+                        })}
+                        onSubmit={(values, { setSubmitting }) => {
+                            // 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 => {
+                            //     alert(err.error)
+                            //   });
+
+                            setTimeout(() => {
+                                setSubmitting(false);
+                            }, 400);  // finish the cycle in handler
+                        }}
+                    >
+                        {({
+                            errors,
+                            touched,
+                            handleSubmit,
+                            getFieldProps,  // contain values, handleChange, handleBlur
+                            isSubmitting,
+                        }) => (
+                                <div className="row justify-content-center align-items-center">
+                                    <form onSubmit={handleSubmit} className="col-sm-3">
+                                        <div className="form-group mb-4">
+                                            <input
+                                                className={(touched.email && errors.email ? 'form-control is-invalid' : "form-control")}
+                                                type="email"
+                                                name="email"
+                                                {...getFieldProps('email')}
+                                                placeholder="Input Email"
+                                            />
+                                            {touched.email && errors.email ? (
+                                                <div className="invalid-feedback text-left">{errors.email}</div>
+                                            ) : null}
+                                        </div>
+                                        <div className="form-group mb-4">
+                                            <input
+                                                className={(touched.password && errors.password ? 'form-control is-invalid' : "form-control")}
+                                                type="password"
+                                                name="password"
+                                                {...getFieldProps('password')}
+                                                placeholder="Input Password"
+                                            />
+                                            {touched.password && errors.password ? (
+                                                <div className="invalid-feedback text-left">{errors.password}</div>
+                                            ) : null}
+                                        </div>
+                                        <button type="submit" className="btn btn-dark" disabled={isSubmitting}>
+                                            Login
+                  </button>
+                                        <button>
+                                            <Link to="/home">gha</Link></button>
+                                        <Link to="/signup">비밀번호를 잊으셨나요?</Link>
+                                        <div></div>
+                                        <Link to="/signup">회원이 아니신가요?</Link>
+                                    </form>
+                                </div>
+                            )}
+                    </Formik>
+
+                </Log>
+            </div>
+        </div>
+    )
+}
+
+export default Login
\ No newline at end of file
--- a/server/client/src/Pages/NoticePage.js
+++ b/server/client/src/Pages/NoticePage.js
+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Notice() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">notice
+            </div>
+        </div>
+    )
+}
+
+export default Notice
\ No newline at end of file
--- a/server/client/src/Pages/SignupPage.js
+++ b/server/client/src/Pages/SignupPage.js
+import React, { useState } from 'react';
+import { Formik } from 'formik';
+import * as Yup from 'yup';
+import axios from 'axios';
+import 'bootstrap/dist/css/bootstrap.css';
+import { Link, Redirect } from 'react-router-dom';
+
+function Signup() {
+    //   const [state, setState] = useState(false);
+
+    //   if (state) {
+    //     return <Redirect to="/login" />;
+    //   }
+
+    return (
+        <div className="d-flex flex-column justify-content-between vh-100">
+            <Formik
+                initialValues={{ name: '', email: '', password: '', password2: '', address: '', }}
+                validationSchema={Yup.object({
+                    name: Yup.string()
+                        .required('이름을 입력해주세요.'),
+                    email: Yup.string()
+                        .email('이메일형식이 유효하지 않습니다.')
+                        .required('이메일을 입력해주세요.'),
+                    password: Yup.string()
+                        .required('비밀번호를 입력해주세요.')
+                        .min(8, '8자 이상 입력해주세요.'),
+                    password2: Yup.string()
+                        .required('비밀번호를 다시 입력해주세요.')
+                        .min(8, '8자 이상 입력해주세요.')
+                        .oneOf([Yup.ref("password"), null], '비밀번호가 일치하지 않습니다.'),
+                    address: Yup.string()
+                        .required('주소를 입력해주세요.')
+                })}
+                onSubmit={(values, { setSubmitting }) => {
+                    // axios({
+                    //   method: 'post',
+                    //   url: '/users',
+                    //   data: values,
+                    // }).then(res => {
+                    //   if (res.status === 404) return alert(res.data.error)
+                    alert("회원가입이 완료되었습니다!")
+
+                    //   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,
+                }) => (
+                        <div className="row justify-content-center align-items-center">
+                            <form onSubmit={handleSubmit} className="col-sm-3">
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="name"
+                                        {...getFieldProps('name')}
+                                        placeholder="Input Name" />
+                                    {touched.name && errors.name ? (
+                                        <div className="invalid-feedback text-left">{errors.name}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.email && errors.email ? 'form-control is-invalid' : "form-control")}
+                                        type="email"
+                                        name="email"
+                                        {...getFieldProps('email')}
+                                        placeholder="Input Email"
+                                    />
+                                    {touched.email && errors.email ? (
+                                        <div className="invalid-feedback text-left">{errors.email}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.address && errors.address ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="address"
+                                        {...getFieldProps('address')}
+                                        placeholder="Input Address" />
+                                    {touched.address && errors.address ? (
+                                        <div className="invalid-feedback text-left">{errors.address}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.password && errors.password ? 'form-control is-invalid' : "form-control")}
+                                        type="password"
+                                        name="password"
+                                        {...getFieldProps('password')}
+                                        placeholder="Input Password"
+                                    />
+                                    {touched.password && errors.password ? (
+                                        <div className="invalid-feedback text-left">{errors.password}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.password2 && errors.password2 ? 'form-control is-invalid' : "form-control")}
+                                        type="password"
+                                        name="password2"
+                                        {...getFieldProps('password2')}
+                                        placeholder="Input Confirm Password"
+                                    />
+                                    {touched.password2 && errors.password2 ? (
+                                        <div className="invalid-feedback text-left">{errors.password2}</div>
+                                    ) : null}
+                                </div>
+                                <button type="submit" className="btn btn-dark" disabled={isSubmitting}>
+                                    Sign Up
+                  </button>
+                                <button>
+                                    <Link to="/">gha</Link></button>
+                            </form>
+                        </div>
+                    )}
+            </Formik>
+        </div>
+    );
+}
+
+
+export default Signup;
--- a/server/client/src/index.js
+++ b/server/client/src/index.js
@@ -4,14 +4,23 @@ import * as serviceWorker from './serviceWorker';
 import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
 import 'bootstrap';
 import 'bootstrap/dist/css/bootstrap.css';
-import Login from './Pages/Login';
-import Home from './Pages/Home';
+
+import Login from './Pages/LoginPage';
+import Home from './Pages/HomePage';
+import Signup from './Pages/SignupPage';
+import Apply from './Pages/ApplyPage';
+import Check from './Pages/CheckPage';
+import Notice from './Pages/NoticePage';

 ReactDOM.render(
 <Router>
    <Switch>
      <Route exact path="/" component={Login} />
      <Route path="/home" component={Home} />
+      <Route path="/signup" component={Signup} />
+      <Route path="/apply" component={Apply} />
+      <Route path="/check" component={Check} />
+      <Route path="/notice" component={Notice} />
    </Switch>
  </Router>,
  document.getElementById('root')
@@ -21,4 +30,3 @@ ReactDOM.render(
 // unregister() to register() below. Note this comes with some pitfalls.
 // Learn more about service workers: https://bit.ly/CRA-PWA
 serviceWorker.unregister();
-
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -4,6 +4,7 @@
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
+<<<<<<< HEAD
    "@types/babel-types": {
      "version": "7.0.9",
      "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz",
@@ -17,11 +18,14 @@
        "@types/babel-types": "*"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
    },
+<<<<<<< HEAD
    "accepts": {
      "version": "1.3.7",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -66,6 +70,8 @@
      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
    },
+=======
+>>>>>>> origin/NewMaster
    "ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -85,6 +91,7 @@
        "readable-stream": "^2.0.6"
      }
    },
+<<<<<<< HEAD
    "array-flatten": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -120,11 +127,14 @@
      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
    },
+=======
+>>>>>>> origin/NewMaster
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
    },
+<<<<<<< HEAD
    "basic-auth": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
@@ -140,6 +150,8 @@
        }
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "bcrypt": {
      "version": "5.0.0",
      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz",
@@ -163,6 +175,7 @@
      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
    },
+<<<<<<< HEAD
    "body-parser": {
      "version": "1.18.3",
      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
@@ -190,6 +203,8 @@
        }
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -204,6 +219,7 @@
      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz",
      "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="
    },
+<<<<<<< HEAD
    "bytes": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
@@ -230,12 +246,19 @@
      "requires": {
        "is-regex": "^1.0.3"
      }
+=======
+    "buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+>>>>>>> origin/NewMaster
    },
    "chownr": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
    },
+<<<<<<< HEAD
    "clean-css": {
      "version": "3.4.28",
      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
@@ -255,11 +278,14 @@
        "wordwrap": "0.0.2"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
    },
+<<<<<<< HEAD
    "commander": {
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
@@ -268,6 +294,8 @@
        "graceful-readlink": ">= 1.0.0"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -278,6 +306,7 @@
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
+<<<<<<< HEAD
    "constantinople": {
      "version": "3.1.2",
      "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz",
@@ -323,11 +352,14 @@
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
      "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
    },
+=======
+>>>>>>> origin/NewMaster
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
    },
+<<<<<<< HEAD
    "debug": {
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -348,6 +380,8 @@
      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
    },
+=======
+>>>>>>> origin/NewMaster
    "deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -363,6 +397,7 @@
      "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
      "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="
    },
+<<<<<<< HEAD
    "depd": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -373,21 +408,27 @@
      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
    },
+=======
+>>>>>>> origin/NewMaster
    "detect-libc": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
    },
+<<<<<<< HEAD
    "doctypes": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
      "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
    },
+=======
+>>>>>>> origin/NewMaster
    "dotenv": {
      "version": "8.2.0",
      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
    },
+<<<<<<< HEAD
    "ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -486,6 +527,16 @@
      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
    },
+=======
+    "ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+>>>>>>> origin/NewMaster
    "fs-minipass": {
      "version": "1.2.7",
      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
@@ -527,6 +578,7 @@
        "path-is-absolute": "^1.0.0"
      }
    },
+<<<<<<< HEAD
    "graceful-readlink": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
@@ -537,11 +589,14 @@
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
    },
+=======
+>>>>>>> origin/NewMaster
    "has-unicode": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
    },
+<<<<<<< HEAD
    "http-errors": {
      "version": "1.6.3",
      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -560,6 +615,8 @@
        }
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -595,6 +652,7 @@
      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
    },
+<<<<<<< HEAD
    "ipaddr.js": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -621,6 +679,8 @@
        }
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "is-fullwidth-code-point": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -629,6 +689,7 @@
        "number-is-nan": "^1.0.0"
      }
    },
+<<<<<<< HEAD
    "is-promise": {
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
@@ -642,11 +703,14 @@
        "has-symbols": "^1.0.1"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "isarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
    },
+<<<<<<< HEAD
    "js-stringify": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
@@ -659,6 +723,42 @@
      "requires": {
        "is-promise": "^2.0.0",
        "promise": "^7.0.1"
+=======
+    "jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "requires": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
+      }
+    },
+    "jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "requires": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "requires": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+>>>>>>> origin/NewMaster
      }
    },
    "kareem": {
@@ -666,6 +766,7 @@
      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz",
      "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw=="
    },
+<<<<<<< HEAD
    "kind-of": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -693,6 +794,42 @@
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+=======
+    "lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+    },
+    "lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+    },
+    "lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+    },
+    "lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+>>>>>>> origin/NewMaster
    },
    "memory-pager": {
      "version": "1.5.0",
@@ -700,6 +837,7 @@
      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
      "optional": true
    },
+<<<<<<< HEAD
    "merge-descriptors": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -728,6 +866,8 @@
        "mime-db": "1.44.0"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "minimatch": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -802,6 +942,7 @@
      "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
      "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ=="
    },
+<<<<<<< HEAD
    "morgan": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
@@ -814,6 +955,8 @@
        "on-headers": "~1.0.1"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "mpath": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz",
@@ -876,11 +1019,14 @@
        }
      }
    },
+<<<<<<< HEAD
    "negotiator": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
    },
+=======
+>>>>>>> origin/NewMaster
    "node-addon-api": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz",
@@ -956,6 +1102,7 @@
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
    },
+<<<<<<< HEAD
    "on-finished": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -969,6 +1116,8 @@
      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
    },
+=======
+>>>>>>> origin/NewMaster
    "once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -996,16 +1145,20 @@
        "os-tmpdir": "^1.0.0"
      }
    },
+<<<<<<< HEAD
    "parseurl": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
    },
+=======
+>>>>>>> origin/NewMaster
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
    },
+<<<<<<< HEAD
    "path-parse": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
@@ -1016,11 +1169,14 @@
      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
    },
+=======
+>>>>>>> origin/NewMaster
    "process-nextick-args": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
    },
+<<<<<<< HEAD
    "promise": {
      "version": "7.3.1",
      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -1183,6 +1339,8 @@
        }
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -1215,21 +1373,27 @@
        }
      }
    },
+<<<<<<< HEAD
    "regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
    },
+=======
+>>>>>>> origin/NewMaster
    "regexp-clone": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
      "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
    },
+<<<<<<< HEAD
    "repeat-string": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
    },
+=======
+>>>>>>> origin/NewMaster
    "require_optional": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
@@ -1239,6 +1403,7 @@
        "semver": "^5.1.0"
      }
    },
+<<<<<<< HEAD
    "resolve": {
      "version": "1.17.0",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
@@ -1247,11 +1412,14 @@
        "path-parse": "^1.0.6"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "resolve-from": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
    },
+<<<<<<< HEAD
    "right-align": {
      "version": "0.1.3",
      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -1260,6 +1428,8 @@
        "align-text": "^0.1.1"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "rimraf": {
      "version": "2.7.1",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -1297,6 +1467,7 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
    },
+<<<<<<< HEAD
    "send": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
@@ -1335,16 +1506,21 @@
        "send": "0.16.2"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "set-blocking": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
    },
+<<<<<<< HEAD
    "setprototypeof": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
    },
+=======
+>>>>>>> origin/NewMaster
    "sift": {
      "version": "7.0.1",
      "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz",
@@ -1360,6 +1536,7 @@
      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
      "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
    },
+<<<<<<< HEAD
    "source-map": {
      "version": "0.4.4",
      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
@@ -1368,6 +1545,8 @@
        "amdefine": ">=0.0.4"
      }
    },
+=======
+>>>>>>> origin/NewMaster
    "sparse-bitfield": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
@@ -1377,11 +1556,14 @@
        "memory-pager": "^1.0.2"
      }
    },
+<<<<<<< HEAD
    "statuses": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
    },
+=======
+>>>>>>> origin/NewMaster
    "string-width": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -1434,6 +1616,7 @@
        "yallist": "^3.0.3"
      }
    },
+<<<<<<< HEAD
    "to-fast-properties": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -1481,11 +1664,14 @@
      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
    },
+=======
+>>>>>>> origin/NewMaster
    "util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
    },
+<<<<<<< HEAD
    "utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -1501,6 +1687,8 @@
      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
    },
+=======
+>>>>>>> origin/NewMaster
    "wide-align": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -1509,6 +1697,7 @@
        "string-width": "^1.0.2 || 2"
      }
    },
+<<<<<<< HEAD
    "window-size": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
@@ -1528,6 +1717,8 @@
      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
    },
+=======
+>>>>>>> origin/NewMaster
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1537,6 +1728,7 @@
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+<<<<<<< HEAD
    },
    "yargs": {
      "version": "3.10.0",
@@ -1548,6 +1740,8 @@
        "decamelize": "^1.0.0",
        "window-size": "0.1.0"
      }
+=======
+>>>>>>> origin/NewMaster
    }
  }
 }
--- a/server/package.json
+++ b/server/package.json
@@ -12,6 +12,7 @@
    "dotenv": "^8.2.0",
    "express": "~4.16.1",
    "http-errors": "~1.6.3",
+    "jsonwebtoken": "^8.5.1",
    "mongoose": "^5.10.5",
    "morgan": "~1.9.1",
    "pug": "2.0.0-beta11"

--- a/server/schemas/index.js
+++ b/server/schemas/index.js
--- a/server/schemas/reserve.js
+++ b/server/schemas/reserve.js