Merge branch 'master' into dogsitters-finder

Reviewed-on: #89

package-lock.json

@@ -25,6 +25,7 @@
         "jsonwebtoken": "^9.0.2",
         "mongodb": "^6.12.0",
         "mongoose": "^8.9.2",
+        "mongoose-sequence": "^6.0.1",
         "morgan": "^1.10.0",
         "pbkdf2-password": "^1.2.1",
         "rotating-file-stream": "^3.2.5",
@@ -2133,6 +2134,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -5642,6 +5649,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
     "node_modules/lodash.includes": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
@@ -5995,6 +6008,19 @@
         "url": "https://opencollective.com/mongoose"
       }
     },
+    "node_modules/mongoose-sequence": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mongoose-sequence/-/mongoose-sequence-6.0.1.tgz",
+      "integrity": "sha512-uXnLCW9pu2V49Xw8BmdXdeRugd2mv+ntu3nT2Bbm33pNRmmvHE2GKA+8BASKoQt960McLX4VL78wkb492f6MoQ==",
+      "license": "GPL-2.0",
+      "dependencies": {
+        "async": "^3.2.5",
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "mongoose": ">=5"
+      }
+    },
     "node_modules/mongoose/node_modules/mongodb": {
       "version": "6.12.0",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.12.0.tgz",

package.json

@@ -39,6 +39,7 @@
     "jsonwebtoken": "^9.0.2",
     "mongodb": "^6.12.0",
     "mongoose": "^8.9.2",
+    "mongoose-sequence": "^6.0.1",
     "morgan": "^1.10.0",
     "pbkdf2-password": "^1.2.1",
     "rotating-file-stream": "^3.2.5",

server/index.js

@@ -89,6 +89,7 @@ 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('/connectme', require('./routers/connectme'))
 
 app.use(require("./error"))
 

server/routers/connectme/index.js

@@ -0,0 +1,8 @@
+const { Router } = require('express')
+const router = Router()
+
+router.get('/cities', (request, response) => {
+	response.send(require('./json/cities.json'))
+})
+
+module.exports = router

server/routers/connectme/json/cities.json

@@ -0,0 +1,85 @@
+{
+  "data": [
+    {
+      "id": 1,
+      "title": "Моска"
+    },
+    {
+      "id": 2,
+      "title": "Санкт-петербург"
+    },
+    {
+      "id": 3,
+      "title": "Новосибирска"
+    },
+    {
+      "id": 4,
+      "title": "Екатеринбург"
+    },
+    {
+      "id": 5,
+      "title": "Казань"
+    },
+    {
+      "id": 6,
+      "title": "Нижний новгород"
+    },
+    {
+      "id": 7,
+      "title": "Челябинск"
+    },
+    {
+      "id": 8,
+      "title": "Самара"
+    },
+    {
+      "id": 9,
+      "title": "Омск"
+    },
+    {
+      "id": 10,
+      "title": "Ростов-на-дону"
+    },
+    {
+      "id": 11,
+      "title": "Уфа"
+    },
+    {
+      "id": 12,
+      "title": "Красноярск"
+    },
+    {
+      "id": 13,
+      "title": "Пермь"
+    },
+    {
+      "id": 14,
+      "title": "Воронеж"
+    },
+    {
+      "id": 15,
+      "title": "Волгоград"
+    },
+    {
+      "id": 16,
+      "title": "Краснодар"
+    },
+    {
+      "id": 17,
+      "title": "Тюмень"
+    },
+    {
+      "id": 18,
+      "title": "Ижевск"
+    },
+    {
+      "id": 19,
+      "title": "Барнаул"
+    },
+    {
+      "id": 20,
+      "title": "Владивосток"
+    }
+  ],
+  "count": 20
+}

server/routers/dogsitters-finder/auth.js

@@ -0,0 +1,74 @@
+const { Router } = require("express");
+const hash = require("pbkdf2-password")();
+const { promisify } = require("node:util");
+const jwt = require('jsonwebtoken')
+
+const { getAnswer } = require("../../utils/common");
+
+const { AuthModel } = require("./model/todo/auth");
+const { TOKEN_KEY } = require('./const')
+const { UserModel } = require("./model/todo/user");
+
+const { requiredValidate } = require('./utils')
+
+const router = Router();
+
+router.post(
+  "/signup",
+  requiredValidate("login", "password", "email"),
+  async (req, res, next) => {
+    const { login, password, email } = req.body
+
+    const user = await AuthModel.findOne({ login });
+
+    if (user) {
+      throw new Error("Пользователь с таким логином уже существует");
+    }
+
+    hash({ password }, async function (err, pass, salt, hash) {
+      if (err) return next(err);
+
+      const user = await UserModel.create({ login, email });
+      await AuthModel.create({ login, hash, salt, userId: user.id });
+
+      res.json(getAnswer(null, { ok: true }))
+    })
+  }
+)
+
+function authenticate(login, pass, cb) {
+    AuthModel.findOne({ login }).populate('userId').exec().then((user) => {
+    if (!user) return cb(null, null)
+
+    hash({ password: pass, salt: user.salt }, function (err, pass, salt, hash) {
+      if (err) return cb(err)
+      if (hash === user.hash) return cb(null, user)
+      cb(null, null)
+    })
+  })
+}
+
+const auth = promisify(authenticate)
+
+router.post('/signin', requiredValidate('login', 'password'), async (req, res) => {
+    const { login, password } = req.body
+
+    const user = await auth(login, password)
+
+    if (!user) {
+        throw new Error("Неверный логин или пароль")
+    }
+
+    const accessToken = jwt.sign({
+        ...JSON.parse(JSON.stringify(user.userId)),
+    }, TOKEN_KEY, {
+        expiresIn: '12h'
+    })
+
+    res.json(getAnswer(null, {
+        user: user.userId,
+        token: accessToken,
+    }))
+})
+
+module.exports = router

server/routers/dogsitters-finder/const.js

@@ -0,0 +1,3 @@
+exports.DSF_AUTH_PASSWD_MODEL_NAME = 'DSF_AUTH_PASSWD'
+exports.DSF_AUTH_USER_MODEL_NAME = 'DSF_AUTH_USER'
+exports.DSF_INTERACTION_MODEL_NAME = 'DSF_INTERACTION'

server/routers/dogsitters-finder/index.js

@@ -7,34 +7,63 @@ router.get("/users", (request, response) => {
 router.post("/auth", (request, response) => {
   const { phoneNumber, password } = request.body;
   console.log(phoneNumber, password);
-  if (phoneNumber === "89999999999") {
-    response.send(require("./json/auth/dogsitter.success.json"));
-  } else if (phoneNumber === "89555555555") {
-    response.status(400).send(require("./json/auth/error.json"));
+  if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
+    response.send(require("../json/auth/success.json"));
   } else {
-    response.send(require("./json/auth/owner.success.json"));
+    response.status(401).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"));
+  const { phoneNumber, code } = request.body;
+  if (code === "0000" && phoneNumber === "89999999999") {
+    response.send(require("../json/2fa/dogsitter.success.json"));
+  } else if (code === "0000" && phoneNumber === "89559999999") {
+    response.send(require("../json/2fa/owner.success.json"));
   } else {
-    response.status(400).send(require("./json/2fa/error.json"));
+    response.status(401).send(require("../json/2fa/error.json"));
   }
 });
 
 router.post("/register", (request, response) => {
   const { firstName, secondName, phoneNumber, password, role } = request.body;
   console.log(phoneNumber, password, role);
-  if (phoneNumber === "89283244141" || phoneNumber === "89872855893") {
-    response.status(400).send(require("./json/register/error.json"));
+  if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
+    response.status(401).send(require("../json/register/error.json"));
   } else if (role === "dogsitter") {
-    response.send(require("./json/register/dogsitter.success.json"));
+    response.send(require("../json/register/dogsitter.success.json"));
   } else {
-    response.send(require("./json/register/owner.success.json"));
+    response.send(require("../json/register/owner.success.json"));
   }
 });
 
-module.exports = router;
+router.get("/auth/session", (request, response) => {
+  const authHeader = request.headers.authorization;
+
+  if (!authHeader) {
+    return response.status(401).json({ error: "Authorization header missing" });
+  }
+
+  // Берём сам токен из заголовка
+  const token = authHeader.split(" ")[1];
+
+  if (!token) {
+    return response.status(401).json({ error: "Bearer token missing" });
+  }
+
+  const jwt = require("jsonwebtoken");
+  const secretKey = "secret";
+
+  try {
+    const decoded = jwt.verify(token, secretKey);
+
+    if (decoded.role === "dogsitter") {
+      response.send(require("../json/role/dogsitter.success.json"));
+    } else {
+      response.send(require("../json/role/owner.success.json"));
+    }
+  } catch (e) {
+    console.log("token e:", e);
+    return response.status(403).json({ error: "Invalid token" });
+  }
+});

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

@@ -0,0 +1,3 @@
+{
+  "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwicm9sZSI6ImRvZ3NpdHRlciIsImlhdCI6MTUxNjIzOTAyMn0.7q66wTNyLZp3TGFYF_JdU-yhlWViJulTxP_PCQzO4OI"
+}

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

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

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

@@ -0,0 +1,3 @@
+{
+    "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6Mywicm9sZSI6Im93bmVyIiwiaWF0IjoxNTE2MjM5MDIyfQ.sI9839YXveTpEWhdpr5QbCYllt6hHYO7NsrQDcrXZIQ"
+}

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

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

server/routers/dogsitters-finder/json/auth/dogsitter.success.json

@@ -1,12 +0,0 @@
-{
-    "data": {
-        "id": 1,
-        "phoneNumber": 89283244141,
-        "firstName": "Вася",
-        "secondName": "Пупкин",
-        "role": "dogsitter",
-        "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12",
-        "price": 1500,
-        "aboutMe": "Я люблю собак"
-    }
-}

server/routers/dogsitters-finder/json/auth/error.json

@@ -1,3 +1,5 @@
 {
-    "error": "Пользователь не найден"
-}
+  "message": "Неверный логин или пароль",
+  "error": "Unauthorized",
+  "statusCode": 401
+}

server/routers/dogsitters-finder/json/auth/owner.success.json

@@ -1,9 +0,0 @@
-{
-    "data": {
-        "id": 3,
-        "phoneNumber": 89872855893,
-        "firstName": "Гадий",
-        "secondName": "Петрович",
-        "role": "owner"
-    }
-}

server/routers/dogsitters-finder/json/auth/success.json

@@ -0,0 +1,5 @@
+{
+  "status": "success",
+  "message": "Первый фактор аутентификации пройден",
+  "statusCode": 200
+}

server/routers/dogsitters-finder/json/register/dogsitter.success.json

@@ -1,12 +1,3 @@
 {
-    "data": {
-        "id": 5,
-        "phoneNumber": 89555555555,
-        "firstName": "Масяня",
-        "secondName": "Карлова",
-        "role": "dogsitter",
-        "location": "Россия, республика Татарстан, Казань, улица Пушкина, 12",
-        "price": 100,
-        "aboutMe": "Все на свете - собаки"
-    }
+    "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NSwicm9sZSI6ImRvZ3NpdHRlciIsImlhdCI6MTUxNjIzOTAyMn0.T9V3-f3rD1deA5a2J-tYNw0cACEpzKHbhMPkc7gh8c0"
 }

server/routers/dogsitters-finder/json/register/error.json

@@ -1,3 +1,5 @@
 {
-    "error": "Пользователь с таким номером телефона уже существует"
+    "message": "Такой пользователь уже был зарегистрирован",
+    "error": "Unauthorized",
+    "statusCode": 401
 }

server/routers/dogsitters-finder/json/register/owner.success.json

@@ -1,9 +1,3 @@
 {
-    "data": {
-        "id": 6,
-        "phoneNumber": 89888888888,
-        "firstName": "Генадий",
-        "secondName": "Паровозов",
-        "role": "owner"
-    }
+    "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6Niwicm9sZSI6Im93bmVyIiwiaWF0IjoxNTE2MjM5MDIyfQ.qgOhk9tNcaMRbarRWISTgvGx5Eq_X8fcA5lhdVs2tQI"
 }

server/routers/dogsitters-finder/json/role/dogsitter.success.json

@@ -0,0 +1,4 @@
+{
+    "id": 1,
+    "role": "dogsitter"
+}

server/routers/dogsitters-finder/json/role/error.json

@@ -0,0 +1,5 @@
+{
+  "message": "Неверный jwt token",
+  "error": "Forbidden",
+  "statusCode": 403
+}

server/routers/dogsitters-finder/json/role/owner.success.json

@@ -0,0 +1,4 @@
+{
+    "id": 3,
+    "role": "owner"
+}

server/routers/dogsitters-finder/model/auth.js

@@ -0,0 +1,44 @@
+const { Schema, model } = require("mongoose");
+
+const {
+  DSF_AUTH_PASSWD_MODEL_NAME,
+  DSF_AUTH_USER_MODEL_NAME,
+} = require("../../const");
+
+const schema = new Schema({
+  login: { 
+    type: String, 
+    required: true, 
+    unique: true
+  },
+  hash: { 
+    type: String, 
+    required: true 
+  },
+  salt: { 
+    type: String, 
+    required: true 
+  },
+  userId: { 
+    type: Schema.Types.ObjectId, 
+    ref: DSF_AUTH_USER_MODEL_NAME 
+  },
+  created: {
+    type: Date,
+    default: () => new Date().toISOString(),
+  },
+});
+
+schema.set("toJSON", {
+  virtuals: true,
+  versionKey: false,
+  transform: function (doc, ret) {
+    delete ret._id;
+  },
+});
+
+schema.virtual("id").get(function () {
+  return this._id.toHexString();
+});
+
+exports.AuthModel = model(DSF_AUTH_PASSWD_MODEL_NAME, schema);

server/routers/dogsitters-finder/model/interaction.js

@@ -0,0 +1,24 @@
+const { Schema, model } = require("mongoose");
+
+const { DSF_AUTH_USER_MODEL_NAME, DSF_INTERACTION_MODEL_NAME } = require("../../const");
+
+const interactionSchema = new Schema({
+  owner_id: {
+    type: Schema.Types.ObjectId,
+    ref: DSF_AUTH_USER_MODEL_NAME,
+    required: true
+  },
+  dogsitter_id: {
+    type: Schema.Types.ObjectId,
+    ref: DSF_AUTH_USER_MODEL_NAME,
+    required: true
+  },
+  timestamp: {
+    type: Date,
+    default: Date.now
+  }
+});
+
+interactionSchema.index({ owner_id: 1, dogsitter_id: 1 });
+
+module.exports.Interaction = model(DSF_INTERACTION_MODEL_NAME, interactionSchema);

server/routers/dogsitters-finder/model/user.js

@@ -0,0 +1,83 @@
+const { Schema, model } = require("mongoose");
+
+const { DSF_AUTH_USER_MODEL_NAME } = require("../../const");
+
+const userSchema = new Schema({
+  phone_number: {
+    type: String,
+    required: true,
+    unique: true,
+    match: /^\+?\d{10,15}$/
+  },
+  first_name: {
+    type: String,
+    required: true,
+    trim: true
+  },
+  second_name: {
+    type: String,
+    required: true,
+    trim: true
+  },
+  role: {
+    type: String,
+    enum: ["dogsitter", "owner"],
+    required: true
+  },
+  location: {
+    type: String,
+    required: function() {
+      return this.role === "dogsitter";
+    }
+  },
+  price: {
+    type: Number,
+    min: 0,
+    required: function() {
+      return this.role === "dogsitter";
+    }
+  },
+  about_me: {
+    type: String,
+    maxlength: 500
+  },
+  rating: {
+    type: Number,
+    min: 0,
+    max: 5,
+    default: 0
+  },
+  ratings: {
+    type: [Number],
+    default: [],
+    validate: {
+      validator: function(arr) {
+        return arr.every(v => v >= 0 && v <= 5);
+      },
+      message: "Рейтинг должен быть в диапазоне от 0 до 5!"
+    }
+  },
+  tg: {
+    type: String,
+    match: /^[a-zA-Z0-9_]{5,32}$/
+  },
+  created: {
+    type: Date,
+    default: Date.now
+  }
+});
+
+userSchema.virtual("id").get(function() {
+  return this._id.toHexString();
+});
+
+userSchema.set("toJSON", {
+  virtuals: true,
+  versionKey: false,
+  transform: function(doc, ret) {
+    delete ret._id;
+    delete ret.__v;
+  }
+});
+
+module.exports.User = model(DSF_AUTH_USER_MODEL_NAME, userSchema);

server/routers/dogsitters-finder/routes.js

@@ -0,0 +1,149 @@
+const { Router } = require('express')
+const { expressjwt } = require('express-jwt')
+
+const { getAnswer } = require('../../utils/common')
+const { User, Interaction } = require('./model')
+const { TOKEN_KEY } = require('./const')
+const { requiredValidate } = require('./utils')
+
+const router = Router()
+
+// Получение списка пользователей
+router.get('/users', async (req, res) => {
+
+  const users = await User.find()
+    .select('-__v -ratings -phone_number')
+    .lean()
+  
+  console.log('get users successfull')
+
+  res.send(getAnswer(null, users))
+})
+
+// Получение конкретного пользователя
+router.get('/dogsitter-viewing', async (req, res) => {
+  const { userId } = req.params
+
+  const user = await User.findById(userId)
+    .select('-__v -ratings')
+    .lean()
+
+  if (!user) {
+    return res.status(404).send(getAnswer(new Error('Пользователь не найден')))
+  }
+
+  res.send(getAnswer(null, user))
+})
+
+router.use(expressjwt({ secret: TOKEN_KEY, algorithms: ['HS256'] }))
+
+// Добавление оценки пользователю
+router.post('/dogsitter-viewing/rating', requiredValidate('value'), async (req, res) => {
+  const { userId } = req.params
+  const { value } = req.body
+  const authUserId = req.auth.id
+
+  try {
+    const user = await User.findById(userId)
+    if (!user) throw new Error('Пользователь не найден')
+    if (user.role !== 'dogsitter') throw new Error('Нельзя оценивать этого пользователя')
+    if (user.id === authUserId) throw new Error('Нельзя оценивать самого себя')
+
+    user.ratings.push(Number(value))
+    user.rating = user.ratings.reduce((a, b) => a + b, 0) / user.ratings.length
+
+    const updatedUser = await user.save()
+    
+    res.send(getAnswer(null, {
+      id: updatedUser.id,
+      rating: updatedUser.rating.toFixed(1),
+      totalRatings: updatedUser.ratings.length
+    }))
+
+  } catch (error) {
+    res.status(400).send(getAnswer(error))
+  }
+})
+
+// Обновление информации пользователя
+router.patch('/users', async (req, res) => {
+  const { userId } = req.params
+  const updates = req.body
+
+  try {
+    const user = await User.findByIdAndUpdate(userId, updates, { new: true })
+      .select('-__v -ratings')
+    
+    if (!user) throw new Error('Пользователь не найден')
+    res.send(getAnswer(null, user))
+
+  } catch (error) {
+    res.status(400).send(getAnswer(error))
+  }
+})
+
+// Создание объекта взаимодействия
+router.post('/interactions', 
+  expressjwt({ secret: TOKEN_KEY, algorithms: ['HS256'] }),
+  requiredValidate('dogsitter_id'),
+  async (req, res) => {
+    try {
+      const { dogsitter_id } = req.body
+      const owner_id = req.auth.id // ID из JWT токена
+
+      // Проверка существования пользователей
+      const [owner, dogsitter] = await Promise.all([
+        User.findById(owner_id),
+        User.findById(dogsitter_id)
+      ])
+
+      if (!owner || owner.role !== 'owner') {
+        throw new Error('Владелец не найден или имеет неверную роль')
+      }
+
+      if (!dogsitter || dogsitter.role !== 'dogsitter') {
+        throw new Error('Догситтер не найден или имеет неверную роль')
+      }
+
+      // Создание взаимодействия
+      const interaction = await Interaction.create({
+        owner_id,
+        dogsitter_id
+      })
+
+      res.send(getAnswer(null, {
+        id: interaction.id,
+        timestamp: interaction.timestamp
+      }))
+
+    } catch (error) {
+      res.status(400).send(getAnswer(error))
+    }
+  }
+)
+
+router.get('/interactions/check', async (req, res) => {
+  const { owner_id, dogsitter_id } = req.query;
+
+  if (!owner_id || !dogsitter_id) {
+    return res.status(400).send(getAnswer('Missing owner_id or dogsitter_id'));
+  }
+
+  try {
+    // Поиск взаимодействий по owner_id и dogsitter_id
+    const interactions = await Interaction.find({ owner_id, dogsitter_id })
+      .select('-__v') // Выбираем только нужные поля
+      .lean();
+
+    if (interactions.length === 0) {
+      return res.status(404).send(getAnswer('No interactions found'));
+    }
+
+    res.send(getAnswer(null, interactions));
+  } catch (error) {
+    console.error('Error checking interactions:', error);
+    res.status(500).send(getAnswer('Internal Server Error'));
+  }
+});
+
+module.exports = router

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

@@ -1,5 +1,6 @@
 const { Schema, model } = require('mongoose')
 const { orderStatus } = require('./const')
+const { OrderNumberModel } = require('./order.number')
 
 const schema = new Schema({
     phone: {
@@ -27,6 +28,10 @@ const schema = new Schema({
         type: String,
         required: true
     },
+    orderNumber: {
+        type: String,
+        unique: true
+    },
     status: {
         type: String,
         required: true,
@@ -47,6 +52,18 @@ const schema = new Schema({
     },
 })
 
+schema.pre('save', async function (next) {
+    if (this.isNew) {
+        const counter = await OrderNumberModel.findOneAndUpdate(
+            { _id: 'orderNumber' },
+            { $inc: { sequenceValue: 1 } },
+            { new: true, upsert: true }
+        )
+        this.orderNumber = counter.sequenceValue.toString()
+    }
+    next()
+})
+
 schema.set('toJSON', {
     virtuals: true,
     versionKey: false,

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

@@ -0,0 +1,14 @@
+const { Schema, model } = require('mongoose')
+
+const schema = new Schema({
+  _id: {
+      type: String,
+      required: true,
+  },
+  sequenceValue: {
+      type: Number,
+      default: 0
+  }
+})
+
+exports.OrderNumberModel = model('dry-wash-order-number', schema)

server/routers/gamehub/index.js

@@ -9,7 +9,11 @@ router.get("/update-like", (request, response) => {
 });
 
 router.get("/categories", (request, response) => {
-  response.send(require("./json/categories/success.json"));
+  response.send(require("./json/home-page-data/all-games.json"));
+});
+
+router.get("/favourites", (request, response) => {
+  response.send(require("./json/home-page-data/all-games.json"));
 });
 
 router.get("/shopping-cart", (request, response) => {

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

@@ -1,186 +0,0 @@
-{   
-    "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,7 +5,7 @@
       {
         "username": "Пользователь1",
         "text": "Текст комментария 1",
-        "likes": 9,
+        "likes": 11,
         "rating": 8,
         "date": "2025-03-01T10:00:00Z"
       },
@@ -19,7 +19,7 @@
       {
         "username": "Пользователь3",
         "text": "Текст комментария 3",
-        "likes": 5,
+        "likes": 2,
         "rating": 3,
         "date": "2025-02-01T10:00:00Z"
       },

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

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

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

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

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

@@ -3,43 +3,51 @@
   "data": {
     "topSail": [
       {
+        "id": 1,
         "image": "game1",
-        "text": "$10",
+        "price": 1500,
         "imgPath": "img_top_1"
       },
       {
+        "id": 2,
         "image": "game2",
-        "text": "$10",
+        "price": 980,
         "imgPath": "img_top_2"
       },
       {
+        "id": 3,
         "image": "game3",
-        "text": "$10",
+        "price": 1900,
         "imgPath": "img_top_3"
       },
       {
+        "id": 4,
         "image": "game4",
-        "text": "$10",
+        "price": 1200,
         "imgPath": "img_top_4"
       },
       {
+        "id": 5,
         "image": "game5",
-        "text": "$10",
+        "price": 479,
         "imgPath": "img_top_5"
       },
       {
+        "id": 6,
         "image": "game6",
-        "text": "$10",
+        "price": 700,
         "imgPath": "img_top_6"
       },
       {
+        "id": 7,
         "image": "game7",
-        "text": "$10",
+        "price": 1100,
         "imgPath": "img_top_7"
       },
       {
+        "id": 8,
         "image": "game8",
-        "text": "$10",
+        "price": 3800,
         "imgPath": "img_top_8"
       }
     ],

server/routers/kazan-explore/json/sport/quiz/en/success.json

@@ -788,5 +788,121 @@
                 "image_url": "w_six"
             }
         ]
+    },
+    "history": {
+        "intro_text": "Let's see how well you know UNICS!",
+        "intro_image": "culture",
+        "questions": [
+            {
+                "question": "When was Kazan founded?",
+                "options": [
+                    "1005",
+                    "1156",
+                    "1230",
+                    "1323"
+                ],
+                "correct_answer": "1005",
+                "image_url": "culture"
+            },
+            {
+                "question": "What is the main river flowing through Kazan?",
+                "options": [
+                    "Volga",
+                    "Kazanka",
+                    "Kama",
+                    "Izh"
+                ],
+                "correct_answer": "Kazanka",
+                "image_url": "culture"
+            },
+            {
+                "question": "Who was the first khan of Kazan?",
+                "options": [
+                    "Ulugh Muhammad",
+                    "Akhmat",
+                    "Shah Ali",
+                    "Mamuka"
+                ],
+                "correct_answer": "Ulugh Muhammad",
+                "image_url": "culture"
+            },
+            {
+                "question": "What is the name of Kazan's main sports complex where the 2013 Universiade was held?",
+                "options": [
+                    "Kazan Arena",
+                    "Tatneft Arena",
+                    "Bugulma Arena",
+                    "Ak Bars Sports Palace"
+                ],
+                "correct_answer": "Kazan Arena",
+                "image_url": "culture"
+            },
+            {
+                "question": "Which mosque in Kazan is considered one of the largest in Russia?",
+                "options": [
+                    "Kul Sharif Mosque",
+                    "Mari El Mosque",
+                    "Aisha Mosque",
+                    "Imam Muhammad Mosque"
+                ],
+                "correct_answer": "Kul Sharif Mosque",
+                "image_url": "culture"
+            },
+            {
+                "question": "What is the name of the square where the Kazan Kremlin and Kul Sharif Mosque are located?",
+                "options": [
+                    "Vakhitov Square",
+                    "Freedom Square",
+                    "Kremlin Square",
+                    "Revolution Square"
+                ],
+                "correct_answer": "Kremlin Square",
+                "image_url": "culture"
+            },
+            {
+                "question": "What symbol of Kazan is depicted on the city's coat of arms?",
+                "options": [
+                    "Dragon",
+                    "Tiger",
+                    "Lion",
+                    "Eagle"
+                ],
+                "correct_answer": "Dragon",
+                "image_url": "culture"
+            },
+            {
+                "question": "Who was the architect of the Kazan Kremlin?",
+                "options": [
+                    "Ivan Zarudny",
+                    "Fyodor Benjamin",
+                    "Andrey Ushakov",
+                    "Yury Dashevsky"
+                ],
+                "correct_answer": "Andrey Ushakov",
+                "image_url": "culture"
+            },
+            {
+                "question": "Which of these universities is located in Kazan?",
+                "options": [
+                    "Moscow State University",
+                    "Kazan Federal University",
+                    "St. Petersburg Polytechnic University",
+                    "Novosibirsk State University"
+                ],
+                "correct_answer": "Kazan Federal University",
+                "image_url": "culture"
+            },
+            {
+                "question": "What is the name of the largest street in Kazan, which is also the center of the city's nightlife?",
+                "options": [
+                    "Kremlin Street",
+                    "Bauman Street",
+                    "Pushkin Street",
+                    "Kayum Nasyri Street"
+                ],
+                "correct_answer": "Bauman Street",
+                "image_url": "culture"
+            }
+        ]
     }
 }

server/routers/kazan-explore/json/sport/quiz/ru/success.json

@@ -788,5 +788,121 @@
                 "image_url": "w_six"
             }
         ]
+    },
+    "history": {
+        "intro_text": "Давайте узнаем, насколько вы хорошо знаете историю Казани!",
+        "intro_image": "culture",
+        "questions": [
+            {
+                "question": "Когда Казань была основана?",
+                "options": [
+                    "1000 год",
+                    "1156 год",
+                    "1230 год",
+                    "1323 год"
+                ],
+                "correct_answer": "1000 год",
+                "image_url": "culture"
+            },
+            {
+                "question": "Как называется главная река, протекающая через Казань?",
+                "options": [
+                    "Волга",
+                    "Казанка",
+                    "Кама",
+                    "Иж"
+                ],
+                "correct_answer": "Казанка",
+                "image_url": "culture"
+            },
+            {
+                "question": "Кто был первым казанским ханом?",
+                "options": [
+                    "Улу-Мухаммед",
+                    "Ахмат",
+                    "Шах-Али",
+                    "Мамука"
+                ],
+                "correct_answer": "Улу-Мухаммед",
+                "image_url": "culture"
+            },
+            {
+                "question": "Как называется главный спортивный комплекс Казани, где проводились Универсиада 2013 года?",
+                "options": [
+                    "Казан Арена",
+                    "Татнефть Арена",
+                    "Бугульминская арена",
+                    "Дворец спорта \"Ак Барс\""
+                ],
+                "correct_answer": "Казан Арена",
+                "image_url": "culture"
+            },
+            {
+                "question": "Какая мечеть в Казани считается одной из самых больших в России?",
+                "options": [
+                    "Мечеть Кул Шариф",
+                    "Мечеть Марий Эл",
+                    "Мечеть Айша",
+                    "Мечеть имама Мухаммада"
+                ],
+                "correct_answer": "Мечеть Кул Шариф",
+                "image_url": "culture"
+            },
+            {
+                "question": "Как называется площадь, на которой расположены Казанский Кремль и мечеть Кул Шариф?",
+                "options": [
+                    "Площадь Вахитова",
+                    "Площадь Свободы",
+                    "Площадь Кремля",
+                    "Площадь Революции"
+                ],
+                "correct_answer": "Площадь Кремля",
+                "image_url": "culture"
+            },
+            {
+                "question": "Какой символ Казани изображён на гербе города?",
+                "options": [
+                    "Дракон",
+                    "Тигр",
+                    "Лев",
+                    "Орел"
+                ],
+                "correct_answer": "Дракон",
+                "image_url": "culture"
+            },
+            {
+                "question": "Какой архитектор спроектировал Казанский Кремль?",
+                "options": [
+                    "Иван Зарудный",
+                    "Фёдор Бенжамин",
+                    "Андрей Ушаков",
+                    "Юрий Дашевский"
+                ],
+                "correct_answer": "Андрей Ушаков",
+                "image_url": "culture"
+            },
+            {
+                "question": "Какой из этих вузов находится в Казани?",
+                "options": [
+                    "Московский государственный университет",
+                    "Казанский федеральный университет",
+                    "Санкт-Петербургский политехнический университет",
+                    "Новосибирский государственный университет"
+                ],
+                "correct_answer": "Казанский федеральный университет",
+                "image_url": "culture"
+            },
+            {
+                "question": "Как называется крупнейшая в Казани улица, которая также является центром ночной жизни города?",
+                "options": [
+                    "Кремлевская улица",
+                    "Баумана улица",
+                    "Пушкина улица",
+                    "Каюма Насыри улица"
+                ],
+                "correct_answer": "Баумана улица",
+                "image_url": "culture"
+            }
+        ]
     }
 }

server/routers/kazan-explore/json/sport/quiz/tt/success.json

@@ -788,5 +788,121 @@
                 "image_url": "w_six"
             }
         ]
+    },
+    "history": {
+        "intro_text": "Әйдәгез, Казан тарихын белүегезне ачыклыйк!",
+        "intro_image": "culture",
+        "questions": [
+            {
+                "question": "Казан кайчан нигезләнгән?",
+                "options": [
+                    "1000 ел",
+                    "1156 ел",
+                    "1230 ел",
+                    "1323 ел"
+                ],
+                "correct_answer": "1000 ел",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казан аша агучы төп елга ничек атала?",
+                "options": [
+                    "Идел",
+                    "Казанка",
+                    "Кама",
+                    "Иж"
+                ],
+                "correct_answer": "Казанка",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казанның беренче ханы кем булган?",
+                "options": [
+                    "Олуг Мөхәммәт",
+                    "Әхмәт",
+                    "Шаһ-Әли",
+                    "Мамука"
+                ],
+                "correct_answer": "Олуг Мөхәммәт",
+                "image_url": "culture"
+            },
+            {
+                "question": "2013 елда Универсиада узган Казанның төп спорт комплексы ничек атала?",
+                "options": [
+                    "Казан Арена",
+                    "Татнефть Арена",
+                    "Бөгелмә Арена",
+                    "Ак Барс спорт сарае"
+                ],
+                "correct_answer": "Казан Арена",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казандагы иң зур мәчетләрнең берсе Россиядәге кайсысы?",
+                "options": [
+                    "Кол Шәриф мәчете",
+                    "Марий Эл мәчете",
+                    "Айша мәчете",
+                    "Имам Мөхәммәт мәчете"
+                ],
+                "correct_answer": "Кол Шәриф мәчете",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казан Кремле һәм Кол Шәриф мәчете урнашкан мәйдан ничек атала?",
+                "options": [
+                    "Вахитов мәйданы",
+                    "Ирек мәйданы",
+                    "Кремль мәйданы",
+                    "Революция мәйданы"
+                ],
+                "correct_answer": "Кремль мәйданы",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казан гербында кайсы символ сурәтләнгән?",
+                "options": [
+                    "Аждаһа",
+                    "Юлбарыс",
+                    "Арслан",
+                    "Бүре"
+                ],
+                "correct_answer": "Аждаһа",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казан Кремленең архитекторын атагыз.",
+                "options": [
+                    "Иван Зарудный",
+                    "Фёдор Бенжамин",
+                    "Андрей Ушаков",
+                    "Юрий Дашевский"
+                ],
+                "correct_answer": "Андрей Ушаков",
+                "image_url": "culture"
+            },
+            {
+                "question": "Бу югары уку йортларының кайсысы Казанда урнашкан?",
+                "options": [
+                    "Мәскәү дәүләт университеты",
+                    "Казан федераль университеты",
+                    "Санкт-Петербург политехник университеты",
+                    "Новосибирск дәүләт университеты"
+                ],
+                "correct_answer": "Казан федераль университеты",
+                "image_url": "culture"
+            },
+            {
+                "question": "Казандагы иң зур урам ничек атала? Ул шулай ук шәһәрнең төнге тормыш үзәге булып тора.",
+                "options": [
+                    "Кремль урамы",
+                    "Бауман урамы",
+                    "Пушкин урамы",
+                    "Каюм Насыйри урамы"
+                ],
+                "correct_answer": "Бауман урамы",
+                "image_url": "culture"
+            }
+        ]
     }
 }

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

@@ -1 +1,26 @@
-[{"id":1,"description":"10 слов в Data Science","imageFilename":"kart1.jpg","words":[2,3,4,5,6,7,8,9,10,11,12]}]
+[
+  {
+    "id": 1,
+    "description": "10 слов в Data Science",
+    "imageFilename": "kart1.jpg",
+    "words": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+  },
+  {
+    "id": 2,
+    "description": "Job Interview",
+    "imageFilename": "kart1.jpg",
+    "words": [13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
+  },
+{
+    "id": 3,
+    "description": "ReactJS",
+    "imageFilename": "kart1.jpg",
+    "words": [23, 24, 25, 26, 27, 28, 29, 30, 31, 32]
+  },
+{
+    "id": 4,
+    "description": "NodeJS",
+    "imageFilename": "kart1.jpg",
+    "words": [33, 34, 35, 36, 37, 38, 39, 40, 41, 42]
+  }
+]

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

@@ -1,8 +1,10 @@
 const router = require('express').Router();
 
+const wordsRouter = require('./words');
 const dictionariesRouter = require('./dictionaries');
 const unitsRouter = require('./units');
 const gigachatRouter = require('./gigachat');
+const usersRouter = require('./users');
 module.exports = router;
 
 const delay =
@@ -12,6 +14,8 @@ const delay =
   };
 
 router.use(delay());
+router.use('/words', wordsRouter);
 router.use('/dictionaries', dictionariesRouter);
 router.use('/units', unitsRouter);
-router.use('/gigachat', gigachatRouter);
+router.use('/gigachat', gigachatRouter);
+router.use('/users', usersRouter);

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

@@ -4,9 +4,45 @@ const router = require('express').Router();
 
 module.exports = router;
 
-const data = require('./data/units.json');
+const data = require('./units.json');
 router.get('/', (req, res) => {
-  res.send(data);
+  // for every data set author from users and save it to authoredData variable
+  const users = require('../users/users.json');
+  const authoredData = data.map((unit) => {
+    const user = users.find((user) => user.public_id == unit.author);
+    let authoredUnit = undefined;
+    if (user) {
+      authoredUnit = { ...unit, author: user };
+    }
+    return authoredUnit;
+  });
+
+  res.send(authoredData);
+});
+
+router.post('/:id', (req, res) => {
+  const id = parseInt(req.params.id);
+  const updatedUnit = req.body;
+
+  if (!updatedUnit) {
+    return res.status(400).send('No unit to be added');
+  }
+
+  if (!data) {
+    return res.status(500).send('No data to be updated');
+  }
+
+  const index = data.findIndex((unit) => unit.id === id);
+
+  if (index < 0) {
+    return res.status(404).send('Not found');
+  }
+
+  data.splice(index, 1);
+
+  data.push({...updatedUnit, author: updatedUnit.author.public_id});
+
+  res.status(200).send(data); 
 });
 
 router.put('/', (req, res) => {
@@ -16,17 +52,17 @@ router.put('/', (req, res) => {
     return res.status(400).send('No new unit to be added');
   }
 
+  if (!newUnit.author) {
+    return res.status(400).send('User is not logged in!');
+  }
+
   if (!data) {
     return res.status(500).send('No data to be updated');
   }
 
   const newId = data.length + 1;
-  const filename = newUnit.name.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-  fs.writeFileSync(path.join(__dirname, 'data', `${filename}.md`), newUnit.content);
+  data.push({ ...newUnit, id: newId });
 
-  data.push({ id: newId, filename: filename, name: newUnit.name });
-
-  fs.writeFileSync(path.join(__dirname, 'data', 'units.json'), JSON.stringify(data));
   res.status(200).send(data);
 });
 
@@ -39,24 +75,19 @@ router.delete('/:id', (req, res) => {
   }
 
   data.splice(index, 1);
-  fs.writeFileSync(path.join(__dirname, 'data', 'units.json'), JSON.stringify(data));
   res.send({ message: `Unit with ID ${id} deleted` });
 });
 
 router.get('/:id', (req, res) => {
+  const users = require('../users/users.json');
   const id = parseInt(req.params.id);
   const unit = data.find((unit) => unit.id === id);
 
   if (!unit) {
-    return res.status(404).send('Not found');
+    return res.status(404).send('Unit not found');
   }
 
-  const unitFilepath = path.join(__dirname, 'data', `${unit.filename}.md`);
-  const unitContent = fs.readFileSync(unitFilepath, 'utf-8');
+  const user = users.find((user) => user.public_id == unit.author);
 
-  if (!unitContent) {
-    return res.status(404).send('Not found');
-  }
-
-  res.send({ ...unit, content: unitContent });
+  res.send({...unit, author: user});
 });

server/routers/kfu-m-24-1/eng-it-lean/units/units.json

@@ -0,0 +1,20 @@
+[
+  {
+    "content": "# Цель урока\n\nИзучение структуры документации программы с блоком кода.\n\n## Лексика\n\n### Базовая лексика:\n\n- Documentation – документация\n- Code block – блок кода\n- Description – описание\n- Function – функция\n- Variable – переменная\n- Comment – комментарий\n\n### Расширенная лексика:\n\n- API – интерфейс прикладного программирования\n- Method – метод\n- Class – класс\n- Library – библиотека\n- Framework – фреймворк\n\n## Грамматический фокус\n\nПравило: Структура документации программы должна включать краткое описание, блок кода и примеры использования.\n\nПример:\n\nDocumentation for a program typically includes the following sections:\n\n1. **Description**: A brief overview of what the program does and its purpose.\n2. **Code Block**: The actual code that implements the functionality described in the first section.\n3. **Examples**: One or more examples demonstrating how to use the features described in the documentation.\n\nТипичные ошибки и как их избежать: Ошибки могут возникнуть из-за недостаточного описания функционала или неправильного форматирования кода. Чтобы избежать этого, важно тщательно проработать каждый раздел документации и убедиться, что все примеры корректны и понятны.\n\n## Контекстуализация\n\nТекст для анализа:\n\n**Description**: This is a simple Python script that calculates the average value of a list of numbers.\n\n**Code Block**: \n```python\ndef calculate_average(numbers):\n    \"\"\"Calculate the average value of a list of numbers\"\"\"\n    return sum(numbers)/len(numbers)\n```\n\nПримеры использования:\n\n```python\n# Example usage\nnumbers = [10, 20, 30]\naverage = calculate_average(numbers)\nprint(\"The average value of the list\", numbers, \"is\", average)\n```\n\n## Упражнения\n\nПисьменное задание: Написать документацию для простой функции на языке Python, которая принимает список чисел и возвращает среднее значение. Включить описание, код блока и пример использования.\n\nУстная практика: Ролевой диалог между разработчиком и техническим писателем о структуре и содержании документации программы.\n\nАналитическое задание: Проанализировать существующую документацию программы и найти ошибки или неясности. Предложить улучшения.\n\n## Домашнее задание\n\nТекстовые задачи:\n\n- Написать документацию для другой функции на языке Python, используя правильную структуру.\n- Исправить ошибки в существующей документации программы.\n- Перевести фрагмент документации на русский язык, сохраняя точность и стиль.\n",
+    "id": 2,
+    "author": "1738707541324",
+    "name": "Документация программы"
+  },
+  {
+    "content": "### Цель урока:\nИзучение ключевых слов и фраз, связанных с процессом трудоустройства, а также освоение базовой структуры диалога на собеседовании.\n\n### Лексика:\n**Базовая лексика:**\n1. **Job interview** – собеседование при приеме на работу\n2. **Resume / CV** – резюме\n3. **Cover letter** – сопроводительное письмо\n4. **Interviewer** – интервьюер\n5. **Application form** – анкета при приеме на работу\n6. **Salary** – зарплата\n7. **Benefits** – льготы\n\n**Расширенная лексика:**\n1. **To apply for a job** – подавать заявку на работу\n2. **To be offered the job** – получить предложение о работе\n3. **To negotiate salary** – вести переговоры о зарплате\n4. **To accept the offer** – принять предложение\n5. **To decline the offer** – отклонить предложение\n6. **To resign from your current position** – подать заявление об уходе с текущей работы\n7. **To start working at the company** – начать работать в компании\n8. **Probation period** – испытательный срок\n9. **References** – рекомендации\n10. **Work experience** – опыт работы\n\n### Грамматический фокус:\n**Правило:**\nСтруктура простого вопроса на английском языке:\n- Общий вопрос: \"Do you have any questions?\"\n- Специальный вопрос: \"What are your strengths and weaknesses?\"\n\n**Пример:**\nОбщий вопрос: \"How do you feel about this job opportunity?\"\nСпециальный вопрос: \"Can you tell me about your previous work experience?\"\n\n**Типичные ошибки и как их избежать:**\nОшибка: Неправильное использование порядка слов в вопросах.\nРешение: Практиковать построение вопросов до автоматизма.\n\n### Контекстуализация:\n**Текст для анализа:**\n\"I'm applying for the position of a marketing manager at XYZ Company. Here is my resume.\"\n\"Thank you for considering me. Can you please tell me more about the responsibilities of this role?\"\n\"Sure, let me give you an overview.\"\n\n### Упражнения:\n**Письменное задание:**\nСоставьте список из 5 вопросов, которые вы бы задали на собеседовании. Используйте простые вопросы и специальные вопросы.\n\n**Устная практика:**\nРолевая игра: один студент играет роль интервьюера, другой – кандидата на должность. Меняйтесь ролями.\n\n**Аналитическое задание:**\nНайдите и исправьте ошибки в следующем письме:\n\"Dear HR Manager,\n\nMy name is John Smith and I am writing to apply for the position of Sales Representative at ABC Inc. I enclose my resume for your review.\n\nI believe that my skills and experiences make me an ideal candidate for this position. In my current role as a sales representative at XYZ Corp, I have consistently met or exceeded my sales targets. Additionally, I possess strong communication and negotiation skills which will enable me to effectively represent your products and services.\n\nIf you would like to schedule an interview, please contact me at your convenience. Thank you for your time and consideration.\n\nBest regards,\nJohn Smith\"\n\n### Домашнее задание:\n**Текстовые задачи:**\n1. Написать сопроводительное письмо для конкретной вакансии, используя расширенную лексику.\n2. Составить резюме для воображаемой должности, включая все необходимые разделы.\n3. Перевести текст собеседования на английский язык, сохраняя структуру и смысл.",
+    "id": 3,
+    "author": "1738707541324",
+    "name": "Job Interview"
+  },
+  {
+    "content": "# Multifunctional Verbs\n\n## Overview\n\nThis unit focuses on the use of multifunctional verbs in English. These verbs are able to express multiple meanings depending on their use in a sentence.\n\n## Learning Objectives\n\nBy the end of this unit, you will be able to:\n\n* Identify the different forms of the main multifunctional verb.\n* Explain how these forms can be used interchangeably in sentences.\n* Demonstrate the correct usage of the three forms of the multifunctional verb by providing sentences and examples.\n\n## Vocabulary Review\n\n| Term | Definition                                               |\n| ---- | -------------------------------------------------------- |\n| Be   | To express a present or ongoing state of being.          |\n| Have | To express ownership or possession.                      |\n| Do   | To express an action to be done, future action or habit. |\n\n## Activities\n\n### Activity 1: Identify the Different Forms of the Main Multifunctional Verb\n\n* Read through each sentence and identify if the verb is used in its present tense (is), past tense (was/were), or future tense (will, would).\n* Discuss how this usage can vary depending on context.\n* Write down sentences that use different forms to illustrate your points.\n\n1. **Sentence 1**\n\n   : \"The cat is sleeping.\"\n   * Present tense: The cat is sleeping.\n   * Past tense: The cat slept.\n   * Future tense: The cat will sleep.\n2. **Sentence 2**\n\n   : \"I have a dog at home.\"\n   * Present tense: I have a dog.\n   * Past tense: I had a dog.\n   * Future tense: I will have a dog.\n3. **Sentence 3**\n\n   : \"We are going on a hike tomorrow.\"\n   * Present tense: We are going on a hike.\n   * Past tense: We went on a hike.\n   * Future tense: We will go on a hike.\n4. **Sentence 4**\n\n   : \"He has been studying all day.\"\n   * Present tense: He is studying.\n   * Past tense: He studied.\n   * Future tense: He will study.\n5. **Sentence 5**\n\n   : \"We are going to buy some groceries later today.\"\n   * Present tense: We are going to buy some groceries.\n   * Past tense: We bought some groceries.\n   * Future tense: We will buy some groceries.\n\n### Activity 2: Explain How These Forms Can Be Used Interchangeably in Sentences\n\n* Read through a sentence and identify the present, past, and future tense uses.\n* In pairs, explain why these forms are used interchangeably.\n* Provide examples of sentences that demonstrate this usage.\n* Highlight how the context changes the meaning.\n\n### Activity 3: Correct Usage of the Three Forms of the Multifunctional Verb\n\n* Read through a sentence and identify which form is being used.\n* In pairs, discuss why these forms are used in certain situations.\n* Provide sentences that demonstrate the correct usage of the three forms.",
+    "id": 1,
+    "author": "1738707541324",
+    "name": "Multifunctional Verbs"
+  }
+]

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

@@ -0,0 +1,53 @@
+const router = require('express').Router();
+const fs = require('fs');
+
+module.exports = router;
+
+let data = require('./users.json');
+const path = require('path');
+router.get('/', (req, res) => {
+  res.send(data);
+});
+
+router.post('/', (req, res) => {
+  const newUser = req.body;
+  
+  data.push(newUser);
+  fs.writeFileSync(path.join(__dirname, 'users.json'), JSON.stringify(data));
+  res.send(data);
+});
+
+router.post('/login', (req, res) => {
+  const { email, password } = req.body;
+  const user = data.find((user) => user.email === email && user.password === password);
+
+  if (!user) {
+    res.status(404).send('Пользователь не найден');
+  }
+  res.json({ public_id: user.public_id });
+});
+
+router.get('/account', (req, res) => {
+  const { public_id } = req.query;
+  const user = data.find((user) => user.public_id == public_id);
+
+  if (!user) {
+    res.status(404).send('Пользователь не найден');
+  }
+  res.send({ ...user, id: -1 });
+});
+
+router.post('/account/save', (req, res) => {
+  const updatedUser = req.body;
+  const { public_id } = updatedUser;
+  const index = data.findIndex((user) => user.public_id == public_id);
+
+  if (!index || index === -1) {
+    res.status(404).send('Пользователь не найден');
+  }
+
+  data[index] = { ...data[index], ...updatedUser, id: data[index].id, password: data[index].password };
+  fs.writeFileSync(path.join(__dirname, 'users.json'), JSON.stringify(data));
+
+  res.status(200);
+});

server/routers/kfu-m-24-1/eng-it-lean/users/users.json

@@ -0,0 +1 @@
+[{"id":1738707541324,"public_id":1738707541324,"email":"1@gmail.com","password":"1","age":"22","nickname":"324324","about":"Чиловый "}]

server/routers/kfu-m-24-1/eng-it-lean/words/words.json

@@ -132,5 +132,306 @@
       "During model validation, its ability to make accurate predictions on new data is checked.",
       "Validation showed that the model is robust against changes in data and has low generalization error."
     ]
