Merge branch 'NewMaster' into cherry

server/.gitignore

@@ -17,6 +17,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
\ No newline at end of file

server/app.js

@@ -3,17 +3,19 @@ const express = require('express');
 const path = require('path');
 const cookieParser = require('cookie-parser');
 const logger = require('morgan');
+require('dotenv').config();
 
 const indexRouter = require('./routes/index');
 const usersRouter = require('./routes/users');
+const connect = require('./schemas');
 
 const app = express();
 const port = 3030;
-app.listen(port, () => console.log(port));
+connect();
 
 // view engine setup
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'pug');
+// app.set('views', path.join(__dirname, 'views'));
+// app.set('view engine', 'pug');
 
 app.use(logger('dev'));
 app.use(express.json());
@@ -24,6 +26,9 @@ app.use(express.static(path.join(__dirname, 'public')));
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
 
+
+app.listen(port, () => console.log(port));
+
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
   next(createError(404));

server/client/.gitignore

@@ -17,6 +17,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+
 npm-debug.log*
 yarn-debug.log*
-yarn-error.log*
+yarn-error.log*
\ No newline at end of file

server/client/package-lock.json

@@ -7791,6 +7791,11 @@
         }
       }
     },
+    "jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9425,6 +9430,11 @@
         "ts-pnp": "^1.1.6"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",

server/client/package.json

@@ -9,6 +9,8 @@
     "axios": "^0.20.0",
     "bootstrap": "^4.5.2",
     "formik": "^2.1.5",
+    "jquery": "^3.5.1",
+    "popper.js": "^1.16.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",

server/client/src/Components/Menu.js

+import React, { useState, useEffect } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+
+const Nav = styled.nav`
+    background-color: #981e1e;
+`
+
+function Menu() {
+    return (
+        <Nav className="navbar sticky-top navbar-expand-md">
+            <Link to="/home" className="navbar-brand">대관 서비스</Link>
+            <button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar" aria-controls="collapsibleNavbar">
+                <span className="navbar-toggler-icon"></span>
+            </button>
+            <div className="collapse navbar-collapse" id="collapsibleNavbar">
+                <ul className="navbar-nav">
+                    <li className="nav-item">
+                        <Link to="/home" className="nav-link">대관 현황</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/apply" className="nav-link">대관 신청</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/check" className="nav-link">대관 확인/취소</Link>
+                    </li>
+                    <li className="nav-item">
+                        <Link to="/notice" className="nav-link">공지사항</Link>
+                    </li>
+
+                </ul>
+            </div>
+        </Nav>
+    )
+}
+
+export default Menu
\ No newline at end of file

server/client/src/Pages/ApplyPage.js

+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Apply() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">apply
+            </div>
+        </div>
+    )
+}
+
+export default Apply
\ No newline at end of file

server/client/src/Pages/CheckPage.js

+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Check() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">check
+            </div>
+        </div>
+    )
+}
+
+export default Check
\ No newline at end of file

server/client/src/Pages/HomePage.js

+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+import { Link, Redirect } from 'react-router-dom';
+
+function Home() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">
+                home
+                <button><Link to="/">로그인</Link></button>
+                <button><Link to="/signup">회원가입</Link></button>
+            </div>
+        </div>
+    )
+}
+
+export default Home
\ No newline at end of file

server/client/src/Pages/LoginPage.js

