From 2e9e6170c8602ed44f68a2fb998725599afd5190 Mon Sep 17 00:00:00 2001
From: "Yoon, Daeki" <dowellware@gmail.com>
Date: Fri, 6 Nov 2020 16:51:27 +0900
Subject: [PATCH] express helmet

---
 server/express.js         |  5 +++--
 server/routes/index.js    |  7 ++++---
 server/routes/reserves.js | 25 +++++++++++--------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/server/express.js b/server/express.js
index 7af7c3e..f4ff06c 100644
--- a/server/express.js
+++ b/server/express.js
@@ -16,10 +16,11 @@ const app = express()
 
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: true }))
-app.use(helmet())
+// app.use(helmet())
 app.use(cors())
 
-app.use('/dist', express.static(path.join(CURRENT_WORKING_DIR, 'dist')))
+console.log('path=', path.join(CURRENT_WORKING_DIR, 'client', 'build'))
+app.use('/', express.static(path.join(CURRENT_WORKING_DIR, 'client', 'build')))
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter, reservesRouter);
diff --git a/server/routes/index.js b/server/routes/index.js
index 0cf80af..685bb2d 100644
--- a/server/routes/index.js
+++ b/server/routes/index.js
@@ -4,8 +4,9 @@ const User = require('../models/user');
 const router = express.Router();
 
 /* GET home page. */
-// router.get('/', function(req, res, next) {
-//   res.render('index', { title: 'Express' });
-// });
+router.get('/', function(req, res, next) {
+  console.log('index router');
+  res.send("hello")
+});
 
 module.exports = router;
\ No newline at end of file
diff --git a/server/routes/reserves.js b/server/routes/reserves.js
index 52707c8..13006e6 100644
--- a/server/routes/reserves.js
+++ b/server/routes/reserves.js
@@ -82,20 +82,17 @@ router.get('/room/:room', function (req, res, next) {
 
 router.get('/:_id', verifyToken, function (req, res, next) {
   console.log('/reserves get req.params', req.params)
-  Reserve.find({ user: req.params._id }, function (err, reserve) {
-    if (err) return res.status(500).json({ error: err });
-    // console.log(reserve, Date.now())
-    const reserves = reserve.map(item => (
-      new Date(item.end) >= Date.now() ? item : ""
-    ));
-
-    if (!reserves) {
-      console.log("no신청")
-      res.status(404).json({ error: "신청내역이 없습니다." })
-    }
-    console.log("reserves", reserves)
-    res.status(201).json(reserves);
-  })
+  Reserve.find({ user: req.params._id }).sort({date: 0})
+      .then((reserve) => {
+          const reserves = reserve.map(item => (
+              new Date(item.end) >= Date.now() ? item : ""
+          ));
+          console.log("reserves", reserves)
+          res.status(201).json(reserves);
+      })
+      .catch((err) => {
+          res.status(500).json({ error: err });
+      })
 });
 
 router.get('/admin/:_id', verifyToken, function (req, res, next) {
-- 
GitLab