kayashov73/my-bar
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
Kayashov.SM
2025-08-22 03:18:30 +04:00
parent 488638885c
commit 198be069b4
37 changed files with 481 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/app/pages/BarChangePage.js
View File

@@ -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")))
})

2
front/src/app/pages/cocktails/CocktailsPageContent.js
View File

@@ -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)

8
front/src/app/pages/cocktails/EditCocktailPage.js
View File

@@ -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())
}}

6
front/src/app/pages/ingredients/EditIngredientPage.js
View File

@@ -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("Ошибка сохранения"))
}

6
front/src/app/pages/ingredients/IngredientsPage.js
View File

@@ -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("Ошибка удаления ингредиента. Перезагрузите страницу"))
}

2
front/src/components/bar/BarList.js
View File

@@ -16,7 +16,7 @@ export function BarList({all}) {
useEffect(() => {
setLoading(true);
api().get(`${requests.bar.list}?my=${!all}`)
api().get(`${requests.bar.all}?my=${!all}`)
.then((r) => {
setBars(r.data)
setLoading(false);

2
front/src/components/cocktails/CocktailInfoModal.js
View File

@@ -37,7 +37,7 @@ export function CocktailInfoModal({row}) {
.catch(() => createError("Ошибка получения информации об ингредиенте"))
}
const selectIngredientHandler = (ingredient) => {
const url = `${requests.bar.ingredient}?id=${ingredient.id}`;
const url = `${requests.ingredient.crud}?id=${ingredient.id}`;
const request = ingredient.isHave ? api().delete(url) : api().put(url);
const value = !ingredient.isHave;
request.then(() => {

4
front/src/components/cocktails/EditCocktailReceipt.js
View File

@@ -20,11 +20,11 @@ export function EditCocktailReceipt({receipt, handler}) {
const [units, setUnits] = useState([])
useEffect(() => {
api().get(requests.bar.ingredientList)
api().get(requests.ingredient.all)
.then((r) => setIngredients(r.data.sort(getComparator("asc", "name"))))
.catch(() => createError("Ошибка получения списка ингредиентов"))
api().get(requests.bar.unit)
api().get(requests.unit)
.then((r) => setUnits(r.data.sort(getComparator("asc", "name"))))
.catch(() => createError("Ошибка получения единиц измерения"))
}, []);

4
front/src/components/cocktails/FilterBlock.js
View File

@@ -24,11 +24,11 @@ export function FilterBlock({filter, handleFilterChange, handleClearFilter, barm
const sort = ['Название по возрастанию', 'Название по убыванию'];
useEffect(() => {
api().get(requests.bar.category)
api().get(requests.category.basic)
.then((r) => setCategory(r.data))
.catch(() => createError("Ошибка получения категорий"))
api().get(requests.bar.glass)
api().get(requests.glass.list)
.then((r) => setGlass(r.data))
.catch(() => createError("Ошибка получения посуды"))
// eslint-disable-next-line

2
front/src/lib/clients/UserClient.js
View File

@@ -5,7 +5,7 @@ class UserClient {
async getMe() {
try{
let url = requests.users.getMe
let url = requests.auth.getMe
const response = await api().get(url);
return {data: response.data}
} catch (e) {

2
front/src/lib/clients/api.js
View File

@@ -1,7 +1,7 @@
import axios from "axios";
import {tokenUtil} from "../TokenUtil";
const host = "localhost:8080"; //дебаг вместе с беком
const host = "localhost:8081"; //дебаг вместе с беком
// const host = "192.168.1.100:8091"; //дебаг фронта
// const host = "bar.kayashov.keenetic.pro"; //прод
export const api = () => {

93
front/src/requests.js
View File

@@ -2,71 +2,56 @@ const host = "api/";
const routes = {
auth: host + "auth/",
users: host + "users/",
operations: host + "operations/",
bar: host + "bar/",
session: host + "bar/session",
category: host + "category",
cocktail: host + "cocktail",
glass: host + "glass",
ingredient: host + "ingredient",
order: host + "order",
cocktails: host + "cocktail",
visitor: host + "visitors"
receipt: host + "receipt",
unit: host + "unit",
}
export const requests = {
auth: {
login: routes.auth + "login",
refresh: routes.auth + "refresh",
singOut: "signOut"
},
cocktails: {
menu: routes.cocktails + "/menu",
simple: routes.cocktails + "/simple",
cocktail: routes.cocktails + "?id=",
modal: routes.cocktails + "/modal?id=",
edit: routes.cocktails,
savePhoto: routes.cocktails + "/photo",
favourite: routes.cocktails + "/favourite?id=",
rating: routes.cocktails + "/rating?id=",
receipts: routes.cocktails + "/receipts?id=",
byIngredient: routes.cocktails + "/byIngredient?id=",
instructions: routes.cocktails + "/instructions?id=",
calc: routes.cocktails + "/calc",
},
visitors: {
all: routes.visitor,
invite: routes.visitor + "/invite?"
singOut: "signOut",
getMe: routes.auth + "getMe",
},
bar: {
list: routes.bar + "all",
change: routes.bar + "change",
crud: routes.bar,
addToMyList: routes.bar + "addToMyList",
enter: routes.bar + "enter?id=",
pay: routes.order + "?",
order: routes.order,
myOrders: routes.order + "/my",
purchases: routes.bar + "purchases",
menu: routes.bar + "menu",
ingredients: routes.ingredient,
ingredientSimple: routes.ingredient + "/simple",
ingredient: routes.ingredient,
ingredientList: routes.ingredient + "/all",
glass: routes.bar + "glass",
category: routes.bar + "category",
receipts: routes.bar + "receipt?id=",
tags: routes.bar + "tags",
all: routes.bar + "all",
change: routes.bar + "change",
},
category: {
basic: routes.category,
},
cocktails: {
menu: routes.cocktail + "/menu",
calc: routes.cocktail + "/calc",
byIngredient: routes.cocktail + "/byIngredient?id=",
photo: routes.cocktail + "/photo",
cocktail: routes.cocktail + "?id=",
basic: routes.cocktail,
simple: routes.cocktail + "/simple",
modal: routes.cocktail + "/modal?id=",
favourite: routes.cocktail + "/favourite?id=",
rating: routes.cocktail + "/rating?id=",
receipts: routes.cocktail + "/receipts?id=",
},
glass: {
list: routes.glass,
},
ingredient: {
all: routes.ingredient + "/all",
simple: routes.ingredient + "/simple",
type: routes.ingredient + "/type",
session: {
status: routes.session + "/info",
change: routes.session
},
unit: routes.bar + "units"
crud: routes.ingredient,
},
users: {
getMe: routes.bar + "getMe",
},
operations: {
getAll: routes.operations,
create: routes.operations,
}
// receipt: {
// receipts: routes.bar + "receipt?id=",
//
// },
unit: routes.unit + "/units"
}