большая доработка чистоты кода в части бек

front/src/app/pages/BarChangePage.js

@@ -22,7 +22,7 @@ export function BarChangePage() {
     const {createError, createSuccess, createWarning} = useAlert();
 
     useEffect(() => {
-        api().get(requests.bar.list)
+        api().get(requests.bar.all)
             .then((r) => {
                 setBars(r.data.sort(getComparator("name")))
             })

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

@@ -95,7 +95,7 @@ const CocktailsPageContent = () => {
         // eslint-disable-next-line
     }, [loading]);
     useEffect(() => {
-        api().get(requests.bar.ingredientSimple)
+        api().get(requests.ingredient.simple)
             .then((r) => {
                 const arr = r.data.filter((i) => i.isHave)
                     .map((i) => i.name)

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

@@ -95,7 +95,7 @@ export function EditCocktailPage() {
             })
             .catch(() => createError("Ошибка получения данных"))
 
-        api().get(requests.bar.category)
+        api().get(requests.category.basic)
             .then((r) => {
                 setCategory(r.data.sort(getComparator())
                     .map((item, i) => {
@@ -104,7 +104,7 @@ export function EditCocktailPage() {
             })
             .catch(() => createError("Ошибка получения категорий"))
 
-        api().get(requests.bar.glass)
+        api().get(requests.glass.list)
             .then((r) => setGlass(r.data.sort(getComparator())
                 .map((item, i) => {
                     return {id: i, name: item}
@@ -135,7 +135,7 @@ export function EditCocktailPage() {
         }))
     }
     const saveHandler = () => {
-        api().patch(requests.cocktails.edit, cocktail)
+        api().patch(requests.cocktails.basic, cocktail)
             .then((r) => {
                 if (!r.data.error) {
                     createSuccess("Сохранено")
@@ -212,7 +212,7 @@ export function EditCocktailPage() {
                                     const file = event.target.files[0];
                                     let formData = new FormData();
                                     formData.append('file', file);
-                                    api().post(requests.cocktails.savePhoto, formData)
+                                    api().post(requests.cocktails.photo, formData)
                                         .then((r) => changeCocktailValue("image", r.data))
                                         .catch(() => getError())
                                 }}

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

@@ -36,7 +36,7 @@ export function EditIngredientPage() {
     const [ingredient, setIngredient] = useState(emptyIngredient)
     const {createError, createSuccess} = useAlert();
     useEffect(() => {
-        api().get(requests.bar.ingredientList)
+        api().get(requests.ingredient.all)
             .then((r) => {
                 const arr = r.data.sort(getComparator("asc", "name"));
                 setIngredients(arr)
@@ -53,7 +53,7 @@ export function EditIngredientPage() {
             })
             .catch(() => createError("Ошибка получения данных"))
 
-        api().get(requests.bar.type)
+        api().get(requests.ingredient.type)
             .then((r) => setTypes(r.data.sort(getComparator("asc", "name"))))
         // eslint-disable-next-line
     }, []);
@@ -65,7 +65,7 @@ export function EditIngredientPage() {
         }))
     }
     const saveIngredientHandler = () => {
-        api().patch(requests.bar.ingredient, ingredient)
+        api().patch(requests.ingredient.crud, ingredient)
             .then(() => createSuccess("Ингредиент сохранен"))
             .catch(() => createError("Ошибка сохранения"))
     }

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

@@ -30,7 +30,7 @@ export function IngredientsPage() {
     const {createError, createSuccess} = useAlert();
 
     useEffect(() => {
-        api().get(requests.bar.ingredientList)
+        api().get(requests.ingredient.all)
             .then((r) => {
                 setIngredients(r.data)
                 setLoading(false);
@@ -63,7 +63,7 @@ export function IngredientsPage() {
                 return ingredient;
             }
         })
-        const url = `${requests.bar.ingredient}?id=${row.id}`;
+        const url = `${requests.ingredient.crud}?id=${row.id}`;
         const request = value ? api().put(url) : api().delete(url);
         request
             .then(() => {
@@ -80,7 +80,7 @@ export function IngredientsPage() {
         const newState = ingredients.filter((ingredient) => ingredient.id !== id);
         setIngredients(newState)
 
-        api().delete(`${requests.bar.ingredient}/${id}`)
+        api().delete(`${requests.ingredient.crud}/${id}`)
             .then((r) => createSuccess("Ингредиент удален"))
             .catch(() => createError("Ошибка удаления ингредиента. Перезагрузите страницу"))
     }