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

server/.gitignore

-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+node_modules

server/app.js

@@ -8,6 +8,9 @@ require('dotenv').config();
 
 const indexRouter = require('./routes/index');
 const usersRouter = require('./routes/users');
+const loginRouter = require('./routes/login');
+const reservesRouter = require('./routes/reserves');
+const noticeRouter = require('./routes/notices');
 const connect = require('./schemas');
 
 const app = express();
@@ -24,7 +27,10 @@ app.use(cookieParser(process.env.JWT_SECRET));
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
-app.use('/users', usersRouter);
+app.use('/users', usersRouter, reservesRouter);
+app.use('/login', loginRouter);
+app.use('/reserves', reservesRouter);
+app.use('/notices', noticeRouter);
 
 app.listen(port, () => console.log(port));
 
@@ -44,4 +50,4 @@ app.use(function(err, req, res, next) {
   // res.render('error');
 });
 
-module.exports = app;
+module.exports = app;
\ No newline at end of file

server/client/package-lock.json

@@ -2146,6 +2146,11 @@
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
     },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
     "accepts": {
       "version": "1.3.7",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -2320,6 +2325,39 @@
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
       "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -3066,6 +3104,15 @@
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
     },
+    "bcrypt": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz",
+      "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==",
+      "requires": {
+        "node-addon-api": "^3.0.0",
+        "node-pre-gyp": "0.15.0"
+      }
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -3084,6 +3131,39 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
     },
+    "bl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz",
+      "integrity": "sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==",
+      "requires": {
+        "readable-stream": "^2.3.5",
+        "safe-buffer": "^5.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -3320,6 +3400,11 @@
         "node-int64": "^0.4.0"
       }
     },
+    "bson": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz",
+      "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="
+    },
     "buffer": {
       "version": "4.9.2",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
@@ -3700,6 +3785,11 @@
         "q": "^1.1.2"
       }
     },
+    "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="
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -3873,6 +3963,11 @@
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
       "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
     },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
     "constants-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -4417,6 +4512,11 @@
         "regexp.prototype.flags": "^1.2.0"
       }
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -4536,6 +4636,16 @@
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+    },
+    "denque": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz",
+      "integrity": "sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -4555,6 +4665,11 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+    },
     "detect-newline": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
@@ -6204,6 +6319,54 @@
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "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",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
+      }
+    },
     "gensync": {
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
@@ -6405,6 +6568,11 @@
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -6738,6 +6906,14 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
     },
+    "ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
+    },
     "immer": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz",
@@ -7959,6 +8135,11 @@
         "object.assign": "^4.1.0"
       }
     },
+    "kareem": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz",
+      "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw=="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -8297,6 +8478,12 @@
         }
       }
     },
+    "memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "optional": true
+    },
     "merge-deep": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
@@ -8490,6 +8677,30 @@
         "minipass": "^3.0.0"
       }
     },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "requires": {
+        "minipass": "^2.9.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        }
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -8568,6 +8779,43 @@
         "run-queue": "^1.0.3"
       }
     },
+    "mpath": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.7.0.tgz",
+      "integrity": "sha512-Aiq04hILxhz1L+f7sjGyn7IxYzWm1zLNNXcfhDtx04kZ2Gk7uvFdgZ8ts1cWa/6d0TQmag2yR8zSGZUmp0tFNg=="
+    },
+    "mquery": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.2.tgz",
+      "integrity": "sha512-XB52992COp0KP230I3qloVUbkLUxJIu328HBP2t2EsxSFtf4W1HPSOBWOXf1bqxK4Xbb66lfMJ+Bpfd9/yZE1Q==",
+      "requires": {
+        "bluebird": "3.5.1",
+        "debug": "3.1.0",
+        "regexp-clone": "^1.0.0",
+        "safe-buffer": "5.1.2",
+        "sliced": "1.0.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.1",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+          "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
+      }
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -8622,6 +8870,26 @@
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
+    "needle": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
+      "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
+      "requires": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
     "negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -8651,6 +8919,11 @@
         "tslib": "^1.10.0"
       }
     },
+    "node-addon-api": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+      "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="
+    },
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -8761,11 +9034,44 @@
         }
       }
     },
+    "node-pre-gyp": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz",
+      "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==",
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.3",
+        "needle": "^2.5.0",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4.4.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
     "node-releases": {
       "version": "1.1.61",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
       "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="
     },
+    "nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "requires": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      }
+    },
     "normalize-package-data": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -8808,6 +9114,29 @@
         "sort-keys": "^1.0.0"
       }
     },
+    "npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "requires": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+    },
+    "npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -8816,6 +9145,17 @@
         "path-key": "^2.0.0"
       }
     },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
     "nth-check": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -8829,6 +9169,11 @@
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
       "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
     },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
     "nwsapi": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
@@ -9157,11 +9502,25 @@
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
     },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
     "p-each-series": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
@@ -10655,6 +11014,24 @@
         }
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        }
+      }
+    },
     "react": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
