Merge pull request #5 from evgenygorchakov/module4-task1

htmlacademy-nodejs-api · Jun 16, 2024 · 83c25a4 · 83c25a4
2 parents c5d299a + 064b9ba
commit 83c25a4
Show file tree

Hide file tree

Showing 53 changed files with 1,126 additions and 150 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,26 @@
+services:
+  db:
+    image: mongo:4.2
+    container_name: six-cities_mongo_db
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: ${DB_USER}
+      MONGO_INITDB_ROOT_PASSWORD: ${DB_PASSWORD}
+    ports:
+      - ${DB_PORT}:27017
+    volumes:
+      - six-cities_data:/data/db
+
+  db_ui:
+    image: mongo-express:1.0.2-20
+    container_name: six-cities_mongo_express
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_BASICAUTH_USERNAME: ${DB_USER}
+      ME_CONFIG_BASICAUTH_PASSWORD: ${DB_PASSWORD}
+      ME_CONFIG_MONGODB_ADMINUSERNAME: ${DB_USER}
+      ME_CONFIG_MONGODB_ADMINPASSWORD: ${DB_PASSWORD}
+      ME_CONFIG_MONGODB_URL: mongodb://${DB_USER}:${DB_PASSWORD}@db:${DB_PORT}/
+
+volumes:
+  six-cities_data:
diff --git a/mocks/mock-data-example.tsv b/mocks/mock-data-example.tsv
@@ -0,0 +1 @@
+Breathtaking Mountain views in cozy Birdbox	Enjoy the relaxed and comfortable enclosure of the Birdbox. Sleep right beside nature and its amazing  surroundings.	2022-04-06T08:45:40.283Z	Dusseldorf	preview.jpg	photo1.jpg;photo2.jpg;photo3.jpg;photo4.jpg;photo5.jpg;photo6.jpg	0	1	5	house	2	4	2400	Laptop;friendly;workspace;Baby seat;Washer;Towels;Fridge	John	[email protected]	ava.jpg	qwerty	pro	 48.85661;2.351499
diff --git a/mocks/mock-data.tsv b/mocks/mock-data.tsv
diff --git a/mocks/mock-server-data.json b/mocks/mock-server-data.json
@@ -28,7 +28,9 @@
       "photo1.jpg",
       "photo2.jpg",
       "photo3.jpg",
-      "photo4.jpg"
+      "photo4.jpg",
+      "photo5.jpg",
+      "photo6.jpg"
     ],
     "types": [
       "apartment",
@@ -82,7 +84,7 @@
       "qwerty2"
     ],
     "userTypes": [
-      "common",
+      "regular",
       "pro"
     ]
   }