+  },
+  {
+    "id": 13,
+    "word": "resume",
+    "translation": "резюме",
+    "definition": "a document containing a summary of your work experience, education, and skills that you submit when applying for a job",
+    "synonyms": ["CV", "curriculum vitae"],
+    "examples": [
+      "Make sure to update your resume before the interview."
+    ]
+  },
+  {
+    "id": 14,
+    "word": "interviewer",
+    "translation": "интервьюер",
+    "definition": "the person who conducts an interview, typically a representative of the company or organization offering the job",
+    "synonyms": ["questioner", "examiner"],
+    "examples": [
+      "The interviewer asked about my previous work experiences."
+    ]
+  },
+  {
+    "id": 15,
+    "word": "qualification",
+    "translation": "квалификация",
+    "definition": "a quality, skill, or attribute that makes someone suitable for a particular job or activity",
+    "synonyms": ["credential", "competence"],
+    "examples": [
+      "Do you have any qualifications in project management?"
+    ]
+  },
+  {
+    "id": 16,
+    "word": "experience",
+    "translation": "опыт",
+    "definition": "practical contact with and observation of facts or events, especially those gained through employment",
+    "synonyms": ["background", "track record"],
+    "examples": [
+      "She has five years of experience in marketing."
+    ]
+  },
+  {
+    "id": 17,
+    "word": "skillset",
+    "translation": "набор навыков",
+    "definition": "the range of skills and abilities possessed by an individual",
+    "synonyms": ["abilities", "talents"],
+    "examples": [
+      "Her skillset includes proficiency in several programming languages."
+    ]
+  },
+  {
+    "id": 18,
+    "word": "cover letter",
+    "translation": "сопроводительное письмо",
+    "definition": "a document sent with your resume that provides additional information on why you're qualified for the position",
+    "synonyms": ["application letter", "letter of introduction"],
+    "examples": [
+      "Always include a well-written cover letter with your application."
+    ]
+  },
+  {
+    "id": 19,
+    "word": "hiring manager",
+    "translation": "менеджер по найму",
+    "definition": "the person responsible for making hiring decisions within a company or department",
+    "synonyms": ["recruiter", "HR manager"],
+    "examples": [
+      "The hiring manager will review all applications and select candidates for interviews."
+    ]
+  },
+  {
+    "id": 20,
+    "word": "job description",
+    "translation": "описание вакансии",
+    "definition": "a detailed account of the responsibilities, duties, required skills, and working conditions associated with a specific job",
+    "synonyms": ["position profile", "role specification"],
+    "examples": [
+      "Read the job description carefully to understand what the employer is looking for."
+    ]
+  },
+  {
+    "id": 21,
+    "word": "salary negotiation",
+    "translation": "переговоры о зарплате",
+    "definition": "the process of discussing and agreeing upon the compensation for a job, including salary, benefits, and other forms of remuneration",
+    "synonyms": ["compensation discussion", "pay bargaining"],
+    "examples": [
+      "It's important to prepare for salary negotiations during the final stages of the interview process."
+    ]
+  },
+  {
+    "id": 22,
+    "word": "reference",
+    "translation": "рекомендация",
+    "definition": "a person who can vouch for your qualifications, character, and work ethic, often contacted by potential employers",
+    "synonyms": ["endorsement", "testimonial"],
+    "examples": [
+      "Be prepared to provide references from former supervisors or colleagues."
+    ]
+  },
+  {
+    "id": 23,
+    "word": "component",
+    "translation": "компонент",
+    "definition": "A reusable piece of code that renders part of the user interface.",
+    "synonyms": ["module", "widget"],
+    "examples": [
+      "In React, components are the building blocks of the UI."
+    ]
+  },
+  {
+    "id": 24,
+    "word": "props",
+    "translation": "пропсы",
+    "definition": "Short for 'properties', these are read-only components passed down from parent components to child components.",
+    "synonyms": ["attributes", "parameters"],
+    "examples": [
+      "Props allow you to pass data between components."
+    ]
+  },
+  {
+    "id": 25,
+    "word": "state",
+    "translation": "состояние",
+    "definition": "An object that holds data specific to a component which may change over time.",
+    "synonyms": ["data", "context"],
+    "examples": [
+      "Managing state is crucial for dynamic web applications."
+    ]
+  },
+  {
+    "id": 26,
+    "word": "render",
+    "translation": "рендеринг",
+    "definition": "The process of updating the DOM to match the current state of a component.",
+    "synonyms": ["update", "refresh"],
+    "examples": [
+      "React efficiently handles rendering to ensure smooth updates."
+    ]
+  },
+  {
+    "id": 27,
+    "word": "virtual DOM",
+    "translation": "виртуальный DOM",
+    "definition": "A lightweight copy of the actual DOM maintained by React to improve performance by minimizing updates to the real DOM.",
+    "synonyms": ["shadow tree", "virtual representation"],
+    "examples": [
+      "Virtual DOM allows React to update only necessary parts of the UI."
+    ]
+  },
+  {
+    "id": 28,
+    "word": "JSX",
+    "translation": "JSX",
+    "definition": "A syntax extension to JavaScript used in React to describe what the user interface should look like.",
+    "synonyms": ["template language", "syntax extension"],
+    "examples": [
+      "JSX makes it easier to write and understand React components."
+    ]
+  },
+  {
+    "id": 29,
+    "word": "hooks",
+    "translation": "хуки",
+    "definition": "Functions that let you use state and other React features without writing a class.",
+    "synonyms": ["functionalities", "utilities"],
+    "examples": [
+      "Hooks make functional components more powerful."
+    ]
+  },
+  {
+    "id": 30,
+    "word": "event handling",
+    "translation": "обработка событий",
+    "definition": "The mechanism by which React components respond to user actions such as clicks, key presses, etc.",
+    "synonyms": ["interaction management", "action response"],
+    "examples": [
+      "Event handlers in React allow you to define how components react to user interactions."
+    ]
+  },
+  {
+    "id": 31,
+    "word": "lifecycle methods",
+    "translation": "методы жизненного цикла",
+    "definition": "Methods called at different stages of a component's existence, allowing developers to perform tasks at each stage.",
+    "synonyms": ["phase callbacks", "stage handlers"],
+    "examples": [
+      "Lifecycle methods help manage the behavior of components throughout their lifecycle."
+    ]
+  },
+  {
+    "id": 32,
+    "word": "routing",
+    "translation": "маршрутизация",
+    "definition": "The process of defining and managing navigation paths within a single-page application.",
+    "synonyms": ["navigation control", "path management"],
+    "examples": [
+      "React Router is commonly used for routing in React apps."
+    ]
+  },
+
+  {
+    "id": 33,
+    "word": "server-side",
+    "translation": "серверная сторона",
+    "definition": "Refers to operations performed by the server in contrast to client-side operations.",
+    "synonyms": ["backend", "back-end"],
+    "examples": [
+      "Node.js is primarily used for server-side development."
+    ]
+  },
+  {
+    "id": 34,
+    "word": "asynchronous",
+    "translation": "асинхронный",
+    "definition": "Programming model where operations execute independently of other operations, allowing efficient handling of multiple requests simultaneously.",
+    "synonyms": ["non-blocking", "concurrent"],
+    "examples": [
+      "Node.js uses asynchronous I/O to handle many concurrent connections efficiently."
+    ]
+  },
+  {
+    "id": 35,
+    "word": "callback",
+    "translation": "коллбек",
+    "definition": "A function passed into another function as an argument, which is then invoked inside the outer function to complete some kind of routine or action.",
+    "synonyms": ["handler", "continuation"],
+    "examples": [
+      "Callbacks are widely used in Node.js for handling asynchronous operations."
+    ]
+  },
+  {
+    "id": 36,
+    "word": "event loop",
+    "translation": "цикл событий",
+    "definition": "Mechanism in Node.js that handles asynchronous operations and ensures non-blocking I/O by offloading operations to the system kernel whenever possible.",
+    "synonyms": ["event-driven architecture", "runtime environment"],
+    "examples": [
+      "The event loop is fundamental to understanding how Node.js works."
+    ]
+  },
+  {
+    "id": 37,
+    "word": "package manager",
+    "translation": "менеджер пакетов",
+    "definition": "Tool used to install, update, configure, and remove packages in Node.js projects.",
+    "synonyms": ["dependency manager", "library manager"],
+    "examples": [
+      "npm and yarn are popular package managers for Node.js."
+    ]
+  },
+  {
+    "id": 38,
+    "word": "middleware",
+    "translation": "промежуточное ПО",
+    "definition": "Software that sits between an application and the backend infrastructure, providing additional functionality to the request-response cycle.",
+    "synonyms": ["interceptor", "filter"],
+    "examples": [
+      "Express.js uses middleware to handle common tasks like logging, authentication, and error handling."
+    ]
+  },
+  {
+    "id": 39,
+    "word": "REST API",
+    "translation": "REST API",
+    "definition": "Architectural style for building APIs using HTTP methods to perform CRUD operations on resources.",
+    "synonyms": ["web service", "API design pattern"],
+    "examples": [
+      "Many Node.js applications implement RESTful APIs to communicate with clients."
+    ]
+  },
+  {
+    "id": 40,
+    "word": "streams",
+    "translation": "потоки",
+    "definition": "Data structures that facilitate continuous transfer of data in chunks rather than loading everything into memory at once.",
+    "synonyms": ["data flow", "pipeline"],
+    "examples": [
+      "Streams are useful for handling large files or continuous data in Node.js."
+    ]
+  },
+  {
+    "id": 41,
+    "word": "cluster module",
+    "translation": "модуль кластера",
+    "definition": "Built-in module in Node.js that allows an application to be split into multiple processes running on separate CPU cores, improving performance and scalability.",
+    "synonyms": ["multi-processing", "parallel execution"],
+    "examples": [
+      "Using the cluster module can significantly enhance the throughput of a Node.js application."
+    ]
+  },
+  {
+    "id": 42,
+    "word": "event emitter",
+    "translation": "излучатель событий",
+    "definition": "Class in Node.js that facilitates communication between objects in an application by emitting named events that other objects can listen to.",
+    "synonyms": ["publisher-subscriber", "observer pattern"],
+    "examples": [
+      "Event emitters are useful for implementing custom event-based systems in Node.js."
+    ]
   }
 ]

