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
shopping-mall
Commits
e2bb9325
Commit
e2bb9325
authored
Jan 25, 2021
by
Jiwon Yoon
Browse files
Merge branch 'ourMaster' into jiwon
parents
dcddb500
520cf554
Changes
23
Show whitespace changes
Inline
Side-by-side
server/controllers/user.controller.js
View file @
e2bb9325
...
...
@@ -32,7 +32,7 @@ const userById = async (req, res, next, id) => {
const
signup
=
async
(
req
,
res
)
=>
{
const
{
name
,
number1
,
number2
,
id
,
password
,
tel
,
email
}
=
req
.
body
console
.
log
(
"
whatup
"
,
req
.
body
)
console
.
log
(
"
whatup
"
,
req
.
body
)
try
{
if
(
!
isLength
(
password
,
{
min
:
8
,
max
:
15
}))
{
return
res
.
status
(
422
).
send
(
'
비밀번호는 8-15자리로 입력해주세요.
'
)
...
...
server/routes/category.routes.js
View file @
e2bb9325
...
...
@@ -9,6 +9,4 @@ router.route('/main')
router
.
route
(
'
/sub/:sub
'
)
.
get
(
categoryCtrl
.
getSubCategory
)
// router.param('sub',categoryCtrl.getsubId)
export
default
router
\ No newline at end of file
server/routes/product.routes.js
View file @
e2bb9325
...
...
@@ -13,16 +13,16 @@ router.route('/getproduct')
router
.
route
(
'
/getproduct/all
'
)
.
get
(
productCtrl
.
getAll
)
router
.
route
(
'
/getproduct/:category
'
)
router
.
route
(
'
/getproduct/
main/
:category
'
)
.
get
(
productCtrl
.
getlist
)
router
.
route
(
'
/getproduct/
:subcategory
'
)
.
get
(
productCtrl
.
sub
getlist
)
router
.
route
(
'
/getproduct/
sub/:subname
'
)
.
get
(
productCtrl
.
sub
name
)
router
.
route
(
'
/pluspurchase
'
)
.
post
(
productCtrl
.
plusPurchase
)
router
.
param
(
'
category
'
,
productCtrl
.
categoryId
)
router
.
param
(
'
sub
category
'
,
productCtrl
.
subcategoryId
)
router
.
param
(
'
sub
name
'
,
productCtrl
.
subcategoryId
)
export
default
router
\ No newline at end of file
Prev
1
2
Next
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