Skip to content

Commit 47324fe

Browse files
dawidolkodawidolko
committed
fix logic
1 parent 5e7a209 commit 47324fe

3 files changed

Lines changed: 60 additions & 25 deletions

File tree

‎frontend/src/components/CartContent/CartPreview.jsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ const CartPreview = () => {
5353
response.data.forEach((product) => {
5454
productMap[product.id] = {
5555
...product,
56-
image: product.photos?.[0]?.path
57-
? `${BASE_URL}/media/${product.photos[0].path}`
58-
: PLACEHOLDER_IMAGE,
56+
image:
57+
config.useMockData && product.imgs && product.imgs[0]
58+
? product.imgs[0]
59+
: product.photos?.[0]?.path
60+
? `${BASE_URL}/media/${product.photos[0].path}`
61+
: PLACEHOLDER_IMAGE,
5962
};
6063
});
6164
setProducts(productMap);

‎frontend/src/components/LogoSlider/ProductSliderItem.jsx‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import config from "../../config/config";
99
const ProductSliderItem = ({
1010
id,
1111
photos,
12+
imgs,
1213
name,
1314
price,
1415
old_price,
@@ -37,9 +38,12 @@ const ProductSliderItem = ({
3738
} else {
3839
addToFavorites({
3940
id,
40-
img: photos?.[0]?.path
41-
? `${config.apiUrl}/media/${photos[0].path}`
42-
: "https://via.placeholder.com/150",
41+
img:
42+
config.useMockData && imgs && imgs[0]
43+
? imgs[0]
44+
: photos?.[0]?.path
45+
? `${config.apiUrl}/media/${photos[0].path}`
46+
: "https://via.placeholder.com/150",
4347
name,
4448
price,
4549
});
@@ -61,9 +65,12 @@ const ProductSliderItem = ({
6165
});
6266
};
6367

64-
const imageUrl = photos?.[0]?.path
65-
? `${config.apiUrl}/media/${photos[0].path}`
66-
: "https://via.placeholder.com/150";
68+
const imageUrl =
69+
config.useMockData && imgs && imgs[0]
70+
? imgs[0]
71+
: photos?.[0]?.path
72+
? `${config.apiUrl}/media/${photos[0].path}`
73+
: "https://via.placeholder.com/150";
6774

6875
return (
6976
<div className="sliderItem" onClick={handleBoxClick}>

‎frontend/src/components/ProductSection/ProductPage.jsx‎

Lines changed: 41 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,12 @@ const ProductPage = () => {
238238
} else {
239239
addToFavorites({
240240
id: product.id,
241-
img: `${config.apiUrl}/media/${product.photos[0]?.path}`,
241+
img:
242+
config.useMockData && product.imgs && product.imgs[0]
243+
? product.imgs[0]
244+
: product.photos && product.photos[0]?.path
245+
? `${config.apiUrl}/media/${product.photos[0].path}`
246+
: "/placeholder.jpg",
242247
name: product.name,
243248
price: product.price,
244249
});
@@ -441,9 +446,13 @@ const ProductPage = () => {
441446
</button>
442447
<img
443448
src={
444-
product.photos && product.photos[currentIndex]
445-
? `${config.apiUrl}/media/${product.photos[currentIndex].path}`
446-
: "/placeholder.jpg"
449+
config.useMockData &&
450+
product.imgs &&
451+
product.imgs[currentIndex]
452+
? product.imgs[currentIndex]
453+
: product.photos && product.photos[currentIndex]
454+
? `${config.apiUrl}/media/${product.photos[currentIndex].path}`
455+
: "/placeholder.jpg"
447456
}
448457
alt={product.name}
449458
className="productPage__main-img productPage__main-img--clickable"
@@ -469,9 +478,13 @@ const ProductPage = () => {
469478
<div key={`thumb-${photo?.id ?? photo?.path ?? idx}`}>
470479
<img
471480
src={
472-
photo?.path
473-
? `${config.apiUrl}/media/${photo.path}`
474-
: "/placeholder.jpg"
481+
config.useMockData
482+
? typeof photo === "string"
483+
? photo
484+
: "/placeholder.jpg"
485+
: photo?.path
486+
? `${config.apiUrl}/media/${photo.path}`
487+
: "/placeholder.jpg"
475488
}
476489
alt={`Thumbnail ${idx + 1}`}
477490
className={`productPage__thumbnail ${
@@ -500,9 +513,13 @@ const ProductPage = () => {
500513
<img
501514
className="common-image-overlay__image"
502515
src={
503-
product.photos && product.photos[currentIndex]
504-
? `${config.apiUrl}/media/${product.photos[currentIndex].path}`
505-
: "/placeholder.jpg"
516+
config.useMockData &&
517+
product.imgs &&
518+
product.imgs[currentIndex]
519+
? product.imgs[currentIndex]
520+
: product.photos && product.photos[currentIndex]
521+
? `${config.apiUrl}/media/${product.photos[currentIndex].path}`
522+
: "/placeholder.jpg"
506523
}
507524
alt={product.name}
508525
/>
@@ -560,9 +577,13 @@ const ProductPage = () => {
560577
onClick={() => navigate(`/product/${recProduct.id}`)}>
561578
<img
562579
src={
563-
recProduct.photos && recProduct.photos[0]
564-
? `${config.apiUrl}/media/${recProduct.photos[0].path}`
565-
: "/placeholder.jpg"
580+
config.useMockData &&
581+
recProduct.imgs &&
582+
recProduct.imgs[0]
583+
? recProduct.imgs[0]
584+
: recProduct.photos && recProduct.photos[0]
585+
? `${config.apiUrl}/media/${recProduct.photos[0].path}`
586+
: "/placeholder.jpg"
566587
}
567588
alt={recProduct.name}
568589
className="productPage__quick-rec-img"
@@ -629,9 +650,13 @@ const ProductPage = () => {
629650
onClick={() => navigate(`/product/${similarProduct.id}`)}>
630651
<img
631652
src={
632-
similarProduct.photos && similarProduct.photos[0]
633-
? `${config.apiUrl}/media/${similarProduct.photos[0].path}`
634-
: "/placeholder.jpg"
653+
config.useMockData &&
654+
similarProduct.imgs &&
655+
similarProduct.imgs[0]
656+
? similarProduct.imgs[0]
657+
: similarProduct.photos && similarProduct.photos[0]
658+
? `${config.apiUrl}/media/${similarProduct.photos[0].path}`
659+
: "/placeholder.jpg"
635660
}
636661
alt={similarProduct.name}
637662
className="productPage__similar-product-img"

0 commit comments

Comments
 (0)