Добавлен атрибут картинки для ингредиентов и удален атрибут английского названия

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

@@ -111,10 +111,6 @@ export function EditIngredientPage() {
                                    variant="outlined" label={"Название"}
                                    value={ingredient.name}
                                    onChange={(e) => changeIngredientValue("name", e.target.value)}/>
-                        <TextField sx={{mr: 1, mb: 2, minWidth: 330}}
-                                   label="Английское название" variant="outlined"
-                                   value={ingredient.enName}
-                                   onChange={(e) => changeIngredientValue("enName", e.target.value)}/>
                     </Box>
 
                     <Box height={70} mt={1} ml={1}>

front/src/components/core/UserPopover.js

@@ -39,6 +39,7 @@ export function UserPopover({anchorEl, onClose, open}) {
         } catch (err) {
             logger.error('Sign out error', err);
         }
+        // eslint-disable-next-line
     }, [checkSession, location]);
 
     return (
@@ -85,7 +86,7 @@ export function UserPopover({anchorEl, onClose, open}) {
 }
 
 function userDescriptor(user) {
-    if(!user) {
+    if (!user) {
         return null;
     }
     if (!user.name) {

front/src/components/navigation/NavItem.js

@@ -1,5 +1,5 @@
 import Stack from "@mui/material/Stack";
-import {isNavItemActive} from "../../lib/isNavItemActive";
+import {isNavItemActive} from "./isNavItemActive";
 import {navIcons} from "../core/navIcons";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";

front/src/context/AuthContext.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {useCallback, useEffect} from 'react';
 import {logger} from "../lib/DefaultLogger";
-import {tokenUtil} from "../lib/TokenUtil";
+import {tokenUtil} from "../lib/clients/TokenUtil";
 
 export const AuthContext = React.createContext(undefined);
 

front/src/context/UserContext.js

@@ -2,7 +2,7 @@ import * as React from "react";
 import {createContext, useCallback, useEffect, useState} from "react";
 import {logger} from "../lib/DefaultLogger";
 import {userClient} from "../lib/clients/UserClient";
-import {tokenUtil} from "../lib/TokenUtil";
+import {tokenUtil} from "../lib/clients/TokenUtil";
 
 export const UserContext = createContext(undefined);
 

front/src/lib/clients/TokenUtil.js

@@ -1,5 +1,5 @@
 import {decodeToken, isExpired} from "react-jwt";
-import {requests} from "../requests";
+import {requests} from "../../requests";
 import axios from "axios";
 
 class TokenUtil {

front/src/lib/clients/api.js

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

front/src/lib/sliceData.js

@@ -1,18 +0,0 @@
-export const sliceData = (rows, page, elementOnPage) => {
-    if (!rows || rows.length === 0) {
-        return [];
-    }
-
-    const maxPage = Math.ceil(rows.length / elementOnPage);
-    // const start = (page - 1) * elementOnPage;
-    const start = 0;
-    console.log(maxPage, start)
-    let end;
-    if (page === maxPage) {
-        end = rows.length;
-    } else {
-        end = start + elementOnPage;
-    }
-
-    return rows.slice(start, end);
-}

front/src/requests.js

@@ -48,10 +48,5 @@ export const requests = {
         type: routes.ingredient + "/type",
         crud: routes.ingredient,
     },
-    // receipt: {
-    //     receipts: routes.bar + "receipt?id=",
-    //
-    // },
-
     unit: routes.unit + "/units"
 }

src/main/java/ru/kayashov/bar/controller/dto/ingredient/IngredientResponseDto.java

@@ -32,7 +32,7 @@ public class IngredientResponseDto {
                 .type(i.getType() != null ? i.getType().getName() : null)
                 .abv(i.getAbv())
                 .isHave(i.getIsHave())
-                .image("https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png")
+                .image(i.getImage())
                 .description(i.getDescription())
                 .build();
     }

src/main/java/ru/kayashov/bar/controller/dto/ingredient/IngredientSimpleResponseDto.java

@@ -16,7 +16,7 @@ public class IngredientSimpleResponseDto {
 
     public static IngredientSimpleResponseDto mapToDto(IngredientEntity ingredient) {
         return new IngredientSimpleResponseDto(ingredient.getId(), ingredient.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + ingredient.getEnName() + "-Medium.png",
+                ingredient.getImage(),
                 ingredient.getIsHave());
     }
 }

src/main/java/ru/kayashov/bar/mapper/CocktailMapper.java

@@ -154,7 +154,7 @@ public class CocktailMapper {
     private IngredientSimpleResponseDto createIngredientResponseDto(IngredientEntity i) {
         return new IngredientSimpleResponseDto(i.getId(),
                 i.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png",
+                i.getImage(),
                 i.getIsHave());
     }
 

src/main/java/ru/kayashov/bar/mapper/IngredientMapper.java

@@ -27,7 +27,7 @@ public class IngredientMapper {
                 .type(i.getType() != null ? i.getType().getName() : null)
                 .abv(i.getAbv())
                 .isHave(i.getIsHave())
-                .image("https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png")
+                .image(i.getImage())
                 .description(i.getDescription())
                 .build();
     }
@@ -40,7 +40,7 @@ public class IngredientMapper {
 
     private IngredientSimpleResponseDto mapIngredientToSimpleDto(IngredientEntity i) {
         return new IngredientSimpleResponseDto(i.getId(), i.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png",
+                i.getImage(),
                 i.getIsHave());
     }
 }

src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java

@@ -33,10 +33,10 @@ public class IngredientEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
-    private String enName;
     private Boolean alcohol;
     private Integer abv;
     private Boolean isHave;
+    private String image;
 
     @Column(columnDefinition = "text")
     private String description;

src/main/java/ru/kayashov/bar/repository/IngredientRepository.java

@@ -6,6 +6,4 @@ import ru.kayashov.bar.model.entity.IngredientEntity;
 import java.util.Optional;
 
 public interface IngredientRepository extends JpaRepository<IngredientEntity, Long> {
-
-    Optional<IngredientEntity> findByEnNameIgnoreCase(String name);
 }

src/main/java/ru/kayashov/bar/service/IngredientService.java

@@ -93,6 +93,7 @@ public class IngredientService {
         IngredientEntity entity;
         if (dto.getId() == null) {
             entity = new IngredientEntity();
+            entity.setIsHave(false);
         } else {
             entity = repository.findById(dto.getId())
                     .orElse(null);