1.1.1

Reviewed-on: #62
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>

package-lock.json

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

package.json

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

server/data/const.js

@@ -1,2 +0,0 @@
-exports.TODO_LIST_MODEL_NAME = 'TODO_LIST'
-exports.TODO_ITEM_MODEL_NAME = 'TODO_ITEM'

server/data/model/todo/item.js

@@ -1,23 +0,0 @@
-const { Schema, model } = require('mongoose')
-
-const { TODO_ITEM_MODEL_NAME } = require('../../const')
-
-const schema = new Schema({
-    title: String,
-    done: { type: Boolean, default: false },
-    closed: Date,
-    created: {
-        type: Date, default: () => new Date().toISOString(),
-    },
-})
-
-schema.set('toJSON', {
-    virtuals: true,
-    versionKey: false,
-})
-
-schema.virtual('id').get(function () {
-    return this._id.toHexString()
-})
-
-exports.ItemModel = model(TODO_ITEM_MODEL_NAME, schema)

server/index.js

@@ -80,7 +80,7 @@ app.use(require("./root"))
  */
 app.use("/kfu-m-24-1", require("./routers/kfu-m-24-1"))
 app.use("/epja-2024-1", require("./routers/epja-2024-1"))
-app.use("/todo", require("./routers/todo/routes"))
+app.use("/v1/todo", require("./routers/todo"))
 app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
 app.use("/kazan-explore", require("./routers/kazan-explore"))
 app.use("/edateam", require("./routers/edateam-legacy"))

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

@@ -1,9 +1,21 @@
 const router = require('express').Router()
+const { OrderModel } = require('./model/order')
 