@@ -11113,6 +11490,11 @@
       "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
       "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
     },
+    "regexp-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz",
+      "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
+    },
     "regexp.prototype.flags": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
@@ -11307,6 +11689,27 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "requires": {
+        "resolve-from": "^2.0.0",
+        "semver": "^5.1.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        }
+      }
+    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -11540,6 +11943,15 @@
       "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-10.0.0.tgz",
       "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg=="
     },
+    "saslprep": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz",
+      "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==",
+      "optional": true,
+      "requires": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
     "sass-loader": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
@@ -11851,6 +12263,11 @@
         "object-inspect": "^1.8.0"
       }
     },
+    "sift": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz",
+      "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g=="
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -11898,6 +12315,11 @@
         }
       }
     },
+    "sliced": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+      "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -12095,6 +12517,15 @@
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
     },
+    "sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=",
+      "optional": true,
+      "requires": {
+        "memory-pager": "^1.0.2"
+      }
+    },
     "spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -12668,6 +13099,44 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
     },
+    "tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "fs-minipass": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+          "requires": {
+            "minipass": "^2.6.0"
+          }
+        },
+        "minipass": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        }
+      }
+    },
     "terser": {
       "version": "4.8.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
@@ -13907,6 +14376,43 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",

server/client/package.json

@@ -8,6 +8,7 @@
     "@testing-library/user-event": "^7.2.1",
     "@toast-ui/react-calendar": "^1.0.5",
     "axios": "^0.20.0",
+    "bcrypt": "^5.0.0",
     "bootstrap": "^4.5.2",
     "formik": "^2.1.5",
     "jquery": "^3.5.1",
@@ -27,7 +28,6 @@
     "eject": "react-scripts eject",
     "proxy": "http://localhost:3030"
   },
-  "proxy": "http://localhost:3030",
   "eslintConfig": {
     "extends": "react-app"
   },
@@ -42,5 +42,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+  "proxy": "http://localhost:3030"
 }

server/client/src/App.css

-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

server/client/src/App.js

-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
-
-function App() {
-  return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
-  );
-}
-
-export default App;

