add backendURl to src path

build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.c25a228f.css",
-    "main.js": "/static/js/main.0a7f6f01.js",
+    "main.js": "/static/js/main.eb1cb086.js",
     "static/js/787.884e199e.chunk.js": "/static/js/787.884e199e.chunk.js",
     "static/media/main-page-image.png": "/static/media/main-page-image.bc655052ce386c031a15.png",
     "static/media/default-avatar-image.png": "/static/media/default-avatar-image.fb653606e5a348e7bc76.png",
@@ -9,11 +9,11 @@
     "static/media/shopping-logo.svg": "/static/media/shopping-logo.423022a24e67b6b6140c294be23af1b0.svg",
     "index.html": "/index.html",
     "main.c25a228f.css.map": "/static/css/main.c25a228f.css.map",
-    "main.0a7f6f01.js.map": "/static/js/main.0a7f6f01.js.map",
+    "main.eb1cb086.js.map": "/static/js/main.eb1cb086.js.map",
     "787.884e199e.chunk.js.map": "/static/js/787.884e199e.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.c25a228f.css",
-    "static/js/main.0a7f6f01.js"
+    "static/js/main.eb1cb086.js"
   ]
 }

src/components/CartPage/CartItem.js

@@ -5,6 +5,7 @@ import { AiOutlinePlus, AiOutlineMinus } from "react-icons/ai";
 import { actionCartChange } from "../../reducers";
 import { useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
+import { backendURL } from "../../helpers";
 
 const { Typography, Stack, IconButton, TextField, ButtonGroup, Button, TableCell, TableRow, Input } = require("@mui/material");
 
@@ -34,7 +35,7 @@ export const CartItem = ({ order, onDeleteClick }) => {
             <TableCell>
                 <Box
                     component="img"
-                    src={images && images[0]?.url ? `/${images ? images[0]?.url : ""}` : defaultGoodImage}
+                    src={images && images[0]?.url ? `${backendURL}/${images ? images[0]?.url : ""}` : defaultGoodImage}
                     sx={{ width: 50 }}
                     onError={({ currentTarget }) => {
                         currentTarget.onerror = null;

src/components/DashboardPage/DashboardOrder/DashboardOrderGood/index.js

@@ -1,4 +1,5 @@
 import { Box, Grid, Typography } from "@mui/material";
+import { backendURL } from "../../../../helpers";
 import defaultGoodImage from "../../../../images/default-good-image.png";
 
 export const DashboardOrderGood = ({ orderGood }) => {
@@ -7,7 +8,7 @@ export const DashboardOrderGood = ({ orderGood }) => {
         <Box className="DashboardOrderGood">
             <Grid container spacing={4}>
                 <Grid item xs={2}>
-                    <Box component="img" src={good?.images[0]?.url ? `/${good?.images[0]?.url}` : defaultGoodImage} />
+                    <Box component="img" src={good?.images[0]?.url ? `${backendURL}/${good?.images[0]?.url}` : defaultGoodImage} />
                 </Grid>
                 <Grid item xs={10}>
                     <Typography textAlign="left">Назва: {good?.name || "-"}</Typography>

src/components/GoodPage/index.js

@@ -4,6 +4,7 @@ import defaultGoodImage from "../../images/default-good-image.png";
 import { Divider, Grid, Stack, Typography } from "@mui/material";
 import { Box } from "@mui/system";
 import { Carousel } from "react-responsive-carousel";
+import { backendURL } from "../../helpers";
 
 export const GoodPage = () => {
     const good = useSelector((state) => state.promise?.goodById?.payload || {});
@@ -16,7 +17,7 @@ export const GoodPage = () => {
                         {(good.images || [{ _id: 0, url: defaultGoodImage }]).map((image) => (
                             <img
                                 key={image?._id}
-                                src={image?.url ? `/${image?.url}` : defaultGoodImage}
+                                src={image?.url ? `${backendURL}/${image?.url}` : defaultGoodImage}
                                 onError={({ currentTarget }) => {
                                     currentTarget.onerror = null; // prevents looping
                                     currentTarget.src = defaultGoodImage;

src/components/admin/AdminCategoryPage/CategoryForm.js

@@ -202,7 +202,7 @@ const CategoryForm = ({
                     onNO={() => setIsDeleteModalOpen(false)}
                     onYES={() => {
                         onDelete(category);
-                        setPromiseTimeOut(setTimeout(() => formik.isSubmitting(false), 3000));
+                        setPromiseTimeOut(setTimeout(() => formik.setSubmitting(false), 3000));
                     }}
                 />
             )}

src/components/admin/AdminGoodPage/GoodForm.js

@@ -45,8 +45,10 @@ export const GoodForm = ({
     const [inputImages, setInputImages] = useState([]);
     const { setAlert } = useContext(UIContext);
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+    const [promiseTimeOut, setPromiseTimeOut] = useState(null);
     const navigate = useNavigate();
     const dispatch = useDispatch();
+
     const formik = useFormik({
         initialValues: {
             name: "",
@@ -67,12 +69,14 @@ export const GoodForm = ({
             goodToSave.images = inputImages?.map(({ _id }) => ({ _id })) || [];
             onSaveClick && onSaveClick();
             onSave(goodToSave);
+            setPromiseTimeOut(setTimeout(() => formik.setSubmitting(false), 3000));
         },
     });
 
     useEffect(() => {
         if (promiseStatus === "FULFILLED") {
             formik.setSubmitting(false);
+            setPromiseTimeOut(null);
             setAlert({
                 show: true,
                 severity: "success",
@@ -82,6 +86,7 @@ export const GoodForm = ({
         if (promiseStatus === "REJECTED") {
             const errorMessage = serverErrors.reduce((prev, curr) => prev + "\n" + curr.message, "");
             formik.setSubmitting(false);
+            setPromiseTimeOut(null);
             setAlert({
                 show: true,
                 severity: "error",
@@ -92,9 +97,11 @@ export const GoodForm = ({
 
     useEffect(() => {
         if (deletePromiseStatus === "FULFILLED") {
+            setPromiseTimeOut(null);
             navigate("/admin/goods/");
         }
         if (deletePromiseStatus === "REJECTED") {
+            setPromiseTimeOut(null);
             setAlert({
                 show: true,
                 severity: "error",
@@ -225,6 +232,7 @@ export const GoodForm = ({
                     onNO={() => setIsDeleteModalOpen(false)}
                     onYES={() => {
                         onDelete(good);
+                        setPromiseTimeOut(setTimeout(() => formik.setSubmitting(false), 3000));
                     }}
                 />
             )}

src/components/admin/AdminGoodsPage/AdminGoodItem.js

@@ -1,6 +1,7 @@
 import { Link } from "react-router-dom";
 import defaultGoodImage from "../../../images/default-good-image.png";
 import { Box, Button, TableCell, TableRow } from "@mui/material";
+import { backendURL } from "../../../helpers";
 
 const AdminGoodItem = ({ good }) => (
     <TableRow className="AdminGoodItem">
@@ -10,7 +11,7 @@ const AdminGoodItem = ({ good }) => (
             {
                 <Box
                     component="img"
-                    src={good.images?.length ? `/${good.images ? good.images[0]?.url : ""}` : defaultGoodImage}
+                    src={good.images?.length ? `${backendURL}/${good.images ? good.images[0]?.url : ""}` : defaultGoodImage}
                     onError={({ currentTarget }) => {
                         currentTarget.onerror = null; // prevents looping
                         currentTarget.src = defaultGoodImage;

src/components/admin/AdminLayoutPage/index.js

@@ -31,10 +31,12 @@ const AdminCategoryPageContainer = ({}) => {
 
     useEffect(() => {
         dispatch(actionGoodsAll());
+        dispatch(actionCatAll());
 
         return () => {
             dispatch(actionPromiseClear("goodsAll"));
             dispatch(actionPromiseClear("adminCatById"));
+            dispatch(actionPromiseClear("catAll"));
         };
     }, []);
 

src/components/common/SearchBar/SearchGoodResultItem.js

@@ -2,6 +2,7 @@ import { Link } from "react-router-dom";
 import defaultGoodImage from "../../../images/default-good-image.png";
 
 import { Grid, Box, Typography } from "@mui/material";
+import { backendURL } from "../../../helpers";
 const SearchGoodResultItem = ({ good, onClick, link = "" } = {}) => {
     const { _id = 0, images = [], name = "", description = "", price = "" } = good || {};
 
@@ -17,7 +18,7 @@ const SearchGoodResultItem = ({ good, onClick, link = "" } = {}) => {
             <Grid item xs={3}>
                 <Box
                     component="img"
-                    src={images ? `/${images[0]?.url}` : defaultGoodImage}
+                    src={images ? `${backendURL}/${images[0]?.url}` : defaultGoodImage}
                     onError={({ currentTarget }) => {
                         currentTarget.onerror = null; // prevents looping
                         currentTarget.src = defaultGoodImage;