-router.post('/orders', (req, res) => {
-    res
-        .status(200)
-        .send(require(`./json/arm-orders/success.json`))
+router.post('/orders', async (req, res, next) => {
+        const {startDate, endDate} = req.body
+
+        if (!startDate || !endDate) {
+                throw new Error('startDate and endDate are required')
+        }
+
+        const orders = await OrderModel.find({
+                $or: [
+                        {startWashTime: { $gte: new Date(startDate), $lte: new Date(endDate) }},
+                        {endWashTime: { $gte: new Date(startDate), $lte: new Date(endDate) }},
+                ]
+        })
+
+        res.status(200).send({ success: true, body: orders })
 })
 
 module.exports = router

server/routers/dry-wash/index.js

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

server/routers/dry-wash/json/arm-orders/success.json

@@ -2,24 +2,59 @@
   "success": true,
   "body": [
     {
-      "id": "order1",
-      "carNumber": "A123BC",
-      "startWashTime": "2024-11-24T10:30:00.000Z",
-      "endWashTime": "2024-11-24T16:30:00.000Z",
-      "orderDate": "2024-11-24T08:41:46.366Z",
+      "phone": "+79876543210",
+      "carNumber": "А123ВЕ16",
+      "carBody": 1,
+      "carColor": "#ffff00",
+      "startWashTime": "2025-05-12T08:21:00.000Z",
+      "endWashTime": "2025-05-12T08:22:00.000Z",
+      "location": "55.792799704829854,49.11034340707925 Республика Татарстан (Татарстан), Казань, улица Чернышевского",
       "status": "progress",
-      "phone": "79001234563",
-      "location": "Казань, ул. Баумана, 1"
+      "notes": "",
+      "created": "2025-01-18T17:43:21.488Z",
+      "updated": "2025-01-18T17:43:21.492Z"
     },
     {
-      "id": "order2",
-      "carNumber": "A245BC",
-      "startWashTime": "2024-11-24T11:30:00.000Z",
-      "endWashTime": "2024-11-24T17:30:00.000Z",
-      "orderDate": "2024-11-24T07:40:46.366Z",
+      "phone": "89876543210",
+      "carNumber": "К456МН23",
+      "carBody": 2,
+      "carColor": "#ffffff",
+      "startWashTime": "2025-01-12T08:21:00Z",
+      "endWashTime": "2025-01-12T08:22:00Z",
+      "location": "55.808430668108585,49.198608125449255 Республика Татарстан (Татарстан), Казань, улица Академика Губкина, 50/1",
+      "status": "pending",
+      "notes": "заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки заметки",
+      "created": "2025-01-18T17:46:10.388Z",
+      "updated": "2025-01-18T17:46:10.395Z",
+      "id": "678be8e211e62f4a61790cca"
+    },
+    {
+      "phone": "4098765432105",
+      "carNumber": "О789РС777",
+      "carBody": 3,
+      "carColor": "красный",
+      "startWashTime": "2025-08-12T08:21:00.000Z",
+      "endWashTime": "2025-08-12T08:22:00.000Z",
+      "location": "55.78720449830353,49.12111640202319 Республика Татарстан (Татарстан), Казань, улица Пушкина, 5/43",
+      "status": "cancelled",
+      "notes": "Заказ отменен по запросу самого клиента",
+      "created": "2025-01-18T17:47:46.294Z",
+      "updated": "2025-01-18T17:47:46.295Z",
+      "id": "678be8e211e62f4a61790ccb"
+    },
+    {
+      "phone": "+79876543210",
+      "carNumber": "Т123УХ716",
+      "carBody": 99,
+      "carColor": "чайная роза",
+      "startWashTime": "2025-01-11T11:21:00.000Z",
+      "endWashTime": "2025-01-12T11:22:00.000Z",
+      "location": "55.77063673480112,49.22182909159608 Республика Татарстан (Татарстан), Казань, Советский район, микрорайон Азино-2",
       "status": "progress",
-      "phone": "79001234567",
-      "location": "Казань, ул. Баумана, 43"
+      "notes": "Клиент остался доволен, предложить в следующий раз акцию",
+      "created": "2025-01-18T17:55:05.691Z",
+      "updated": "2025-01-18T17:55:05.695Z",
+      "id": "678be8e211e62f4a61790ccc"
     }
   ]
 }

server/routers/dry-wash/model/const.js

@@ -0,0 +1,11 @@
+const orderStatus = {
+  CANCELLED: 'cancelled',
+  PROGRESS: 'progress',
+  PENDING: 'pending',
+  WORKING: 'working',
+  COMPLETE: 'complete',
+}
+
+module.exports = {
+  orderStatus
+}

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

@@ -11,6 +11,9 @@ const schema = new Schema({
 schema.set('toJSON', {
     virtuals: true,
     versionKey: false,
+    transform(_doc, ret) {
+        delete ret._id;
+    }
 })
 
 schema.virtual('id').get(function () {

server/routers/dry-wash/model/order.js

@@ -1,26 +1,58 @@
 const { Schema, model } = require('mongoose')
+const { orderStatus } = require('./const')
 
 const schema = new Schema({
-    startWashTime: {type: String, required: true},
-    endWashTime: {type: String, required: true},
-    orderDate: {type: String, required: true},
-    location: {type: String, required: true},
-    phone: {type: String, required: true},
-    status: {type: String, required: true},
-    carNumber: {type: String, required: true},
+    phone: {
+        type: String,
+        required: true
+    },
+    carNumber: {
+        type: String,
+        required: true
+    },
+    carBody: {
+        type: Number,
+        required: true
+    },
+    carColor: String,
+    startWashTime: {
+        type: Date,
+        required: true
+    },
+    endWashTime: {
+        type: Date,
+        required: true
+    },
+    location: {
+        type: String,
+        required: true
+    },
+    status: {
+        type: String,
+        required: true,
+        enum: Object.values(orderStatus)
+    },
+    master: {
+        type: Schema.Types.ObjectId,
+        ref: 'dry-wash-master'
+    },
+    notes: String,
     created: {
-        type: Date, default: () => new Date().toISOString(),
+        type: Date,
+        default: () => new Date().toISOString(),
     },
     updated: {
-        type: Date, default: () => new Date().toISOString(),
+        type: Date,
+        default: () => new Date().toISOString(),
     },
-    master: {type: Schema.Types.ObjectId, ref: 'dry-wash-master'},
-    notes:  String,
 })
 
 schema.set('toJSON', {
     virtuals: true,
     versionKey: false,
+    transform(_doc, ret) {
+        delete ret._id
+    }
 })
 
 schema.virtual('id').get(function () {

server/routers/dry-wash/order.js

@@ -0,0 +1,251 @@
+const mongoose = require("mongoose")
+const router = require('express').Router()
+const { MasterModel } = require('./model/master')
+const { OrderModel } = require('./model/order')
+const { orderStatus } = require('./model/const')
+
+const isValidPhoneNumber = (value) => /^(\+)?\d{9,15}/.test(value)
+const isValidCarNumber = (value) => /^[авекмнорстух][0-9]{3}[авекмнорстух]{2}[0-9]{2,3}$/i.test(value)
+const isValidCarBodyType = (value) => typeof value === 'number' && value > 0 && value < 100
+const isValidCarColor = (value) => value.length < 50 && /^[#a-z0-9а-я-\s,.()]+$/i.test(value)
+const isValidISODate = (value) => /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:.\d{1,3})?Z$/.test(value)
+
+const latitudeRe = /^(-?[1-8]?\d(?:\.\d{1,18})?|90(?:\.0{1,18})?)$/
+const longitudeRe = /^(-?(?:1[0-7]|[1-9])?\d(?:\.\d{1,18})?|180(?:\.0{1,18})?)$/
+const addressRe = /^[а-я0-9\s,.'-/()]*$/i
+const isValidLocation = (value) => {
+    if (value.length > 200) {
+        return false
+    }
+
+    const [coordinates, address] = value.split(' ')
+    const [latitude, longitude] = coordinates.split(',')
+    return latitudeRe.test(latitude) && longitudeRe.test(longitude) && addressRe.test(address)
+}
+
+const isValidOrderStatus = (value) => Object.values(orderStatus).includes(value)
+const isValidOrderNotes = (value) => value.length < 500
+
+const VALIDATION_MESSAGES = {
+    order: {
+        notFound: 'Order not found'
+    },
+    orderId: {
+        invalid: 'Valid order ID is required',
+    },
+    orderStatus: {
+        invalid: 'Invalid order status'
+    },
+    orderNotes: {
+        invalid: 'Invalid order notes'
+    },
+    master: {
+        notFound: 'Master not found'
+    },
+    masterId: {
+        invalid: 'Invalid master ID',
+    },
+    phoneNumber: {
+        required: 'Phone number is required',
+        invalid: 'Invalid phone number'
+    },
+    carNumber: {
+        required: 'Car number is required',
+        invalid: 'Invalid car number'
+    },
+    carBody: {
+        required: 'Car body type is required',
+        invalid: 'Invalid car body type'
+    },
+    carColor: {
+        invalid: 'Invalid car color'
+    },
+    washingBegin: {
+        required: 'Begin time of washing is required',
+        invalid: 'Invalid begin time of washing'
+    },
+    washingEnd: {
+        required: 'End time of washing is required',
+        invalid: 'Invalid end time of washing'
+    },
+    washingLocation: {
+        required: 'Location of washing is required',
+        invalid: 'Invalid location of washing'
+    },
+}
+
+router.post('/create', async (req, res, next) => {
+    const bodyErrors = []
+
+    const { customer } = req.body
+    if (!customer.phone) {
+        bodyErrors.push(VALIDATION_MESSAGES.phoneNumber.required)
+    } else if (!isValidPhoneNumber(customer.phone)) {
+        bodyErrors.push(VALIDATION_MESSAGES.phoneNumber.invalid)
+    }
+
+    const { car } = req.body
+    if (!car.number) {
+        bodyErrors.push(VALIDATION_MESSAGES.carNumber.required)
+    } else if (!isValidCarNumber(car.number)) {
+        bodyErrors.push(VALIDATION_MESSAGES.carNumber.invalid)
+    }
+    if (!car.body) {
+        bodyErrors.push(VALIDATION_MESSAGES.carBody.required)
+    } else if (!isValidCarBodyType(car.body)) {
+        bodyErrors.push(VALIDATION_MESSAGES.carBody.invalid)
+    }
+    if (!isValidCarColor(car.color)) {
+        bodyErrors.push(VALIDATION_MESSAGES.carColor.invalid)
+    }
+
+    const { washing } = req.body
+    if (!washing.begin) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingBegin.required)
+    } else if (!isValidISODate(washing.begin)) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingBegin.invalid)
+    }
+    if (!washing.end) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingEnd.required)
+    } else if (!isValidISODate(washing.end)) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingEnd.invalid)
+    }
+    if (!washing.location) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingLocation.required)
+    } else if (!isValidLocation(washing.location)) {
+        bodyErrors.push(VALIDATION_MESSAGES.washingLocation.invalid)
+    }
+
+    if (bodyErrors.length > 0) {
+        throw new Error(bodyErrors.join(', '))
+    }
+
+    try {
+        const order = await OrderModel.create({
+            phone: customer.phone,
+            carNumber: car.number,
+            carBody: car.body,
+            carColor: car.color,
+            startWashTime: washing.begin,
+            endWashTime: washing.end,
+            location: washing.location,
+            status: orderStatus.PROGRESS,
+            notes: '',
+            created: new Date().toISOString(),
+        })
+
+        res.status(200).send({ success: true, body: order })
+
+    } catch (error) {
+        next(error)
+    }
+})
+
+router.get('/:id', async (req, res, next) => {
+    const { id } = req.params
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+        throw new Error(VALIDATION_MESSAGES.orderId.invalid)
+    }
+
+    try {
+        const order = await OrderModel.findById(id)
+        if (!order) {
+            throw new Error(VALIDATION_MESSAGES.order.notFound)
+        }
+
+        res.status(200).send({ success: true, body: order })
+    } catch (error) {
+        next(error)
+    }
+})
+
+router.patch('/:id', async (req, res, next) => {
+    const { id } = req.params
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+        throw new Error(VALIDATION_MESSAGES.orderId.invalid)
+    }
+
+    const bodyErrors = []
+
+    const { status } = req.body
+    if (status) {
+        if (!isValidOrderStatus(status)) {
+            bodyErrors.push(VALIDATION_MESSAGES.orderStatus.invalid)
+        }
+    }
+
+    const { master: masterId } = req.body
+    if (masterId) {
+        if (!mongoose.Types.ObjectId.isValid(masterId)) {
+            bodyErrors.push(VALIDATION_MESSAGES.masterId.invalid)
+        } else {
+            try {
+                const master = await MasterModel.findById(masterId)
+                if (!master) {
+                    bodyErrors.push(VALIDATION_MESSAGES.master.notFound)
+                }
+            } catch (error) {
+                next(error)
+            }
+        }
+    }
+
+    const { notes } = req.body
+    if (notes) {
+        if (!isValidOrderNotes(notes)) {
+            bodyErrors.push(VALIDATION_MESSAGES.orderNotes.invalid)
+        }
+    }
+
+    if (bodyErrors.length > 0) {
+        throw new Error(bodyErrors.join(', '))
+    }
+
+    try {
+        const updateData = {}
+        if (status) {
+            updateData.status = status
+        }
+        if (masterId) {
+            updateData.master = masterId
+        }
+        if (notes) {
+            updateData.notes = notes
+        }
+        updateData.updated = new Date().toISOString()
+
+        const order = await OrderModel.findByIdAndUpdate(
+            id,
+            updateData,
+            { new: true }
+        )
+        if (!order) {
+            throw new Error(VALIDATION_MESSAGES.order.notFound)
+        }
+
+        res.status(200).send({ success: true, body: order })
+    } catch (error) {
+        next(error)
+    }
+})
+
+router.delete('/:id', async (req, res, next) => {
+    const { id } = req.params
+    if (!mongoose.Types.ObjectId.isValid(id)) {
+        throw new Error(VALIDATION_MESSAGES.orderId.invalid)
+    }
+
+    try {
+        const order = await OrderModel.findByIdAndDelete(id, {
+            new: true,
+        })
+        if (!order) {
+            throw new Error(VALIDATION_MESSAGES.order.notFound)
+        }
+        res.status(200).send({ success: true, body: order })
+    } catch (error) {
+        next(error)
+    }
+})
+
+module.exports = router

