diff --git a/package.json b/package.json index 8e8924f..1f8662d 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "lodash": "^4.17.21", "react": "^17.0.2", "react-dom": "^17.0.2", + "react-modern-drawer": "^1.0.1", "react-redux": "^7.2.6", "react-router-dom": "^6.0.2", "react-scripts": "4.0.3", diff --git a/src/App.js b/src/App.js index 3fada8a..60b1eea 100644 --- a/src/App.js +++ b/src/App.js @@ -2,6 +2,7 @@ import "./App.scss"; import { Provider } from "react-redux"; import { ToastContainer } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; +import "react-modern-drawer/dist/index.css"; import store from "./redux/store"; import Router from "./router"; @@ -12,7 +13,7 @@ function App({theme}) { + + + + + + + diff --git a/src/assets/icons/bookmark-deactive-light.svg b/src/assets/icons/bookmark-deactive-light.svg new file mode 100644 index 0000000..abef12d --- /dev/null +++ b/src/assets/icons/bookmark-deactive-light.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/dots-menu-dark.svg b/src/assets/icons/dots-menu-dark.svg new file mode 100644 index 0000000..eab0346 --- /dev/null +++ b/src/assets/icons/dots-menu-dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/icons/dots-menu-light.svg b/src/assets/icons/dots-menu-light.svg new file mode 100644 index 0000000..14839b2 --- /dev/null +++ b/src/assets/icons/dots-menu-light.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/components/BottomNavigation/index.js b/src/components/BottomNavigation/index.js index 4de876c..3b828bc 100644 --- a/src/components/BottomNavigation/index.js +++ b/src/components/BottomNavigation/index.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Link } from "react-router-dom"; +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"; @@ -12,7 +12,7 @@ export const BottomNavigation = ({ pages, isDark }) => { const Tab = ({ page }) => { return ( - setActiveLink(page.link)} @@ -25,14 +25,14 @@ export const BottomNavigation = ({ pages, isDark }) => { {page.name} - + ); }; return ( <>