Compare commits

...

7 Commits

Author SHA1 Message Date
25eee8adf5 fix
Some checks failed
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 13:10:58 +03:00
88552eb04f Merge pull request 'Uncomment dogsitters app' (#97) from dsf-fix into master
Reviewed-on: #97
2025-02-08 12:49:30 +03:00
ab92c99321 Uncomment dogsitters app
Some checks failed
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 12:47:43 +03:00
02963de893 Merge pull request 'Изменение путей запросов' (#96) from dogsitters-finder-3 into master
Reviewed-on: #96
2025-02-08 12:41:38 +03:00
48550416d9 Изменение путей запросов
Some checks failed
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 12:40:39 +03:00
aa
878c5ffd68 Merge pull request 'изменение админ панели' (#95) from gamehub into master
Reviewed-on: #95
2025-02-08 11:45:19 +03:00
aaeii
6e37fe93f7 изменение админ панели
Some checks failed
platform/multy-stub/pipeline/head There was a failure building this commit
2025-02-08 11:44:00 +03:00
2 changed files with 32 additions and 20 deletions

View File

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

View File

@@ -21,7 +21,7 @@ router.get("/favourites", (request, response) => {
}); });
// router.get("/shopping-cart", (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) => { router.get("/shopping-cart", (request, response) => {
@@ -175,35 +175,39 @@ router.post("/add-to-cart", async (req, res) => {
module.exports = router; module.exports = router;
const createElement = (key, value, buttonTitle) => ` const createElement = (key, value, buttonTitle, basePath) => `
<label> <label>
<input name="${key}" type="radio" ${ <input name="${key}" type="radio" ${
stubs[key] === value ? "checked" : "" stubs[key] === value ? "checked" : ""
} onclick="fetch('/api/admin/set/${key}/${value}')"/> } onclick="fetch('${basePath}/admin/set/${key}/${value}')"/>
${buttonTitle || value} ${buttonTitle || value}
</label> </label>
`; `;
router.get("/admin/home", (request, response) => { router.get("/admin/home", (request, response) => {
const basePath = request.baseUrl; // Получаем базовый путь маршрутизатора
response.send(` response.send(`
<div> <div>
<fieldset> <fieldset>
<legend>Настройка данных для /home</legend> <legend>Настройка данных для /home</legend>
${createElement("home", "success", "Отдать успешный ответ")} ${createElement("home", "success", "Отдать успешный ответ", basePath)}
${createElement("home", "empty", "Отдать пустой массив")} ${createElement("home", "empty", "Отдать пустой массив", basePath)}
${createElement("home", "error", "Отдать ошибку")} ${createElement("home", "error", "Отдать ошибку", basePath)}
</fieldset> </fieldset>
</div> </div>
`); `);
}); });
router.get("/admin/game-page", (request, response) => { router.get("/admin/game-page", (request, response) => {
response.send(` response.send(`
<div> <div>
<fieldset> <fieldset>
<legend>Настройка данных для /game-page</legend> <legend>Настройка данных для /game-page</legend>
${createElement("game-page", "success", "Отдать успешный ответ")} ${createElement(
"game-page",
"success",
"Отдать успешный ответ"
)}
${createElement("game-page", "empty", "Отдать пустой массив")} ${createElement("game-page", "empty", "Отдать пустой массив")}
${createElement("game-page", "error", "Отдать ошибку")} ${createElement("game-page", "error", "Отдать ошибку")}
@@ -217,7 +221,11 @@ router.get("/admin/categories", (request, response) => {
<div> <div>
<fieldset> <fieldset>
<legend>Настройка данных для /categories</legend> <legend>Настройка данных для /categories</legend>
${createElement("categories", "success", "Отдать успешный ответ")} ${createElement(
"categories",
"success",
"Отдать успешный ответ"
)}
${createElement("categories", "empty", "Отдать пустой массив")} ${createElement("categories", "empty", "Отдать пустой массив")}
${createElement("categories", "error", "Отдать ошибку")} ${createElement("categories", "error", "Отдать ошибку")}
</fieldset> </fieldset>
@@ -230,7 +238,11 @@ router.get("/admin/favourites", (request, response) => {
<div> <div>
<fieldset> <fieldset>
<legend>Настройка данных для /favourites</legend> <legend>Настройка данных для /favourites</legend>
${createElement("favourites", "success", "Отдать успешный ответ")} ${createElement(
"favourites",
"success",
"Отдать успешный ответ"
)}
${createElement("favourites", "empty", "Отдать пустой массив")} ${createElement("favourites", "empty", "Отдать пустой массив")}
${createElement("favourites", "error", "Отдать ошибку")} ${createElement("favourites", "error", "Отдать ошибку")}
</fieldset> </fieldset>