server/routers/freetracker/index.js

@@ -2,5 +2,6 @@ const router = require('express').Router();
 
 router.use('/performer', require('./dashboard-performer'))
 router.use('/auth', require('./auth'))
+router.use('/landing', require('./landing'))
 
 module.exports = router;

server/routers/freetracker/landing/index.js

@@ -0,0 +1,29 @@
+const Router = require('express').Router;
+
+const router = Router()
+
+const values = {
+  'blocks': 'success',
+  'application': 'success'
+}
+
+const timer = (_req, _res, next) => {
+  setTimeout(() => next(), 500)
+}
+
+router.use(timer)
+
+router.get(
+  '/blocks',
+  (req, res) =>
+    res.send(require(`./json/blocks-${values['blocks']}.json`))
+)
+
+router.post(
+  '/application',
+  (req, res) => {
+    res.send(require(`./json/application-${values['application']}.json`))
+  }
+)
+
+module.exports = router

server/routers/freetracker/landing/json/application-error.json

@@ -0,0 +1,7 @@
+{
+  "success": false,
+  "body": { },
+  "errors": [
+    "Что-то пошло не так"
+  ]
+}

server/routers/freetracker/landing/json/application-success.json

@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "body": { }
+}

server/routers/freetracker/landing/json/blocks-error.json

