From 59aea98eff8b33c3d86385cd01c09e0a709faf1c Mon Sep 17 00:00:00 2001 From: LeonG11 Date: Fri, 5 Jun 2026 23:04:37 +0300 Subject: [PATCH] fix(frontend) make main page --- ...86d6401c7ac5594d8fdc7c3652c6.png => background.png} | Bin ...b691529bb843e719e7d434f185d4be3.jpg => calamar.jpg} | Bin ...270d7bb3c4f1d85302bb979f8757b568.jpg => cancer.jpg} | Bin ...8685038b351929089e791e3cf0774ee.jpg => cancer2.jpg} | Bin ...2f2bddd51513d19fe4a2ee02d82fc941a.jpg => fish1.jpg} | Bin ...7aa0f3bc227a13a8b9dfb0d130ee89960.png => fish2.png} | Bin ...3a9c6e90e5dab3a529da0a541c7e728.jpg => lobster.jpg} | Bin ...40258302c855b820a6a5bfcdca98a53c.jpg => ouster.jpg} | Bin ...01de0f1b3b41609d9fa988b3c8fe1fac.jpg => salmon.jpg} | Bin ...496e07140be66e2c05da900484513f7c3.jpg => shell.jpg} | Bin ...2b0038857384689c0c98b772b488ffed.jpg => shell2.jpg} | Bin ...74d7298e75af3054e934dd1e56491544.jpg => shell3.jpg} | Bin ...441276f45f650655f7cdfae5a630a16.jpg => shrimps.jpg} | Bin ...6413569c3ef92d2aeffd6e9b16f7d1ec23.jpg => tuna.jpg} | Bin frontend/src/components/Arrow.jsx | 42 ++++++++++++ frontend/src/pages/Main.jsx | 60 +++++++----------- frontend/src/pages/Shop.jsx | 0 17 files changed, 66 insertions(+), 36 deletions(-) rename frontend/src/assets/Исходники/{4d093466f81086d6401c7ac5594d8fdc7c3652c6.png => background.png} (100%) rename frontend/src/assets/Исходники/{4f796b4f7b691529bb843e719e7d434f185d4be3.jpg => calamar.jpg} (100%) rename frontend/src/assets/Исходники/{0b2cda85270d7bb3c4f1d85302bb979f8757b568.jpg => cancer.jpg} (100%) rename frontend/src/assets/Исходники/{42131d9b38685038b351929089e791e3cf0774ee.jpg => cancer2.jpg} (100%) rename frontend/src/assets/Исходники/{01ba84b2f2bddd51513d19fe4a2ee02d82fc941a.jpg => fish1.jpg} (100%) rename frontend/src/assets/Исходники/{9e90dc77aa0f3bc227a13a8b9dfb0d130ee89960.png => fish2.png} (100%) rename frontend/src/assets/Исходники/{2a2064d043a9c6e90e5dab3a529da0a541c7e728.jpg => lobster.jpg} (100%) rename frontend/src/assets/Исходники/{c561ff6540258302c855b820a6a5bfcdca98a53c.jpg => ouster.jpg} (100%) rename frontend/src/assets/Исходники/{f290caba01de0f1b3b41609d9fa988b3c8fe1fac.jpg => salmon.jpg} (100%) rename frontend/src/assets/Исходники/{450a8ab496e07140be66e2c05da900484513f7c3.jpg => shell.jpg} (100%) rename frontend/src/assets/Исходники/{4990ef4e2b0038857384689c0c98b772b488ffed.jpg => shell2.jpg} (100%) rename frontend/src/assets/Исходники/{d530e1a874d7298e75af3054e934dd1e56491544.jpg => shell3.jpg} (100%) rename frontend/src/assets/Исходники/{34e39e62d441276f45f650655f7cdfae5a630a16.jpg => shrimps.jpg} (100%) rename frontend/src/assets/Исходники/{1e59486413569c3ef92d2aeffd6e9b16f7d1ec23.jpg => tuna.jpg} (100%) create mode 100644 frontend/src/components/Arrow.jsx create mode 100644 frontend/src/pages/Shop.jsx diff --git a/frontend/src/assets/Исходники/4d093466f81086d6401c7ac5594d8fdc7c3652c6.png b/frontend/src/assets/Исходники/background.png similarity index 100% rename from frontend/src/assets/Исходники/4d093466f81086d6401c7ac5594d8fdc7c3652c6.png rename to frontend/src/assets/Исходники/background.png diff --git a/frontend/src/assets/Исходники/4f796b4f7b691529bb843e719e7d434f185d4be3.jpg b/frontend/src/assets/Исходники/calamar.jpg similarity index 100% rename from frontend/src/assets/Исходники/4f796b4f7b691529bb843e719e7d434f185d4be3.jpg rename to frontend/src/assets/Исходники/calamar.jpg diff --git a/frontend/src/assets/Исходники/0b2cda85270d7bb3c4f1d85302bb979f8757b568.jpg b/frontend/src/assets/Исходники/cancer.jpg similarity index 100% rename from frontend/src/assets/Исходники/0b2cda85270d7bb3c4f1d85302bb979f8757b568.jpg rename to frontend/src/assets/Исходники/cancer.jpg diff --git a/frontend/src/assets/Исходники/42131d9b38685038b351929089e791e3cf0774ee.jpg b/frontend/src/assets/Исходники/cancer2.jpg similarity index 100% rename from frontend/src/assets/Исходники/42131d9b38685038b351929089e791e3cf0774ee.jpg rename to frontend/src/assets/Исходники/cancer2.jpg diff --git a/frontend/src/assets/Исходники/01ba84b2f2bddd51513d19fe4a2ee02d82fc941a.jpg b/frontend/src/assets/Исходники/fish1.jpg similarity index 100% rename from frontend/src/assets/Исходники/01ba84b2f2bddd51513d19fe4a2ee02d82fc941a.jpg rename to frontend/src/assets/Исходники/fish1.jpg diff --git a/frontend/src/assets/Исходники/9e90dc77aa0f3bc227a13a8b9dfb0d130ee89960.png b/frontend/src/assets/Исходники/fish2.png similarity index 100% rename from frontend/src/assets/Исходники/9e90dc77aa0f3bc227a13a8b9dfb0d130ee89960.png rename to frontend/src/assets/Исходники/fish2.png diff --git a/frontend/src/assets/Исходники/2a2064d043a9c6e90e5dab3a529da0a541c7e728.jpg b/frontend/src/assets/Исходники/lobster.jpg similarity index 100% rename from frontend/src/assets/Исходники/2a2064d043a9c6e90e5dab3a529da0a541c7e728.jpg rename to frontend/src/assets/Исходники/lobster.jpg diff --git a/frontend/src/assets/Исходники/c561ff6540258302c855b820a6a5bfcdca98a53c.jpg b/frontend/src/assets/Исходники/ouster.jpg similarity index 100% rename from frontend/src/assets/Исходники/c561ff6540258302c855b820a6a5bfcdca98a53c.jpg rename to frontend/src/assets/Исходники/ouster.jpg diff --git a/frontend/src/assets/Исходники/f290caba01de0f1b3b41609d9fa988b3c8fe1fac.jpg b/frontend/src/assets/Исходники/salmon.jpg similarity index 100% rename from frontend/src/assets/Исходники/f290caba01de0f1b3b41609d9fa988b3c8fe1fac.jpg rename to frontend/src/assets/Исходники/salmon.jpg diff --git a/frontend/src/assets/Исходники/450a8ab496e07140be66e2c05da900484513f7c3.jpg b/frontend/src/assets/Исходники/shell.jpg similarity index 100% rename from frontend/src/assets/Исходники/450a8ab496e07140be66e2c05da900484513f7c3.jpg rename to frontend/src/assets/Исходники/shell.jpg diff --git a/frontend/src/assets/Исходники/4990ef4e2b0038857384689c0c98b772b488ffed.jpg b/frontend/src/assets/Исходники/shell2.jpg similarity index 100% rename from frontend/src/assets/Исходники/4990ef4e2b0038857384689c0c98b772b488ffed.jpg rename to frontend/src/assets/Исходники/shell2.jpg diff --git a/frontend/src/assets/Исходники/d530e1a874d7298e75af3054e934dd1e56491544.jpg b/frontend/src/assets/Исходники/shell3.jpg similarity index 100% rename from frontend/src/assets/Исходники/d530e1a874d7298e75af3054e934dd1e56491544.jpg rename to frontend/src/assets/Исходники/shell3.jpg diff --git a/frontend/src/assets/Исходники/34e39e62d441276f45f650655f7cdfae5a630a16.jpg b/frontend/src/assets/Исходники/shrimps.jpg similarity index 100% rename from frontend/src/assets/Исходники/34e39e62d441276f45f650655f7cdfae5a630a16.jpg rename to frontend/src/assets/Исходники/shrimps.jpg diff --git a/frontend/src/assets/Исходники/1e59486413569c3ef92d2aeffd6e9b16f7d1ec23.jpg b/frontend/src/assets/Исходники/tuna.jpg similarity index 100% rename from frontend/src/assets/Исходники/1e59486413569c3ef92d2aeffd6e9b16f7d1ec23.jpg rename to frontend/src/assets/Исходники/tuna.jpg diff --git a/frontend/src/components/Arrow.jsx b/frontend/src/components/Arrow.jsx new file mode 100644 index 0000000..0ab2692 --- /dev/null +++ b/frontend/src/components/Arrow.jsx @@ -0,0 +1,42 @@ +import { useNavigate } from "react-router-dom"; + +export default function Arrow({ + link, + radius = "20", + cx = "64", + cy = "20", + width = "84", + height = "40", + colorCircle = "#B78A61", +}) { + const navigate = useNavigate(); + + return ( + + ); +} diff --git a/frontend/src/pages/Main.jsx b/frontend/src/pages/Main.jsx index be29961..f1b4aa0 100644 --- a/frontend/src/pages/Main.jsx +++ b/frontend/src/pages/Main.jsx @@ -1,48 +1,36 @@ -import { useEffect, useState } from "react"; -import * as api from "../api"; // Импортируем все функции из api/index.js import PageLayout from "../components/PageLayout"; +import bgLayout from "../assets/Исходники/background.png"; +import Arrow from "../components/Arrow"; + +import { useEffect, useState } from "react"; export default function Dashboard() { - const [items, setItems] = useState([]); + const [isLoaded, setIsLoaded] = useState(false); useEffect(() => { - api - .getAllItems() - .then((res) => { - setItems(res.data); - }) - .catch((err) => { - console.error("Ошибка при получении товара с сервера", err); - }); + setIsLoaded(true); }, []); - return ( -
- {Array.isArray(items) && - items.map((item) => ( -
-
ID: ${item.id}
-
- {item.name} -
-
- {item.price} -
-
- {item.name} -
-
- {item.category} -
-
- {item.unit} -
+
+
+
+
Свежие морепродукты
+
На любой вкус
+
+
Смотреть товары
+
- ))} +
+
); diff --git a/frontend/src/pages/Shop.jsx b/frontend/src/pages/Shop.jsx new file mode 100644 index 0000000..e69de29