From 56ffb21b91543d8565101bdebf49d76299eca326 Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Mon, 28 Apr 2025 18:39:15 +0400 Subject: [PATCH] gthdst ghfdrb --- .../pages/cocktails/CocktailsPageContent.js | 13 ------------- .../app/pages/cocktails/EditCocktailPage.js | 11 ++--------- front/src/components/cocktails/Cocktail.js | 14 ++++---------- front/src/components/cocktails/FilterBlock.js | 19 ------------------- pom.xml | 4 ---- .../bar/controller/BarController.java | 18 ++++++------------ 6 files changed, 12 insertions(+), 67 deletions(-) diff --git a/front/src/app/pages/cocktails/CocktailsPageContent.js b/front/src/app/pages/cocktails/CocktailsPageContent.js index 677bbc4..b3ae2e5 100644 --- a/front/src/app/pages/cocktails/CocktailsPageContent.js +++ b/front/src/app/pages/cocktails/CocktailsPageContent.js @@ -28,7 +28,6 @@ const emptyFilter = { glass: [], category: [], alcohol: [], - tags: [], iCount: [], ingredient: [], inMenu: "", @@ -210,17 +209,6 @@ const CocktailsPageContent = () => { .then(() => setRows(newState)) .catch(() => createError("Ошибка сохранения данных")) } - const editMenuBlock = (row) => { - if (user.role === "USER" || user.role === "ADMIN_NOT_BARMEN") { - return null; - } - return ( - - ) - } return ( @@ -254,7 +242,6 @@ const CocktailsPageContent = () => { ) })} diff --git a/front/src/app/pages/cocktails/EditCocktailPage.js b/front/src/app/pages/cocktails/EditCocktailPage.js index eb81305..f76bbef 100644 --- a/front/src/app/pages/cocktails/EditCocktailPage.js +++ b/front/src/app/pages/cocktails/EditCocktailPage.js @@ -74,7 +74,6 @@ export function EditCocktailPage() { const [glass, setGlass] = useState([]); const [category, setCategory] = useState([]); - const [tags, setTags] = useState([]) useEffect(() => { api().get(requests.cocktails.simple) @@ -98,16 +97,12 @@ export function EditCocktailPage() { .catch(() => createError("Ошибка получения данных")) api().get(requests.bar.category) - .then((r) => setCategory(r.data.sort(getComparator("asc", "name")))) + .then((r) => setCategory(r.data.sort(getComparator()))) .catch(() => createError("Ошибка получения категорий")) api().get(requests.bar.glass) - .then((r) => setGlass(r.data.sort(getComparator("asc", "name")))) + .then((r) => setGlass(r.data.sort(getComparator()))) .catch(() => createError("Ошибка получения посуды")) - - api().get(requests.bar.tags) - .then((r) => setTags(r.data.sort(getComparator("asc", "name")))) - .catch(() => createError("Ошибка получения тегов")) // eslint-disable-next-line }, []); useEffect(() => { @@ -235,8 +230,6 @@ export function EditCocktailPage() { - {/*Рецепт*/} diff --git a/front/src/components/cocktails/Cocktail.js b/front/src/components/cocktails/Cocktail.js index 91fe6e0..622aa56 100644 --- a/front/src/components/cocktails/Cocktail.js +++ b/front/src/components/cocktails/Cocktail.js @@ -34,16 +34,7 @@ function renderRating(handleChangeRating, row) { ) } -export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect, editMenuBlock}) { - const {createAlert, createError} = useAlert(); - const {session, user} = useUser(); - - function pay(cocktailId) { - api().post(`${requests.bar.pay}cocktail=${cocktailId}`) - .then(() => createAlert("Ожидайте свой заказ", "success")) - .catch(() => createError("Ошибка во время создания заказа")) - } - +export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect}) { return ( @@ -71,6 +62,9 @@ export function Cocktail({row, handleFavourite, handleChangeRating, handleSelect {row.name} + + + diff --git a/front/src/components/cocktails/FilterBlock.js b/front/src/components/cocktails/FilterBlock.js index 61c0199..a343da8 100644 --- a/front/src/components/cocktails/FilterBlock.js +++ b/front/src/components/cocktails/FilterBlock.js @@ -15,22 +15,10 @@ import {useAlert} from "../../hooks/useAlert"; import {api} from "../../lib/clients/api"; import {sortList} from "./sortingList"; -const inMenuFilter = [ - { - id: true, - name: "Есть в меню" - }, - { - id: false, - name: "Нет в меню" - } -] - export function FilterBlock({filter, handleFilterChange, handleClearFilter, barmen}) { const {createError} = useAlert(); const [glass, setGlass] = useState([]); const [category, setCategory] = useState([]); - const [tags, setTags] = useState([]) const alcohol = [ { name: "Алкогольный", @@ -70,10 +58,6 @@ export function FilterBlock({filter, handleFilterChange, handleClearFilter, barm api().get(requests.bar.glass) .then((r) => setGlass(r.data)) .catch(() => createError("Ошибка получения посуды")) - - api().get(requests.bar.tags) - .then((r) => setTags(r.data)) - .catch(() => createError("Ошибка получения тегов")) // eslint-disable-next-line }, []); @@ -141,9 +125,6 @@ export function FilterBlock({filter, handleFilterChange, handleClearFilter, barm {/*Фильтр по посуде*/} {glass.length > 0 && ()} - {/*Фильтр по тегам*/} - {tags.length > 0 && ()} {/*Фильтр по нехватке ингредиентов*/} {(barmen && filter.all) && (org.springframework.boot spring-boot-starter-security - - org.springframework.kafka - spring-kafka - org.springframework.boot diff --git a/src/main/java/ru/kayashov/bar/controller/BarController.java b/src/main/java/ru/kayashov/bar/controller/BarController.java index da81439..d9d02ad 100644 --- a/src/main/java/ru/kayashov/bar/controller/BarController.java +++ b/src/main/java/ru/kayashov/bar/controller/BarController.java @@ -37,17 +37,17 @@ public class BarController { return unitRepository.findAll(); } - @GetMapping("glass") + @GetMapping("/glass") public List getGlass() { return Arrays.stream(Glass.values()).map(Glass::getName).toList(); } - @GetMapping("category") + @GetMapping("/category") public List getCategory() { return Arrays.stream(Category.values()).map(Category::getName).toList(); } - @GetMapping("receipt") + @GetMapping("/receipt") public List getReceipt(@RequestParam("id") Long id) { return sessionService.getReceiptList(id); } @@ -56,18 +56,12 @@ public class BarController { public VisitorResponseDto getMe() { Visitor visitor = visitorService.getCurrentVisitor(); String role; - Boolean invited; - boolean active; role = UserRole.ADMIN.toString(); - invited = true; - active = true; - VisitorResponseDto dto = VisitorResponseDto.mapToDto(visitor, invited, role, active); - log.info("Запрос информации о пользователе: {}-{} {}, вошел в бар{},в роли {}", + VisitorResponseDto dto = VisitorResponseDto.mapToDto(visitor, true, role, true); + log.info("Запрос информации о пользователе: {}-{} {}, вошел в бар", dto.getId(), dto.getName().strip(), - dto.getLastName() != null ? dto.getLastName().strip() : "", - invited ? "" : "не ", - role); + dto.getLastName() != null ? dto.getLastName().strip() : ""); return dto; } }