diff --git a/src/components/ProductStatusCard/delivery-icon.svg b/public/assets/icons/delivery-primary.svg similarity index 56% rename from src/components/ProductStatusCard/delivery-icon.svg rename to public/assets/icons/delivery-primary.svg index 1b2ce22..9f03246 100644 --- a/src/components/ProductStatusCard/delivery-icon.svg +++ b/public/assets/icons/delivery-primary.svg @@ -1,11 +1,11 @@ - - - - - - - - + + + + + + + + diff --git a/public/assets/icons/dots-primary.svg b/public/assets/icons/dots-primary.svg index a2e25b1..2a2801f 100644 --- a/public/assets/icons/dots-primary.svg +++ b/public/assets/icons/dots-primary.svg @@ -1,6 +1,10 @@ + + + + diff --git a/src/components/ProductStatusCard/info-circle.svg b/public/assets/icons/info-primary.svg similarity index 55% rename from src/components/ProductStatusCard/info-circle.svg rename to public/assets/icons/info-primary.svg index 316dc07..6863c4d 100644 --- a/src/components/ProductStatusCard/info-circle.svg +++ b/public/assets/icons/info-primary.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/public/assets/icons/plus-primary.svg b/public/assets/icons/plus-primary.svg new file mode 100644 index 0000000..bc27464 --- /dev/null +++ b/public/assets/icons/plus-primary.svg @@ -0,0 +1,3 @@ + + + + diff --git a/src/components/ProductStatusCard/arrow-icon.svg b/public/assets/icons/reject-primary.svg similarity index 56% rename from src/components/ProductStatusCard/arrow-icon.svg rename to public/assets/icons/reject-primary.svg index 8760e2a..dc6bfbc 100644 --- a/src/components/ProductStatusCard/arrow-icon.svg +++ b/public/assets/icons/reject-primary.svg @@ -1,11 +1,11 @@ - - - - + + + + - - + + diff --git a/src/components/ProductStatusCard/icon-shop.svg b/public/assets/icons/seller-primary.svg similarity index 86% rename from src/components/ProductStatusCard/icon-shop.svg rename to public/assets/icons/seller-primary.svg index c981bd6..5cf474f 100644 --- a/src/components/ProductStatusCard/icon-shop.svg +++ b/public/assets/icons/seller-primary.svg @@ -1,11 +1,11 @@ - + - - - - - + + + + + diff --git a/public/assets/icons/seller-white.svg b/public/assets/icons/seller-white.svg new file mode 100644 index 0000000..0e20594 --- /dev/null +++ b/public/assets/icons/seller-white.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/components/ProductStatusCard/shield-tick.svg b/public/assets/icons/sheild-primary.svg similarity index 80% rename from src/components/ProductStatusCard/shield-tick.svg rename to public/assets/icons/sheild-primary.svg index 933d500..2f1c67b 100644 --- a/src/components/ProductStatusCard/shield-tick.svg +++ b/public/assets/icons/sheild-primary.svg @@ -1,5 +1,5 @@ - - + + diff --git a/src/components/ProductStatusCard/tick-circle.svg b/public/assets/icons/tick-circle.svg similarity index 100% rename from src/components/ProductStatusCard/tick-circle.svg rename to public/assets/icons/tick-circle.svg diff --git a/src/components/ProductImage/product-image.jpg b/src/components/ProductImage/product-image.jpg deleted file mode 100644 index 50ee881..0000000 Binary files a/src/components/ProductImage/product-image.jpg and /dev/null differ diff --git a/src/components/ProductStatusCard/index.js b/src/components/ProductStatusCard/index.js index 8b92148..581d634 100644 --- a/src/components/ProductStatusCard/index.js +++ b/src/components/ProductStatusCard/index.js @@ -3,19 +3,10 @@ import { connect } from "react-redux"; import { userProduct } from "../../redux/actions"; import { toast } from "react-toastify"; import separate from "../../utils/separate"; -//components; -import Button from "../Button"; import location from "../../utils/location"; -//assets -import arrow from "./arrow-icon.svg"; -import delivery from "./delivery-icon.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 bookmarkDeactiveLightIcon from "../../assets/icons/bookmark-deactive-light.svg"; -import bookmarkDeactiveDarkIcon from "../../assets/icons/bookmark-deactive-dark.svg"; +//components; +import Button from "../Button"; const ProductStatusCard = ({ price, @@ -39,7 +30,7 @@ const ProductStatusCard = ({
- +
{suggestedCounter ? (
{`${window.t( @@ -53,7 +44,11 @@ const ProductStatusCard = ({ {seller && (
- +
{seller?.name ? (
@@ -67,13 +62,21 @@ const ProductStatusCard = ({ ) : null}
- +
)}
- +
 {shippingTime || " "} @@ -85,7 +88,11 @@ const ProductStatusCard = ({ {garanty && (
- +
{garanty}
@@ -97,7 +104,9 @@ const ProductStatusCard = ({
bookmark
- +

diff --git a/src/components/ProductSuggestion/index.js b/src/components/ProductSuggestion/index.js index 1a1c9eb..90dba52 100644 --- a/src/components/ProductSuggestion/index.js +++ b/src/components/ProductSuggestion/index.js @@ -2,11 +2,10 @@ import React, { useState, useEffect } from "react"; import { product, userProduct } from "../../redux/actions"; import { connect } from "react-redux"; import separate from "../../utils/separate"; -import Button from "../Button"; import { toast } from "react-toastify"; -import productImg from "./product-chair.svg"; -import plus from "./plus.svg"; +//components +import Button from "../Button"; const ProductSuggestion = ({ isDark, @@ -88,7 +87,7 @@ const ProductSuggestion = ({

{Number(index) !== similarList.length - 1 && ( @@ -151,32 +150,3 @@ const mapDispatchToProps = { }; export default connect(mapStateToProps, mapDispatchToProps)(ProductSuggestion); - -ProductSuggestion.defaultProps = { - suggestions: [ - { - productImage: productImg, - productTitle: window.t("لپ تاپ گیمینگ ایسوس"), - productPrice: "750000", - plusIcon: null, - }, - { - productImage: productImg, - productTitle: window.t("مانیتور 40 اینچ"), - productPrice: "3.000.000", - plusIcon: plus, - }, - { - productImage: productImg, - productTitle: window.t("ماوس گیمینگ"), - productPrice: "650/000", - plusIcon: plus, - }, - { - productImage: productImg, - productTitle: window.t("لپ تاپ مک بوک پرو 2022"), - productPrice: "2000", - plusIcon: plus, - }, - ], -}; diff --git a/src/components/ProductSuggestion/plus.svg b/src/components/ProductSuggestion/plus.svg deleted file mode 100644 index adc93a9..0000000 --- a/src/components/ProductSuggestion/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - - + - diff --git a/src/components/ProductSuggestion/product-chair.svg b/src/components/ProductSuggestion/product-chair.svg deleted file mode 100644 index f5bb26c..0000000 --- a/src/components/ProductSuggestion/product-chair.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/components/QandA/index.js b/src/components/QandA/index.js index 4652652..08607f1 100644 --- a/src/components/QandA/index.js +++ b/src/components/QandA/index.js @@ -1,7 +1,7 @@ import React, { useState } from "react"; - import moment from "jalali-moment"; +//components import Counter from "../Counter"; import Button from "../Button"; diff --git a/src/components/Search/index.js b/src/components/Search/index.js index 8b2e416..8a07ea1 100644 --- a/src/components/Search/index.js +++ b/src/components/Search/index.js @@ -2,9 +2,6 @@ import React from "react"; import { connect } from "react-redux"; import { publicApi } from "../../redux/actions"; -//assets -import searchIcon from "./search.png"; - const langDetector = (lang = "fa", option1, option2) => { return lang === "fa" ? option1 : option2; }; @@ -22,7 +19,11 @@ function Search(props) { type="submit" className="p-1 focus:outline-none focus:shadow-outline" > - +
- +

{`${window.t( "توصیه خرید توسط" )} ${book?.product[2]?.suggestedCounter} ${window.t("نفر")}`}