From e2826816797c400233ad7f3edcd3338804d17fab Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Sat, 27 Dec 2025 20:55:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BA=D1=82=D0=B5=D0=B9=D0=BB=D1=8F=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=BA?= =?UTF-8?q?=D1=82=D0=B5=D0=B9=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/app/pages/cocktails/CocktailsPageContent.js | 8 ++++++++ front/src/components/cocktails/Cocktail.js | 6 +++++- front/src/lib/clients/CocktailClient.js | 4 ++++ front/src/requests.js | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/front/src/app/pages/cocktails/CocktailsPageContent.js b/front/src/app/pages/cocktails/CocktailsPageContent.js index 050f9a6..c7c54d6 100644 --- a/front/src/app/pages/cocktails/CocktailsPageContent.js +++ b/front/src/app/pages/cocktails/CocktailsPageContent.js @@ -124,6 +124,13 @@ const CocktailsPageContent = () => { const handleSelectCocktail = (row) => selectCocktail(row.id) const deleteHandle = (row) => cocktailClient.deleteCocktail(row.id, rows, setRows, createSuccess, createError) + const hideHandler = (id) => { + cocktailClient.hiddenCocktail(id) + .then(() => { + createSuccess("Коктейль скрыт успешно"); + setRows(rows.filter((r) => r.id !== id)) + }).catch(() => createError("Ошибка при попытке скрыть коктейль")) + } return ( @@ -158,6 +165,7 @@ const CocktailsPageContent = () => { handleChangeRating={handleChangeRating} handleSelect={handleSelectCocktail} deleteHandler={deleteHandle} + hideHandler={hideHandler} /> ) })} diff --git a/front/src/components/cocktails/Cocktail.js b/front/src/components/cocktails/Cocktail.js index a66df72..9374e44 100644 --- a/front/src/components/cocktails/Cocktail.js +++ b/front/src/components/cocktails/Cocktail.js @@ -10,6 +10,7 @@ import {CocktailDescription} from "./CocktailDescription"; import EditIcon from '@mui/icons-material/Edit'; import DeleteIcon from '@mui/icons-material/Delete'; import LocalBarIcon from '@mui/icons-material/LocalBar'; +import VisibilityOffIcon from '@mui/icons-material/VisibilityOff'; import {paths} from "../../path"; import {useAlert} from "../../hooks/useAlert"; import {useUser} from "../../hooks/useUser"; @@ -35,7 +36,7 @@ function renderRating(handleChangeRating, row) { ) } -export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect, deleteHandler}) { +export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect, deleteHandler, hideHandler}) { const {createError, createSuccess} = useAlert(); const {user} = useUser(); return ( @@ -73,6 +74,9 @@ export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect + hideHandler(row.id)}> + + deleteHandler(row)}> diff --git a/front/src/lib/clients/CocktailClient.js b/front/src/lib/clients/CocktailClient.js index 22322c1..ef19455 100644 --- a/front/src/lib/clients/CocktailClient.js +++ b/front/src/lib/clients/CocktailClient.js @@ -119,6 +119,10 @@ class CocktailClient { .catch(() => createError("Ошибка удаления коктейля")) } + async hiddenCocktail(id) { + return api().post(requests.cocktails.hide + id); + } + saveChangeCocktail (cocktail, createError, createSuccess) { api().patch(requests.cocktails.basic, cocktail) .then((r) => { diff --git a/front/src/requests.js b/front/src/requests.js index 18fabd4..10ba5d6 100644 --- a/front/src/requests.js +++ b/front/src/requests.js @@ -38,6 +38,7 @@ export const requests = { favourite: routes.cocktail + "/favourite?id=", rating: routes.cocktail + "/rating?id=", drink: routes.cocktail + "/drink", + hide: routes.cocktail + "/hidden/", }, glass: { list: routes.glass,