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

server/schemas/Category.js

+import mongoose from 'mongoose'
+
+const { Array } = mongoose.Schema.Types
+
+const CategoriesSchema = new mongoose.Schema ({
+    "DRESS": {
+        type: Array,
+        required: true
+    },
+    "OUTER": {
+        type: Array,
+        required: true
+    },
+    "TOP": {
+        type: Array,
+        required: true
+    },
+    "PANTS": {
+        type: Array,
+        required: true
+    },
+    "SKIRT": {
+        type: Array,
+        required: true
+    },
+    "TRAINING": {
+        type: Array,
+        required: true
+    },
+    "SHOES": {
+        type: Array,
+        required: true
+    },
+})
+
+export default mongoose.models.Categories || mongoose.model('Categories', CategoriesSchema)
\ No newline at end of file

server/schemas/Product.js

 import mongoose from 'mongoose'
 
-const { String} = mongoose.Schema.Types
+const { String, Number } = mongoose.Schema.Types
 
 const ProductSchema = new mongoose.Schema({
     pro_name: {
@@ -33,20 +33,19 @@ const ProductSchema = new mongoose.Schema({
         required: true,
     },
     sub_category: {
-        type: Array,
+        type: [String],
         required: true,
     },
     description: {
         type: String,
         required: true,
     },
-    main_image: {
-        type: Array,
-        required: true,
+    main_imgUrl: {
+        type: String,
+        required: true
     },
-    detail_image: {
-        type: Array,
-        required: true,
+    detail_imgUrls: {
+        type: [String]
     }
 }, {
     timestamps: true

server/schemas/User.js

@@ -16,7 +16,6 @@ const UserSchema = new mongoose.Schema({
         type: String,
         required: true,
     },
-
     number1: {
         type: String,
         required: true,