From 27ff4e17db176eeb9cffe7d63112ab33147a12ce Mon Sep 17 00:00:00 2001 From: bluestreamlds <85561356+bluestreamlds@users.noreply.github.com> Date: Mon, 7 Feb 2022 22:53:05 +0530 Subject: [PATCH] Feature/wms 62 (#47) * create warehouse * edit warehouse changes * Update: linted and formatted * add warehouse button * Update: linted * Added: icons * Update: Hidden pre decoration * Updated: breadcrumbs logic Co-authored-by: Llewellyn Dsouza --- src/assets/images/HomeIcon.js | 28 +++++++ src/assets/images/SearchInventoryIcon.js | 2 +- src/components/Breadcrumbs/index.js | 83 ++++++++++---------- src/components/Sidenav/SidenavItem.js | 2 +- src/components/Sidenav/styles/sidenavItem.js | 4 +- src/routes/index.js | 6 +- 6 files changed, 78 insertions(+), 47 deletions(-) create mode 100644 src/assets/images/HomeIcon.js diff --git a/src/assets/images/HomeIcon.js b/src/assets/images/HomeIcon.js new file mode 100644 index 0000000..3eb238a --- /dev/null +++ b/src/assets/images/HomeIcon.js @@ -0,0 +1,28 @@ +import React from 'react'; + +export default function HomeIcon({ width = 24, height = 24, stroke = 'white' }) { + return ( + + + + + ); +} + +HomeIcon.propTypes = { + width: Number, + height: Number, + stroke: String +}; diff --git a/src/assets/images/SearchInventoryIcon.js b/src/assets/images/SearchInventoryIcon.js index 8db5cb0..6ddbe56 100644 --- a/src/assets/images/SearchInventoryIcon.js +++ b/src/assets/images/SearchInventoryIcon.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; -const SearchInventoryIcon = ({ width = '78', height = '86', color = '#007AFF', ...props }) => ( +const SearchInventoryIcon = ({ width = 78, height = 86, color = '#007AFF', ...props }) => ( { + if (route[0] === 'home') route = []; + else if (route.length === 1) route = ['home']; + else { + route = ['home', ...route]; + route.pop(); + } + return route.map((el) => ( + + + {el} + + + )); +}; + function Breadcrumbs({ title, route, light, children }) { return ( - (light ? white.main : grey[600]), - padding: '0 8px' - } - }} - separator={} - > - {route.map((el) => ( - + + + (light ? white.main : grey[600]), + padding: '0 8px' + } + }} + separator={} + > + {buildBreadcrumbs(route, light)} - {el} + {title.replace('-', ' ')} - - ))} - - {title.replace('-', ' ')} - - + + + {children} - - + + ); } diff --git a/src/components/Sidenav/SidenavItem.js b/src/components/Sidenav/SidenavItem.js index 746595d..356bf66 100644 --- a/src/components/Sidenav/SidenavItem.js +++ b/src/components/Sidenav/SidenavItem.js @@ -56,7 +56,7 @@ function SidenavItem({ color, name, active, nested, children, open, ...rest }) { }) } > - + {children && ( dashboard, + icon: , collapse: [ { name: 'Home', @@ -118,7 +120,7 @@ const protectedRoutes = [ type: 'collapse', name: 'Setup', key: 'Setup', - icon: dashboard, + icon: , collapse: [ { name: 'Setup Home',