- 
+
{images.map((img, index) => (
@@ -143,7 +143,7 @@ export const Product = ({
key={index}
className={index === currentImg ? "img-picker-active" : "img-picker"}
src={img}
- alt=""
+ alt={`${title} - превью ${index + 1}`}
onClick={() => handleClick(index)}
/>
))}
diff --git a/src/pages/cartpage.tsx b/src/pages/cart-page.tsx
similarity index 97%
rename from src/pages/cartpage.tsx
rename to src/pages/cart-page.tsx
index bffd42f..da6b589 100644
--- a/src/pages/cartpage.tsx
+++ b/src/pages/cart-page.tsx
@@ -18,7 +18,7 @@ import { Link, useNavigate } from "react-router-dom";
import axios from "axios";
import emptyCartImg from "imgs/empty-cart.png";
-export const Cartpage = () => {
+export const CartPage = () => {
const amountInCart = useAppSelector(amountInCartSelector);
const cost = useAppSelector(totalCostSelector);
const cart = useAppSelector(cartSelector);
@@ -68,7 +68,7 @@ export const Cartpage = () => {
setDeliveryCost(payload?.value as string);
};
- const handleChangeCkecked = () => {
+ const handleChangeChecked = () => {
setChecked(!checked);
setCheckedError("");
};
@@ -118,7 +118,7 @@ export const Cartpage = () => {
id: product.productId,
totalPrice: product.price,
totalCount: product.amount,
- sticketNumber: product.stickerNumber,
+ stickerNumber: product.stickerNumber,
color: product.color,
size: product.size,
model: product.model,
@@ -230,7 +230,7 @@ export const Cartpage = () => {
{
- При составление заказа произошла ошибка, попробуйте позже.
+ При составлении заказа произошла ошибка, попробуйте позже.
)}
diff --git a/src/pages/contact-uspage.tsx b/src/pages/contact-us-page.tsx
similarity index 100%
rename from src/pages/contact-uspage.tsx
rename to src/pages/contact-us-page.tsx
diff --git a/src/pages/homepage.tsx b/src/pages/home-page.tsx
similarity index 100%
rename from src/pages/homepage.tsx
rename to src/pages/home-page.tsx
diff --git a/src/pages/made-in-alfa-page.tsx b/src/pages/made-in-alfa-page.tsx
new file mode 100644
index 0000000..a8b6020
--- /dev/null
+++ b/src/pages/made-in-alfa-page.tsx
@@ -0,0 +1,40 @@
+import { Gap } from "@alfalab/core-components/gap";
+import { Typography } from "@alfalab/core-components/typography";
+import { Page } from "components/page";
+import { useAppDispatch, useAppSelector } from "store";
+import { aStoreActions, madeInAlfaProductsSelector } from "store/a-store";
+import { MadeInAlfaCard } from "components/made-in-alfa-card";
+import { useEffect } from "react";
+import "./styles.css";
+
+export const MadeInAlfapage = () => {
+ const dispatch = useAppDispatch();
+ const products = useAppSelector(madeInAlfaProductsSelector);
+
+ useEffect(() => {
+ dispatch(aStoreActions.requestMadeInAlfa());
+ }, [dispatch]);
+
+ return (
+
+
+ );
+};
diff --git a/src/pages/made-in-alfa-productpage.tsx b/src/pages/made-in-alfa-product-page.tsx
similarity index 91%
rename from src/pages/made-in-alfa-productpage.tsx
rename to src/pages/made-in-alfa-product-page.tsx
index f880926..ce37ee9 100644
--- a/src/pages/made-in-alfa-productpage.tsx
+++ b/src/pages/made-in-alfa-product-page.tsx
@@ -8,7 +8,7 @@ import { useAppDispatch, useAppSelector } from "store";
import { useCallback, useEffect } from "react";
import { aStoreActions, currentProductSelector, hasErrorSelector } from "store/a-store";
-export const MadeInAflaProductpage = () => {
+export const MadeInAlfaProductpage = () => {
const { productId } = useParams();
const dispatch = useAppDispatch();
@@ -27,6 +27,10 @@ export const MadeInAflaProductpage = () => {
product = data.products.find((product) => product.id === parseInt(productId as string)) as ProductType;
}
+ if (!product || !product.id) {
+ return
-
- );
-};
diff --git a/src/pages/own-designpage.tsx b/src/pages/own-design-page.tsx
similarity index 100%
rename from src/pages/own-designpage.tsx
rename to src/pages/own-design-page.tsx
diff --git a/src/pages/own-desigh-productpage.tsx b/src/pages/own-design-product-page.tsx
similarity index 95%
rename from src/pages/own-desigh-productpage.tsx
rename to src/pages/own-design-product-page.tsx
index b2b0a68..dbfa391 100644
--- a/src/pages/own-desigh-productpage.tsx
+++ b/src/pages/own-design-product-page.tsx
@@ -27,6 +27,10 @@ export const OwnDesignProductpage = () => {
product = data.customProducts.find((product) => product.id === parseInt(productId as string)) as ProductType;
}
+ if (!product || !product.id) {
+ return = (state) => {
};
const addToCart: CaseReducer> = (state, { payload }) => {
+ const areOptionsEqual = (options1: any[], options2: any[]) => {
+ if (options1.length !== options2.length) return false;
+ return options1.every((opt1) => {
+ const key1 = Object.keys(opt1)[0];
+ const val1 = opt1[key1];
+ const opt2 = options2.find((o) => Object.keys(o)[0] === key1);
+ return opt2 && opt2[key1] === val1;
+ });
+ };
+
const product = state.cart.find(
- (product) =>
- product.productId === payload.productId &&
- product.productOptions.every(
- (value, index) => Object.values(value)[0] === Object.values(payload.productOptions[index])[0]
- )
+ (p) => p.productId === payload.productId && areOptionsEqual(p.productOptions, payload.productOptions)
);
+
if (product) {
product.amount++;
} else {
- Стоимость товаров в коризне:
+ Стоимость товаров в корзине:
@@ -276,7 +276,7 @@ export const Cartpage = () => {
{orderError && (
+
+ Сделано в Альфе
+
+
+
+ {products.map((product) => (
+
+
-
-
- Сделано в Альфе
-
-
- Хотим каждую из этих вещей! Себе, родным и друзьям
-
-
-
-
- {products.map((product) => (
-
-
-