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

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>

server/routes/index.js

-var express = require('express');
-var router = express.Router();
+const express = require('express');
+const User = require('../schemas/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) {
+//   res.render('index', { title: 'Express' });
+// });
 
 module.exports = router;

server/routes/login.js

+const express = require('express');
+const User = require('../schemas/user');
+const bcrypt = require("bcrypt");
+const jwt = require('jsonwebtoken');
+const user = require('../schemas/user');
+
+const router = express.Router();
+
+router.get('/', function (req, res, next) {
+    console.log('/login get request', req.body)
+    User.find({})
+        .then((signups) => {
+            res.json(signups);
+        })
+        .catch((err) => {
+            console.error(err);
+            next(err);
+        });
+});
+
+router.post('/', function (req, res, next) {
+    console.log('/login post request', req.body)
+    User.findOne({ id: req.body.id }, 'id password name', function (err, users) {
+        if (err) return res.status(500).json({ error: err });
+
+        if (!users) {
+            return res.status(404).json({ error: '해당 학번이 존재하지 않습니다.' });
+        }
+
+        bcrypt.compare(req.body.password, users.password, function (err, result) {
+            if (err) {
+                console.log(err)
+                return res.status(500).json({ error: err });
+            }
+
+            if (result) {
+                const token = jwt.sign({
+                    id: users.id,
+                }, process.env.JWT_SECRET, {
+                    expiresIn: '1m',
+                });
+                return res.status(201).json({
+                    token,
+                    users,
+                });
+            }
+            res.status(404).json({ error: '비밀번호를 다시 입력해주세요.' });
+        });
+
+    })
+});
+
+router.post('/find', function (req, res, next) {
+    console.log('/find post request', req.body)
+    User.findOne({ id: req.body.id }, 'id question answer', function (err, users) {
+        if (err) return res.status(500).json({ error: err });
+
+        if (!users) return res.status(404).json({ error: '해당 학번이 존재하지 않습니다.' });
+        
+        if (users.question === req.body.question) {
+            if (users.answer === req.body.answer) {
+                return res.status(201).json({users});
+            }
+            return res.status(404).json({ error: '답변이 일치하지 않습니다.'});
+        }
+        return res.status(404).json({error: '질문을 다시 선택해주세요.'});
+    })
+});
+module.exports = router;

server/routes/middlewares.js

+const jwt = require('jsonwebtoken');
+
+exports.isLoggedIn = (req, res, next) => {
+  if (req.isAuthenticated()) {
+    next();
+  } else {
+    res.status(403).send('로그인 필요');
+  }
+};
+
+exports.isNotLoggedIn = (req, res, next) => {
+  if (!req.isAuthenticated()) {
+    next();
+  } else {
+    res.redirect('/');
+  }
+};
+
+exports.verifyToken = (req, res, next) => {
+  try {
+    req.decoded = jwt.verify(req.headers.authorization, process.env.JWT_SECRET);
+    console.log('decode', req.decoded)
+    return next();
+  } catch (error) {
+    if (error.name === 'TokenExpiredError') { // 유효기간 초과
+      return res.status(419).json({
+        code: 419,
+        error: '토큰이 만료되었습니다. 다시 로그인 해주세요.',
+      });
+    }
+    return res.status(401).json({
+      code: 401,
+      error: '유효하지 않은 토큰입니다. 다시 로그인 해주세요.',
+    });
+  }
+};

server/routes/notices.js

+const express = require('express');
+const Notice = require('../schemas/notice');
+
+const router = express.Router();
+
+router.get('/', function (req, res, next) {
+    Notice.find({}).sort({ post_date: -1 })
+        .then((notices) => {
+            res.json(notices);
+        })
+        .catch((err) => {
+            console.error(err);
+            next(err);
+        });
+});
+
+module.exports = router;
\ No newline at end of file

server/routes/reserves.js

+const express = require('express');
+const User = require('../schemas/user');
+const Reserve = require('../schemas/reserve');
+const { verifyToken } = require('./middlewares');
+
+const router = express.Router();
+
+router.post('/', function (req, res, next) {
+    console.log('/reserve post req.body', req.body)
+
+    const reserve = new Reserve({
+        user: req.body._id,
+        date: req.body.date,
+        starttime: Number(req.body.starttime),
+        usetime: Number(req.body.usetime),
+        start: `${req.body.date}T`+`${req.body.starttime}:00:00`,
+        end: `${req.body.date}T`+`${Number(req.body.starttime)+Number(req.body.usetime)}:00:00`,
+        room: req.body.room,
+        reason: req.body.reason,
+        students: req.body.students,
+        approve: req.body.approve,
+        num: req.body.students.length + 1,
+    });
+
+    reserve.save()
+        .then((result) => {
+            console.log(result);
+            res.status(201).json(result);
+        })
+        .catch((err) => {
+            console.error(err);
+            next(err);
+        });
+});
+
+// router.get('/:_id', verifyToken, function (req, res, next) {
+router.get('/:_id', function (req, res, next) {
+    console.log('/reserves get req.params', req.params)
+    Reserve.find({ user: req.params._id }, function (err, reserve) {
+        console.log('id.name',reserve)
+        if (err) return res.status(500).json({ error: err });
+        console.log('reserve list', reserve)
+        res.status(201).json(reserve);
+
+    })
+});
+
+router.get('/admin/:_id', function (req, res, next) {
+    console.log('/reserves/admin get req.params', req.params)
+    Reserve.find({ approve: false }).populate('user').exec(function (err, reserve) {
+        if (err) return res.status(500).json({ error: err });
+        console.log('reserve list', reserve)
+        res.status(201).json(reserve);
+    })
+});
+
+router.delete('/:_id', function (req, res, next) {
+    console.log('/reserves delete req.params', req.params)
+    Reserve.findOne({ _id: req.params._id }, function (err, reserve) {
+        if (err) return res.status(500).json({ error: err });
+
+        reserve.remove()
+            .then(() => {
+                console.log();
+                res.status(201).json();
+            })
+            .catch((err) => {
+                console.error(err);
+                next(err);
+            });
+    })
+});
+
+router.put('/:id', function (req, res, next) {
+    console.log('/reserves put req.body', req.params)
+    Reserve.findOne({ _id: req.params.id }, 'approve', function (err, reserve) {
+        if (err) return res.status(500).json({ error: err });
+        reserve.approve = true;
+        reserve.save()
+            .then((result) => {
+                console.log(result);
+                res.status(201).json(result);
+            })
+            .catch((err) => {
+                console.error(err);
+                next(err);
+            });
+    });
+});
+
+module.exports = router;

server/routes/users.js

-var express = require('express');
-var router = express.Router();
+const express = require('express');
+const User = require('../schemas/user');
+const bcrypt = require("bcrypt");
+const { verifyToken } = require('./middlewares');
 
-/* GET users listing. */
-router.get('/', function(req, res, next) {
-  res.send('respond with a resource');
+const router = express.Router();
+
+router.post('/', function (req, res, next) {
+  console.log('/users post req.body', req.body)
+  User.findOne({ id: req.body.id }, function (err, users) {
+    if (err) return res.status(500).json({ error: err });
+
+    if (users) {
+      return res.status(404).json({ error: '이미 존재하는 학번입니다.' })
+    };
+
+    const user = new User({
+      name: req.body.name,
+      id: req.body.id,
+      password: req.body.password,
+      question: req.body.question,
+      answer: req.body.answer,
+    });
+
+    user.save()
+      .then((result) => {
+        console.log(result);
+        res.status(201).json(result);
+      })
+      .catch((err) => {
+        console.error(err);
+        next(err);
+      });
+  })
+});
+
+router.get('/:_id', function (req, res, next) {
+  console.log('/users get req.params', req.params)
+  User.findOne({ _id: req.params._id }, function (err, user) {
+    if (err) return res.status(500).json({ error: err });
+    res.status(201).json(user);
+  })
+});
+
+router.get('/admin/:_id', function (req, res, next) {
+  console.log('/admin get req.params', req.params)
+  User.findOne({ _id: req.params._id }, 'role', function (err, user) {
+    if (err) return res.status(500).json({ error: err });
+    if (user.role == 'admin') {
+      next();
+    }
+    else return res.status(404).json({ error: '권한이 없습니다.' })
+  })
+});
+
+router.put('/change/:id', function (req, res, next) {
+  console.log('/change put req.body', req.params)
+  User.findOne({ _id: req.params.id }, 'password', function (err, user) {
+    if (err) return res.status(500).json({ error: err });
+    bcrypt.compare(req.body.password, user.password, function (err, result) {
+      if (err) {
+        console.log(err)
+        return res.status(500).json({ error: err });
+      }
+      if (result) {
+        return res.status(404).json({ error: '새로운 비밀번호를 입력해주세요.' })
+      }
+    });
+
+    user.password = req.body.password;
+    user.save()
+      .then((result) => {
+        console.log(result);
+        res.status(201).json(result);
+      })
+      .catch((err) => {
+        console.error(err);
+        next(err);
+      });
+  })
 });
 
 module.exports = router;

server/routes/writes.js

+const express = require('express');
+// const path = require('path');
+// const multer = require('multer');
+// const fs = require('fs');
+const Notice = require('../schemas/notice');
+
+const router = express.Router();
+
+router.post('/', function (req, res, next) {
+    console.log("writes req.body", req.body)
+    const notice = new Notice({
+        notice_title: req.body.title,
+        notice_author: "예진",
+        notice_content: req.body.content
+    });
+    console.log(notice);
+    notice.save()
+        .then((result) => {
+            console.log(result);
+            res.status(201).json(result);
+        })
+        .catch((err) => {
+            console.error(err);
+            next(err);
+        });
+});
+
+module.exports = router;

server/schemas/index.js

@@ -5,8 +5,8 @@ module.exports = () => {
         if (process.env.NODE_ENV !== 'production') {
             mongoose.set('debug', true);
         }
-        mongoose.connect('mongodb://hijinju:highlight@localhost:27017/admin', {
-            dbName: 'ku_rental',
+        mongoose.connect('mongodb://hyj:hyj3657@localhost:27017/admin', {
+            dbName: 'ku_rental', useNewUrlParser: true, useUnifiedTopology: true,
         }, (error) => {
             if (error) {
                 console.log('몽고디비 연결 에러', error);

server/schemas/notice.js

+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+const noticeSchema = new Schema({
+    notice_img: {
+        type: Array,
+    },
+    notice_title: {
+        type: String,
+        required: true,
+    },
+    notice_author: {
+        type: String,
+        // default: "나야나"
+        required: true,
+    },
+    post_date: {
+        type: Date,
+        default: Date.now,
+        required: true,
+    },
+    notice_content: {
+        type: String,
+        required: true,
+    },
+});
+
+module.exports = mongoose.model('Notice', noticeSchema);

server/schemas/reserve.js

 const mongoose = require('mongoose');
 
 const { Schema } = mongoose;
+const { Types: { ObjectId } } = Schema;
 const reserveSchema = new Schema({
-    date: {
-        type: String,
-    },
-    time: {
-        type: String,
-    },
-    room:{
-        type: String,
-    },
-    name: { //대표자 이름
-        type: String,
-    },
-    id:{
-      type: Number,
-    },
-    reason: {
-      type: String,
-    },
-    member: {
-      type: String,
-    },
-    approve: {
-      type: Boolean,
-    },
-    num: {
-      type: Number,
-    }
+  user: {
+    type: ObjectId,
+    required: true,
+    ref: 'User',
+  },
+  date: {
+    type: String,
+  },
+  starttime: {
+    type: Number,
+  },
+  usetime: {
+    type: Number,
+  },
+  start: {
+    type: String,
+  },
+  end: {
+    type: String,
+
+  },
+  room: {
+    type: String,
+
+  },
+  reason: {
+    type: String,
+
+  },
+  students: {
+    type: Array,
+
+  },
+  approve: {
+    type: Boolean,
+    default: false,
+
+  },
+  num: {
+    type: Number,
+  },
 });
 
-module.exports = mongoose.model('Reserve', reserveSchema);
+module.exports = mongoose.model('Reserve', reserveSchema);
\ No newline at end of file

server/schemas/user.js

@@ -12,6 +12,17 @@ const userSchema = new Schema({
         type: String,
         
     },
+    role: {
+      type: String,
+      default:'user',
+    },
+    answer:{
+      type: String,
+    },
+    question: {
+      type: String,
+    },
+  
     id: {
         type: Number,
         required: true,
@@ -20,22 +31,22 @@ const userSchema = new Schema({
 });
 
 userSchema.pre("save", function (next) {
-    let user = this; //User모델 자체를 가르킴.
-  
-    //model 안의 paswsword가 변경 또는 생성될 때 암호화
-    if (user.isModified("password")) {
-      bcrypt.genSalt(saltRounds, function (err, salt) {
+  let user = this; //User모델 자체를 가르킴.
+
+  //model 안의 paswsword가 변경 또는 생성될 때 암호화
+  if (user.isModified("password")) {
+    bcrypt.genSalt(saltRounds, function (err, salt) {
+      if (err) return next(err);
+      bcrypt.hash(user.password, salt, function (err, hash) {
         if (err) return next(err);
-        bcrypt.hash(user.password, salt, function (err, hash) {
-          if (err) return next(err);
-          user.password = hash;
-          next();
-        });
+        user.password = hash;
+        next();
       });
-    } else {
-      next();
-    }
-  });
+    });
+  } else {
+    next();
+  }
+});
 
 
 module.exports = mongoose.model('User', userSchema);
\ No newline at end of file

server/views/error.pug

-extends layout
-
-block content
-  h1= message
-  h2= error.status
-  pre #{error.stack}

server/views/index.pug

-extends layout
-
-block content
-  h1= title
-  p Welcome to #{title}

server/views/layout.pug

-doctype html
-html
-  head
-    title= title
-    link(rel='stylesheet', href='/stylesheets/style.css')
-  body
-    block content