server/routers/kfu-m-24-1/sberhubproject/events/data/event.json

@@ -9,13 +9,13 @@
     "id": 2,
     "name": "Командная встреча",
     "description": "Ежеквартальная встреча для согласования целей",
-    "date": "2025-02-02T00:00:00Z"
+    "date": 1672444800000
   },
   {
     "id": 3,
     "name": "День рождения",
     "description": "Празднование 30-летия Ивана",
-    "date": "2025-02-02T00:00:00Z"
+    "date": "2025-01-25"
   },
   {
     "id": 4,

server/routers/kfu-m-24-1/sberhubproject/events/index.js

@@ -27,10 +27,12 @@ router.post('/:user_id/:action/:id', (req, res) => {
   const user_id = parseInt(req.params.user_id);
   const id = parseInt(req.params.id);
   const action = req.params.action;
+  /*
   if (users_data.findIndex((item) => item.id === user_id) === -1 || data.findIndex((item) => item.id === id) === -1) {
     res.status(404).send();
     return;
   }
+    */
   if (action !== 'participate' && action !== 'refuse') {
     res.status(400).send({ error: 'Invalid action' });
     return;

server/routers/kfu-m-24-1/sberhubproject/gigachat/controller.js

@@ -0,0 +1,83 @@
+const { v4: uuidv4 } = require('uuid');
+const axios = require('axios');
+const https = require('https');
+
+process.env.GIGACHAT_AUTH =
+  'YzA2ODg0NTYtYzE3Yi00OGJkLTkyY2MtMzdkM2U0YjE4ZmQ5Ojc0ZWVhN2YxLTI5MWYtNDNiZS05MTY2LWIyZjg5MGY2YWQ3Ng==';
+
+const agent = new https.Agent({
+  rejectUnauthorized: false
+});
+
+class controller {
+  async getText(req, res) {
+    try {
+      const { text } = req.body;
+
+      const headers = {
+        Authorization: `Basic ${process.env.GIGACHAT_AUTH}`,
+        RqUID: uuidv4(),
+        'Content-Type': 'application/x-www-form-urlencoded',
+        Accept: 'application/json'
+      };
+
+      const access_token = await axios
+        .post('https://ngw.devices.sberbank.ru:9443/api/v2/oauth', encodeURI(`scope=GIGACHAT_API_PERS`), {
+          headers: headers,
+          httpsAgent: agent
+        })
+        .then((response) => {
+          return response.data.access_token;
+        })
+        .catch((error) => {
+          return error;
+        });
+
+      const systemMessage = ` Создай анализ совместимости между двумя людьми и отобрази результат исключительно в формате JSON, который будет результатом работы 'JSON.stringify()'. Он должен состоять из следующих частей:
+
+1. **Совместимость** в процентах.
+2. **Список точек соприкосновения**. Перечисли их через запятую.
+3. **Список потенциальных различий**. Перечисли через запятую.
+
+Результат должен быть строкой JSON, полученной через 'JSON.stringify()', и не содержать дополнительных пояснений или текста.
+
+Пример:
+    {"compatibility": 70, "pointsOfContact": ["общие интересы", "совместные увлечения", "взаимное уважение"], "potentialDifferences": ["различные жизненные цели", "противоположные характеры", "несовпадающие ценности"]}
+`;
+
+      const textAI = await axios
+        .post(
+          'https://gigachat.devices.sberbank.ru/api/v1/chat/completions',
+          JSON.stringify({
+            model: 'GigaChat:latest',
+            messages: [
+              {
+                role: 'user',
+                content: systemMessage + text
+              }
+            ],
+            profanity_check: true
+          }),
+          {
+            headers: {
+              'Content-Type': 'application/json',
+              Authorization: `Bearer ${access_token}`
+            },
+            httpsAgent: agent
+          }
+        )
+        .then((response) => {
+          return response.data.choices[0].message.content;
+        })
+        .catch((error) => {
+          return error;
+        });
+
+      res.status(200).json({ text: textAI });
+    } catch (e) {
+      res.status(400).json({ message: e });
+    }
+  }
+}
+
+module.exports = new controller();

server/routers/kfu-m-24-1/sberhubproject/gigachat/index.js

@@ -0,0 +1,6 @@
+const router = require('express').Router();
+const controller = require('./controller');
+
+router.post('/', controller.getText);
+
+module.exports = router;

server/routers/kfu-m-24-1/sberhubproject/index.js

@@ -2,8 +2,19 @@ const router = require('express').Router();
 const interestsRouter = require('./interests');
 const usersRouter = require('./users');
 const eventsRouter = require('./events');
+const gigachatRouter = require('./gigachat');
+const telegramRouter = require('./telegram');
 module.exports = router;
 
+const delay =
+  (ms = 1000) =>
+  (req, res, next) => {
+    setTimeout(next, ms);
+  };
+
+router.use(delay());
 router.use('/interests', interestsRouter);
 router.use('/users', usersRouter);
 router.use('/events', eventsRouter);
+router.use('/gigachat', gigachatRouter);
+router.use('/telegram', telegramRouter);

server/routers/kfu-m-24-1/sberhubproject/telegram/controller.js

@@ -0,0 +1,24 @@
+const axios = require('axios');
+
+process.env.TELEGRAM_TOKEN = '7866617284:AAHDOfPQJdKmufOdRgFza6XA8ZWRHPeA_Yc';
+
+class controller {
+  async sendMessage(req, res) {
+    try {
+      const { chat_id, text } = req.body;
+
+      const response = await axios.get(`https://api.telegram.org/bot${process.env.TELEGRAM_TOKEN}/sendMessage`, {
+        params: {
+          chat_id: chat_id,
+          text: text,
+          parse_mode: 'html'
+        }
+      });
+      res.json(response.data);
+    } catch (e) {
+      res.status(400).json({ message: e.message });
+    }
+  }
+}
+
+module.exports = new controller();

server/routers/kfu-m-24-1/sberhubproject/telegram/index.js

@@ -0,0 +1,6 @@
+const router = require('express').Router();
+const controller = require('./controller');
+
+router.post('/', controller.sendMessage);
+
+module.exports = router;

server/routers/kfu-m-24-1/sberhubproject/users/data/users.json

@@ -6,8 +6,19 @@
     "about": "Разработчик с 10-летним стажем, увлекаюсь новыми технологиями.",
     "email": "ivan.ivanov@example.com",
     "interests": [
-      { "value": "Новые технологии, ИИ, техника", "label": "Новые технологии, ИИ, техника" },
-      { "value": "Музыка", "label": "Музыка" }
+      "Новые технологии, ИИ, техника",
+      "Музыка"
+    ]
+  },
+  {
+    "id": 1252744945,
+    "username": "Моряков Сергей",
+    "photo": "",
+    "about": "Люблю путешествия и фотографию, обожаю изучать новые культуры.",
+    "email": "sergey.moryakov@example.com",
+    "interests": [
+      "Путешествия и туризм",
+      "Искусство, фотография и дизайн"
     ]
   },
   {
@@ -17,8 +28,8 @@
     "about": "Люблю путешествия и фотографию, обожаю изучать новые культуры.",
     "email": "maria.smirnova@example.com",
     "interests": [
-      { "value": "Путешествия и туризм", "label": "Путешествия и туризм" },
-      { "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" }
+      "Путешествия и туризм",
+      "Искусство, фотография и дизайн"
     ]
   },
   {
@@ -28,8 +39,8 @@
     "about": "Финансовый аналитик, интересуюсь инвестициями и рынками.",
     "email": "aleksey.kuznetsov@example.com",
     "interests": [
-      { "value": "Политика, социология, активизм и дебаты", "label": "Политика, социология, активизм и дебаты" },
-      { "value": "Математика, физика и информатика", "label": "Математика, физика и информатика" }
+      "Политика, социология, активизм и дебаты",
+      "Математика, физика и информатика"
     ]
   },
   {
@@ -39,8 +50,8 @@
     "about": "Дизайнер интерьеров, люблю создавать уютные и стильные пространства.",
     "email": "olga.petrovna@example.com",
     "interests": [
-      { "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" },
-      { "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
+      "Искусство, фотография и дизайн",
+      "Кино и другое многомодальное искусство"
     ]
   },
   {
@@ -50,8 +61,8 @@
     "about": "Тренер по фитнесу, придерживаюсь здорового образа жизни.",
     "email": "dmitriy.sidorov@example.com",
     "interests": [
-      { "value": "Спорт, фитнес и ЗОЖ", "label": "Спорт, фитнес и ЗОЖ" },
-      { "value": "Волонтерство и благотворительность", "label": "Волонтерство и благотворительность" }
+      "Спорт, фитнес и ЗОЖ",
+      "Волонтерство и благотворительность"
     ]
   },
   {
@@ -61,8 +72,8 @@
     "about": "Психолог, занимаюсь личностным ростом и развитием.",
     "email": "elena.volkova@example.com",
     "interests": [
-      { "value": "Психология и психическое здоровье", "label": "Психология и психическое здоровье" },
-      { "value": "Литература и история", "label": "Литература и история" }
+      "Психология и психическое здоровье",
+      "Литература и история"
     ]
   },
   {
@@ -72,8 +83,8 @@
     "about": "Ведущий мероприятий и организатор, люблю работать с людьми.",
     "email": "artem.morozov@example.com",
     "interests": [
-      { "value": "Настольные игры", "label": "Настольные игры" },
-      { "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
+      "Настольные игры",
+      "Кино и другое многомодальное искусство"
     ]
   },
   {
@@ -83,8 +94,8 @@
     "about": "Веду блог о моде и стиле, увлекаюсь новыми трендами.",
     "email": "irina.fedorova@example.com",
     "interests": [
-      { "value": "Мода", "label": "Мода" },
-      { "value": "Путешествия и туризм", "label": "Путешествия и туризм" }
+      "Мода",
+      "Путешествия и туризм"
     ]
   },
   {
@@ -94,8 +105,8 @@
     "about": "Разработчик мобильных приложений, увлекаюсь игровыми технологиями.",
     "email": "sergey.chernov@example.com",
     "interests": [
-      { "value": "Соревновательные видеоигры", "label": "Соревновательные видеоигры" },
-      { "value": "Новые технологии, ИИ, техника", "label": "Новые технологии, ИИ, техника" }
+      "Соревновательные видеоигры",
+      "Новые технологии, ИИ, техника"
     ]
   },
   {
@@ -105,8 +116,8 @@
     "about": "Работаю в области маркетинга, увлекаюсь продвижением брендов.",
     "email": "tatyana.lebedeva@example.com",
     "interests": [
-      { "value": "Маркетинг", "label": "Маркетинг" },
-      { "value": "Литература и история", "label": "Литература и история" }
+      "Маркетинг",
+      "Литература и история"
     ]
   },
   {
@@ -116,8 +127,8 @@
     "about": "Инженер-программист, увлекаюсь разработкой игр и виртуальной реальностью.",
     "email": "andrey.vasilyev@example.com",
     "interests": [
-      { "value": "Разработка игр", "label": "Разработка игр" },
-      { "value": "Виртуальная реальность", "label": "Виртуальная реальность" }
+      "Разработка игр",
+      "Виртуальная реальность"
     ]
   },
   {
@@ -127,8 +138,8 @@
     "about": "Преподаватель литературы, люблю поэзию и классическую литературу.",
     "email": "natalya.kozlova@example.com",
     "interests": [
-      { "value": "Литература и история", "label": "Литература и история" },
-      { "value": "Образование и наука", "label": "Образование и наука" }
+      "Литература и история",
+      "Образование и наука"
     ]
   },
   {
@@ -138,8 +149,8 @@
     "about": "Спортсмен, занимаюсь бегом и триатлоном.",
     "email": "pavel.novikov@example.com",
     "interests": [
-      { "value": "Спорт, фитнес и ЗОЖ", "label": "Спорт, фитнес и ЗОЖ" },
-      { "value": "Путешествия и туризм", "label": "Путешествия и туризм" }
+      "Спорт, фитнес и ЗОЖ",
+      "Путешествия и туризм"
     ]
   },
   {
@@ -149,8 +160,8 @@
     "about": "Архитектор, увлекаюсь современным дизайном и урбанистикой.",
     "email": "ekaterina.mikhailova@example.com",
     "interests": [
-      { "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" },
-      { "value": "Урбанистика", "label": "Урбанистика" }
+      "Искусство, фотография и дизайн",
+      "Урбанистика"
     ]
   },
   {
@@ -160,8 +171,8 @@
     "about": "Бизнес-консультант, помогаю компаниям развиваться.",
     "email": "viktor.sokolov@example.com",
     "interests": [
-      { "value": "Бизнес и предпринимательство", "label": "Бизнес и предпринимательство" },
-      { "value": "Политика, социология, активизм и дебаты", "label": "Политика, социология, активизм и дебаты" }
+      "Бизнес и предпринимательство",
+      "Политика, социология, активизм и дебаты"
     ]
   },
   {
@@ -171,8 +182,8 @@
     "about": "Художник, работаю в стиле абстракционизма.",
     "email": "anna.pavlova@example.com",
     "interests": [
-      { "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" },
-      { "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
+      "Искусство, фотография и дизайн",
+      "Кино и другое многомодальное искусство"
     ]
   },
   {
@@ -182,8 +193,8 @@
     "about": "Ученый, занимаюсь исследованиями в области биотехнологий.",
     "email": "denis.ivanov@example.com",
     "interests": [
-      { "value": "Биология и биотехнологии", "label": "Биология и биотехнологии" },
-      { "value": "Образование и наука", "label": "Образование и наука" }
+      "Биология и биотехнологии",
+      "Образование и наука"
     ]
   },
   {
@@ -193,8 +204,8 @@
     "about": "Повар, специализируюсь на авторской кухне.",
     "email": "lyudmila.kuznetsova@example.com",
     "interests": [
-      { "value": "Кулинария", "label": "Кулинария" },
-      { "value": "Путешествия и туризм", "label": "Путешествия и туризм" }
+      "Кулинария",
+      "Путешествия и туризм"
     ]
   },
   {
@@ -204,8 +215,8 @@
     "about": "Музыкант, играю на гитаре и пишу песни.",
     "email": "grigoriy.petrov@example.com",
     "interests": [
-      { "value": "Музыка", "label": "Музыка" },
-      { "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
+      "Музыка",
+      "Кино и другое многомодальное искусство"
     ]
   },
   {
@@ -215,19 +226,8 @@
     "about": "Врач, специализируюсь на профилактической медицине.",
     "email": "valentina.semenova@example.com",
     "interests": [
-      { "value": "Медицина и здоровье", "label": "Медицина и здоровье" },
-      { "value": "Спорт, фитнес и ЗОЖ", "label": "Спорт, фитнес и ЗОЖ" }
-    ]
-  },
-  {
-    "id": 1252744945,
-    "username": "Моряков Сергей",
-    "photo": "https://i.pravatar.cc/150?img=50",
-    "about": "Люблю путешествия и фотографию, обожаю изучать новые культуры.",
-    "email": "maria.smirnova@example.com",
-    "interests": [
-      { "value": "Путешествия и туризм", "label": "Путешествия и туризм" },
-      { "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" }
+      "Медицина и здоровье",
+      "Спорт, фитнес и ЗОЖ"
     ]
   }
 ]

server/routers/kfu-m-24-1/sberhubproject/users/index.js

@@ -27,10 +27,12 @@ router.post('/:to_id/:action/:from_id', (req, res) => {
   const to_id = parseInt(req.params.to_id);
   const from_id = parseInt(req.params.from_id);
   const action = req.params.action;
+  /*
   if (data.findIndex((item) => item.id === to_id) === -1 || data.findIndex((item) => item.id === from_id) === -1) {
     res.status(404).send();
     return;
   }
+    */
   if (action !== 'like' && action !== 'dislike') {
     res.status(400).send({ error: 'Invalid action' });
     return;