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
e67fdeae
Commit
e67fdeae
authored
Sep 24, 2020
by
Choi Ga Young
Browse files
Merge remote-tracking branch 'origin/cherry' into rkyoung7
parents
23ea3f58
2bfc9c64
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
server/app.js
View file @
e67fdeae
...
...
@@ -32,7 +32,6 @@ app.use('/', indexRouter);
app
.
use
(
'
/users
'
,
usersRouter
);
app
.
use
(
'
/login
'
,
loginRouter
);
app
.
listen
(
port
,
()
=>
console
.
log
(
port
));
// catch 404 and forward to error handler
app
.
use
(
function
(
req
,
res
,
next
)
{
...
...
server/client/package-lock.json
View file @
e67fdeae
This diff is collapsed.
Click to expand it.
server/client/package.json
View file @
e67fdeae
...
...
@@ -7,6 +7,7 @@
"@testing-library/react"
:
"^9.5.0"
,
"@testing-library/user-event"
:
"^7.2.1"
,
"axios"
:
"^0.20.0"
,
"bcrypt"
:
"^5.0.0"
,
"bootstrap"
:
"^4.5.2"
,
"formik"
:
"^2.1.5"
,
"jquery"
:
"^3.5.1"
,
...
...
@@ -24,7 +25,6 @@
"test"
:
"react-scripts test"
,
"eject"
:
"react-scripts eject"
},
"proxy"
:
"http://localhost:3030"
,
"eslintConfig"
:
{
"extends"
:
"react-app"
},
...
...
@@ -39,5 +39,6 @@
"last 1 firefox version"
,
"last 1 safari version"
]
}
},
"proxy"
:
"http://localhost:3030"
}
server/package-lock.json
View file @
e67fdeae
This diff is collapsed.
Click to expand it.
server/package.json
View file @
e67fdeae
...
...
@@ -10,12 +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"
}
}
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