+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Link, Redirect } from 'react-router-dom';
+import { Formik } from 'formik';
+import * as Yup from 'yup';
+import axios from 'axios';
+
+const Log = styled.div`
+    background-color: #981e1e;
+`
+const Logo = styled.div`
+    background-color: #E76A6A;
+`
+
+
+function Login() {
+    const [state, setState] = useState(false);
+
+    if (state) {
+        return <Redirect to="/" />;
+    }
+    return (
+        <div className="container-fluid">
+            <div className="row">
+                <Logo className="col-md-5 col-12">
+                    <h2>고려대학교</h2>
+                    <h4>대관 시스템</h4>
+                </Logo>
+                <Log className="col-md-7 col-12">
+                    <Formik
+                        initialValues={{ email: '', password: '' }}
+                        validationSchema={Yup.object({
+                            email: Yup.string()
+                                .email('이메일형식이 유효하지 않습니다.')
+                                .required('이메일을 입력해주세요.'),
+                            password: Yup.string()
+                                .required('비밀번호를 입력해주세요.')
+                                .min(8, '8자 이상 입력해주세요.'),
+                        })}
+                        onSubmit={(values, { setSubmitting }) => {
+                            axios({
+                                method: 'post',
+                                url: '/login',
+                                data: values,
+                            }).then(res => {
+                                if (res.status === 404) return alert(res.data.error)
+                                alert("로그인이 완료되었습니다!")
+
+                                localStorage.setItem('token', res.data.token);
+                                localStorage.setItem('id', res.data.users._id);
+                                setState(true);
+                            })
+                                .catch(err => {
+                                    alert(err.error)
+                                });
+
+                            setTimeout(() => {
+                                setSubmitting(false);
+                            }, 400);  // finish the cycle in handler
+                        }}
+                    >
+                        {({
+                            errors,
+                            touched,
+                            handleSubmit,
+                            getFieldProps,  // contain values, handleChange, handleBlur
+                            isSubmitting,
+                        }) => (
+                                <div className="row justify-content-center align-items-center">
+                                    <form onSubmit={handleSubmit} className="col-sm-3">
+                                        <div className="form-group mb-4">
+                                            <input
+                                                className={(touched.email && errors.email ? 'form-control is-invalid' : "form-control")}
+                                                type="email"
+                                                name="email"
+                                                {...getFieldProps('email')}
+                                                placeholder="Input Email"
+                                            />
+                                            {touched.email && errors.email ? (
+                                                <div className="invalid-feedback text-left">{errors.email}</div>
+                                            ) : null}
+                                        </div>
+                                        <div className="form-group mb-4">
+                                            <input
+                                                className={(touched.password && errors.password ? 'form-control is-invalid' : "form-control")}
+                                                type="password"
+                                                name="password"
+                                                {...getFieldProps('password')}
+                                                placeholder="Input Password"
+                                            />
+                                            {touched.password && errors.password ? (
+                                                <div className="invalid-feedback text-left">{errors.password}</div>
+                                            ) : null}
+                                        </div>
+                                        <button type="submit" className="btn btn-dark" disabled={isSubmitting}>
+                                            Login
+                                        </button>
+                                        <button><Link to="/home">홈</Link></button>
+                                        <Link to="/signup">비밀번호를 잊으셨나요?</Link>
+                                        <div></div>
+                                        <Link to="/signup">회원이 아니신가요?</Link>
+                                    </form>
+                                </div>
+                            )}
+                    </Formik>
+
+                </Log>
+            </div>
+        </div>
+    )
+}
+
+export default Login
\ No newline at end of file

server/client/src/Pages/NoticePage.js

+import React, { useState, useEffect } from 'react';
+import Menu from '../Components/Menu';
+
+function Notice() {
+    return (
+        <div>
+            <Menu />
+            <div className="container">notice
+            </div>
+        </div>
+    )
+}
+
+export default Notice
\ No newline at end of file

server/client/src/Pages/SignupPage.js

+import React, { useState } from 'react';
+import { Formik } from 'formik';
+import * as Yup from 'yup';
+import axios from 'axios';
+import 'bootstrap/dist/css/bootstrap.css';
+import { Link, Redirect } from 'react-router-dom';
+
+function Signup() {
+      const [state, setState] = useState(false);
+
+      if (state) {
+        return <Redirect to="/login" />;
+      }
+
+    return (
+        <div className="d-flex flex-column justify-content-between vh-100">
+            <Formik
+                initialValues={{ name: '', id: '', password: '', password2: ''}}
+                validationSchema={Yup.object({
+                    name: Yup.string()
+                        .required('이름을 입력해주세요.'),
+                    id: Yup.string()
+                        // .id('이메일형식이 유효하지 않습니다.')
+                        .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 }) => {
+                    console.log(values);
+                    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.id && errors.id ? 'form-control is-invalid' : "form-control")}
+                                        type="text"
+                                        name="id"
+                                        {...getFieldProps('id')}
+                                        placeholder="Input id"
+                                    />
+                                    {touched.id && errors.id ? (
+                                        <div className="invalid-feedback text-left">{errors.id}</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="/">로그인</Link></button>
+                                <button><Link to="/home">홈</Link></button>
+                            </form>
+                        </div>
+                    )}
+            </Formik>
+        </div>
+    );
+}
+
+
+export default Signup;

