Изменение путей запросов

Reviewed-on: #95

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "multi-stub",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "multi-stub",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
         "ai": "^4.1.13",

package.json

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

server/index.js

@@ -81,7 +81,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("/v1/todo", require("./routers/todo"))
-app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
+// app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
 app.use("/kazan-explore", require("./routers/kazan-explore"))
 app.use("/edateam", require("./routers/edateam-legacy"))
 app.use("/dry-wash", require("./routers/dry-wash"))

server/routers/dogsitters-finder/index.js

@@ -8,20 +8,20 @@ router.post("/auth", (request, response) => {
   const { phoneNumber, password } = request.body;
   console.log(phoneNumber, password);
   if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
-    response.send(require("../json/auth/success.json"));
+    response.send(require("./json/auth/success.json"));
   } else {
-    response.status(401).send(require("../json/auth/error.json"));
+    response.status(401).send(require("./json/auth/error.json"));
   }
 });
 
 router.post("/auth/2fa", (request, response) => {
   const { phoneNumber, code } = request.body;
   if (code === "0000" && phoneNumber === "89999999999") {
-    response.send(require("../json/2fa/dogsitter.success.json"));
+    response.send(require("./json/2fa/dogsitter.success.json"));
   } else if (code === "0000" && phoneNumber === "89559999999") {
-    response.send(require("../json/2fa/owner.success.json"));
+    response.send(require("./json/2fa/owner.success.json"));
   } else {
-    response.status(401).send(require("../json/2fa/error.json"));
+    response.status(401).send(require("./json/2fa/error.json"));
   }
 });
 
@@ -29,11 +29,11 @@ router.post("/register", (request, response) => {
   const { firstName, secondName, phoneNumber, password, role } = request.body;
   console.log(phoneNumber, password, role);
   if (phoneNumber === "89999999999" || phoneNumber === "89559999999") {
-    response.status(401).send(require("../json/register/error.json"));
+    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"));
   }
 });
 
@@ -58,9 +58,9 @@ router.get("/auth/session", (request, response) => {
     const decoded = jwt.verify(token, secretKey);
 
     if (decoded.role === "dogsitter") {
-      response.send(require("../json/role/dogsitter.success.json"));
+      response.send(require("./json/role/dogsitter.success.json"));
     } else {
-      response.send(require("../json/role/owner.success.json"));
+      response.send(require("./json/role/owner.success.json"));
     }
   } catch (e) {
     console.log("token e:", e);

server/routers/gamehub/index.js

@@ -21,7 +21,7 @@ router.get("/favourites", (request, response) => {
 });
 
 // router.get("/shopping-cart", (request, response) => {
-//   response.send(require("../json/shopping-cart/success.json"));
+//   response.send(require("./json/shopping-cart/success.json"));
 // });
 
 router.get("/shopping-cart", (request, response) => {
@@ -64,7 +64,7 @@ const fs = require("fs").promises;
 const path = require("path");
 
 // Path to JSON file
-const commentsFilePath = path.join(__dirname, "../json/gamepage/success.json");
+const commentsFilePath = path.join(__dirname, "./json/gamepage/success.json");
 
 // Read JSON file
 async function readComments() {
@@ -112,7 +112,7 @@ router.post("/update-like", async (req, res) => {
 // Путь к JSON-файлу с корзиной
 const cartFilePath = path.join(
   __dirname,
-  "../json/home-page-data/games-in-cart.json"
+  "./json/home-page-data/games-in-cart.json"
 );
 
 // Функция для чтения JSON-файла
@@ -175,35 +175,39 @@ router.post("/add-to-cart", async (req, res) => {
 
 module.exports = router;
 
-const createElement = (key, value, buttonTitle) => `
+const createElement = (key, value, buttonTitle, basePath) => `
     <label>
         <input name="${key}" type="radio" ${
   stubs[key] === value ? "checked" : ""
-} onclick="fetch('/api/admin/set/${key}/${value}')"/>
+} onclick="fetch('${basePath}/admin/set/${key}/${value}')"/>
         ${buttonTitle || value}
     </label>
 `;
 
 router.get("/admin/home", (request, response) => {
+  const basePath = request.baseUrl; // Получаем базовый путь маршрутизатора
   response.send(`
         <div>
             <fieldset>
                 <legend>Настройка данных для /home</legend>
-                ${createElement("home", "success", "Отдать успешный ответ")}
-                ${createElement("home", "empty", "Отдать пустой массив")}
-                ${createElement("home", "error", "Отдать ошибку")}
+                ${createElement("home", "success", "Отдать успешный ответ", basePath)}
+                ${createElement("home", "empty", "Отдать пустой массив", basePath)}
+                ${createElement("home", "error", "Отдать ошибку", basePath)}
             </fieldset>
         </div>    
     `);
 });
 
-
 router.get("/admin/game-page", (request, response) => {
   response.send(`
         <div>
             <fieldset>
                 <legend>Настройка данных для /game-page</legend>
-                ${createElement("game-page", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "game-page",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("game-page", "empty", "Отдать пустой массив")}
                 ${createElement("game-page", "error", "Отдать ошибку")}
 
@@ -217,7 +221,11 @@ router.get("/admin/categories", (request, response) => {
         <div>
             <fieldset>
                 <legend>Настройка данных для /categories</legend>
-                ${createElement("categories", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "categories",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("categories", "empty", "Отдать пустой массив")}
                 ${createElement("categories", "error", "Отдать ошибку")}
                 </fieldset>
@@ -230,7 +238,11 @@ router.get("/admin/favourites", (request, response) => {
         <div>
             <fieldset>
                 <legend>Настройка данных для /favourites</legend>
-                ${createElement("favourites", "success", "Отдать успешный ответ")}
+                ${createElement(
+                  "favourites",
+                  "success",
+                  "Отдать успешный ответ"
+                )}
                 ${createElement("favourites", "empty", "Отдать пустой массив")}
                 ${createElement("favourites", "error", "Отдать ошибку")}
             </fieldset>