@@ -0,0 +1,9 @@
+{
+  "success": false,
+  "body": {
+    "blocks": []
+  },
+  "errors": [
+    "Что-то пошло не так"
+  ]
+}

server/routers/freetracker/landing/json/blocks-success.json

@@ -0,0 +1,22 @@
+{
+  "success": true,
+  "body": {
+    "blocks": [
+      {
+        "titleKey":"block1.title",
+        "textKey":"block1.subtitle",
+        "imageName":"truck1"
+      },
+      {
+        "titleKey":"block2.title",
+        "textKey":"block2.subtitle",
+        "imageName":"truck2"
+      },
+      {
+        "titleKey":"block3.title",
+        "textKey":"block3.subtitle",
+        "imageName":"truck3"
+      }
+    ]
+  }
+}

server/routers/gamehub/index.js

@@ -4,6 +4,10 @@ router.get("/game-page", (request, response) => {
   response.send(require("./json/gamepage/success.json"));
 });
 
+router.get("/update-like", (request, response) => {
+  response.send(require("./json/gamepage/success.json"));
+});
+
 router.get("/categories", (request, response) => {
   response.send(require("./json/categories/success.json"));
 });
@@ -20,4 +24,69 @@ router.get("/all-games", (request, response) => {
   response.send(require("./json/home-page-data/all-games.json"));
 });
 
