Merge pull request 'Добавлены стабы для двуфакторной авторизации' (#53) from dogsitters-finder into master

Reviewed-on: #53

server/index.js

@@ -87,6 +87,8 @@ app.use("/edateam", require("./routers/edateam-legacy"))
 app.use("/dry-wash", require("./routers/dry-wash"))
 app.use("/freetracker", require("./routers/freetracker"))
 app.use("/dhs-testing", require("./routers/dhs-testing"))
+app.use("/gamehub", require("./routers/gamehub")) 
+
 
 app.use(require("./error"))
 

server/routers/dogsitters-finder/index.js

@@ -1,35 +1,40 @@
-const router = require('express').Router();
+const router = require("express").Router();
 
 router.get("/users", (request, response) => {
-    response.send(require("./json/users/users.json"))
+  response.send(require("./json/users/users.json"));
-})
+});
 
 router.post("/auth", (request, response) => {
-    const {phoneNumber, password} = request.body;
+  const { phoneNumber, password } = request.body;
   console.log(phoneNumber, password);
-    if (phoneNumber === '89999999999') {
+  if (phoneNumber === "89999999999") {
-        response.send(require("./json/auth/dogsitter.success.json"))
+    response.send(require("./json/auth/dogsitter.success.json"));
+  } else if (phoneNumber === "89555555555") {
+    response.status(400).send(require("./json/auth/error.json"));
+  } else {
+    response.send(require("./json/auth/owner.success.json"));
   }
-    else if (phoneNumber === '89555555555') {
+});
-        response.status(400).send(require("./json/auth/error.json"))
+
+router.post("/auth/2fa", (request, response) => {
+  const { code } = request.body;
+  if (code === "0000") {
+    response.send(require("./json/2fa/success.json"));
+  } else {
+    response.status(400).send(require("./json/2fa/error.json"));
   }
-    else {
+});
-        response.send(require("./json/auth/owner.success.json"))
-    }
-})
 
 router.post("/register", (request, response) => {
-    const {firstName, secondName, phoneNumber, password, role} = request.body;
+  const { firstName, secondName, phoneNumber, password, role } = request.body;
   console.log(phoneNumber, password, role);
-    if (phoneNumber === '89283244141' || phoneNumber === '89872855893') {
+  if (phoneNumber === "89283244141" || phoneNumber === "89872855893") {
-        response.status(400).send(require("./json/register/error.json"))
+    response.status(400).send(require("./json/register/error.json"));
+  } else if (role === "dogsitter") {
+    response.send(require("./json/register/dogsitter.success.json"));
+  } else {
+    response.send(require("./json/register/owner.success.json"));
   }
-    else if (role === 'dogsitter') {
+});
-        response.send(require("./json/register/dogsitter.success.json"))
-    }
-    else {
-        response.send(require("./json/register/owner.success.json"))
-    }
-})
 
 module.exports = router;

server/routers/dogsitters-finder/json/2fa/error.json

@@ -0,0 +1,4 @@
+{
+  "status": "error",
+  "message": "Invalid code."
+}

server/routers/dogsitters-finder/json/2fa/success.json

@@ -0,0 +1,4 @@
+{
+  "status": "success",
+  "message": "Two-factor authentication passed."
+}

server/routers/dry-wash/arm-master.js

@@ -0,0 +1,87 @@
+const router = require('express').Router()
+const {MasterModel} = require('./model/master')
+const mongoose = require("mongoose")
+
+
+router.get('/masters', async (req, res,next) => {
+    try {
+        const master = await MasterModel.find({})
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+router.delete('/masters/:id', async (req, res,next) => {
+    const { id } = req.params;
+
+    if (!mongoose.Types.ObjectId.isValid(id)){
+        throw new Error('ID is required')
+    }
+
+    try {
+        const master = await MasterModel.findByIdAndDelete(id, {
+            new: true,
+        });
+        if (!master) {
+            throw new Error('master not found')
+        }
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+
+router.post('/masters',  async (req, res,next) => {
+
+    const {name, phone} =  req.body
+
+    if (!name || !phone ){
+        throw new Error('Enter name and phone')
+    }
+    try {
+        const master =  await MasterModel.create({name, phone})
+        res.status(200).send({success: true, body: master})
+    } catch (error) {
+        next(error)
+    }
+})
+
+
+router.patch('/masters/:id', async (req, res, next) => {
+    const { id } = req.params;
+
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+        throw new Error('ID is required')
+    }
+
+    const { name, phone } = req.body;
+
+    if (!name && !phone) {
+        throw new Error('Enter name and phone')
+    }
+
+
+    try {
+        const updateData = {};
+        if (name) updateData.name = name;
+        if (phone) updateData.phone = phone;
+
+        const master = await MasterModel.findByIdAndUpdate(
+            id,
+            updateData,
+            { new: true }
+        );
+
+        if (!master) {
+            throw new Error('master not found')
+        }
+
+        res.status(200).send({ success: true, body: master });
+    } catch (error) {
+        next(error);
+    }
+});
+
+module.exports = router

server/routers/dry-wash/arm-orders.js

@@ -0,0 +1,9 @@
+const router = require('express').Router()
+
+router.get('/orders', (req, res) => {
+    res
+        .status(200)
+        .send(require(`./json/arm-orders/success.json`))
+})
+
+module.exports = router

server/routers/dry-wash/arm.js

@@ -1,37 +0,0 @@
-const router = require('express').Router()
-const {MasterModel} = require('./model/master')
-
-router.post('/master',  async (req, res,next) => {
-
-   const {name, phone} =  req.body
-
-   if (!name || !phone ){
-        throw new Error('Enter name  and phone')
-   }
-    try {
-        const master =  await MasterModel.create({name, phone})
-        res.status(200).send({success: true, body: master})
-    } catch (error) {
-        next(error)
-    }
-})
-
-
-
-router.get('/masters', async (req, res,next) => {
-    try {
-        const master = await MasterModel.find({})
-        res.status(200).send({success: true, body: master})
-    } catch (error) {
-        next(error)
-    }
-})
-
-
-router.get('/orders', (req, res) => {
-    res
-        .status(200)
-        .send(require(`./json/arm-orders/success.json`))
-})
-
-module.exports = router

server/routers/dry-wash/index.js

@@ -1,8 +1,10 @@
 const router = require('express').Router()
-const armRouter  = require('./arm')
+const armMasterRouter  = require('./arm-master')
+const armOrdersRouter  = require('./arm-orders')
 
 
-router.use('/arm', armRouter)
+router.use('/arm', armMasterRouter)
+router.use('/arm', armOrdersRouter)
 
 
 module.exports = router

server/routers/dry-wash/postman/dry-wash.postman_collection.json

@@ -16,7 +16,7 @@
 						"header": [],
 						"body": {
 							"mode": "raw",
-							"raw": "{\n    \"name\":\"Anton\",\n    \"phone\": \"89172420577\"\n}",
+							"raw": "{\n    \"name\":\"Anto234\",\n    \"phone\": \"89172420577\"\n}",
 							"options": {
 								"raw": {
 									"language": "json"
@@ -42,13 +42,60 @@
 						"method": "GET",
 						"header": [],
 						"url": {
-							"raw": "{{host}}/arm/masters",
+							"raw": "{{host}}/arm/master-list",
 							"host": [
 								"{{host}}"
 							],
 							"path": [
 								"arm",
-								"masters"
+								"master-list"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "delete master",
+					"request": {
+						"method": "DELETE",
+						"header": [],
+						"url": {
+							"raw": "{{host}}/arm/masters/{{id}}",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"arm",
+								"masters",
+								"{{id}}"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "update master",
+					"request": {
+						"method": "PATCH",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": "{\n    \"name\":\"Anto234\",\n    \"phone\": \"89172420577\"\n}",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{host}}/arm/masters/{{id}}",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"arm",
+								"masters",
+								"{{id}}"
 							]
 						}
 					},

server/routers/gamehub/index.js

@@ -0,0 +1,19 @@
+const router = require("express").Router();
+
+router.get("/game-page", (request, response) => {
+  response.send(require("./json/gamepage/success.json"));
+});
+
+router.get("/categories", (request, response) => {
+  response.send(require("./json/categories/success.json"));
+});
+
+router.get("/shopping-cart", (request, response) => {
+  response.send(require("./json/shopping-cart/success.json"));
+});
+
+router.get("/home", (request, response) => {
+  response.send(require("./json/home-page-data/success.json"));
+});
+
+module.exports = router;

server/routers/gamehub/json/categories/success.json

@@ -0,0 +1,150 @@
+{   
+    "success": true,
+    "data": {
+    "games1": [
+        {
+            "id": 1,
+            "title": "How to Survive",
+            "price": 259,
+            "old_price": 500,
+            "image": "sales_game1",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Red Solstice 2 Survivors",
+            "price": 561,
+            "image": "sales_game2",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "Sons Of The Forests",
+            "price": 820,
+            "old_price": 1100,
+            "image": "new_game2",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ],
+    "games2": [
+        {
+            "id": 1,
+            "title": "Alpha League",
+            "price": 299,
+            "image": "new_game1",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Sons Of The Forests",
+            "price": 820,
+            "old_price": 1100,
+            "image": "new_game2",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "Pacific Drives",
+            "price": 1799,
+            "image": "new_game3",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ],
+    "games3": [
+        {
+            "id": 1,
+            "title": "Elden Ring",
+            "price": 3295,
+            "old_price": 3599,
+            "image": "leaders_game2",
+            "os": "windows"
+        },
+        {
+            "id": 2,
+            "title": "Counter-Strike 2",
+            "price": 479,
+            "image": "leaders_game1",
+            "os": "windows"
+        },
+        {
+            "id": 3,
+            "title": "PUBG: BATTLEGROUNDS",
+            "price": 199,
+            "image": "leaders_game3",
+            "os": "windows"
+        },
+        {
+            "id": 4,
+            "title": "The Witcher 3: Wild Hunt",
+            "price": 990,
+            "old_price": 1200,
+            "image": "leaders_game4",
+            "os": "windows"
+        },
+        {
+            "id": 5,
+            "title": "Atomic Heart",
+            "price": 1200,
+            "old_price": 2500,
+            "image": "leaders_game5",
+            "os": "windows"
+        },
+        {
+            "id": 6,
+            "title": "Crab Game",
+            "price": 600,
+            "old_price": 890,
+            "image": "leaders_game6",
+            "os": "windows"
+        }
+    ]
+}
+}

server/routers/gamehub/json/gamepage/success.json

@@ -0,0 +1,24 @@
+{
+    "success": true,
+    "data": {
+      "comments": [
+        {
+          "username": "Пользователь1",
+          "text": "Текст комментария 1"
+        },
+        {
+          "username": "Пользователь2",
+          "text": "Текст комментария 2"
+        },
+        {
+          "username": "Пользователь3",
+          "text": "Текст комментария 3"
+        },
+        {
+          "username": "Пользователь4",
+          "text": "Текст комментария 4"
+        }
+      ]
+    }
+  }
+  

server/routers/gamehub/json/home-page-data/success.json

@@ -0,0 +1,91 @@
+{
+  "success": true,
+  "data": {
+    "topSail": [
+      {
+        "image": "game1",
+        "text": "$10"
+      },
+      {
+        "image": "game2",
+        "text": "$10"
+      },
+      {
+        "image": "game3",
+        "text": "$10"
+      },
+      {
+        "image": "game4",
+        "text": "$10"
+      },
+      {
+        "image": "game5",
+        "text": "$10"
+      },
+      {
+        "image": "game6",
+        "text": "$10"
+      },
+      {
+        "image": "game7",
+        "text": "$10"
+      },
+      {
+        "image": "game8",
+        "text": "$10"
+      }
+    ],
+    "categories": [
+      {
+        "image": "category1",
+        "text": "гонки"
+      },
+      {
+        "image": "category2",
+        "text": "глубокий сюжет"
+      },
+      {
+        "image": "category3",
+        "text": "симуляторы"
+      },
+      {
+        "image": "category4",
+        "text": "открытый мир"
+      },
+      {
+        "image": "category5",
+        "text": "экшен"
+      },
+      {
+        "image": "category6",
+        "text": "стратегии"
+      },
+      {
+        "image": "category7",
+        "text": "шутеры"
+      },
+      {
+        "image": "category8",
+        "text": "приключения"
+      }
+    ],
+    "news": [
+      {
+        "image": "news1",
+        "text": "Разработчики Delta Force: Hawk Ops представили крупномасштабный режим Havoc Warfare"
+      },
+      {
+        "image": "news2",
+        "text": "Первый трейлер Assassin’s Creed Shadows — с темнокожим самураем в феодальной Японии"
+      },
+      {
+        "image": "news3",
+        "text": "Призрак Цусимы» вышел на ПК — и уже ставит рекорды для Sony"
+      },
+      {
+        "image": "news4",
+        "text": "Авторы Skull and Bones расширяют планы на второй сезо"
+      }
+    ]
+  }
+}

server/routers/gamehub/json/shopping-cart/success.json

@@ -0,0 +1,37 @@
+{
+    "success":true,
+    "data":
+    [
+        {
+            "id": 1,
+            "title": "Mortal Kombat 11",
+            "image": "mortal",
+            "alt": "Игра Мортал Комбат 11, картинка",
+            "releaseDate": "23 апр. 2019",
+            "description": "MORTAL KOMBAT 11 ULTIMATE ВКЛЮЧАЕТ В СЕБЯ БАЗОВУЮ ИГРУ МК11, КОМВАТ РАСК 1, ДОПОЛНЕНИЕ «ПОСЛЕДСТВИЯ» И НЕДАВНО ДОБАВЛЕННЫЙ НАБОР «КОМБАТ 2».",
+            "price": 300 
+            
+        },
+        {
+            "id": 2,
+            "title": "EA SPORTS™ FIFA 23",
+            "image": "fifa",
+            "alt": "Игра Фифа, картинка",
+            "releaseDate": "30 сен. 2022",
+            "description": "В FIFA 23 всемирная игра становится еще лучше с технологией HyperMotion2, мужским и женским FIFA World Cup™, женскими командами, кроссплатформенной игрой и множеством прочих возможностей.",
+            "price": 300 
+            
+        },
+        {
+            "id": 3,
+            "title": "Ведьмак: Дикая Охота",
+            "image": "ved",
+            "alt": "Игра Ведьмак, картинка",
+            "releaseDate": "18 мая 2015",
+            "description": "Вы — Геральт из Ривии, наемный убийца чудовищ. Вы путешествуете по миру, в котором бушует война и на каждом шагу подстерегают чудовища. Вам предстоит выполнить заказ и найти Цири — Дитя Предназначения, живое оружие, способное изменить облик этого мира.",
+            "price": 300 
+            
+        }
+    ]
+}
+