server/client/src/index.js

@@ -3,17 +3,30 @@ import ReactDOM from 'react-dom';
 import * as serviceWorker from './serviceWorker';
 import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
 import 'bootstrap/dist/css/bootstrap.css';
+import axios from 'axios';
+// import { PrivateRoute } from './PrivateRoute';
 
-import Login from './Pages/Login';
-import Home from './Pages/Home';
-import Signup from './Pages/Signup';
+
+import Login from './Pages/LoginPage';
+import Home from './Pages/HomePage';
+import Signup from './Pages/SignupPage';
+import Apply from './Pages/ApplyPage';
+import Check from './Pages/CheckPage';
+import Notice from './Pages/NoticePage';
+
+axios.defaults.validateStatus = function (status) {
+  return status < 500; // default
+}
 
 ReactDOM.render(
 <Router>
     <Switch>
       <Route exact path="/" component={Login} />
-      <Route path="/Home" component={Home} />
-      <Route path="/Signup" component={Signup} />
+      <Route path="/home" component={Home} />
+      <Route path="/signup" component={Signup} />
+      <Route path="/apply" component={Apply} />
+      <Route path="/check" component={Check} />
+      <Route path="/notice" component={Notice} />
     </Switch>
   </Router>,
   document.getElementById('root')

server/package-lock.json

@@ -180,6 +180,17 @@
         "type-is": "~1.6.16"
       },
       "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
         "iconv-lite": {
           "version": "0.4.23",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
@@ -187,6 +198,11 @@
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
           }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         }
       }
     },
@@ -1257,6 +1273,17 @@
         "unpipe": "1.0.0"
       },
       "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
         "iconv-lite": {
           "version": "0.4.23",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
@@ -1264,6 +1291,11 @@
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
           }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         }
       }
     },
@@ -1401,6 +1433,22 @@
         "statuses": "~1.4.0"
       },
       "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

server/package.json

@@ -10,8 +10,8 @@
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
     "dotenv": "^8.2.0",
-    "express": "~4.16.1",
-    "http-errors": "~1.6.3",
+    "express": "^4.16.4",
+    "http-errors": "^1.6.3",
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^5.10.5",
     "morgan": "~1.9.1",

server/routes/index.js

-var express = require('express');
+var express = require('express');   
+const User = require('../schemas/user');
 var 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/users.js

@@ -3,7 +3,30 @@ var router = express.Router();
 
 /* GET users listing. */
 router.get('/', function(req, res, next) {
-  res.send('respond with a resource');
+  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,
+    });
+
+    user.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

+const mongoose = require('mongoose');
+
+module.exports = () => {
+    const connect = () => {
+        if (process.env.NODE_ENV !== 'production') {
+            mongoose.set('debug', true);
+        }
+        mongoose.connect('mongodb://cherry:1q2w3e4r@localhost:27017/admin', {
+            dbName: 'KU_Rental',
+        }, (error) => {
+            if (error) {
+                console.log('몽고디비 연결 에러', error);
+            } else {
+                console.log('몽고디비 연결 성공');
+            }
+        });
+    };
+    connect();
+    mongoose.connection.on('error', (error) => {
+        console.error('몽고디비 연결 에러', error);
+    });
+    mongoose.connection.on('disconnected', () => {
+        console.error('몽고디비 연결이 끊겼습니다. 연결을 재시도합니다.');
+        connect();
+    });
+
+    require('./user');
+    require('./reserve');
+};

server/schemas/reserve.js

+const mongoose = require('mongoose');
+
+const { Schema } = mongoose;
+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,
+    
+    },
+  
+    
+});
+
+module.exports = mongoose.model('Reserve', reserveSchema);

server/schemas/user.js

+const mongoose = require('mongoose');
+const bcrypt = require("bcrypt");
+const saltRounds = 10;
+
+const { Schema } = mongoose;
+const userSchema = new Schema({
+    name: {
+        type: String,
+        required: true,
+    },
+    password: {
+        type: String,
+        
+    },
+    id: {
+        type: Number,
+        required: true,
+    },
+    
+});
+
+userSchema.pre("save", function (next) {
+    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);
+          user.password = hash;
+          next();
+        });
+      });
+    } else {
+      next();
+    }
+  });
+
+
+module.exports = mongoose.model('User', userSchema);