+
+// // Маршрут для обновления лайков
+// router.post("/update-like", (request, response) => {
+//   const { username, likes } = request.body;
+
+//   // Эмулируем успешное обновление лайков
+//   console.log(`Лайки для пользователя ${username} обновлены до ${likes}`);
+
+//   response.status(200).json({
+//     success: true,
+//     message: `Лайки для пользователя ${username} обновлены до ${likes}`,
+//   });
+// });
+
+
+const fs = require("fs").promises;
+const path = require("path");
+
+// Path to JSON file
+const commentsFilePath = path.join(__dirname, "./json/gamepage/success.json");
+
+// Read JSON file
+async function readComments() {
+  const data = await fs.readFile(commentsFilePath, "utf-8");
+  const parsedData = JSON.parse(data);
+  console.log("Прочитанные данные:", parsedData);  // Логируем полученные данные
+  return parsedData;
+}
+// Write to JSON file
+async function writeComments(data) {
+  await fs.writeFile(commentsFilePath, JSON.stringify(data, null, 2), "utf-8");
+}
+
+// Update likes route
+router.post("/update-like", async (req, res) => {
+  const { username, likes } = req.body;
+
+  if (!username || likes === undefined) {
+    return res.status(400).json({ success: false, message: "Invalid input" });
+  }
+
+  try {
+    const data = await readComments();
+    const comment = data.data.comments.find((c) => c.username === username);
+
+    if (comment) {
+      comment.likes = likes;
+      await writeComments(data); // Сохраняем обновленные данные в файл
+
+      // Возвращаем актуализированные данные
+      res.status(200).json({
+        success: true,
+        message: "Likes updated successfully",
+        data: data.data, // Возвращаем актуализированные данные
+      });
+    } else {
+      res.status(404).json({ success: false, message: "Comment not found" });
+    }
+  } catch (error) {
+    console.error("Error updating likes:", error);
+    res.status(500).json({ success: false, message: "Server error" });
+  }
+});
+
+
 module.exports = router;

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

@@ -8,14 +8,18 @@
             "price": 259,
             "old_price": 500,
             "image": "sales_game1",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 2,
             "title": "Red Solstice 2 Survivors",
             "price": 561,
             "image": "sales_game2",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 3,
@@ -23,7 +27,9 @@
             "price": 820,
             "old_price": 1100,
             "image": "new_game2",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 4,
