diff --git a/public/assets/icons/ar-primary.svg b/public/assets/icons/ar-primary.svg index b07bbcd..5a5d2d4 100644 --- a/public/assets/icons/ar-primary.svg +++ b/public/assets/icons/ar-primary.svg @@ -1,8 +1,9 @@ - - - - - - - - + + + + + + + AR + + diff --git a/public/assets/icons/ar-white.svg b/public/assets/icons/ar-white.svg index 430d5b5..e4c817c 100644 --- a/public/assets/icons/ar-white.svg +++ b/public/assets/icons/ar-white.svg @@ -1,8 +1,9 @@ - - - - - - - - + + + + + + + AR + + diff --git a/src/assets/icons/arrow-right-blue.svg b/public/assets/icons/arrow-primary.svg similarity index 65% rename from src/assets/icons/arrow-right-blue.svg rename to public/assets/icons/arrow-primary.svg index 72d113d..155fc0d 100644 --- a/src/assets/icons/arrow-right-blue.svg +++ b/public/assets/icons/arrow-primary.svg @@ -1,8 +1,8 @@ - - + + diff --git a/public/assets/icons/arrow-white.svg b/public/assets/icons/arrow-white.svg new file mode 100644 index 0000000..155fc0d --- /dev/null +++ b/public/assets/icons/arrow-white.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/icons/bookmark-fill-primary.svg b/public/assets/icons/bookmark-fill-primary.svg new file mode 100644 index 0000000..40a4819 --- /dev/null +++ b/public/assets/icons/bookmark-fill-primary.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/assets/icons/bookmark-fill-white.svg b/public/assets/icons/bookmark-fill-white.svg new file mode 100644 index 0000000..bf61a5c --- /dev/null +++ b/public/assets/icons/bookmark-fill-white.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/assets/icons/dots-primary.svg b/public/assets/icons/dots-primary.svg new file mode 100644 index 0000000..a2e25b1 --- /dev/null +++ b/public/assets/icons/dots-primary.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/assets/icons/dots-white.svg b/public/assets/icons/dots-white.svg new file mode 100644 index 0000000..eab0346 --- /dev/null +++ b/public/assets/icons/dots-white.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/public/assets/icons/hamburger-primary.svg b/public/assets/icons/hamburger-primary.svg new file mode 100644 index 0000000..bf9153e --- /dev/null +++ b/public/assets/icons/hamburger-primary.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/assets/icons/hamburger-white.svg b/public/assets/icons/hamburger-white.svg new file mode 100644 index 0000000..3e3add4 --- /dev/null +++ b/public/assets/icons/hamburger-white.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/components/Product/vuesax-linear-heart.svg b/public/assets/icons/like.svg similarity index 100% rename from src/components/Product/vuesax-linear-heart.svg rename to public/assets/icons/like.svg diff --git a/src/assets/icons/logo.svg b/public/assets/icons/logo-small.svg similarity index 100% rename from src/assets/icons/logo.svg rename to public/assets/icons/logo-small.svg diff --git a/public/assets/icons/qr-primary.svg b/public/assets/icons/qr-primary.svg new file mode 100644 index 0000000..2c1f502 --- /dev/null +++ b/public/assets/icons/qr-primary.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/assets/icons/qr-white.svg b/public/assets/icons/qr-white.svg new file mode 100644 index 0000000..a18759e --- /dev/null +++ b/public/assets/icons/qr-white.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/icons/ar-white.svg b/src/assets/icons/ar-white.svg deleted file mode 100644 index e4c817c..0000000 --- a/src/assets/icons/ar-white.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - AR - - diff --git a/src/assets/icons/hamburger-blue.svg b/src/assets/icons/hamburger-blue.svg deleted file mode 100644 index 05fb996..0000000 --- a/src/assets/icons/hamburger-blue.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/assets/icons/qr-blue.svg b/src/assets/icons/qr-blue.svg deleted file mode 100644 index ebc902e..0000000 --- a/src/assets/icons/qr-blue.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/components/Navbar/cart-blue.svg b/src/components/Navbar/cart-blue.svg deleted file mode 100644 index 0764444..0000000 --- a/src/components/Navbar/cart-blue.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/components/Navbar/dark-crimson-cart-icon.svg b/src/components/Navbar/dark-crimson-cart-icon.svg deleted file mode 100644 index 151d5e0..0000000 --- a/src/components/Navbar/dark-crimson-cart-icon.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/components/Navbar/dark-crimson-profile-icon.svg b/src/components/Navbar/dark-crimson-profile-icon.svg deleted file mode 100644 index 3879312..0000000 --- a/src/components/Navbar/dark-crimson-profile-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index 92fd44b..8e24a75 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -10,23 +10,6 @@ import Search from "../Search"; import SearchResult from "./SearchResult"; import Loading from "../Loading"; -//assets -import logoIcon from "../../assets/icons/logo.svg"; -import qrIcon from "../../assets/icons/qr-white.svg"; -import qrBlueIcon from "../../assets/icons/qr-blue.svg"; -import arIcon from "../../assets/icons/ar-white.svg"; -import arBlueIcon from "../../assets/icons/ar-blue.svg"; -import hamburgerIcon from "../../assets/icons/hamburger.svg"; -import hamburgerBlueIcon from "../../assets/icons/hamburger-blue.svg"; -import arrowBlueIcon from "../../assets/icons/arrow-right-blue.svg"; -import arrowWhiteIcon from "../../assets/icons/arrow-left-white.svg"; -import dotsMenuDarkIcon from "../../assets/icons/dots-menu-dark.svg"; -import bookmarkDeactiveDarkIcon from "../../assets/icons/bookmark-deactive-dark.svg"; -import bookmarkActiveDarkIcon from "../../assets/icons/bookmark-active-dark.svg"; -import dotsMenuLightIcon from "../../assets/icons/dots-menu-light.svg"; -import bookmarkDeactiveLightIcon from "../../assets/icons/bookmark-deactive-light.svg"; -import bookmarkActiveLightIcon from "../../assets/icons/bookmark-active-light.svg"; - function Navbar({ getCartProducts, getUserFavorite, @@ -99,7 +82,11 @@ function Navbar({ to="/" className="flex items-center text-2xl font-black text-green7B" > - + {window.t("دانوین")} @@ -125,7 +112,7 @@ function Navbar({ to="/" className="lg:hidden absolute left-1/2 transform -translate-y-1/2 top-1/2 -translate-x-1/2" > - + )} {/* desktop */} @@ -136,17 +123,25 @@ function Navbar({ setDrawerOpen((prevState) => !prevState)} - src={isDark ? hamburgerIcon : hamburgerBlueIcon} + src={ + isDark + ? "/assets/icons/hamburger-white.svg" + : "/assets/icons/hamburger-primary.svg" + } alt="" - className="w-7 h-7.5" + className="w-7" /> )} {!title && back ? ( back navigation(-1)} /> ) : null} @@ -186,7 +181,11 @@ function Navbar({ }} > @@ -201,7 +200,11 @@ function Navbar({ }} > @@ -213,7 +216,7 @@ function Navbar({ ) : isActiveBookmark ? ( bookmark @@ -227,7 +230,7 @@ function Navbar({ ) : ( bookmark )} {title && back ? ( back navigation(-1)} /> ) : null} @@ -268,7 +277,7 @@ function Navbar({ setOverLayer(true)} diff --git a/src/components/PrivateRouter/index.js b/src/components/PrivateRouter/index.js deleted file mode 100644 index 017d7c6..0000000 --- a/src/components/PrivateRouter/index.js +++ /dev/null @@ -1,32 +0,0 @@ -import React from "react"; -import { Route, Redirect } from "react-router-dom"; -import { connect } from "react-redux"; - -const PrivateRouter = ({ - component: Component, - restricted, - status, - customPage, - ...rest -}) => { - return ( - - restricted ? ( - - ) : ( - - - ) - } - /> - ); -}; - -export default connect( - (state) => ({ - status: state.user.status, - }), - {} -)(PrivateRouter); diff --git a/src/components/Product/discount.png b/src/components/Product/discount.png deleted file mode 100644 index eff7853..0000000 Binary files a/src/components/Product/discount.png and /dev/null differ diff --git a/src/components/Product/goldon.png b/src/components/Product/goldon.png deleted file mode 100644 index d864e44..0000000 Binary files a/src/components/Product/goldon.png and /dev/null differ diff --git a/src/components/Product/index.js b/src/components/Product/index.js index 4ede0ea..1a54026 100644 --- a/src/components/Product/index.js +++ b/src/components/Product/index.js @@ -2,11 +2,9 @@ import React, { useState } from "react"; import { Link } from "react-router-dom"; import { connect } from "react-redux"; import separate from "../../utils/separate"; -import StarRating from "../StarRating"; -import book from "./goldon.png"; -import heart from "./vuesax-linear-heart.svg"; -import discountImg from "./discount.png"; +//components +import StarRating from "../StarRating"; const ProductDesign = ({ grades, @@ -56,12 +54,7 @@ const ProductDesign = ({ )} {likeBtn && (
- -
- )} - {discount && ( -
- +
)} @@ -227,6 +220,6 @@ ProductDesign.defaultProps = { productTitleAlignment: "text-justify", //میتونیم تعیین کنیم که قیمت و دکمه اضاف به سبد خرید کنار یکدیگر باشند یا زیر هم priceDirection: "flex-row", - productImg: book, + productImg: "", writeGHEIMAT: false, }; diff --git a/src/views/Address/index.js b/src/views/Address/index.js index 6845cf8..6c68e8a 100644 --- a/src/views/Address/index.js +++ b/src/views/Address/index.js @@ -22,7 +22,6 @@ import Radio from "../../components/Radio"; import dropdownIcon from "../../assets/icons/white-dropdown.svg"; import lightGreenArrow from "../../assets/icons/light-green-arrow.svg"; -import arrowBlueIcon from "../../assets/icons/arrow-right-blue.svg"; import arrowWhiteIcon from "../../assets/icons/arrow-left-white.svg"; export const Address = ({ diff --git a/src/views/DeliveryForm/index.js b/src/views/DeliveryForm/index.js index 920d837..d963a1b 100644 --- a/src/views/DeliveryForm/index.js +++ b/src/views/DeliveryForm/index.js @@ -8,8 +8,6 @@ import PaymentMethods from "./PaymentMethod"; //assets import ExpressIcon from "../../assets/icons/express.svg"; import PishtazIcon from "../../assets/icons/pishtaz.svg"; -import arrowBlueIcon from "../../assets/icons/arrow-right-blue.svg"; -import arrowWhiteIcon from "../../assets/icons/arrow-left-white.svg"; export const DeliveryForm = ({ getList, @@ -70,9 +68,13 @@ export const DeliveryForm = ({ تکمیل اطلاعات back setPhase("products")} />