From 9224d665cf888270b910c574808ae6225b078250 Mon Sep 17 00:00:00 2001 From: mahdi Date: Sat, 21 May 2022 13:00:13 +0430 Subject: [PATCH] update 3 files and delete 10 files --- .../images/ProductStatusCardarrow-icon.svg | 0 .../images/ProductStatusCarddelivery-icon.svg | 0 .../images/ProductStatusCardicon-shop.svg | 0 .../images/ProductStatusCardicon1.svg | 0 .../images/ProductStatusCardinfo-circle.svg | 0 .../images/ProductStatusCardshield-tick.svg | 0 .../images/ProductStatusCardtick-circle.svg | 0 .../ProductStatusCard/index.js | 31 ++++++++++--------- src/components/CardDesgin/index.js | 2 ++ .../ProductTab/index.js | 2 +- .../ProductTab/table/index.js | 0 .../ProductDescriptionTable/index.js | 2 ++ 12 files changed, 22 insertions(+), 15 deletions(-) rename src/components/ProductStatusCard/arrow-icon.svg => public/images/ProductStatusCardarrow-icon.svg (100%) rename src/components/ProductStatusCard/delivery-icon.svg => public/images/ProductStatusCarddelivery-icon.svg (100%) rename src/components/ProductStatusCard/icon-shop.svg => public/images/ProductStatusCardicon-shop.svg (100%) rename src/components/ProductStatusCard/icon1.svg => public/images/ProductStatusCardicon1.svg (100%) rename src/components/ProductStatusCard/info-circle.svg => public/images/ProductStatusCardinfo-circle.svg (100%) rename src/components/ProductStatusCard/shield-tick.svg => public/images/ProductStatusCardshield-tick.svg (100%) rename src/components/ProductStatusCard/tick-circle.svg => public/images/ProductStatusCardtick-circle.svg (100%) rename src/components/{ => CardDesgin}/ProductStatusCard/index.js (85%) rename src/components/{ => ProductDescriptionTable}/ProductTab/index.js (97%) rename src/components/{ => ProductDescriptionTable}/ProductTab/table/index.js (100%) diff --git a/src/components/ProductStatusCard/arrow-icon.svg b/public/images/ProductStatusCardarrow-icon.svg similarity index 100% rename from src/components/ProductStatusCard/arrow-icon.svg rename to public/images/ProductStatusCardarrow-icon.svg diff --git a/src/components/ProductStatusCard/delivery-icon.svg b/public/images/ProductStatusCarddelivery-icon.svg similarity index 100% rename from src/components/ProductStatusCard/delivery-icon.svg rename to public/images/ProductStatusCarddelivery-icon.svg diff --git a/src/components/ProductStatusCard/icon-shop.svg b/public/images/ProductStatusCardicon-shop.svg similarity index 100% rename from src/components/ProductStatusCard/icon-shop.svg rename to public/images/ProductStatusCardicon-shop.svg diff --git a/src/components/ProductStatusCard/icon1.svg b/public/images/ProductStatusCardicon1.svg similarity index 100% rename from src/components/ProductStatusCard/icon1.svg rename to public/images/ProductStatusCardicon1.svg diff --git a/src/components/ProductStatusCard/info-circle.svg b/public/images/ProductStatusCardinfo-circle.svg similarity index 100% rename from src/components/ProductStatusCard/info-circle.svg rename to public/images/ProductStatusCardinfo-circle.svg diff --git a/src/components/ProductStatusCard/shield-tick.svg b/public/images/ProductStatusCardshield-tick.svg similarity index 100% rename from src/components/ProductStatusCard/shield-tick.svg rename to public/images/ProductStatusCardshield-tick.svg diff --git a/src/components/ProductStatusCard/tick-circle.svg b/public/images/ProductStatusCardtick-circle.svg similarity index 100% rename from src/components/ProductStatusCard/tick-circle.svg rename to public/images/ProductStatusCardtick-circle.svg diff --git a/src/components/ProductStatusCard/index.js b/src/components/CardDesgin/ProductStatusCard/index.js similarity index 85% rename from src/components/ProductStatusCard/index.js rename to src/components/CardDesgin/ProductStatusCard/index.js index deb9f93..5468062 100644 --- a/src/components/ProductStatusCard/index.js +++ b/src/components/CardDesgin/ProductStatusCard/index.js @@ -1,13 +1,6 @@ import React from "react"; -import arrow from "./arrow-icon.svg"; -import delivery from "./delivery-icon.svg"; -import checked from "./icon1.svg"; -import circle from "./info-circle.svg"; -import shield from "./shield-tick.svg"; -import tick from "./tick-circle.svg"; -import shop from "./icon-shop.svg"; -import Button from "../Button"; +import Button from "../../ButtonDesign/Button"; const ProductStatusCard = ({ items, productPrice, discountPrice }) => { console.log(items.alertIcon); @@ -38,7 +31,13 @@ const ProductStatusCard = ({ items, productPrice, discountPrice }) => { )} - {item.alertIcon && } + {item.alertIcon && ( + + )} {Number(index) !== items.length - 1 && (
@@ -65,7 +64,11 @@ const ProductStatusCard = ({ items, productPrice, discountPrice }) => {
- +

@@ -86,7 +89,7 @@ export default ProductStatusCard; ProductStatusCard.defaultProps = { items: [ { - icon: tick, + icon: "images/ProductStatusCardtick-circle.svg", title: "توصیه به خرید توسط 4420 نفر", subtitle: null, alertIcon: false, @@ -94,7 +97,7 @@ ProductStatusCard.defaultProps = { customerSatisfactionPercent: null, }, { - icon: shop, + icon: "images/ProductStatusCardicon-shop.svg", title: " آپادانا ", subtitle: " فروشنده", alertIcon: true, @@ -102,7 +105,7 @@ ProductStatusCard.defaultProps = { customerSatisfactionPercent: " 91.5 ", }, { - icon: delivery, + icon: "images/ProductStatusCarddelivery-icon.svg", title: " 20 روز کاری پس از سفارش ", subtitle: "زمان ارسال", alertIcon: false, @@ -110,7 +113,7 @@ ProductStatusCard.defaultProps = { customerSatisfactionPercent: null, }, { - icon: shield, + icon: "images/ProductStatusCardshield-tick.svg", title: "اصالت و سلامت فیزیکی", subtitle: "گارانتی ", alertIcon: true, diff --git a/src/components/CardDesgin/index.js b/src/components/CardDesgin/index.js index 30f034a..fb563e9 100644 --- a/src/components/CardDesgin/index.js +++ b/src/components/CardDesgin/index.js @@ -8,6 +8,7 @@ import CardDesign2 from "./CardDesign2"; import CardDesign3 from "./CardDesign3"; import CustomToast from "./CustomToast"; import CustomToast2 from "./CustomToast2"; +import ProductStatusCard from "./ProductStatusCard"; function CardDesgin() { const list = { @@ -19,6 +20,7 @@ function CardDesgin() { 6: , 7: , 8: , + 9: , }; const [type, setType] = useState(1); return ( diff --git a/src/components/ProductTab/index.js b/src/components/ProductDescriptionTable/ProductTab/index.js similarity index 97% rename from src/components/ProductTab/index.js rename to src/components/ProductDescriptionTable/ProductTab/index.js index 8db9adb..f359f92 100644 --- a/src/components/ProductTab/index.js +++ b/src/components/ProductDescriptionTable/ProductTab/index.js @@ -5,7 +5,7 @@ const ProductTab = ({ tabs }) => { const [selectedTab, setSelectedTab] = useState(null); return ( -
+
    {tabs.map((tab, index) => ( diff --git a/src/components/ProductTab/table/index.js b/src/components/ProductDescriptionTable/ProductTab/table/index.js similarity index 100% rename from src/components/ProductTab/table/index.js rename to src/components/ProductDescriptionTable/ProductTab/table/index.js diff --git a/src/components/ProductDescriptionTable/index.js b/src/components/ProductDescriptionTable/index.js index 4ea5a60..b88a343 100644 --- a/src/components/ProductDescriptionTable/index.js +++ b/src/components/ProductDescriptionTable/index.js @@ -1,10 +1,12 @@ import React, { useState } from "react"; import ProductTable1 from "./ProductTable1"; +import ProductTab from "./ProductTab"; function Advertisements() { const list = { 1: , + 2: , }; const [type, setType] = useState(1); return (