server/client/src/Components/Menu.js

 import React, { useState, useEffect } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, Redirect } from 'react-router-dom';
 import styled from 'styled-components';
 
 const Nav = styled.nav`
-    background-color: #981e1e;
+    background-color: #7B031D;
+    height: 6vh;
+
+    a {
+        color: #ffffff;
+    }
+
+    & .logoutBtn:hover {
+        text-decoration: underline;
+    }
 `
 
 function Menu() {
+    const [state, setState] = useState()
+    const name = localStorage.getItem('name');
+
+    if (state) return <Redirect to="/" />;
+
+    function logout() {
+        localStorage.clear();
+        alert("로그아웃 되었습니다.");
+        setState(true);
+    }
+
     return (
         <Nav className="navbar sticky-top navbar-expand-md">
-            <Link to="/home" className="navbar-brand">대관 서비스</Link>
+            <a class="navbar-brand" href="#">대관 서비스</a>
             <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">
+            <div className="collapse navbar-collapse justify-content-between" id="collapsibleNavbar">
                 <ul className="navbar-nav">
+                    <li className="nav-item">
+                        <Link to="/notice" className="nav-link">공지사항</Link>
+                    </li>
                     <li className="nav-item">
                         <Link to="/home" className="nav-link">대관 현황</Link>
                     </li>
                     <li className="nav-item">
-                        <Link to="/apply" className="nav-link">대관 신청</Link>
+                        <Link to={{
+                            pathname: `/apply/${localStorage.getItem('_id')}`,
+                            state: { id: localStorage.getItem('_id') },
+                        }} className="nav-link">대관 신청</Link>
                     </li>
                     <li className="nav-item">
-                        <Link to="/check" className="nav-link">대관 확인/취소</Link>
+                        <Link to={{
+                            pathname: `/check/${localStorage.getItem('_id')}`,
+                            state: { id: localStorage.getItem('_id') },
+                        }} className="nav-link">
+                            대관 확인/취소</Link>
                     </li>
                     <li className="nav-item">
-                        <Link to="/notice" className="nav-link">공지사항</Link>
+                        <Link to={{
+                            pathname: `/acheck/${localStorage.getItem('_id')}`,
+                            state: { id: localStorage.getItem('_id') },
+                        }} className="nav-link">
+                            대관 확인/취소(관리자)</Link>
                     </li>
-
                 </ul>
+                <div className="h-100 mr-3">
+                    <div className="text-white text-right font-weight-light"><small>{name}님 안녕하세요</small></div>
+                    <div className="text-white text-right font-weight-light"><small>
+                        <Link to={{
+                            pathname: `/change/${localStorage.getItem('_id')}`,
+                            state: { id: localStorage.getItem('_id') },
+                        }}>비밀번호 변경</Link> / <span className="logoutBtn" onClick={logout} >로그아웃</span></small></div>
+                </div>
             </div>
         </Nav>
     )

server/client/src/Components/PrivateRoute.js

+import React from 'react';
+import { Redirect, Route } from "react-router-dom";
+
+export const PrivateRoute = ({ component: Component, ...rest }) => (
+  <Route
+    {...rest}
+    render={props =>
+      (localStorage.getItem("token") !==null) ? (
+        <Component {...props} />
+      ) : (
+          <Redirect to={{ 
+            pathname: "/login",
+            state: {match: props.location}
+           }} />
+        )
+    }
+  />
+)
\ No newline at end of file

server/client/src/Pages/ACheckPage.js

+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+import axios from 'axios';
+import { Link, Redirect } from 'react-router-dom';
+import 'bootstrap/dist/css/bootstrap.css';
+
+function ACheck(props) {
+  const [state, setState] = useState()
+  const [reserve, setReserve] = useState([]);
+  useEffect(() => {
+    getReserve(); 
+  }, [])
+
+  function getReserve() {
+    axios.get(`/users/admin/${props.match.params.id}`, { 
+       headers: { authorization: localStorage.getItem('token') },
+    })
+      .then(res => {
+        if (res.status === 404) {
+          alert(res.data.error)
+          setState(true);
+        }
+        console.log(res.data);
+        setReserve(res.data);
+      })
+      .catch(err => {
+        alert(err.error)
+      });
+  }
+  if (state) return <Redirect to="/home" />;
+
+  function remove(index) {
+    axios.delete(`/reserves/${reserve[index]._id}`)
+      .then(res => {
+        if (res.status === 404) return alert(res.data.error)
+        alert("삭제되었습니다!");
+        getReserve();
+      })
+      .catch(err => {
+        alert(err.error)
+      });
+  };
+
+  function admit(index) {
+    axios.put(`/reserves/${reserve[index]._id}`)
+      .then(res => {
+        if (res.status === 404) return alert(res.data.error)
+        alert("승인되었습니다!");
+        getReserve();
+      })
+      .catch(err => {
+        alert(err.error)
+      });
+  };
+
+  return (
+    <div>
+      <Menu />
+      <div className="">
+        <table className="table">
+          <thead>
+            <tr>
+              <th>대표자</th>
+              <th>날짜</th>
+              <th>시간</th>
+              <th>강의실</th>
+              <th>사용인원</th>
+              <th>승인여부</th>
+            </tr>
+          </thead>
+          <tbody>
+            {reserve.map((reserve, index) => {
+              return (
+                <tr key={index}>
+                  <td>{reserve.user.name}</td>
+                  <td>{reserve.date}</td>
+                  <td>{reserve.time}</td>
+                  <td>{reserve.room}</td>
+                  <td>{reserve.num}</td>
+                  <td>
+                    <button onClick={() => admit(index)} className="btn btn-primary">
+                      승인
+                    </button>
+                    <button onClick={() => remove(index)} className="btn btn-danger">
+                      거절
+                    </button>
+                  </td>
+                </tr>
+              )
+            })}
+          </tbody>
+        </table>
+
+      </div>
+    </div>
+  )
+}
+
+export default ACheck
\ No newline at end of file

server/client/src/Pages/ApplyPage.js

 import React, { useState, useEffect } from 'react';
+import { Formik, Field, ErrorMessage, FieldArray } from 'formik';
 import Menu from '../Components/Menu';
+import axios from 'axios';
+import 'bootstrap/dist/css/bootstrap.css';
+import * as Yup from 'yup';
+import { Redirect } from 'react-router-dom';
+
+function Apply(props) {
+    const [state, setState] = useState();
+    const [user, setUser] = useState({ name: "" });
+
+    useEffect(() => {
+        getUser();
+    }, [])
+
+    if (state) {
+        return <Redirect to={{
+            pathname: `/check/${props.match.params.id}`,
+            state: { id: props.match.params.id },
+        }} />;
+    }
+
+    function time(starttime) {
+            console.log(starttime)
+            if (starttime == 21) {
+                return (<Field as="select" name="usetime">
+                    <option value="">이용시간을 선택하세요</option>
+                    <option value="1">1시간</option>
+                </Field>)
+            }
+            if (starttime == 20) {
+                return (<Field as="select" name="usetime">
+                    <option value="">이용시간을 선택하세요</option>
+                    <option value="1">1시간</option>
+                    <option value="2">2시간</option>
+                </Field>)
+            }
+            return (<Field as="select" name="usetime">
+                <option value="">이용시간을 선택하세요</option>
+                <option value="1">1시간</option>
+                <option value="2">2시간</option>
+                <option value="3">3시간</option>
+            </Field>)
+        
+    }
+
+    function getUser() {
+        axios.get(`/users/${props.match.params.id}`, {
+            headers: { authorization: localStorage.getItem('token') },
+        })
+            .then(res => {
+                if (res.status !== 201) {
+                    alert(res.data.error);
+                }
+                console.log(res.data);
+                setUser(res.data);
+            })
+            .catch(err => {
+                alert(err.error)
+            });
+    }
 
-function Apply() {
     return (
         <div>
             <Menu />
-            <div className="container">apply
-            </div>
+            <Formik
+                initialValues={{
+                    _id: `${props.match.params.id}`,
+                    date: '',
+                    starttime: '',
+                    usetime: '',
+                    room: '',
+                    reason: '',
+                    students: [
+                        {
+                            member: '',
+                        },
+                    ],
+                }}
+                validationSchema={Yup.object({
+                    date: Yup.string()
+                        .required('날짜를 입력해주세요.'),
+                    room: Yup.string()
+                        .required('강의실 번호를 입력해주세요.'),
+                    reason: Yup.string()
+                        .required('대관목적을 입력해주세요.'),
+                })}
+                onSubmit={(values, { setSubmitting }) => {
+                    console.log(values)
+                    axios({
+                        method: 'post',
+                        url: '/reserves',
+                        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,
+                    values,
+                    handleSubmit,
+                    getFieldProps,
+                    isSubmitting,
+                }) => (
+                        <div className="row justify-content-center align-items-center">
+                            <form onSubmit={handleSubmit} className="col-sm-3">
+                                <div className="form-group mb-4">
+                                    <label>대표자</label>
+                                    <div>{user.name}</div>
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>신청날짜</label>
+                                    <input
+                                        className={(touched.date && errors.date ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="date"
+                                        {...getFieldProps('date')}
+                                        placeholder="yyyy-mm-dd"
+                                    />
+                                    {touched.date && errors.date ? (
+                                        <div className="invalid-feedback text-left">{errors.date}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>이용시작시간</label>
+                                    <Field as="select" name="starttime">
+                                        <option value="">이용시작시간</option>
+                                        <option value="9">9시</option>
+                                        <option value="10">10시</option>
+                                        <option value="11">11시</option>
+                                        <option value="12">12시</option>
+                                        <option value="13">13시</option>
+                                        <option value="14">14시</option>
+                                        <option value="15">15시</option>
+                                        <option value="16">16시</option>
+                                        <option value="17">17시</option>
+                                        <option value="18">18시</option>
+                                        <option value="19">19시</option>
+                                        <option value="20">20시</option>
+                                        <option value="21">21시</option>
+                                    </Field>
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>이용시간</label>
+                                    {time(values.starttime)}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>강의실</label>
+                                    <input
+                                        className={(touched.room && errors.room ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="room"
+                                        {...getFieldProps('room')}
+                                        placeholder="bn-nnn"
+                                    />
+                                    {touched.room && errors.room ? (
+                                        <div className="invalid-feedback text-left">{errors.room}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>대관목적</label>
+                                    <input
+                                        className={(touched.reason && errors.reason ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="reason"
+                                        {...getFieldProps('reason')}
+                                        placeholder="대관목적을 입력해 주세요."
+                                    />
+                                    {touched.reason && errors.reason ? (
+                                        <div className="invalid-feedback text-left">{errors.reason}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <FieldArray name="students">
+                                        {({ insert, remove, push }) => (
+                                            <div>
+                                                <label>이용자</label>
+                                                {
+                                                    values.students.map((student, index) => (
+                                                        <div className="row" key={index}>
+                                                            <div className="col">
+                                                                <Field
+                                                                    name={`students.${index}.member`}
+                                                                    placeholder="이용자 성함을 입력하세요."
+                                                                    type="text"
+                                                                />
+                                                                <ErrorMessage
+                                                                    name={`friends.${index}.name`}
+                                                                    component="div"
+                                                                    className="field-error"
+                                                                />
+                                                                <button
+                                                                    type="button"
+                                                                    className="secondary"
+                                                                    onClick={() => remove(index)}
+                                                                >
+                                                                    X
+                                                                        </button>
+
+                                                            </div>
+                                                        </div>
+                                                    ))}
+                                                <button
+                                                    type="button"
+                                                    className="btn btn-primary"
+                                                    onClick={() => push({ member: '' })}
+                                                >
+                                                    추가
+                                                </button>
+                                            </div>
+                                        )}
+                                    </FieldArray>
+                                </div>
+                                <button type="submit" className="btn btn-dark" disabled={isSubmitting}>
+                                    신청하기
+                                </button>
+                            </form>
+                        </div>
+                    )}
+            </Formik>
         </div>
     )
 }

server/client/src/Pages/ChangePage.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 Change(props) {
+  const [state, setState] = useState();
+  if (state) {
+  return <Redirect to="/" />;
+  }
+  console.log(props)
+
+  return (
+    <div className="d-flex flex-column justify-content-between vh-100">
+      <Formik
+        initialValues={{ password: '' }}
+        validationSchema={Yup.object({
+          password: Yup.string()
+            .required('비밀번호를 입력해주세요.')
+            .min(8, '8자 이상 입력해주세요.'),
+          password2: Yup.string()
+            .required('비밀번호를 다시 입력해주세요.')
+            .min(8, '8자 이상 입력해주세요.')
+            .oneOf([Yup.ref("password"), null], '비밀번호가 일치하지 않습니다.'),
+        })}
+        onSubmit={(values, { setSubmitting }) => {
+          axios.put(`/users/change/${props.location.state.id}`, { ...values },
+          )
+            .then(res => {
+              console.log(res.data);
+              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.password && errors.password ? 'form-control is-invalid' : "form-control")}
+                    type="password"
+                    name="password"
+                    {...getFieldProps('password')}
+                    placeholder="새 비밀번호를 입력해주세요."
+                  />
+                  {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="새 비밀번호를 다시 입력해주세요."
+                  />
+                  {touched.password2 && errors.password2 ? (
+                    <div className="invalid-feedback text-left">{errors.password2}</div>
+                  ) : null}
+                </div>
+                <button type="submit" className="btn btn-light" disabled={isSubmitting}>저장</button>
+              </form>
+            </div>
+          )}
+      </Formik>
+    </div >
+  );
+}
+
+
+export default Change;

server/client/src/Pages/CheckPage.js

 import React, { useState, useEffect } from 'react';
 import Menu from '../Components/Menu';
+import axios from 'axios';
+import 'bootstrap/dist/css/bootstrap.css';
+
+function Check(props) {
+    const [reserve, setReserve] = useState([]);
+    useEffect(() => {
+        getReserve();
+    }, [])
+
+    function getReserve() {
+        axios.get(`/reserves/${props.match.params.id}`, {
+            headers: { authorization: localStorage.getItem('token') },
+        })
+            .then(res => {
+                if (res.status !== 201) {
+                    alert(res.data.error);
+                }
+                console.log(res.data);
+                setReserve(res.data);
+            })
+            .catch(err => {
+                alert(err.error)
+            });
+    }
+    function remove(index) {
+        axios.delete(`/reserves/${reserve[index]._id}`)
+            .then(res => {
+                if (res.status === 404) return alert(res.data.error)
+                alert("삭제되었습니다!");
+                getReserve();
+            })
+            .catch(err => {
+                alert(err.error)
+            });
+    };
 
-function Check() {
     return (
         <div>
             <Menu />
-            <div className="container">check
+            <div className="">
+                <table className="table">
+                    <thead>
+                        <tr>
+                            <th>날짜</th>
+                            <th>시간</th>
+                            <th>강의실</th>
+                            <th>사용인원</th>
+                            <th>승인여부</th>
+                            <th>예약취소</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {reserve.map((reserve, index) => {
+                            return (
+                                <tr key={index}>
+                                    <td>{reserve.date}</td>
+                                    <td>{reserve.starttime}시~{(Number(reserve.starttime) + reserve.usetime)}시</td>
+                                    <td>{reserve.room}</td>
+                                    <td>{reserve.num}</td>
+                                    <td>{reserve.approve ? "승인" : "미승인"}</td>
+                                    <td>
+                                        <button onClick={() => remove(index)} className="btn btn-danger">
+                                            취소
+                                        </button>
+                                    </td>
+                                </tr>
+                            )
+                        })}
+                    </tbody>
+                </table>
+
             </div>
         </div>
     )
 }
 
-export default Check
+export default Check
\ No newline at end of file

server/client/src/Pages/FindPage.js

+import React, { useState } from 'react';
+import { Field, 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 Find() {
+    const [state, setState] = useState();
+
+    if (state) {
+        return <Redirect to={{
+            pathname: `/change/${localStorage.getItem('_id')}`,
+            state: { id: localStorage.getItem('_id') },
+        }} />;
+    }
+
+    return (
+        <div className="d-flex flex-column justify-content-between vh-100">
+            <Formik
+                initialValues={{ id: '', question: '', answer: '' }}
+                validationSchema={Yup.object({
+                    id: Yup.string()
+                        .required('학번을 입력해주세요.'),
+                    answer: Yup.string()
+                        .required('답변을 입력해주세요.'),
+                })}
+                onSubmit={(values, { setSubmitting }) => {
+                    axios({
+                        method: 'post',
+                        url: '/login/find',
+                        data: values,
+                    }).then(res => {
+                        if (res.status === 404) return alert(res.data.error)
+                        localStorage.setItem('_id', res.data.users._id)
+                        setState(true);
+                    })
+                        .catch(err => {
+                            alert(err.error)
+                        });
+
+                    console.log(values);
+                    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.id && errors.id ? 'form-control is-invalid' : "form-control")}
+                                        type="number"
+                                        name="id"
+                                        {...getFieldProps('id')}
+                                        placeholder="Input Student Id"
+                                    />
+                                    {touched.id && errors.id ? (
+                                        <div className="invalid-feedback text-left">{errors.id}</div>
+                                    ) : null}
+                                </div>
+                                <div className="form-group mb-4">
+                                    <label>본인 확인 질문</label>
+                                    <Field as="select" name="question">
+                                        <option value="">질문을 선택하세요</option>
+                                        <option value="life">자신의 인생 좌우명은?</option>
+                                        <option value="school">자신이 다녔던 초등학교의 이름은?</option>
+                                        <option value="place">기억에 남는 추억의 장소는?</option>
+                                    </Field>
+                                </div>
+                                <div className="form-group mb-4">
+                                    <input
+                                        className={(touched.answer && errors.answer ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="answer"
+                                        {...getFieldProps('answer')}
+                                        placeholder="Input answer" />
+                                    {touched.answer && errors.answer ? (
+                                        <div className="invalid-feedback text-left">{errors.answer}</div>
+                                    ) : null}
+                                </div>
+                                <button type="submit" className="btn btn-dark" disabled={isSubmitting}>
+                                    submit
+                                    </button>
+                                <button><Link to="/login">로그인</Link></button>
+                                <button><Link to="/">홈</Link></button>
+                            </form>
+                        </div>
+                    )}
+            </Formik>
+        </div>
+    );
+}
+
+
+export default Find;

server/client/src/Pages/LoginPage.js

-import React, { } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom';
+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`
+const Asd = styled.div`
     background-color: #7B031D;
+
+    &.web {
+        display : flex;
+        align-items: center;
+    }
+
+    &.mobile {
+        height : 20vh;
+        display : flex;
+        padding:0;
+    }
+    
+    & .mob-head {
+        display: flex;
+        flex-direction: row;
+        height : 100%;
+        width: 100%;
+        justify-content: space-evenly;
+
+    }
+
+    & .mob-img {
+        max-width: 30vw;
+    }
 `
-const Logo = styled.div`
+
+const Asdf = styled.div`
     background-color: rgb(239, 218, 200);
+    a {
+        color : #7B031D;
+    }
+
+    &.mob-formik {
+        height : 80vh;
+        width: 100%;
+        display: flex; 
+        justify-content: center;
+        align-items: center; 
+    }
+
+    &.web-formik {
+        height: 100%;
+        display: flex; 
+        align-items: center; 
+        justify-content: center;
+    }
+
+    & .mobb {
+        height: 35vh;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+    }
+
+    & .webb {
+        flex-direction: column;
+    }
+
+    & .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;
+        flex-direction: column;
+        display: flex;
+    }
+
+    & .mob-input-form {
+      
+    }
 `
 
 function Login() {
+    const [state, setState] = useState(false);
+    const [mobile, setMobile] = useState(false);
+
+    useEffect(() => {
+        if (window.innerWidth < 960) {
+            setMobile(true)
+        } else {
+            setMobile(false)
+        }
+    }, []);
+
+    if (state) {
+        return <Redirect to="/home" />;
+    }
     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">
+        <div className="row vw-100 vh-100 m-0">
+            <Asd className={"col-md-4 col-12" + (mobile ? " mobile" : " web")}>
+                <div className={mobile ? "mob-head" : ""}>
+                    <img className={mobile ? "mob-img" : "img-fluid"} src={Logo} />
+                    <div className={"d-flex " + (mobile ? "align-items-center" : "justify-content-center")}>
+                        <h1 className="font-weight-bold text-white text-center">고려대학교<br/>대관 서비스</h1>
+                    </div>
+                </div>
+            </Asd>
+            <Asdf className={"col-md-8 col-12" + (mobile ? " mob-formik p-0" : " web-formik")}>
+                <Formik
+                    initialValues={{ id: '', password: '' }}
+                    validationSchema={Yup.object({
+                        id: Yup.string()
+                            .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)
+
+                            localStorage.setItem('token', res.data.token);
+                            localStorage.setItem('_id', res.data.users._id);
+                            localStorage.setItem('name', res.data.users.name);
+                            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,
+                    }) => (
+                            <form onSubmit={handleSubmit} className={mobile ? "w-75 h-50vh" : "d-flex webb"}>
+                                <div className={mobile ? "mobb" : "qwer"}>
+                                    <div className={(mobile ? "mob-" : "web-") + "input-form"}>
+                                        <div className={"form-group m-0" + (mobile ? " mb-2" : "")}>
                                             <input
-                                                className={(touched.email && errors.email ? 'form-control is-invalid' : "form-control")}
-                                                type="email"
-                                                name="email"
-                                                {...getFieldProps('email')}
-                                                placeholder="Input Email"
+                                                className={(touched.id && errors.id ? 'form-control is-invalid' : "form-control")}
+                                                type="number"
+                                                name="id"
+                                                {...getFieldProps('id')}
+                                                placeholder="Input Student Id"
                                             />
-                                            {touched.email && errors.email ? (
-                                                <div className="invalid-feedback text-left">{errors.email}</div>
-                                            ) : null}
                                         </div>
-                                        <div className="form-group mb-4">
+                                        <div className="form-group m-0">
                                             <input
                                                 className={(touched.password && errors.password ? 'form-control is-invalid' : "form-control")}
                                                 type="password"
@@ -81,26 +172,20 @@ function Login() {
                                                 {...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>
+                                    <button type="submit" className={"btn btn-dark" + (mobile ? " w-100" : " w-20")} disabled={isSubmitting}> Login </button>
                                 </div>
-                            )}
-                    </Formik>
 
-                </Log>
-            </div>
-        </div>
+                                <div><Link to="/find">비밀번호를 잊으셨나요?</Link></div>
+                                <div><Link to="/signup">회원이 아니신가요?</Link></div>
+
+                            </form>
+                        )}
+
+                </Formik>
+            </Asdf>
+        </div >
     )
 }
 

server/client/src/Pages/NoticePage.js

-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Menu from '../Components/Menu';
+import axios from 'axios';
+import styled from 'styled-components';
 
 function Notice() {
+    const [notices, setNotices] = useState([]);
+
+    useEffect(() => {
+        getNotice();
+    }, []);
+
+    function dateForm(day) {
+        const post_day = new Date(day);
+        let year = post_day.getFullYear();
+        let month = post_day.getMonth() + 1;
+        let date = post_day.getDate();
+
+        month = month < 10 ? '0' + month : month;
+        date = date < 10 ? '0' + date : date;
+
+        const new_date = year + "-" + month + "-" + date;
+        return new_date
+    }
+
+    function getNotice() {
+        axios.get(`/notices`)
+            .then(res => {
+                if (res.status !== 201) {
+                    alert(res.data.error);
+                }
+                console.log(res.data);
+                setNotices(res.data);
+            })
+            .catch(err => {
+                alert(err.error)
+            });
+    }
     return (
         <div>
             <Menu />
-            <div className="container">notice
-            </div>
+            <div className="container-fluid">
+                <div className="row justify-content-center vw-100 vh-90">
+                    <div className="col-md-7 col-12">
+
+                        <h2 className="p-3 border-bottom">공지사항</h2>
+
+                        <div id="accordion w-90 pt-1">
+                            {notices.map((notice, index) =>
+                                <div className="card">
+                                    <div className="card-header collapsed card-link w-100 row m-0 p-1" id={"Hnotice_" + index} data-toggle="collapse" href={"#notice_" + index}>
+                                        <div>
+                                            <div className="col-6 p-0">{notice.notice_title}</div>
+                                            <div className="col-3 p-0 text-center">{notice.notice_author}</div>
+                                            <div className="col-3 p-0 text-right">{dateForm(notice.post_date)}</div>
+                                        </div>
+                                    </div>
+                                    <div id={"notice_" + index} aria-labelledby={"Hnotice_" + index} className="collapse" data-parent="#accordion">
+                                        <div className="card-body">{notice.notice_content}</div>
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+
+                    </div>
+                </div >
+            </div >
         </div>
     )
 }

server/client/src/Pages/SignupPage.js

 import React, { useState } from 'react';
-import { Formik } from 'formik';
+import { Field, 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';
+import styled from 'styled-components';
+
+const Nav = styled.nav`
+    background-color: #7B031D;
+    height: 10vh;
+
+    a {
+        color: #ffffff;
+    }
+`
+
+const Wow = styled.div`
+    height: 90vh;
+
+    & #reCheck::after {
+        content: '비밀번호를 다시 입력하세요';
+    }
+
+    & #reCheck:not(.right) {
+        content: '비밀번호가 다릅니다.';
+        color: red;
+    }
+
+    & .asd {
+        display: flex;
+        flex-direction: column;
+    }
+`
 
 function Signup() {
-    //   const [state, setState] = useState(false);
+    const [state, setState] = useState(false);
+    const [checkPw, setCheckPw] = useState(true);
 
-    //   if (state) {
-    //     return <Redirect to="/login" />;
-    //   }
+    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>
+        <div className="vh-100">
+            <Nav className="navbar sticky-top navbar-expand-md">
+                <a class="navbar-brand" href="#">회원가입</a>
+            </Nav>
+            <div className="container-fluid">
+                <Wow className="row justify-content-center rrooww">
+                    <div className="col-md-4 col-12 d-flex align-items-center h-100">
+                        <Formik
+                            initialValues={{ name: '', id: '', password: '', password2: '', question: '', answer: '' }}
+                            validationSchema={Yup.object({
+                                name: Yup.string()
+                                    .required('이름을 입력해주세요.'),
+                                id: Yup.string()
+                                    .required('학번을 입력해주세요.'),
+                                password: Yup.string()
+                                    .required('비밀번호를 입력해주세요.')
+                                    .min(8, '8자 이상 입력해주세요.'),
+                                password2: Yup.string()
+                                    .required('비밀번호를 다시 입력해주세요.')
+                                    .min(8, '8자 이상 입력해주세요.')
+                                    .oneOf([Yup.ref("password"), null], '비밀번호가 일치하지 않습니다.'),
+                                answer: 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,
+                            }) => (
+                                    < form onSubmit={handleSubmit} className="asd">
+                                        {/* col-sm-3 */}
+
+                                        <div className="form-group ">
+                                            {/*  mb-4 */}
+                                            <div className={touched.name && errors.name ? "text-danger" : ""}>이름을 입력하세요</div>
+                                            <input
+                                                className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
+                                                type="text"
+                                                name="name"
+                                                {...getFieldProps('name')}
+                                                placeholder="이름" />
+                                        </div>
+                                        <div className="form-group">
+                                            {/*  mb-4 */}
+                                            <div className={touched.id && errors.id ? "text-danger" : ""}>학번을 입력하세요</div>
+
+                                            <input
+                                                className={(touched.id && errors.id ? 'form-control is-invalid' : "form-control")}
+                                                type="text"
+                                                name="id"
+                                                {...getFieldProps('id')}
+                                                placeholder="학번/교번"
+                                            />
+                                            {/* {touched.id && errors.id ? (
+                                                    <div className="invalid-feedback text-left">{errors.id}</div>
+                                                ) : null} */}
+                                        </div>
+                                        <div className="form-group">
+                                            {/*  mb-4 */}
+                                            <div className={touched.password && errors.password ? "text-danger" : ""}>비밀번호를 입력하세요(8자리 이상)</div>
+
+                                            <input
+                                                className={(touched.password && errors.password ? 'form-control is-invalid' : "form-control")}
+                                                type="password"
+                                                name="password"
+                                                {...getFieldProps('password')}
+                                                placeholder="비밀번호"
+                                            />
+                                            {/* {touched.password && errors.password ? (
+                                                    <div className="invalid-feedback text-left">{errors.password}</div>
+                                                ) : null} */}
+                                        </div>
+                                        <div className="form-group">
+                                            {/*  mb-4 */}
+                                            {touched.password2 && errors.password2 ? setCheckPw(false) : null}
+                                            <div id="reCheck" className={checkPw ? "right" : "err"}></div>
+                                            <input
+                                                className={touched.password2 && errors.password2 ? "form-control is-invalid" : "form-control"}
+                                                type="password"
+                                                name="password2"
+                                                {...getFieldProps('password2')}
+                                                placeholder="비밀번호 확인"
+                                            />
+
+                                        </div>
+                                        <div className="form-group">
+                                            {/*  mb-4 */}
+                                            <label>본인 확인 질문</label>
+                                            <Field as="select" name="question">
+                                                <option value="">질문을 선택하세요</option>
+                                                <option value="life">자신의 인생 좌우명은?</option>
+                                                <option value="school">자신이 다녔던 초등학교의 이름은?</option>
+                                                <option value="place">기억에 남는 추억의 장소는?</option>
+                                            </Field>
+                                        </div>
+                                        <div className="form-group">
+                                            {/*  mb-4 */}
+                                            <div className={touched.answer && errors.answer ? "text-danger" : ""}>답변을 입력해주세요.</div>
+
+                                            <input
+                                                className={(touched.answer && errors.answer ? 'form-control is-invalid' : "form-control")}
+                                                type="text"
+                                                name="answer"
+                                                {...getFieldProps('answer')}
+                                                placeholder="Input answer" />
+                                        </div>
+                                        <button type="submit" className="btn btn-dark" disabled={isSubmitting}>회원가입</button>
+                                        <button class="btn btn-light"><Link to="/login">로그인</Link></button>
+                                        <button class="btn btn-light"><Link to="/">홈</Link></button>
+                                    </form>
+                                )}
+                        </Formik>
+                    </div>
+                </Wow>
+            </div>
+        </div >
+
     );
 }
 

server/client/src/index.css

-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
\ No newline at end of file

server/client/src/index.js

@@ -4,23 +4,39 @@ import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-d
 import * as serviceWorker from './serviceWorker';
 import 'bootstrap';
 import 'bootstrap/dist/css/bootstrap.css';
+import axios from 'axios';
+import { PrivateRoute } from './Components/PrivateRoute';
 
 import Login from './Pages/LoginPage';
 import Home from './Pages/HomePage';
 import Signup from './Pages/SignupPage';
+import Find from './Pages/FindPage';
+import Change from './Pages/ChangePage';
 import Apply from './Pages/ApplyPage';
 import Check from './Pages/CheckPage';
 import Notice from './Pages/NoticePage';
+import ACheck from './Pages/ACheckPage';
+
+axios.defaults.validateStatus = function (status) {
+  return status < 500; // default
+}
 
 ReactDOM.render(
 <Router>
     <Switch>
-      <Route exact path="/" component={Login} />
+      <PrivateRoute exact path="/" component={Home} />
+      <Route path="/login" component={Login} />
       <Route path="/home" component={Home} />
       <Route path="/signup" component={Signup} />
-      <Route path="/apply" component={Apply} />
-      <Route path="/check" component={Check} />
+      <Route path="/find" component={Find} />
+      <Route path="/change" component={Change} />
+      <Route path="/apply/:id" component={Apply} />
+      <Route path="/check/:id" component={Check} />
       <Route path="/notice" component={Notice} />
+      <Route path="/acheck/:id" component={ACheck} />
+      <Redirect path="/" to="/" />
+      <Redirect path="/home" to="/" />
+      <Redirect path="/change/:id" to="/change"/>
     </Switch>
   </Router>,
   document.getElementById('root')

server/client/src/logo.svg

-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>