@@ -31,7 +37,9 @@
             "price": 990,
             "old_price": 1200,
             "image": "leaders_game4",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 5,
@@ -39,7 +47,9 @@
             "price": 1200,
             "old_price": 2500,
             "image": "leaders_game5",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 6,
@@ -47,31 +57,39 @@
             "price": 600,
             "old_price": 890,
             "image": "leaders_game6",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         }
     ],
     "games2": [
         {
-            "id": 1,
+            "id": 7,
             "title": "Alpha League",
             "price": 299,
             "image": "new_game1",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
-            "id": 2,
+            "id": 8,
             "title": "Sons Of The Forests",
             "price": 820,
             "old_price": 1100,
             "image": "new_game2",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
-            "id": 3,
+            "id": 9,
             "title": "Pacific Drives",
             "price": 1799,
             "image": "new_game3",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 4,
@@ -79,7 +97,9 @@
             "price": 990,
             "old_price": 1200,
             "image": "leaders_game4",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 5,
@@ -87,7 +107,9 @@
             "price": 1200,
             "old_price": 2500,
             "image": "leaders_game5",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 6,
@@ -95,31 +117,39 @@
             "price": 600,
             "old_price": 890,
             "image": "leaders_game6",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         }
     ],
     "games3": [
         {
-            "id": 1,
+            "id": 10,
             "title": "Elden Ring",
             "price": 3295,
             "old_price": 3599,
             "image": "leaders_game2",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
-            "id": 2,
+            "id": 11,
             "title": "Counter-Strike 2",
             "price": 479,
             "image": "leaders_game1",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
-            "id": 3,
+            "id": 12,
             "title": "PUBG: BATTLEGROUNDS",
             "price": 199,
             "image": "leaders_game3",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 4,
@@ -127,7 +157,9 @@
             "price": 990,
             "old_price": 1200,
             "image": "leaders_game4",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 5,
@@ -135,7 +167,9 @@
             "price": 1200,
             "old_price": 2500,
             "image": "leaders_game5",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         },
         {
             "id": 6,
@@ -143,7 +177,9 @@
             "price": 600,
             "old_price": 890,
             "image": "leaders_game6",
-            "os": "windows"
+            "os": "windows",
+            "fav1": "star1",
+            "fav2": "star2"
         }
     ]
 }

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

@@ -1,24 +1,35 @@
 {
-    "success": true,
-    "data": {
-      "comments": [
-        {
-          "username": "Пользователь1",
-          "text": "Текст комментария 1"
-        },
-        {
-          "username": "Пользователь2",
-          "text": "Текст комментария 2"
-        },
-        {
-          "username": "Пользователь3",
-          "text": "Текст комментария 3"
-        },
-        {
-          "username": "Пользователь4",
-          "text": "Текст комментария 4"
-        }
-      ]
-    }
+  "success": true,
+  "data": {
+    "comments": [
+      {
+        "username": "Пользователь1",
+        "text": "Текст комментария 1",
+        "likes": 9,
+        "rating": 8,
+        "date": "2025-03-01T10:00:00Z"
+      },
+      {
+        "username": "Пользователь2",
+        "text": "Текст комментария 2",
+        "likes": 7,
+        "rating": 7,
+        "date": "2025-01-01T10:00:00Z"
+      },
+      {
+        "username": "Пользователь3",
+        "text": "Текст комментария 3",
+        "likes": 5,
+        "rating": 3,
+        "date": "2025-02-01T10:00:00Z"
+      },
+      {
+        "username": "Пользователь4",
+        "text": "Текст комментария 4",
+        "likes": 15,
+        "rating": 2,
+        "date": "2025-12-01T10:00:00Z"
+      }
+    ]
   }
-  
+}

server/routers/kfu-m-24-1/eng-it-lean/dictionaries/index.js

@@ -27,7 +27,7 @@ router.put('/new', (req, res) => {
     return res.status(500).send('No data to update'); // Internal server error
   }
 
-  indexedUpdatedData = { id: data.length, ...updatedData }; // Add the new dictionary to the array
+  const indexedUpdatedData = { id: data.length, ...updatedData }; // Add the new dictionary to the array
 
   data.push(indexedUpdatedData); // Add the new dictionary to the array