diff --git a/src/assets/icons/bottom-home-active.svg b/src/components/BottomNavigation/bottom-home-active.svg similarity index 100% rename from src/assets/icons/bottom-home-active.svg rename to src/components/BottomNavigation/bottom-home-active.svg diff --git a/src/components/BottomNavigation/bottom-home-deactive.svg b/src/components/BottomNavigation/bottom-home-deactive.svg new file mode 100644 index 0000000..187e72a --- /dev/null +++ b/src/components/BottomNavigation/bottom-home-deactive.svg @@ -0,0 +1,5 @@ + diff --git a/src/components/BottomNavigation/bottom-products-active.svg b/src/components/BottomNavigation/bottom-products-active.svg new file mode 100644 index 0000000..9a4c65e --- /dev/null +++ b/src/components/BottomNavigation/bottom-products-active.svg @@ -0,0 +1,14 @@ + diff --git a/src/assets/icons/bottom-products-deactive.svg b/src/components/BottomNavigation/bottom-products-deactive.svg similarity index 100% rename from src/assets/icons/bottom-products-deactive.svg rename to src/components/BottomNavigation/bottom-products-deactive.svg diff --git a/src/components/BottomNavigation/bottom-profile-active.svg b/src/components/BottomNavigation/bottom-profile-active.svg new file mode 100644 index 0000000..19f103b --- /dev/null +++ b/src/components/BottomNavigation/bottom-profile-active.svg @@ -0,0 +1,7 @@ + diff --git a/src/assets/icons/bottom-profile-deactive.svg b/src/components/BottomNavigation/bottom-profile-deactive.svg similarity index 100% rename from src/assets/icons/bottom-profile-deactive.svg rename to src/components/BottomNavigation/bottom-profile-deactive.svg diff --git a/src/components/BottomNavigation/bottom-test-active.svg b/src/components/BottomNavigation/bottom-test-active.svg new file mode 100644 index 0000000..25845a2 --- /dev/null +++ b/src/components/BottomNavigation/bottom-test-active.svg @@ -0,0 +1,10 @@ + diff --git a/src/assets/icons/bottom-test-deactive.svg b/src/components/BottomNavigation/bottom-test-deactive.svg similarity index 100% rename from src/assets/icons/bottom-test-deactive.svg rename to src/components/BottomNavigation/bottom-test-deactive.svg diff --git a/src/components/BottomNavigation/bottom-video-active.svg b/src/components/BottomNavigation/bottom-video-active.svg new file mode 100644 index 0000000..6a4b5fd --- /dev/null +++ b/src/components/BottomNavigation/bottom-video-active.svg @@ -0,0 +1,10 @@ + diff --git a/src/assets/icons/bottom-video-deactive.svg b/src/components/BottomNavigation/bottom-video-deactive.svg similarity index 100% rename from src/assets/icons/bottom-video-deactive.svg rename to src/components/BottomNavigation/bottom-video-deactive.svg diff --git a/src/components/BottomNavigation/index.js b/src/components/BottomNavigation/index.js index 93450c1..0048631 100644 --- a/src/components/BottomNavigation/index.js +++ b/src/components/BottomNavigation/index.js @@ -1,11 +1,19 @@ import React, { useState } from "react"; import { NavLink } from "react-router-dom"; import { connect } from "react-redux"; -import activeHomeIcon from "../../assets/icons/bottom-home-active.svg"; -import deactiveProductsIcon from "../../assets/icons/bottom-products-deactive.svg"; -import deactiveVideoIcon from "../../assets/icons/bottom-video-deactive.svg"; -import deactiveProfileIcon from "../../assets/icons/bottom-profile-deactive.svg"; -import deactiveTestIcon from "../../assets/icons/bottom-test-deactive.svg"; + +//assets +import deactiveHomeIcon from "./bottom-home-deactive.svg"; +import deactiveProductsIcon from "./bottom-products-deactive.svg"; +import deactiveVideoIcon from "./bottom-video-deactive.svg"; +import deactiveProfileIcon from "./bottom-profile-deactive.svg"; +import deactiveTestIcon from "./bottom-test-deactive.svg"; +import activeHomeIcon from "./bottom-home-active.svg"; +import activeTestIcon from "./bottom-test-active.svg"; +import activeProfileIcon from "./bottom-profile-active.svg"; +import activeProductsIcon from "./bottom-products-active.svg"; +import activeVideoIcon from "./bottom-video-active.svg" + export const BottomNavigation = ({ pages, isDark }) => { const [activeLink, setActiveLink] = useState("/"); @@ -57,34 +65,34 @@ BottomNavigation.defaultProps = { name: "صفحه اصلی", link: "/", activeIcon: activeHomeIcon, - deactiveIcon: "", + deactiveIcon: deactiveHomeIcon, }, { id: 1, name: "محصولات", link: "/products", - activeIcon: "", + activeIcon: activeProductsIcon, deactiveIcon: deactiveProductsIcon, }, { id: 2, name: "ویدئو", link: "/videos", - activeIcon: "", + activeIcon: activeVideoIcon, deactiveIcon: deactiveVideoIcon, }, { id: 3, name: "آزمون", link: "/test", - activeIcon: "", + activeIcon: activeTestIcon, deactiveIcon: deactiveTestIcon, }, { id: 4, name: "حساب کاربری", link: "/profile", - activeIcon: "", + activeIcon: activeProfileIcon, deactiveIcon: deactiveProfileIcon, }, ], diff --git a/src/components/Input/index.js b/src/components/Input/index.js index 5b11969..7c3e46e 100644 --- a/src/components/Input/index.js +++ b/src/components/Input/index.js @@ -79,7 +79,7 @@ export default function Input(props) { placeholder={label} className={_.join( [ - `flex-1 border border-gray-300 dark:bg-opacity-10 bg-transparent rounded-md outline-none py-3 px-4 text-sm ${backgroundColor} ${align}`, + `flex-1 border border-gray-300 dark:bg-opacity-10 bg-transparent rounded-md outline-none py-3 px-4 text-tiny ${backgroundColor} ${align}`, inputStatusHandler( value, focusToggle, diff --git a/src/components/Navbar/cart-blue.svg b/src/components/Navbar/cart-blue.svg new file mode 100644 index 0000000..c33a0b3 --- /dev/null +++ b/src/components/Navbar/cart-blue.svg @@ -0,0 +1,9 @@ + diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index 2f138ff..71a1879 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -5,16 +5,16 @@ import _ from "lodash"; import Drawer from "../Drawer"; import Search from "../Search"; //assets -import cartIcon from "./dark-crimson-cart-icon.svg"; -import whiteCartIcon from "./white-cart-icon.svg"; -import profileIcon from "./dark-crimson-profile-icon.svg"; -import searchIcon from "./dark-crimson-search-box.svg"; -import lightGraySearchIcon from "./light-gray-search-box.svg"; +import cartIcon from "./cart-blue.svg"; +// import whiteCartIcon from "./white-cart-icon.svg"; +// import profileIcon from "./dark-crimson-profile-icon.svg"; +// import searchIcon from "./dark-crimson-search-box.svg"; +// import lightGraySearchIcon from "./light-gray-search-box.svg"; import darkCrimsonHamburgerMenu from "./dark-crimson-hamburger-menu.svg"; -import whiteHamburgerMenu from "./white-hamburger-menu-icon.svg"; +// import whiteHamburgerMenu from "./white-hamburger-menu-icon.svg"; -import grayBagIcon from "../../assets/icons/gray-bag.svg"; -import graySearchIcon from "../../assets/icons/gray-search.svg"; +// import grayBagIcon from "../../assets/icons/gray-bag.svg"; +// import graySearchIcon from "../../assets/icons/gray-search.svg"; import logoIcon from "../../assets/icons/logo.svg"; import qrIcon from "../../assets/icons/qr-white.svg"; import qrBlueIcon from "../../assets/icons/qr-blue.svg"; @@ -33,6 +33,7 @@ function Navbar({ pages, isDark, isMobile, + isLogin, headerOptions, loginBtn, menuItems, @@ -140,7 +141,7 @@ function Navbar({ {qr && ( <>
خریدار محصول
: null} -خریدار محصول
+ ) : null}{comment.text}
{e.text}