Merge branch 'ourMaster' into jiwon

server/controllers/user.controller.js

@@ -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

@@ -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

@@ -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.subgetlist)
+router.route('/getproduct/sub/:subname')
+    .get(productCtrl.subname)
 
 router.route('/pluspurchase')
     .post(productCtrl.plusPurchase)
 
 router.param('category', productCtrl.categoryId)
-router.param('subcategory',productCtrl.subcategoryId)
+router.param('subname',productCtrl.subcategoryId)
     
 export default router
\ No newline at end of file