Merge remote-tracking branch 'origin/jiwon' into ourMaster

server/config.js

@@ -6,13 +6,6 @@ const config = {
     kakaoAdminKey: 'b2dda7685c5b2990684d813e362cff07',
     cookieMaxAge: 60 * 60 * 24 * 7 * 1000
 }
-
-// const config = {
-//     port: 3001,
-//     kakaoAdminKey: 'b2dda7685c5b2990684d813e362cff07',
-//   }
   
-  export default config
-  
-
-// export default config
\ No newline at end of file
+export default config
+  
\ No newline at end of file

server/controllers/kakaopay.controller.js

@@ -43,7 +43,7 @@ const singleTest = async (req, res) => {
             'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
         },
         body: bodyData,
-    })
+    })  
     const resp = await response.json()
     console.log(resp)
     res.json({redirect_url: resp.next_redirect_pc_url})

server/controllers/order.controller.js

@@ -60,7 +60,7 @@ const recommendPro = async (req, res) => {
                     'products.productId': mongoose.Types.ObjectId(productId)
                 }
             },
-            { "$unwind": "$products" },
+            { $unwind: "$products" },
             {
                 $group: {
                     _id: "$products.productId",

server/controllers/user.controller.js

@@ -84,7 +84,7 @@ const addorder = async (req, res) => {
         const order = await Order.find({ userId: userId }).populate({
             path: 'products.productId',
             model: 'Product'
-        })
+        }).sort({createdAt:-1})
         res.status(200).json(order)
     } catch (error) {
         console.log(error)