From 2bffd0fbbfc591c5073e458acaae6ef30c845772 Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Wed, 9 Mar 2022 20:18:54 +0330 Subject: [PATCH] reza added some option to dashboard --- src/components/BottomNavigation/index.js | 6 +- src/components/FloatingButton/index.js | 27 ++++ src/components/FloatingButton/plus.svg | 3 + src/components/Footer/index.js | 5 +- src/redux/reducers/book.js | 2 +- src/router.js | 20 ++- src/views/Address/index.js | 36 +----- src/views/Contact/index.js | 11 +- src/views/Contact/layouts/Ticket.js | 49 ++++---- src/views/Contact/layouts/index.scss | 2 +- src/views/Dashboard/index.js | 26 ++-- .../Dashboard/layouts/Main/Addresses/index.js | 115 ++++++++++++++++++ .../Dashboard/layouts/Main/Addresses/menu.svg | 10 ++ src/views/Dashboard/layouts/Main/index.js | 15 ++- .../Dashboard/layouts/SidebarMenu/address.svg | 10 ++ .../layouts/SidebarMenu/favorites.svg | 6 + .../Dashboard/layouts/SidebarMenu/index.js | 40 +++--- .../Dashboard/layouts/SidebarMenu/myBooks.svg | 7 ++ .../layouts/SidebarMenu/myVideos.svg | 10 ++ .../Dashboard/layouts/SidebarMenu/orders.svg | 7 ++ src/views/Favorites/book.svg | 8 ++ src/views/Favorites/bookmark.svg | 7 ++ src/views/Favorites/index.js | 63 ++++++++++ .../Product/Desktop/ProductOverAll/index.js | 41 ++++++- src/views/Product/Desktop/index.js | 26 ---- src/views/Products/layouts/Desktop/Main.js | 84 +++++++++---- src/views/Profile/index.js | 14 +++ src/views/ShoppingCart/Code/index.js | 6 +- src/views/Video/components/Desktop/Table.js | 6 +- src/views/Video/index.js | 38 ++++-- 30 files changed, 534 insertions(+), 166 deletions(-) create mode 100644 src/components/FloatingButton/index.js create mode 100644 src/components/FloatingButton/plus.svg create mode 100644 src/views/Dashboard/layouts/Main/Addresses/index.js create mode 100644 src/views/Dashboard/layouts/Main/Addresses/menu.svg create mode 100644 src/views/Dashboard/layouts/SidebarMenu/address.svg create mode 100644 src/views/Dashboard/layouts/SidebarMenu/favorites.svg create mode 100644 src/views/Dashboard/layouts/SidebarMenu/myBooks.svg create mode 100644 src/views/Dashboard/layouts/SidebarMenu/myVideos.svg create mode 100644 src/views/Dashboard/layouts/SidebarMenu/orders.svg create mode 100644 src/views/Favorites/book.svg create mode 100644 src/views/Favorites/bookmark.svg create mode 100644 src/views/Favorites/index.js create mode 100644 src/views/Profile/index.js diff --git a/src/components/BottomNavigation/index.js b/src/components/BottomNavigation/index.js index b9b9808..541e9f7 100644 --- a/src/components/BottomNavigation/index.js +++ b/src/components/BottomNavigation/index.js @@ -82,15 +82,15 @@ BottomNavigation.defaultProps = { }, { id: 3, - name: "آزمون", - link: "/test", + name: "سبد خرید", + link: "/cart", activeIcon: activeTestIcon, deactiveIcon: deactiveTestIcon, }, { id: 4, name: "حساب کاربری", - link: "/profile", + link: "/dashboard", activeIcon: activeProfileIcon, deactiveIcon: deactiveProfileIcon, }, diff --git a/src/components/FloatingButton/index.js b/src/components/FloatingButton/index.js new file mode 100644 index 0000000..86469d1 --- /dev/null +++ b/src/components/FloatingButton/index.js @@ -0,0 +1,27 @@ +import React from "react"; +import { connect } from "react-redux"; + +//assets +import plusIcon from "./plus.svg"; + +export const FloatingButton = ({ action, position, icon }) => { + return ( + + ); +}; + +const mapStateToProps = (state) => ({}); + +const mapDispatchToProps = {}; + +export default connect(mapStateToProps, mapDispatchToProps)(FloatingButton); + +FloatingButton.defaultProps = { + icon: plusIcon, +}; diff --git a/src/components/FloatingButton/plus.svg b/src/components/FloatingButton/plus.svg new file mode 100644 index 0000000..c22ef09 --- /dev/null +++ b/src/components/FloatingButton/plus.svg @@ -0,0 +1,3 @@ + + + + diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js index 560b347..0e27123 100644 --- a/src/components/Footer/index.js +++ b/src/components/Footer/index.js @@ -14,7 +14,7 @@ const FooterDesign1 = ({ color, bg, items, hasHeader }) => { return ( <> {hasHeader ? ( -
+
@@ -50,7 +50,7 @@ const FooterDesign1 = ({ color, bg, items, hasHeader }) => {
) : null}