resolve conflicts

amirhoseinZare · Jun 5, 2021 · 2dace1b · 2dace1b
2 parents e336446 + 5b8830c
commit 2dace1b
Show file tree

Hide file tree

Showing 5 changed files with 2,605 additions and 37,996 deletions.
diff --git a/Maktab47 Exercise Upload.postman_collection.json b/Maktab47 Exercise Upload.postman_collection.json
@@ -6,72 +6,125 @@
 	},
 	"item": [
 		{
-			"name": "Upload",
-			"request": {
-				"method": "POST",
-				"header": [],
-				"body": {
-					"mode": "formdata",
-					"formdata": [
-						{
-							"key": "image",
-							"type": "file",
-							"src": "/C:/Users/Babak/Desktop/Desktop/thumbnail.jpg"
+			"name": "Test Upload",
+			"item": [
+				{
+					"name": "Upload",
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "formdata",
+							"formdata": [
+								{
+									"key": "image",
+									"type": "file",
+									"src": "/C:/Users/Babak/Desktop/Desktop/thumbnail.jpg"
+								}
+							]
+						},
+						"url": {
+							"raw": "{{SERVER}}/upload",
+							"host": [
+								"{{SERVER}}"
+							],
+							"path": [
+								"upload"
+							]
 						}
-					]
+					},
+					"response": []
 				},
-				"url": {
-					"raw": "{{SERVER}}/upload",
-					"host": [
-						"{{SERVER}}"
-					],
-					"path": [
-						"upload"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Download a File",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "{{SERVER}}/files/:file_id",
-					"host": [
-						"{{SERVER}}"
-					],
-					"path": [
-						"files",
-						":file_id"
-					],
-					"variable": [
-						{
-							"key": "file_id",
-							"value": ""
+				{
+					"name": "List of Files",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{SERVER}}/files",
+							"host": [
+								"{{SERVER}}"
+							],
+							"path": [
+								"files"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Download a File",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{SERVER}}/files/:file_id",
+							"host": [
+								"{{SERVER}}"
+							],
+							"path": [
+								"files",
+								":file_id"
+							],
+							"variable": [
+								{
+									"key": "file_id",
+									"value": ""
+								}
+							]
 						}
-					]
+					},
+					"response": []
 				}
-			},
-			"response": []
+			]
 		},
 		{
-			"name": "List of Files",
-			"request": {
-				"method": "GET",
-				"header": [],
-				"url": {
-					"raw": "{{SERVER}}/files",
-					"host": [
-						"{{SERVER}}"
-					],
-					"path": [
-						"files"
-					]
+			"name": "Products",
+			"item": [
+				{
+					"name": "Create",
+					"request": {
+						"method": "POST",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\r\n    \"name\": \"surface pro laptop\",\r\n    \"brand\": \"microsoft\",\r\n    \"image\": \"/files/65ddd8b1bbce4d8396b62611147fa1d6\",\r\n    \"price\": \"1500\"\r\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{SERVER}}/products",
+							"host": [
+								"{{SERVER}}"
+							],
+							"path": [
+								"products"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "List",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{SERVER}}/products",
+							"host": [
+								"{{SERVER}}"
+							],
+							"path": [
+								"products"
+							]
+						}
+					},
+					"response": []
 				}
-			},
-			"response": []
+			]
 		}
 	],
 	"event": [

diff --git a/db.json b/db.json
@@ -1,24 +1,22 @@
 {
-  "posts": [
-    {
-      "id": 1,
-      "title": "json-server",
-      "author": "typicode"
-    }
-  ],
-  "orders": [
+  "products": [
     {
-      "user": "Mona",
-      "id": 1,
-      "price": "320$",
-      "quantity": 123
+      "name": "asus laptop",
+      "brand": "asus",
+      "image": "/files/3d545729eb7cdb3f85407805ec160740",
+      "price": "1000",
+      "createdAt": 1622901942857,
+      "id": 1
     },
     {
-      "user": "Mandy",
-      "price": "100$",
-      "quantity": 67,
+      "name": "apple laptop",
+      "brand": "apple",
+      "image": "/files/65ddd8b1bbce4d8396b62611147fa1d6",
+      "price": "2000",
+      "createdAt": 1622901942857,
       "id": 2
-    },
+    }
+      ,
     {
       "user": "Morgan",
       "price": "150$",