Commit e619c1ef authored by Lee Jin Ju's avatar Lee Jin Ju
Browse files

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

parents 59155c79 9fbf966c
......@@ -20,4 +20,8 @@
npm-debug.log*
yarn-debug.log*
<<<<<<< HEAD
yarn-error.log*
=======
yarn-error.log*
>>>>>>> origin/rkyoung7
......@@ -7791,11 +7791,14 @@
}
}
},
<<<<<<< HEAD
"jquery": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
"integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
=======
>>>>>>> origin/rkyoung7
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
......@@ -9430,11 +9433,14 @@
"ts-pnp": "^1.1.6"
}
},
<<<<<<< HEAD
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
},
=======
>>>>>>> origin/rkyoung7
"portfinder": {
"version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
......
......@@ -9,8 +9,11 @@
"axios": "^0.20.0",
"bootstrap": "^4.5.2",
"formik": "^2.1.5",
<<<<<<< HEAD
"jquery": "^3.5.1",
"popper.js": "^1.16.1",
=======
>>>>>>> origin/rkyoung7
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-router-dom": "^5.2.0",
......@@ -22,8 +25,12 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
<<<<<<< HEAD
"eject": "react-scripts eject",
"proxy": "http://localhost:3030"
=======
"eject": "react-scripts eject"
>>>>>>> origin/rkyoung7
},
"eslintConfig": {
"extends": "react-app"
......
......@@ -4,22 +4,30 @@ import * as serviceWorker from './serviceWorker';
import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
import 'bootstrap/dist/css/bootstrap.css';
<<<<<<< HEAD
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';
=======
import Login from './Pages/Login';
import Home from './Pages/Home';
>>>>>>> origin/rkyoung7
ReactDOM.render(
<Router>
<Switch>
<Route exact path="/" component={Login} />
<Route path="/home" component={Home} />
<<<<<<< HEAD
<Route path="/signup" component={Signup} />
<Route path="/apply" component={Apply} />
<Route path="/check" component={Check} />
<Route path="/notice" component={Notice} />
=======
>>>>>>> origin/rkyoung7
</Switch>
</Router>,
document.getElementById('root')
......@@ -29,3 +37,7 @@ ReactDOM.render(
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();
<<<<<<< HEAD
=======
>>>>>>> origin/rkyoung7
This diff is collapsed.
......@@ -12,7 +12,10 @@
"dotenv": "^8.2.0",
"express": "~4.16.1",
"http-errors": "~1.6.3",
<<<<<<< HEAD
"jsonwebtoken": "^8.5.1",
=======
>>>>>>> origin/rkyoung7
"mongoose": "^5.10.5",
"morgan": "~1.9.1",
"pug": "2.0.0-beta11"
......
......@@ -5,7 +5,11 @@ module.exports = () => {
if (process.env.NODE_ENV !== 'production') {
mongoose.set('debug', true);
}
<<<<<<< HEAD
mongoose.connect('mongodb://hijinju:highlight@localhost:27017/admin', {
=======
mongoose.connect('mongodb://rkyoung7:rkdud127@localhost:27017/admin', {
>>>>>>> origin/rkyoung7
dbName: 'KU_Rental',
}, (error) => {
if (error) {
......@@ -26,4 +30,8 @@ module.exports = () => {
require('./user');
require('./reserve');
<<<<<<< HEAD
};
=======
};
>>>>>>> origin/rkyoung7
......@@ -41,4 +41,8 @@ const reserveSchema = new Schema({
});
<<<<<<< HEAD
module.exports = mongoose.model('Reserve', reserveSchema);
=======
module.exports = mongoose.model('Reserve', reserveSchema);
>>>>>>> origin/rkyoung7
extends layout
block content
h1= message
h2= error.status
pre #{error.stack}
extends layout
block content
h1= title
p Welcome to #{title}
doctype html
html
head
title= title
link(rel='stylesheet', href='/stylesheets/style.css')
body
block content
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment