feat: add get master with orders

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "multi-stub",
-  "version": "1.2.0",
+  "version": "1.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "multi-stub",
-      "version": "1.2.0",
+      "version": "1.1.0",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.7.9",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-stub",
-  "version": "1.2.0",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {

server/index.js

@@ -88,7 +88,7 @@ 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("/esc", require("./routers/esc"))
+
 
 app.use(require("./error"))
 

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

@@ -1,16 +1,40 @@
 const router = require('express').Router()
 const {MasterModel} = require('./model/master')
 const mongoose = require("mongoose")
+const {OrderModel} = require("./model/order")
 
 
-router.get('/masters', async (req, res,next) => {
+router.get("/masters", async (req, res, next) => {
     try {
-        const master = await MasterModel.find({})
-        res.status(200).send({success: true, body: master})
+        const masters = await MasterModel.find({});
+        const orders = await OrderModel.find({});
+
+        const mastersWithOrders = masters.map((master) => {
+            const masterOrders = orders.filter((order) => {
+                return (
+                    order?.master && order.master.toString() === master._id.toString()
+                );
+            });
+
+            const schedule = masterOrders.map((order) => ({
+                id: order._id,
+                startWashTime: order.startWashTime,
+                endWashTime: order.endWashTime,
+            }));
+
+            return {
+                id: master._id,
+                name: master.name,
+                schedule: schedule,
+                phone: master.phone,
+            };
+        });
+
+        res.status(200).send({ success: true, body: mastersWithOrders });
     } catch (error) {
-        next(error)
+        next(error);
     }
-})
+});
 
 router.delete('/masters/:id', async (req, res,next) => {
     const { id } = req.params;

server/routers/esc/index.js

@@ -1,12 +0,0 @@
-const router = require("express").Router();
-
-router.get('/game-links', (request, response) => {
-    response.send(require('./json/game-links/success.json'))
-  })
-
-router.get('/4u2k-links', (request, response) => {
-  response.send(require('./json/4u2k-links/success.json'))
-})
-;
-
-module.exports = router;

server/routers/esc/json/4u2k-links/success.json

@@ -1,31 +0,0 @@
-{
-    "data":[
-        {
-          "type": "video",
-          "links": {
-            "l1": "https://www.youtube.com/embed/DsQMLrPdLf8?si=l9X57nHqaSYlxDFf",
-            "l2": "https://www.youtube.com/embed/Dk8AAU_UdVk?si=N8NdYMUCfawdsJGE",
-            "l3": "https://www.youtube.com/embed/HKfDfWrCwEA?si=qPugjiKR8V9eZ-yG",
-            "l4": "https://www.youtube.com/embed/tD-6xHAHrQ4?si=ZFe41gSK8d5gqahW"
-          }
-        },
-        {
-          "type": "podcast",
-          "links": {
-            "l1": "https://www.youtube.com/embed/RtVs87Nd1MQ?si=i4giUCtbp4Ouqv2W",
-            "l2": "https://www.youtube.com/embed/DfTU5LA_kw8?si=m7fI5Ie9yIGDFCrU",
-            "l3": "https://www.youtube.com/embed/Sp-1fX1Q15I?si=xyealVly9IBMW7Xi",
-            "l4": "https://www.youtube.com/embed/rLYFJYfluRs?si=MjW1beQ-Q9-TAehF"
-          }
-        },
-        {
-          "type": "entertainment",
-          "links": {
-            "l1": "https://www.youtube.com/embed/DiuuglRCchQ?si=8wTVXKbV-mbHuSjW",
-            "l2": "https://www.youtube.com/embed/zmZcIX5PEyo?si=Hbrv32kl0fqcmtV9",
-            "l3": "https://www.youtube.com/embed/Te-TZUjmzFQ?si=fNG16eruoFEY2KNq",
-            "l4": "https://www.youtube.com/embed/si-MQ5qg3zE?si=67mfO6gV80n1ULqo"
-          }
-        }
-      ]
-}

server/routers/esc/json/game-links/success.json

@@ -1,20 +0,0 @@
-{
-    "data":[
-        {
-          "title": "ABC",
-          "description": "Мой брат Колян сбацал про меня байку на англицком и несколько фишек кинул для шухера. Англицкий ты вроде знаешь, впряжешься за меня, а?",
-          "link": "https://www.oxfordonlineenglish.com/english-level-test/reading"
-        },
-        {
-          "title": "Алё, меня слышно?",
-          "description": "Мой кент на мобилу текст записал с иностранкой. Понимаешь, о чём тут говорят?",
-          "link": "https://test-english.com/listening/"
-        },
-        {
-          "title": "Анонимное тестирование",
-          "description": "Ты язык-то нормально знаешь? Проверься, никто угарать не будет",
-          "link": "https://www.ego4u.com/en/cram-up/tests"
-
-        }
-      ]
-}

server/routers/gamehub/index.js

@@ -8,44 +8,22 @@ router.get("/update-like", (request, response) => {
   response.send(require("./json/gamepage/success.json"));
 });
 
-router.get("/add-to-cart", (request, response) => {
-  response.send(require("./json/home-page-data/games-in-cart.json"));
-});
-
 router.get("/categories", (request, response) => {
-  response.send(require("./json/home-page-data/all-games.json"));
+  response.send(require("./json/categories/success.json"));
 });
 
-router.get("/favourites", (request, response) => {
-  response.send(require("./json/home-page-data/all-games.json"));
-});
-
-// router.get("/shopping-cart", (request, response) => {
-//   response.send(require("./json/shopping-cart/success.json"));
-// });
-
 router.get("/shopping-cart", (request, response) => {
-  response.send(require("./json/home-page-data/games-in-cart.json"));
+  response.send(require("./json/shopping-cart/success.json"));
 });
 
-// Добавляем поддержку разных ответов для /home
-router.get("/home", (req, res) => {
-  if (stubs.home === "success") {
-    res.send(require("./json/home-page-data/success.json"));
-  } else if (stubs.home === "empty") {
-    res.send({ data: [] }); // Отправляем пустой массив
-  } else {
-    res.status(500).json({ success: false, message: "Server error" });
-  }
+router.get("/home", (request, response) => {
+  response.send(require("./json/home-page-data/success.json"));
 });
 
 router.get("/all-games", (request, response) => {
   response.send(require("./json/home-page-data/all-games.json"));
 });
 
-const stubs = {
-  home: "success",
-};
 
 // // Маршрут для обновления лайков
 // router.post("/update-like", (request, response) => {
@@ -60,6 +38,7 @@ const stubs = {
 //   });
 // });
 
+
 const fs = require("fs").promises;
 const path = require("path");
 
@@ -70,7 +49,7 @@ const commentsFilePath = path.join(__dirname, "./json/gamepage/success.json");
 async function readComments() {
   const data = await fs.readFile(commentsFilePath, "utf-8");
   const parsedData = JSON.parse(data);
-  console.log("Прочитанные данные:", parsedData); // Логируем полученные данные
+  console.log("Прочитанные данные:", parsedData);  // Логируем полученные данные
   return parsedData;
 }
 // Write to JSON file
@@ -109,149 +88,5 @@ router.post("/update-like", async (req, res) => {
   }
 });
 
-// Путь к JSON-файлу с корзиной
-const cartFilePath = path.join(
-  __dirname,
-  "./json/home-page-data/games-in-cart.json"
-);
-
-// Функция для чтения JSON-файла
-async function readCart() {
-  const data = await fs.readFile(cartFilePath, "utf-8");
-  return JSON.parse(data);
-}
-
-// Функция для записи в JSON-файл
-async function writeCart(data) {
-  await fs.writeFile(cartFilePath, JSON.stringify(data, null, 2), "utf-8");
-}
-
-// Маршрут для добавления/удаления товара в корзине
-router.post("/add-to-cart", async (req, res) => {
-  const { id, action } = req.body;
-
-  // Проверка наличия id и action
-  if (id === undefined || action === undefined) {
-    return res
-      .status(400)
-      .json({ success: false, message: "Invalid id or action" });
-  }
-
-  try {
-    const cartData = await readCart();
-    let ids = cartData.data.ids;
-
-    if (action === "add") {
-      // Если action "add", добавляем товар, если его нет в корзине
-      if (!ids?.includes(id)) {
-        ids.push(id);
-      }
-    } else if (action === "remove") {
-      // Если action "remove", удаляем товар, если он есть в корзине
-      if (ids?.includes(id)) {
-        ids = ids.filter((item) => item !== id);
-      }
-    } else {
-      // Если action невалиден
-      return res
-        .status(400)
-        .json({ success: false, message: "Invalid action" });
-    }
-
-    // Записываем обновленные данные обратно в файл
-    cartData.data.ids = ids;
-    await writeCart(cartData);
-
-    res.status(200).json({
-      success: true,
-      message: "Cart updated successfully",
-      data: cartData.data, // Возвращаем обновленные данные
-    });
-  } catch (error) {
-    console.error("Error updating cart:", error);
-    res.status(500).json({ success: false, message: "Server error" });
-  }
-});
 
 module.exports = router;
-
-const createElement = (key, value, buttonTitle, basePath) => `
-    <label>
-        <input name="${key}" type="radio" ${
-  stubs[key] === value ? "checked" : ""
-} onclick="fetch('${basePath}/admin/set/${key}/${value}')"/>
-        ${buttonTitle || value}
-    </label>
-`;
-
-router.get("/admin/home", (request, response) => {
-  const basePath = request.baseUrl; // Получаем базовый путь маршрутизатора
-  response.send(`
-        <div>
-            <fieldset>
-                <legend>Настройка данных для /home</legend>
-                ${createElement("home", "success", "Отдать успешный ответ", basePath)}
-                ${createElement("home", "empty", "Отдать пустой массив", basePath)}
-                ${createElement("home", "error", "Отдать ошибку", basePath)}
-            </fieldset>
-        </div>    
-    `);
-});
-
-router.get("/admin/game-page", (request, response) => {
-  response.send(`
-        <div>
-            <fieldset>
-                <legend>Настройка данных для /game-page</legend>
-                ${createElement(
-                  "game-page",
-                  "success",
-                  "Отдать успешный ответ"
-                )}
-                ${createElement("game-page", "empty", "Отдать пустой массив")}
-                ${createElement("game-page", "error", "Отдать ошибку")}
-
-            </fieldset>
-        </div>    
-    `);
-});
-
-router.get("/admin/categories", (request, response) => {
-  response.send(`
-        <div>
-            <fieldset>
-                <legend>Настройка данных для /categories</legend>
-                ${createElement(
-                  "categories",
-                  "success",
-                  "Отдать успешный ответ"
-                )}
-                ${createElement("categories", "empty", "Отдать пустой массив")}
-                ${createElement("categories", "error", "Отдать ошибку")}
-                </fieldset>
-        </div>    
-    `);
-});
-
-router.get("/admin/favourites", (request, response) => {
-  response.send(`
-        <div>
-            <fieldset>
-                <legend>Настройка данных для /favourites</legend>
-                ${createElement(
-                  "favourites",
-                  "success",
-                  "Отдать успешный ответ"
-                )}
-                ${createElement("favourites", "empty", "Отдать пустой массив")}
-                ${createElement("favourites", "error", "Отдать ошибку")}
-            </fieldset>
-        </div>    
-    `);
-});
-
-router.get("/admin/set/:key/:value", (request, response) => {
-  const { key, value } = request.params;
-  stubs[key] = value;
-  response.send("Настройки обновлены!");
-});

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

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

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

@@ -5,28 +5,28 @@
       {
         "username": "Пользователь1",
         "text": "Текст комментария 1",
-        "likes": 13,
+        "likes": 9,
         "rating": 8,
         "date": "2025-03-01T10:00:00Z"
       },
       {
         "username": "Пользователь2",
         "text": "Текст комментария 2",
-        "likes": 10,
+        "likes": 7,
         "rating": 7,
         "date": "2025-01-01T10:00:00Z"
       },
       {
         "username": "Пользователь3",
         "text": "Текст комментария 3",
-        "likes": 4,
+        "likes": 5,
         "rating": 3,
         "date": "2025-02-01T10:00:00Z"
       },
       {
         "username": "Пользователь4",
         "text": "Текст комментария 4",
-        "likes": 18,
+        "likes": 15,
         "rating": 2,
         "date": "2025-12-01T10:00:00Z"
       }

server/routers/gamehub/json/home-page-data/all-games.json

@@ -3,186 +3,147 @@
   "data": [
     {
       "id": 1,
-      "title": "Elden Ring",
-      "image": "game17",
-      "price": 3295,
-      "old_price": 3599,
-      "imgPath": "img_top_17",
-      "description": "Крупномасштабная RPG, действие которой происходит в обширном открытом мире c богатой мифологией и множеством опасных врагов.",
+      "name": "The Witcher 3: Wild Hunt",
+      "image": "game1",
+      "text": "$10",
+      "imgPath": "img_top_1",
+      "description": "Эпическая RPG с открытым миром, в которой Геральт из Ривии охотится на монстров и раскрывает политические заговоры.",
       "category": "RPG"
     },
     {
       "id": 2,
-      "title": "The Witcher 3: Wild Hunt",
-      "image": "game1",
-      "price": 990,
-      "old_price": 1200,
-      "imgPath": "img_top_1",
-      "description": "Эпическая RPG с открытым миром, в которой Геральт из Ривии охотится на монстров и раскрывает политические заговоры.",
-      "category": "RPG"
-      
-    },
-    {
-      "id": 17,
-      "title": "Red Dead Redemption 2",
+      "name": "Red Dead Redemption 2",
       "image": "game2",
-      "price": 980,
-      "old_price": 3800,
+      "text": "$10",
       "imgPath": "img_top_2",
       "description": "Приключенческая игра с открытым миром на Диком Западе, рассказывающая историю Артура Моргана.",
       "category": "Adventures"
     },
     {
       "id": 3,
-      "title": "Forza Horizon 5",
+      "name": "Forza Horizon 5",
       "image": "game3",
-      "price": 1900,
+      "text": "$10",
       "imgPath": "img_top_3",
       "description": "Гоночная игра с огромным открытым миром, действие которой происходит в Мексике.",
       "category": "Race"
     },
     {
       "id": 4,
-      "title": "Atomic Heart",
+      "name": "Atomic Heart",
       "image": "game4",
-      "price": 1200,
-      "old_price": 2500,
-      
+      "text": "$10",
       "imgPath": "img_top_4",
       "description": "Экшен-шутер с элементами RPG, разворачивающийся в альтернативной Советской России.",
       "category": "Shooters"
-    
     },
     {
       "id": 5,
-      "title": "Counter-Strike 2",
+      "name": "Counter-Strike 2",
       "image": "game5",
-      "price": 479,
-      
+      "text": "$10",
       "imgPath": "img_top_5",
       "description": "Популярный онлайн-шутер с соревновательным геймплеем и тактическими элементами.",
       "category": "Shooters"
-    
     },
     {
       "id": 6,
-      "title": "Grand Theft Auto V",
+      "name": "Grand Theft Auto V",
       "image": "game6",
-      "price": 700,
-      
+      "text": "$10",
       "imgPath": "img_top_6",
       "description": "Игра с открытым миром, где можно погрузиться в криминальный мир Лос-Сантоса.",
       "category": "Adventures"
-    
     },
     {
       "id": 7,
-      "title": "Assassin’s Creed IV: Black Flag",
+      "name": "Assassin’s Creed IV: Black Flag",
       "image": "game7",
-      "price": 1100,
-      
+      "text": "$10",
       "imgPath": "img_top_7",
       "description": "Приключенческая игра о пиратах и морских сражениях в эпоху золотого века пиратства.",
       "category": "Adventures"
-    
     },
     {
       "id": 8,
-      "title": "Spider-Man",
+      "name": "Spider-Man",
       "image": "game8",
-      "price": 3800,
-      
+      "text": "$10",
       "imgPath": "img_top_8",
       "description": "Игра о супергерое Человеке-пауке с захватывающими битвами и паркуром по Нью-Йорку.",
       "category": "Action"
-    
     },
     {
       "id": 9,
-      "title": "Assassin’s Creed Mirage",
+      "name": "Assassin’s Creed Mirage",
       "image": "game9",
-      "price": 1600,
-      
+      "text": "$10",
       "imgPath": "img_top_9",
       "description": "Приключенческая игра с упором на скрытность, вдохновленная классическими частями серии.",
       "category": "Action"
-    
     },
     {
       "id": 10,
-      "title": "Assassin’s Creed Valhalla",
+      "name": "Assassin’s Creed Valhalla",
       "image": "game10",
-      "price": 800,
-      "old_price": 2200,
-      
+      "text": "$10",
       "imgPath": "img_top_10",
       "description": "RPG с открытым миром о викингах, включающая битвы, исследования и строительство поселений.",
       "category": "RPG"
-    
     },
     {
       "id": 11,
-      "title": "ARK: Survival Evolved",
+      "name": "ARK: Survival Evolved",
       "image": "game11",
-      "price": 790,
-      
+      "text": "$10",
       "imgPath": "img_top_11",
       "description": "Выживание в открытом мире с динозаврами, строительством и многопользовательскими элементами.",
       "category": "Simulators"
-    
     },
     {
       "id": 12,
-      "title": "FIFA 23",
+      "name": "FIFA 23",
       "image": "game12",
-      "price": 3900,
-      
+      "text": "$10",
       "imgPath": "img_top_12",
       "description": "Популярный футбольный симулятор с улучшенной графикой и реалистичным геймплеем.",
       "category": "Sports"
-    
     },
     {
       "id": 13,
-      "title": "Dirt 5",
+      "name": "Dirt 5",
       "image": "game13",
-      "price": 2300,
-      
+      "text": "$10",
       "imgPath": "img_top_13",
       "description": "Аркадная гоночная игра с фокусом на ралли и внедорожных соревнованиях.",
       "category": "Race"
-    
     },
     {
       "id": 14,
-      "title": "Cyberpunk 2077",
+      "name": "Cyberpunk 2077",
       "image": "game14",
-      "price": 3400,
-      
+      "text": "$10",
       "imgPath": "img_top_14",
       "description": "RPG в киберпанк-сеттинге с нелинейным сюжетом и детализированным открытым миром.",
       "category": "RPG"
-    
     },
     {
       "id": 15,
-      "title": "Age of Empires IV",
+      "name": "Age of Empires IV",
       "image": "game15",
-      "price": 3200,
-      
+      "text": "$10",
       "imgPath": "img_top_15",
       "description": "Классическая стратегия в реальном времени с историческими кампаниями.",
       "category": "Strategies"
-    
     },
     {
       "id": 16,
-      "title": "Civilization VI",
+      "name": "Civilization VI",
       "image": "game16",
-      "price": 4200,
+      "text": "$10",
       "imgPath": "img_top_16",
       "description": "Глобальная пошаговая стратегия, в которой игроки строят и развивают цивилизации.",
       "category": "Strategies"
     }
   ]
-}
+}

server/routers/gamehub/json/home-page-data/games-in-cart.json

@@ -1,16 +0,0 @@
-{
-  "success": true,
-  "data": {
-    "ids": [
-      3,
-      13,
-      1,
-      10,
-      4,
-      9,
-      15,
-      6,
-      7
-    ]
-  }
-}

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

@@ -3,51 +3,43 @@
   "data": {
     "topSail": [
       {
-        "id": 1,
         "image": "game1",
-        "price": 1500,
+        "text": "$10",
         "imgPath": "img_top_1"
       },
       {
-        "id": 2,
         "image": "game2",
-        "price": 980,
+        "text": "$10",
         "imgPath": "img_top_2"
       },
       {
-        "id": 3,
         "image": "game3",
-        "price": 1900,
+        "text": "$10",
         "imgPath": "img_top_3"
       },
       {
-        "id": 4,
         "image": "game4",
-        "price": 1200,
+        "text": "$10",
         "imgPath": "img_top_4"
       },
       {
-        "id": 5,
         "image": "game5",
-        "price": 479,
+        "text": "$10",
         "imgPath": "img_top_5"
       },
       {
-        "id": 6,
         "image": "game6",
-        "price": 700,
+        "text": "$10",
         "imgPath": "img_top_6"
       },
       {
-        "id": 7,
         "image": "game7",
-        "price": 1100,
+        "text": "$10",
         "imgPath": "img_top_7"
       },
       {
-        "id": 8,
         "image": "game8",
-        "price": 3800,
+        "text": "$10",
         "imgPath": "img_top_8"
       }
     ],
@@ -105,27 +97,23 @@
       {
         "image": "news1",
         "text": "Разработчики Delta Force: Hawk Ops представили крупномасштабный режим Havoc Warfare",
-        "imgPath": "img_news_1",
-        "link": "https://gamemag.ru/news/185583/delta-force-hawk-ops-gameplay-showcase-havoc-warfare"
+        "imgPath": "img_news_1"
       },
       {
         "image": "news2",
         "text": "Первый трейлер Assassin’s Creed Shadows — с темнокожим самураем в феодальной Японии",
-        "imgPath": "img_news_2",
-        "link": "https://stopgame.ru/newsdata/62686/pervyy_trailer_assassin_s_creed_shadows_s_temnokozhim_samuraem_v_feodalnoy_yaponii"
+        "imgPath": "img_news_2"
       },
       {
         "image": "news3",
         "text": "Призрак Цусимы» вышел на ПК — и уже ставит рекорды для Sony",
-        "imgPath": "img_news_3",
-        "link": "https://stopgame.ru/newsdata/62706/prizrak_cusimy_vyshel_na_pk_i_uzhe_stavit_rekordy_dlya_sony"
+        "imgPath": "img_news_3"
       },
       {
         "image": "news4",
-        "text": "Авторы Skull and Bones расширяют планы на второй сезон",
-        "imgPath": "img_news_4",
-        "link": "https://stopgame.ru/newsdata/62711/avtory_skull_and_bones_rasshiryayut_plany_na_vtoroy_sezon"
+        "text": "Авторы Skull and Bones расширяют планы на второй сезо",
+        "imgPath": "img_news_4"
       }
     ]
   }
-}
+}

server/routers/kazan-explore/const.js

@@ -1,3 +0,0 @@
-exports.KAZAN_EXPLORE_RESULTS_MODEL_NAME = 'KAZAN_EXPLORE_RESULTS'
-
-exports.TOKEN_KEY = "KAZAN_EXPLORE_TOP_SECRET_TOKEN_KEY"

server/routers/kazan-explore/index.js

@@ -1,250 +1,211 @@
-const router = require('express').Router();
-const { ResultsModel } = require('./model/results')
-
-
-
-router.get('/getQuizResults/:userId', async (request, response) => {
-    const { userId } = request.params;
-
-    try {
-        const results = await ResultsModel.findOne({ userId : userId }).exec();
-
-        if (!results) {
-            return response.status(404).send({ message: 'Quiz results not found' });
-        }
-
-        response.send(results.items);
-    } catch (error) {
-        response.status(500).send({ message: 'An error occurred while fetching quiz results' });
-    }
-});
-
-router.post('/addQuizResult', async (request, response) => {
-    const { userId, quizId, result } = request.body;
-
-    if (!userId || !quizId || !result) {
-        return response.status(400).send({ message: 'Invalid input data' });
-    }
-    try {
-        let userResults = await ResultsModel.findOne({ userId : userId }).exec();
-        if (!userResults) {
-            userResults = new ResultsModel({ userId, items: [] });
-        }
-        userResults.items.push({ quizId, result });
-        await userResults.save();
-
-        response.status(200).send({ message: 'Quiz result added successfully', data: userResults });
-    } catch (error) {
-        response.status(500).send({ message: 'An error occurred while adding quiz result' });
-    }
-});
-
-
-// First page
-router.get('/getInfoAboutKazan', (request, response) => {
-    const lang = request.query.lang || 'ru'; 
-    try {
-        const data = require('./json/first/info-about-kazan/success.json'); 
-        const translatedData = data[lang] || data['ru']; 
-        response.send(translatedData); 
-    } catch (error) {
-        response.status(500).send({ message: 'Internal server error' }); 
-    }
-});
-
-router.get('/getNews', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/first/news/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Sport page
-router.get('/getFirstText', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/sport/first-text/success.json');
-        const translatedData = data[lang] || data['ru']; 
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' }); 
-    }
-});
-
-router.get('/getSecondText', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/sport/second-text/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-});
-
-router.get('/getSportData', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/sport/sport-list/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-router.get('/getSportQuiz', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/sport/quiz/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Places page
-router.get('/getPlacesData', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/places/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Transport page
-router.get('/getInfoAboutTransportPage', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/transport/info-about-page/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-router.get('/getBus', (request, response) => {
-    response.send(require('./json/transport/bus-numbers/success.json'))
-})
-
-router.get('/getTral', (request, response) => {
-    response.send(require('./json/transport/tral-numbers/success.json'))
-})
-
-router.get('/getEvents', (request, response) => {
-    response.send(require('./json/transport/events-calendar/success.json'))
-})
-
-router.get('/getTripSchedule', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/transport/trip-schedule/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// History page
-router.get('/getHistoryText', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/history/text/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getHistoryList', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/history/list/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-// Education page
-router.get('/getInfoAboutEducation', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/education/text/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getEducationList', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require(`./json/education/cards/${lang}/success.json`);
-        response.send(data);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-router.get('/getInfoAboutKFU', (request, response) => {
-    const lang = request.query.lang || 'ru';
-    try {
-        const data = require('./json/education/kfu/success.json');
-        const translatedData = data[lang] || data['ru'];
-        response.send(translatedData);
-    } catch (error) {
-        response.status(404).send({ message: 'Language not found' });
-    }
-})
-
-
-// Login
-router.post('/entrance', (request, response) => {
-    const { email, password } = request.body.entranceData;
-
-    try {
-        const users = require('./json/users-information/success.json');
-        const user = users.data.find(user => user.email === email && user.password === password);
-
-        if (!user) {
-            return response.status(401).send('Неверные учетные данные');
-        }
-
-        const responseObject = {
-            email: user.email,
-        }
-
-        return response.json(responseObject);
-    } catch (error) {
-        console.error('Ошибка чтения файла:', error);
-        response.status(500).send('Внутренняя ошибка сервера');
-    }
-})
-
-router.post('/registration', async (request, response) => {
-    const { email, password, confirmPassword } = request.body.registerData;
-
-    try {
-        if (password !== confirmPassword) {
-            return response.status(400).send('Пароли не совпадают!');
-        }
-        const users = require('./json/users-information/success.json');
-
-        const existingUser = users.data.find(user => user.email === email);
-
-        if (existingUser) {
-            return response.status(400).send('Пользователь с такой почтой уже существует!');
-        }
-
-        return response.json({ email: email });
-    } catch (error) {
-        console.error('Ошибка регистрации пользователя:', error);
-        response.status(500).send('Внутренняя ошибка сервера');
-    }
-});
-
-module.exports = router;
+const router = require('express').Router();
+
+
+// First page
+router.get('/getInfoAboutKazan', (request, response) => {
+    const lang = request.query.lang || 'ru'; // Получаем язык из параметров запроса
+    try {
+        const data = require('./json/first/info-about-kazan/success.json'); // Загружаем весь JSON
+        const translatedData = data[lang] || data['ru']; // Выбираем перевод по языку или дефолтный
+        response.send(translatedData); // Отправляем перевод клиенту
+    } catch (error) {
+        response.status(500).send({ message: 'Internal server error' }); // Ошибка в случае проблем с JSON
+    }
+});
+
+router.get('/getNews', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/first/news/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Sport page
+router.get('/getFirstText', (request, response) => {
+    const lang = request.query.lang || 'ru'; // Получаем язык из параметров
+    try {
+        const data = require('./json/sport/first-text/success.json'); // Загружаем JSON
+        const translatedData = data[lang] || data['ru']; // Берём перевод или дефолтный
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' }); // Обработка ошибки
+    }
+});
+
+router.get('/getSecondText', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/sport/second-text/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+});
+
+router.get('/getSportData', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/sport/sport-list/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+router.get('/getSportQuiz', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/sport/quiz/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Places page
+router.get('/getPlacesData', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/places/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Transport page
+router.get('/getInfoAboutTransportPage', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/transport/info-about-page/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+router.get('/getBus', (request, response) => {
+    response.send(require('./json/transport/bus-numbers/success.json'))
+})
+
+router.get('/getTral', (request, response) => {
+    response.send(require('./json/transport/tral-numbers/success.json'))
+})
+
+router.get('/getEvents', (request, response) => {
+    response.send(require('./json/transport/events-calendar/success.json'))
+})
+
+router.get('/getTripSchedule', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/transport/trip-schedule/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// History page
+router.get('/getHistoryText', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/history/text/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getHistoryList', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/history/list/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+// Education page
+router.get('/getInfoAboutEducation', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/education/text/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getEducationList', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require(`./json/education/cards/${lang}/success.json`);
+        response.send(data);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+router.get('/getInfoAboutKFU', (request, response) => {
+    const lang = request.query.lang || 'ru';
+    try {
+        const data = require('./json/education/kfu/success.json');
+        const translatedData = data[lang] || data['ru'];
+        response.send(translatedData);
+    } catch (error) {
+        response.status(404).send({ message: 'Language not found' });
+    }
+})
+
+
+// Login
+router.post('/entrance', (request, response) => {
+    const { email, password } = request.body.entranceData;
+
+    try {
+        const users = require('./json/users-information/success.json');
+        const user = users.data.find(user => user.email === email && user.password === password);
+
+        if (!user) {
+            return response.status(401).send('Неверные учетные данные');
+        }
+
+        const responseObject = {
+            email: user.email,
+        }
+
+        return response.json(responseObject);
+    } catch (error) {
+        console.error('Ошибка чтения файла:', error);
+        response.status(500).send('Внутренняя ошибка сервера');
+    }
+})
+
+router.post('/registration', async (request, response) => {
+    const { email, password, confirmPassword } = request.body.registerData;
+
+    try {
+        if (password !== confirmPassword) {
+            return response.status(400).send('Пароли не совпадают!');
+        }
+        const users = require('./json/users-information/success.json');
+
+        const existingUser = users.data.find(user => user.email === email);
+
+        if (existingUser) {
+            return response.status(400).send('Пользователь с такой почтой уже существует!');
+        }
+
+        return response.json({ email: email });
+    } catch (error) {
+        console.error('Ошибка регистрации пользователя:', error);
+        response.status(500).send('Внутренняя ошибка сервера');
+    }
+});
+
+module.exports = router;

server/routers/kazan-explore/model/results.js

@@ -1,27 +0,0 @@
-const { Schema, model } = require('mongoose')
-
-const { KAZAN_EXPLORE_RESULTS_MODEL_NAME } = require('../const')
-
-const schema = new Schema({
-    userId: { type: String },
-    items: [
-        {
-          quizId: { type: String },
-          result: { type: Number }
-        }
-    ]
-})
-
-schema.set('toJSON', {
-    virtuals: true,
-    versionKey: false,
-    transform: function (doc, ret) {
-        delete ret._id
-    }
-})
-
-schema.virtual('id').get(function () {
-    return this._id.toHexString()
-})
-
-exports.ResultsModel = model(KAZAN_EXPLORE_RESULTS_MODEL_NAME, schema)