Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
reservation-service
Commits
26af3ca4
Commit
26af3ca4
authored
Nov 03, 2020
by
Lee Jin Ju
Browse files
화이팅
parent
f6c2e54d
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
server/client/package-lock.json
View file @
26af3ca4
This diff is collapsed.
Click to expand it.
server/client/package.json
View file @
26af3ca4
...
...
@@ -11,7 +11,7 @@
"bootstrap"
:
"^4.5.3"
,
"formik"
:
"^2.1.5"
,
"jquery"
:
"^3.5.1"
,
"mo
ment"
:
"^2.29.0
"
,
"mo
ngoose"
:
"^5.10.6
"
,
"popper.js"
:
"^1.16.1"
,
"react"
:
"^16.13.1"
,
"react-bootstrap"
:
"^1.4.0"
,
...
...
@@ -25,10 +25,8 @@
"start"
:
"react-scripts start"
,
"build"
:
"react-scripts build"
,
"test"
:
"react-scripts test"
,
"eject"
:
"react-scripts eject"
,
"proxy"
:
"http://localhost:3030"
"eject"
:
"react-scripts eject"
},
"proxy"
:
"http://localhost:3030"
,
"eslintConfig"
:
{
"extends"
:
"react-app"
},
...
...
@@ -43,5 +41,6 @@
"last 1 firefox version"
,
"last 1 safari version"
]
}
},
"proxy"
:
"http://localhost:3030"
}
server/client/src/Pages/ACheckPage.js
View file @
26af3ca4
...
...
@@ -2,7 +2,6 @@ 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
()
...
...
server/client/src/Pages/ApplyPage.js
View file @
26af3ca4
...
...
@@ -2,7 +2,6 @@ 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
'
;
...
...
server/client/src/Pages/ChangePage.js
View file @
26af3ca4
...
...
@@ -2,7 +2,6 @@ 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
)
{
...
...
server/client/src/Pages/CheckPage.js
View file @
26af3ca4
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
([]);
...
...
server/package-lock.json
View file @
26af3ca4
...
...
@@ -4,7 +4,6 @@
"lockfileVersion"
:
1
,
"requires"
:
true
,
"dependencies"
:
{
<<<<<<<
HEAD
"@types/babel-types"
:
{
"version"
:
"7.0.9"
,
"resolved"
:
"https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz"
,
...
...
@@ -16,26 +15,6 @@
"integrity"
:
"sha512-xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="
,
"requires"
:
{
"@types/babel-types"
:
"*"
=======
"@babel/helper-validator-identifier"
:
{
"version"
:
"7.10.4"
,
"resolved"
:
"https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"
,
"integrity"
:
"sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
},
"@babel/parser"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"
,
"integrity"
:
"sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
},
"@babel/types"
:
{
"version"
:
"7.11.5"
,
"resolved"
:
"https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"
,
"integrity"
:
"sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="
,
"requires"
:
{
"@babel/helper-validator-identifier"
:
"^7.10.4"
,
"lodash"
:
"^4.17.19"
,
"to-fast-properties"
:
"^2.0.0"
>>>>>>>
origin/kimpen
}
},
"abbrev"
:
{
...
...
@@ -72,7 +51,6 @@
}
}
},
<<<<<<<
HEAD
"align-text"
:
{
"version"
:
"0.1.4"
,
"resolved"
:
"https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
,
...
...
@@ -88,8 +66,6 @@
"resolved"
:
"https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
,
"integrity"
:
"sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
},
=======
>>>>>>>
origin/kimpen
"ansi-regex"
:
{
"version"
:
"2.1.1"
,
"resolved"
:
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
,
...
...
@@ -139,14 +115,11 @@
"to-fast-properties"
:
"^1.0.3"
}
},
<<<<<<<
HEAD
"babylon"
:
{
"version"
:
"6.18.0"
,
"resolved"
:
"https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"
,
"integrity"
:
"sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
},
=======
>>>>>>>
origin/kimpen
"balanced-match"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
,
...
...
@@ -268,7 +241,6 @@
"resolved"
:
"https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
,
"integrity"
:
"sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
},
<<<<<<<
HEAD
"clean-css"
:
{
"version"
:
"3.4.28"
,
"resolved"
:
"https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"
,
...
...
@@ -288,14 +260,11 @@
"wordwrap"
:
"0.0.2"
}
},
=======
>>>>>>>
origin/kimpen
"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="
},
<<<<<<<
HEAD
"commander"
:
{
"version"
:
"2.8.1"
,
"resolved"
:
"https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
,
...
...
@@ -304,8 +273,6 @@
"graceful-readlink"
:
">= 1.0.0"
}
},
=======
>>>>>>>
origin/kimpen
"concat-map"
:
{
"version"
:
"0.0.1"
,
"resolved"
:
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
,
...
...
@@ -356,14 +323,11 @@
"resolved"
:
"https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
,
"integrity"
:
"sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
<<<<<<<
HEAD
"core-js"
:
{
"version"
:
"2.6.11"
,
"resolved"
:
"https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"
,
"integrity"
:
"sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
},
=======
>>>>>>>
origin/kimpen
"core-util-is"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
,
...
...
@@ -384,14 +348,11 @@
}
}
},
<<<<<<<
HEAD
"decamelize"
:
{
"version"
:
"1.2.0"
,
"resolved"
:
"https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
,
"integrity"
:
"sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
=======
>>>>>>>
origin/kimpen
"deep-extend"
:
{
"version"
:
"0.6.0"
,
"resolved"
:
"https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"
,
...
...
@@ -579,14 +540,11 @@
"path-is-absolute"
:
"^1.0.0"
}
},
<<<<<<<
HEAD
"graceful-readlink"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
,
"integrity"
:
"sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
},
=======
>>>>>>>
origin/kimpen
"has-symbols"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"
,
...
...
@@ -757,7 +715,6 @@
"resolved"
:
"https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz"
,
"integrity"
:
"sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw=="
},
<<<<<<<
HEAD
"kind-of"
:
{
"version"
:
"3.2.2"
,
"resolved"
:
"https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
,
...
...
@@ -771,8 +728,6 @@
"resolved"
:
"https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
,
"integrity"
:
"sha1-odePw6UEdMuAhF07O24dpJpEbo4="
},
=======
>>>>>>>
origin/kimpen
"lodash"
:
{
"version"
:
"4.17.20"
,
"resolved"
:
"https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"
,
...
...
@@ -909,9 +864,9 @@
}
},
"mongoose"
:
{
"version"
:
"5.10.
5
"
,
"resolved"
:
"https://registry.npmjs.org/mongoose/-/mongoose-5.10.
5
.tgz"
,
"integrity"
:
"sha512-
BOQZsZn9Y79f3rWZFLD1gvOLNN5gOiGvGr5raqQ5v/T4fdAmnjXGCVynpW4SRnQLtrcCeLXyaaXVRT75863Q0
w=="
,
"version"
:
"5.10.
6
"
,
"resolved"
:
"https://registry.npmjs.org/mongoose/-/mongoose-5.10.
6
.tgz"
,
"integrity"
:
"sha512-
p32oja2ydzFMS0K4P7G408Kagju6Qz/LmiAFAcP6BqnIi1McLTd6VZ3+ZQtQmaHM7w8iNupLLambCrsPKNJpY
w=="
,
"requires"
:
{
"bson"
:
"^1.1.4"
,
"kareem"
:
"2.3.1"
,
...
...
@@ -1011,9 +966,9 @@
"integrity"
:
"sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
"node-addon-api"
:
{
"version"
:
"3.0.
0
"
,
"resolved"
:
"https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.
0
.tgz"
,
"integrity"
:
"sha512-
sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rk
Kg=="
"version"
:
"3.0.
2
"
,
"resolved"
:
"https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.
2
.tgz"
,
"integrity"
:
"sha512-
+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczM
Kg=="
},
"node-pre-gyp"
:
{
"version"
:
"0.15.0"
,
...
...
@@ -1344,27 +1299,21 @@
}
}
},
<<<<<<<
HEAD
"regenerator-runtime"
:
{
"version"
:
"0.11.1"
,
"resolved"
:
"https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
,
"integrity"
:
"sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
},
=======
>>>>>>>
origin/kimpen
"regexp-clone"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz"
,
"integrity"
:
"sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw=="
},
<<<<<<<
HEAD
"repeat-string"
:
{
"version"
:
"1.6.1"
,
"resolved"
:
"https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
,
"integrity"
:
"sha1-jcrkcOHIirwtYA//Sndihtp15jc="
},
=======
>>>>>>>
origin/kimpen
"require_optional"
:
{
"version"
:
"1.0.1"
,
"resolved"
:
"https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz"
,
...
...
@@ -1387,7 +1336,6 @@
"resolved"
:
"https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"
,
"integrity"
:
"sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
},
<<<<<<<
HEAD
"right-align"
:
{
"version"
:
"0.1.3"
,
"resolved"
:
"https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
,
...
...
@@ -1396,8 +1344,6 @@
"align-text"
:
"^0.1.1"
}
},
=======
>>>>>>>
origin/kimpen
"rimraf"
:
{
"version"
:
"2.7.1"
,
"resolved"
:
"https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
,
...
...
@@ -1498,7 +1444,6 @@
"resolved"
:
"https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz"
,
"integrity"
:
"sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
},
<<<<<<<
HEAD
"source-map"
:
{
"version"
:
"0.4.4"
,
"resolved"
:
"https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
,
...
...
@@ -1507,8 +1452,6 @@
"amdefine"
:
">=0.0.4"
}
},
=======
>>>>>>>
origin/kimpen
"sparse-bitfield"
:
{
"version"
:
"3.0.3"
,
"resolved"
:
"https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"
,
...
...
@@ -1650,14 +1593,11 @@
"string-width"
:
"^1.0.2 || 2"
}
},
<<<<<<<
HEAD
"window-size"
:
{
"version"
:
"0.1.0"
,
"resolved"
:
"https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
,
"integrity"
:
"sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
},
=======
>>>>>>>
origin/kimpen
"with"
:
{
"version"
:
"5.1.1"
,
"resolved"
:
"https://registry.npmjs.org/with/-/with-5.1.1.tgz"
,
...
...
@@ -1667,14 +1607,11 @@
"acorn-globals"
:
"^3.0.0"
}
},
<<<<<<<
HEAD
"wordwrap"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
,
"integrity"
:
"sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
},
=======
>>>>>>>
origin/kimpen
"wrappy"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
,
...
...
@@ -1684,7 +1621,6 @@
"version"
:
"3.1.1"
,
"resolved"
:
"https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
,
"integrity"
:
"sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
<<<<<<<
HEAD
},
"yargs"
:
{
"version"
:
"3.10.0"
,
...
...
@@ -1696,8 +1632,6 @@
"decamelize"
:
"^1.0.0"
,
"window-size"
:
"0.1.0"
}
=======
>>>>>>>
origin/kimpen
}
}
}
server/package.json
View file @
26af3ca4
...
...
@@ -10,11 +10,11 @@
"cookie-parser"
:
"~1.4.4"
,
"debug"
:
"~2.6.9"
,
"dotenv"
:
"^8.2.0"
,
"express"
:
"
~
4.1
6
.1"
,
"http-errors"
:
"
~
1.6.3"
,
"express"
:
"
^
4.1
7
.1"
,
"http-errors"
:
"
^
1.6.3"
,
"jsonwebtoken"
:
"^8.5.1"
,
"mongoose"
:
"^5.10.
5
"
,
"mongoose"
:
"^5.10.
6
"
,
"morgan"
:
"~1.9.1"
,
"pug"
:
"
2
.0.0
-beta11
"
"pug"
:
"
^3
.0.0"
}
}
server/schemas/index.js
View file @
26af3ca4
...
...
@@ -5,7 +5,7 @@ module.exports = () => {
if
(
process
.
env
.
NODE_ENV
!==
'
production
'
)
{
mongoose
.
set
(
'
debug
'
,
true
);
}
mongoose
.
connect
(
'
mongodb://h
yj:hyj3657
@localhost:27017/admin
'
,
{
mongoose
.
connect
(
'
mongodb://h
ijinju:highlight
@localhost:27017/admin
'
,
{
dbName
:
'
ku_rental
'
,
useNewUrlParser
:
true
,
useUnifiedTopology
:
true
,
},
(
error
)
=>
{
if
(
error
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment