Переведены все запросы на клиенты

front/src/app/pages/BarChangePage.js

@@ -1,7 +1,5 @@
 import Paper from "@mui/material/Paper";
 import React, {useEffect, useState} from "react";
-import {api} from "../../lib/clients/api";
-import {requests} from "../../requests";
 import {useAlert} from "../../hooks/useAlert";
 import {Card} from "@mui/material";
 import Stack from "@mui/material/Stack";
@@ -10,76 +8,23 @@ import IconButton from "@mui/material/IconButton";
 import Box from "@mui/material/Box";
 import DeleteIcon from '@mui/icons-material/Delete';
 import ElectricalServicesIcon from '@mui/icons-material/ElectricalServices';
-import {getComparator} from "../../components/core/getComparator";
 import Toolbar from "@mui/material/Toolbar";
 import AddCircleIcon from '@mui/icons-material/AddCircle';
 import {BarCreateModal} from "../../components/BarCreateModal";
 import PowerIcon from '@mui/icons-material/Power';
+import {barClient} from "../../lib/clients/BarClient";
 
 export function BarChangePage() {
     const [bars, setBars] = useState([])
     const [open, setOpen] = useState(false)
     const {createError, createSuccess, createWarning} = useAlert();
 
-    useEffect(() => {
-        api().get(requests.bar.all)
-            .then((r) => {
-                setBars(r.data.sort(getComparator("name")))
-            })
-            .catch(() => {
-                createError("Ошибка получения списков")
-            })
-        // eslint-disable-next-line
-    }, []);
-    const changeHandler = (bar) => {
-        createWarning("Дождитесь окончания операции")
-        api().post(`${requests.bar.change}/${bar.id}`)
-            .then(() => createSuccess("Список изменен"))
-            .catch(() => createError("Ошибка изменения активного списка"))
+    const createHandler = (name) => barClient.createBar(name, bars, createSuccess, createError, setBars, setOpen)
 
-        const newState = bars.map((b) => {
-            if (b.active) {
-                return {
-                    ...b, active: false
-                }
-            }
-            if (b.id === bar.id) {
-                return {
-                    ...b, active: true
-                }
-            }
-            return b;
-        })
-        setBars(newState);
-    }
-    const deleteHandler = (bar) => {
-        if (bar.active) {
-            createError("Нельзя удалить активный бар!")
-            return;
-        }
-        api().delete(requests.bar.crud + bar.id)
-            .then(() => createSuccess("Список удален"))
-            .catch(() => createError("Ошибка удаления. Обновите страницу"))
-
-        setBars(bars.filter((b) => b.id !== bar.id));
-    }
-    const createHandler = (name) => {
-        api().post(requests.bar.crud + name)
-            .then((r) => {
-                createSuccess("Cписок создан");
-                let state = bars;
-                state.push(r.data);
-                setBars(state)
-                setOpen(false)
-            }).catch(() => createError("Ошибка создания списка"))
-    }
-
-    function closeHandler() {
-        setOpen(false)
-    }
+    useEffect(() => barClient.getBarList(setBars, createError), []);
 
     return (<>
-            <BarCreateModal open={open} close={closeHandler} create={createHandler}/>
+            <BarCreateModal open={open} setOpen={setOpen} create={createHandler}/>
             <Paper sx={{p: 1}}>
                 <Toolbar>
                     <Typography variant='h6'>Списки ингредиентов (бары)</Typography>
@@ -95,10 +40,11 @@ export function BarChangePage() {
                                 <PowerIcon/>
                             </IconButton>}
                             {!b.active && <Box>
-                                <IconButton onClick={() => deleteHandler(b)}>
+                                <IconButton onClick={() => barClient.deleteBar(b, bars, createError, createSuccess, setBars)}>
                                     <DeleteIcon/>
                                 </IconButton>
-                                <IconButton onClick={() => changeHandler(b)}>
+                                <IconButton
+                                    onClick={() => barClient.changeBar(b.id, bars, createWarning, createSuccess, createError, setBars)}>
                                     <ElectricalServicesIcon/>
                                 </IconButton>
                             </Box>}

front/src/app/pages/auth/sign-in/telegram-code.js

@@ -1,28 +1,14 @@
 import * as React from "react";
 import {useSearchParams} from "react-router-dom";
 import {Loading} from "../../../../components/core/Loading";
-import {api} from "../../../../lib/clients/api";
-import {requests} from "../../../../requests";
 import {useAuth} from "../../../../hooks/useAuth";
+import {authClient} from "../../../../lib/clients/AuthClient";
 
 export function TelegramCode() {
     const [searchParams] = useSearchParams();
     const {checkSession} = useAuth();
 
-    let code = searchParams.get("code");
-    const request = {
-        byLogin: false,
-        code: code
-    }
-    api().post(requests.auth.login, request)
-        .then(async (response) => {
-            if (response.data.error) {
-                return;
-            }
-            localStorage.setItem("token", response.data.token);
-            await checkSession?.();
-            window.location.reload();
-        })
+    authClient.loginByCode(searchParams.get("code"), checkSession)
 
     return (
         <Loading loading={true}/>

front/src/app/pages/calc/CalcPage.js

@@ -1,13 +1,12 @@
 import Typography from "@mui/material/Typography";
 import * as React from "react";
 import {useEffect, useMemo} from "react";
-import {api} from "../../../lib/clients/api";
-import {requests} from "../../../requests";
 import {useAlert} from "../../../hooks/useAlert";
 import Stack from "@mui/material/Stack";
 import Box from "@mui/material/Box";
 import {CocktailItemCalc} from "./CocktailItemCalc";
 import {IngredientCalcCard} from "./IngredientCalcCard";
+import {cocktailClient} from "../../../lib/clients/CocktailClient";
 
 export function CalcPage() {
     const {createError} = useAlert();
@@ -23,28 +22,7 @@ export function CalcPage() {
     }
 
     useEffect(() => {
-        if (load) {
-            return;
-        }
-        api().get(requests.cocktails.calc)
-            .then((r) => {
-                const data = r.data;
-                if (data.length === 0) {
-                    setLoad(false);
-                    return;
-                }
-                setCocktails(data);
-                let map = [];
-                data.map((d) => {
-                    map[d.id] = 1
-                })
-                setCocktailMap(map);
-                setLoad(true);
-            })
-            .catch((r) => {
-                setLoad(true);
-                createError("Ошибка загрузки данных от сервера Status:" + r.code)
-            })
+        cocktailClient.getCocktailsForCalcPage(load, setLoad, setCocktails, setCocktailMap, createError)
         // eslint-disable-next-line
     }, [load]);
 

front/src/app/pages/cocktails/CocktailsPageContent.js

@@ -5,19 +5,16 @@ import {useCallback, useEffect, useState} from "react";
 import {Cocktail} from "../../../components/cocktails/Cocktail";
 import {Fab, Skeleton} from "@mui/material";
 import Box from "@mui/material/Box";
-import {requests} from "../../../requests";
 import {NoResult} from "../../../components/cocktails/NoResult";
 import {FilterBlock} from "../../../components/cocktails/FilterBlock";
-import {api} from "../../../lib/clients/api";
 import {CocktailInfoModal} from "../../../components/cocktails/CocktailInfoModal";
 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 {useSelect} from "../../../hooks/useSelect";
 import Paper from "@mui/material/Paper";
 import CheckMarks from "../../../components/cocktails/CheckMarks";
-import {getComparator} from "../../../components/core/getComparator";
+import {cocktailClient} from "../../../lib/clients/CocktailClient";
 
 const emptyFilter = {
     search: "",
@@ -36,7 +33,6 @@ const emptyFilter = {
 const CocktailsPageContent = () => {
     const {user} = useUser();
     const {createError, createSuccess} = useAlert();
-    const [allowIngredients, setAllowIngredients] = useState([])
     const [rows, setRows] = useState([]);
     const [filter, setFilter] = useState(emptyFilter)
     const [chips, setChips] = useState([])
@@ -52,36 +48,10 @@ const CocktailsPageContent = () => {
         if (load || (!isNew && isEnd)) {
             return false;
         }
-        setLoad(true);
-        const request = {
-            ...filter,
-            sort: sortList.find((s) => s.name === filter.sorting).id,
-            page: page + 1,
-            size: size,
-            notHaveCount: Array.isArray(filter.iCount) ? null : filter.iCount
-        }
-        api().post(requests.cocktails.menu, request)
-            .then((r) => {
-                if (r.data.length === 0) {
-                    if (isNew) {
-                        setRows([]);
-                    }
-                    setIsEnd(true);
-                    setLoad(false);
-                    return;
-                }
-                const cocktails = isNew ? r.data : rows.concat(r.data);
-                setRows(cocktails);
-                setIsNew(false);
-                setPage(page + 1);
-                setLoad(false);
-            })
-            .catch((r) => {
-                setLoad(false);
-                createError("Ошибка загрузки данных от сервера Status:" + r.code)
-            })
+        cocktailClient.getMenu(setRows, setIsNew, setPage, setLoad, setIsEnd, isNew, rows, page, size, filter, createError);
         // eslint-disable-next-line
     }, [load, isEnd, page]);
+
     useEffect(() => {
         const handleScroll = () => {
             const {scrollTop, scrollHeight, clientHeight} = document.documentElement;
@@ -93,34 +63,7 @@ const CocktailsPageContent = () => {
         return () => window.removeEventListener('scroll', handleScroll);
         // eslint-disable-next-line
     }, [loading]);
-    useEffect(() => {
-        api().get(requests.ingredient.simple)
-            .then((r) => {
-                const arr = r.data.filter((i) => i.isHave)
-                    .map((i) => i.name)
-                setAllowIngredients(arr)
-            })
-            .catch(() => createError("Ошибка получения ингредиентов"))
-        // eslint-disable-next-line
-    }, [])
-    useEffect(() => {
-        loading();
-        // eslint-disable-next-line
-    }, [filter])
-    useEffect(() => {
-        if (!filter.all) {
-            return;
-        }
-        const ingredients = new Set();
-        rows.map((c) => c.components)
-            .map((c) => c.split(", "))
-            .map((c) => c.filter((i) => !allowIngredients.includes(i)))
-            .filter((nhc) => nhc.length === 1)
-            .map((fc) => fc[0])
-            .forEach((i) => ingredients.add(i))
-        setChips(Array.from(ingredients).sort(getComparator()));
-        // eslint-disable-next-line
-    }, [rows, allowIngredients])
+    useEffect(() => loading(), [filter])
 
     const renderSkeleton = () => {
         return Array.from({length: 3}, () => null)
@@ -142,11 +85,7 @@ const CocktailsPageContent = () => {
             }
             return r;
         })
-        api().post(`${requests.cocktails.rating}${row.id}&rating=${value}`)
-            .then(() => {
-                setRows(newState);
-                createSuccess("Спасибо за оценку!")
-            }).catch(() => createError("Ошибка сохранения"))
+        cocktailClient.changeRating(row.id, newState, value, setRows, createSuccess, createError)
 
     }
     const handleFilterChange = (filterName, value) => {
@@ -172,14 +111,7 @@ const CocktailsPageContent = () => {
             }
             return r;
         });
-        let url = `${requests.cocktails.favourite}${row.id}`;
-        let request = value ? api().put(url) : api().delete(url);
-
-        request
-            .then(() => {
-                setRows(newState);
-                createSuccess("Спасибо за оценку!")
-            }).catch(() => createError("Ошибка сохранения"))
+        cocktailClient.changeFavourite(value, row.id, newState, setRows, createSuccess, createError)
     }
     const handleFilterClear = () => {
         setFilter(emptyFilter);
@@ -187,17 +119,9 @@ const CocktailsPageContent = () => {
         setIsEnd(false);
         setPage(-1);
     }
-    const handleSelectCocktail = (row) => {
-        selectCocktail(row.id)
-    }
-    const deleteHandle = (row) => {
-        api().delete(requests.cocktails.cocktail + row.id)
-            .then(() => {
-                setRows(rows.filter((r) => r.id !== row.id))
-                createSuccess("Коктейль удален")
-            })
-            .catch(() => createError("Ошибка удаления коктейля"))
-    }
+
+    const handleSelectCocktail = (row) => selectCocktail(row.id)
+    const deleteHandle = (row) => cocktailClient.deleteCocktail(row.id, rows, setRows, createSuccess, createError)
 
     return (
         <Box>

front/src/app/pages/cocktails/EditCocktailPage.js

@@ -6,18 +6,18 @@ import {useEffect, useState} from "react";
 import Paper from "@mui/material/Paper";
 import {Autocomplete} from "@mui/material";
 import TextField from "@mui/material/TextField";
-import {api} from "../../../lib/clients/api";
-import {requests} from "../../../requests";
 import {useAlert} from "../../../hooks/useAlert";
 import Stack from "@mui/material/Stack";
 import Button from "@mui/material/Button";
 import {EditCocktailReceipt} from "../../../components/cocktails/EditCocktailReceipt";
 import {SelectEdit} from "../../../components/cocktails/SelectEdit";
-import {getComparator} from "../../../components/core/getComparator";
 import {useSearchParams} from "react-router-dom";
 import {Loading} from "../../../components/core/Loading";
 import CloudUploadIcon from '@mui/icons-material/CloudUpload';
 import {styled} from "@mui/material/styles";
+import {cocktailClient} from "../../../lib/clients/CocktailClient";
+import {categoryClient} from "../../../lib/clients/CategoryClient";
+import {glassClient} from "../../../lib/clients/GlassClient";
 
 const emptyCocktail = {
     id: null,
@@ -75,55 +75,15 @@ export function EditCocktailPage() {
     const [category, setCategory] = useState([]);
 
     useEffect(() => {
-        api().get(requests.cocktails.simple)
-            .then((r) => {
-                const arr = r.data.sort(getComparator("asc", "name"));
-                setCocktails(arr)
-
-                const currentId = searchParams.get("id");
-                if (!currentId) {
-                    setLoading(false);
-                    return;
-                }
-                const currentCocktail = arr.find((r) => r.id === (currentId * 1));
-                if (!currentCocktail) {
-                    setLoading(false);
-                    return;
-                }
-                setSelected(currentCocktail.id);
-                setLoading(false);
-            })
-            .catch(() => createError("Ошибка получения данных"))
-
-        api().get(requests.category.basic)
-            .then((r) => {
-                setCategory(r.data.sort(getComparator())
-                    .map((item, i) => {
-                        return {id: i, name: item}
-                    }))
-            })
-            .catch(() => createError("Ошибка получения категорий"))
-
-        api().get(requests.glass.list)
-            .then((r) => setGlass(r.data.sort(getComparator())
-                .map((item, i) => {
-                    return {id: i, name: item}
-                })))
-            .catch(() => createError("Ошибка получения посуды"))
+        cocktailClient.getSimpleList(setCocktails, setSelected, setLoading, createError, searchParams.get("id"))
+        categoryClient.getCategoryList(setCategory, createError);
+        glassClient.getGlassList(setGlass, createError)
         // eslint-disable-next-line
     }, []);
-    useEffect(() => {
-        if (!selected) {
-            setCocktail(emptyCocktail);
-            return;
-        }
-        api().get(requests.cocktails.cocktail + selected)
-            .then((r) => {
-                setCocktail(r.data)
-            })
-            .catch(() => getError());
-        // eslint-disable-next-line
-    }, [selected])
+
+    useEffect(() => cocktailClient.getOneCocktail(selected, setCocktail, getError, emptyCocktail), [selected])
+    const saveHandler = () => cocktailClient.saveChangeCocktail(cocktail, createError, createSuccess)
+    const deleteHandle = () => cocktailClient.deleteCocktailFromEdit(setCocktails, setCocktail, createError, cocktails, cocktail, emptyCocktail)
 
     const changeCocktailValue = (name, value) => {
         if (name === "tags") {
@@ -134,25 +94,7 @@ export function EditCocktailPage() {
             [name]: value
         }))
     }
-    const saveHandler = () => {
-        api().patch(requests.cocktails.basic, cocktail)
-            .then((r) => {
-                if (!r.data.error) {
-                    createSuccess("Сохранено")
-                    return;
-                }
-                createError("Ошибка на сервере: " + r.data.error)
-            })
-            .catch(() => createError("Неизвестная ошибка"))
-    }
-    const deleteHandle = () => {
-        api().delete(requests.cocktails.cocktail + cocktail.id)
-            .then(() => {
-                setCocktails(cocktails.filter((r) => r.id !== cocktail.id))
-                setCocktail(emptyCocktail);
-            })
-            .catch(() => createError("Ошибка удаления коктейля"))
-    }
+
     return (
         <Box>
             {/*Загрузка*/}
@@ -208,14 +150,7 @@ export function EditCocktailPage() {
                             <VisuallyHiddenInput
                                 type="file"
                                 accept=".jpg,.jpeg,.png"
-                                onChange={(event) => {
-                                    const file = event.target.files[0];
-                                    let formData = new FormData();
-                                    formData.append('file', file);
-                                    api().post(requests.cocktails.photo, formData)
-                                        .then((r) => changeCocktailValue("image", r.data))
-                                        .catch(() => getError())
-                                }}
+                                onChange={(event) => cocktailClient.savePhoto(event, changeCocktailValue, getError)}
                             />
                         </Button>
 

front/src/app/pages/ingredients/EditIngredientPage.js

@@ -5,8 +5,6 @@ import * as React from "react";
 import {useEffect, useState} from "react";
 import Paper from "@mui/material/Paper";
 import {Autocomplete, FormControl, FormControlLabel, InputLabel} from "@mui/material";
-import {api} from "../../../lib/clients/api";
-import {requests} from "../../../requests";
 import {useAlert} from "../../../hooks/useAlert";
 import {useSearchParams} from "react-router-dom";
 import TextField from "@mui/material/TextField";
@@ -15,7 +13,7 @@ import Stack from "@mui/material/Stack";
 import Button from "@mui/material/Button";
 import Select from "@mui/material/Select";
 import MenuItem from "@mui/material/MenuItem";
-import {getComparator} from "../../../components/core/getComparator";
+import {ingredientClient} from "../../../lib/clients/IngredientClient";
 
 const emptyIngredient = {
     id: null,
@@ -36,25 +34,8 @@ export function EditIngredientPage() {
     const [ingredient, setIngredient] = useState(emptyIngredient)
     const {createError, createSuccess} = useAlert();
     useEffect(() => {
-        api().get(requests.ingredient.all)
-            .then((r) => {
-                const arr = r.data.sort(getComparator("asc", "name"));
-                setIngredients(arr)
-
-                const currentId = searchParams.get("id");
-                if (!currentId) {
-                    return;
-                }
-                const currentIngredient = arr.find((r) => r.id === (currentId * 1));
-                if (!currentIngredient) {
-                    return;
-                }
-                setIngredient(currentIngredient);
-            })
-            .catch(() => createError("Ошибка получения данных"))
-
-        api().get(requests.ingredient.type)
-            .then((r) => setTypes(r.data.sort(getComparator("asc", "name"))))
+        ingredientClient.allList(searchParams.get("id"), setIngredients, setIngredient, createError)
+        ingredientClient.getType(setTypes)
         // eslint-disable-next-line
     }, []);
 
@@ -64,11 +45,6 @@ export function EditIngredientPage() {
             [name]: value
         }))
     }
-    const saveIngredientHandler = () => {
-        api().patch(requests.ingredient.crud, ingredient)
-            .then(() => createSuccess("Ингредиент сохранен"))
-            .catch(() => createError("Ошибка сохранения"))
-    }
 
     return (
         <Box>
@@ -158,7 +134,8 @@ export function EditIngredientPage() {
                 </Stack>
             </Paper>
             <Box display={'flex'} justifyContent={'flex-end'}>
-                <Button variant='contained' onClick={() => saveIngredientHandler()}>Сохранить</Button>
+                <Button variant='contained'
+                        onClick={() => ingredientClient.saveIngredient(ingredient, createSuccess, createError)}>Сохранить</Button>
             </Box>
         </Box>
     )

front/src/app/pages/ingredients/IngredientsPage.js

@@ -8,10 +8,8 @@ import SearchIcon from "@mui/icons-material/Search";
 import * as React from "react";
 import {useEffect, useMemo, useState} from "react";
 import {Loading} from "../../../components/core/Loading";
-import {requests} from "../../../requests";
 import {useAlert} from "../../../hooks/useAlert";
 import {IngredientInfoModal} from "../../../components/Ingredients/IngredientInfoModal";
-import {api} from "../../../lib/clients/api";
 import Tab from "@mui/material/Tab";
 import {a11yProps} from "../../../components/core/tabProps";
 import {CustomTabPanel} from "../../../components/core/TabPanel";
@@ -19,6 +17,7 @@ import {IngredientList} from "../../../components/Ingredients/IngredientList";
 import {blue} from "@mui/material/colors";
 import UpIcon from "@mui/icons-material/KeyboardArrowUp";
 import {useSelect} from "../../../hooks/useSelect";
+import {ingredientClient} from "../../../lib/clients/IngredientClient";
 
 export function IngredientsPage() {
     const [value, setValue] = React.useState(0);
@@ -30,15 +29,7 @@ export function IngredientsPage() {
     const {createError, createSuccess} = useAlert();
 
     useEffect(() => {
-        api().get(requests.ingredient.all)
-            .then((r) => {
-                setIngredients(r.data)
-                setLoading(false);
-            })
-            .catch(() => {
-                createError("Ошибка получения списка ингредиентов");
-                setLoading(false);
-            })
+        ingredientClient.getAllIngredients(setIngredients, setLoading, createError)
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
@@ -63,26 +54,12 @@ export function IngredientsPage() {
                 return ingredient;
             }
         })
-        const url = `${requests.ingredient.crud}?id=${row.id}`;
-        const request = value ? api().put(url) : api().delete(url);
-        request
-            .then(() => {
-                setIngredients(newState);
-            })
-            .catch(() => {
-                createError("Ошибка изменения ингредиента");
-            });
-    }
-    const handleOpenModal = (i) => {
-        selectIngredient(i)
+        ingredientClient.changeIngredientIsHave(row.id, value, newState, setIngredients, createError)
     }
     const handleDelete = (id) => {
         const newState = ingredients.filter((ingredient) => ingredient.id !== id);
         setIngredients(newState)
-
-        api().delete(`${requests.ingredient.crud}/${id}`)
-            .then((r) => createSuccess("Ингредиент удален"))
-            .catch(() => createError("Ошибка удаления ингредиента. Перезагрузите страницу"))
+        ingredientClient.deleteIngredientIsHave(id, createSuccess, createError)
     }
 
     return (
@@ -118,11 +95,11 @@ export function IngredientsPage() {
             <Box>
                 <CustomTabPanel value={value} index={0}>
                     <IngredientList rows={ingredientsInBar} value={false} changeHandler={changeHandler}
-                                    infoHandler={handleOpenModal}/>
+                                    infoHandler={selectIngredient}/>
                 </CustomTabPanel>
                 <CustomTabPanel value={value} index={1}>
                     <IngredientList rows={ingredientsToAdd} value={true} changeHandler={changeHandler}
-                                    infoHandler={handleOpenModal}/>
+                                    infoHandler={selectIngredient}/>
                 </CustomTabPanel>
             </Box>
             <Fab sx={{