From 10634242e48712f9eb1c6d6da96d66ef2bc1313f Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Fri, 22 Aug 2025 03:20:42 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BE=D1=82=D1=8B=20=D0=BA=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D1=87=D0=B0=D1=81=D1=82=D0=B8=20=D0=B1=D0=B5=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/app/pages/BarChangePage.js | 1 + front/src/app/pages/cocktails/CocktailsPageContent.js | 1 - front/src/components/cocktails/EditCocktailReceipt.js | 1 + front/src/components/cocktails/FilterBlock.js | 9 ++++----- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/front/src/app/pages/BarChangePage.js b/front/src/app/pages/BarChangePage.js index 36a416a..3af3b93 100644 --- a/front/src/app/pages/BarChangePage.js +++ b/front/src/app/pages/BarChangePage.js @@ -29,6 +29,7 @@ export function BarChangePage() { .catch(() => { createError("Ошибка получения списков") }) + // eslint-disable-next-line }, []); const changeHandler = (bar) => { createWarning("Дождитесь окончания операции") diff --git a/front/src/app/pages/cocktails/CocktailsPageContent.js b/front/src/app/pages/cocktails/CocktailsPageContent.js index b2375db..546eea3 100644 --- a/front/src/app/pages/cocktails/CocktailsPageContent.js +++ b/front/src/app/pages/cocktails/CocktailsPageContent.js @@ -14,7 +14,6 @@ import {useUser} from "../../../hooks/useUser"; import {blue} from "@mui/material/colors"; import UpIcon from "@mui/icons-material/KeyboardArrowUp"; import {sortList} from "../../../components/cocktails/sortingList"; -import Button from "@mui/material/Button"; import {useSelect} from "../../../hooks/useSelect"; import Paper from "@mui/material/Paper"; import CheckMarks from "../../../components/cocktails/CheckMarks"; diff --git a/front/src/components/cocktails/EditCocktailReceipt.js b/front/src/components/cocktails/EditCocktailReceipt.js index 6cd7fd1..81be8d4 100644 --- a/front/src/components/cocktails/EditCocktailReceipt.js +++ b/front/src/components/cocktails/EditCocktailReceipt.js @@ -27,6 +27,7 @@ export function EditCocktailReceipt({receipt, handler}) { api().get(requests.unit) .then((r) => setUnits(r.data.sort(getComparator("asc", "name")))) .catch(() => createError("Ошибка получения единиц измерения")) + // eslint-disable-next-line }, []); const selectHandler = (name, value) => { diff --git a/front/src/components/cocktails/FilterBlock.js b/front/src/components/cocktails/FilterBlock.js index b814cf5..bbddeda 100644 --- a/front/src/components/cocktails/FilterBlock.js +++ b/front/src/components/cocktails/FilterBlock.js @@ -13,14 +13,13 @@ import {useEffect, useState} from "react"; import {requests} from "../../requests"; import {useAlert} from "../../hooks/useAlert"; import {api} from "../../lib/clients/api"; -import {sortList} from "./sortingList"; export function FilterBlock({filter, handleFilterChange, handleClearFilter, barmen}) { const {createError} = useAlert(); const [glass, setGlass] = useState([]); const [category, setCategory] = useState([]); const alcohol = ['Алкогольный', 'Безалкогольный']; - const ingredientCount = [1,2,3,4,5]; + const ingredientCount = [1, 2, 3, 4, 5]; const sort = ['Название по возрастанию', 'Название по убыванию']; useEffect(() => { @@ -100,9 +99,9 @@ export function FilterBlock({filter, handleFilterChange, handleClearFilter, barm filterValue={filter.glass} filterName={"glass"} identity/>)} {/*Фильтр по нехватке ингредиентов*/} {(barmen && filter.all) && ()} + handleChange={handleFilterChange} + nonMulti nullValue identity + filterValue={filter.iCount} filterName={"iCount"}/>)}