From 498837351b64fdce1e8c9416f788a1a05e3aedc0 Mon Sep 17 00:00:00 2001 From: RismanRJ Date: Wed, 16 Jul 2025 21:37:51 +0530 Subject: [PATCH 1/5] Feature: Added Responsive Sidebar Menu UI --- .../molecules/menus/side-menu/side-menu.tsx | 101 ++++++++++-------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx index c7d580105..22e75964a 100644 --- a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx +++ b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx @@ -1,19 +1,24 @@ import React, { useState } from 'react' -import { makeStyles } from '@material-ui/core/styles' -import { MenuList, MenuItem, ListItemIcon, ListItemText, Typography } from '@material-ui/core' +import { makeStyles, useTheme } from '@material-ui/core/styles' +import { MenuList, MenuItem, ListItemIcon, ListItemText, Typography, useMediaQuery, Tooltip, IconButton } from '@material-ui/core' import logo from 'images/gitpay-logo.png' +import responsiveLogo from 'images/logo-symbol.png' import { Logo, StyledButton } from '../../../organisms/layouts/topbar/TopbarStyles' import ReactPlaceholder from 'react-placeholder' import SideMenuPlaceholder from './side-menu.placeholder' +import ChevronLeftIcon from '@mui/icons-material/ChevronLeft'; +import ChevronRightIcon from '@mui/icons-material/ChevronRight'; const useStyles = makeStyles((theme) => ({ - sidePaper: { + sidePaper: (props: { collapsed: boolean }) => ({ backgroundColor: '#2c5c46', - height: '100%' - }, + height: '100%', + width: props.collapsed && 70 , + transition: 'width 0.3s ease', + }), row: { display: 'flex', justifyContent: 'center' @@ -130,47 +135,49 @@ export const SideMenu: React.FC = ({ completed, menuItems }) => { - const classes = useStyles() const [selected, setSelected] = useState(0) + const theme = useTheme() + const [collapsed, setCollapsed] = useState(false) + const classes = useStyles({collapsed}); return (
-
-
-
- - - -
-
-
- } - > +
+
+ + + + +
+
+
+ }> + + setCollapsed(!collapsed)} style={{ color: 'white' , width:'30px',height:'30px', position:'absolute', right:0,top:-10, fontWeight:'bold', + fontSize:'15px',padding:'3px', zIndex:5,backgroundColor:"#d3d3d3"}}> + {!collapsed? : } + + {menuItems.map((section, sectionIndex) => (
- {section.category && ( - - {section.category} - + {section.category && ( + + {section.category} + )} {section.items.map((item, index) => ( item.include && ( @@ -180,16 +187,24 @@ export const SideMenu: React.FC = ({ className={classes.menuItem} selected={item.selected} > - <>{item.icon} - + + + <>{item.icon} + + + {!collapsed && ( + + )} ) ))}
))}
-
-
+
From 6a70324ed7e516c041d4eb68459a7be83eb4dbc4 Mon Sep 17 00:00:00 2001 From: RismanRJ Date: Wed, 16 Jul 2025 21:44:09 +0530 Subject: [PATCH 2/5] Feature: Added Responsive Sidebar Menu UI --- .../design-library/molecules/menus/side-menu/side-menu.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx index 22e75964a..4a1221d07 100644 --- a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx +++ b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx @@ -157,6 +157,7 @@ export const SideMenu: React.FC = ({ setCollapsed(!collapsed)} style={{ color: 'white' , width:'30px',height:'30px', position:'absolute', right:0,top:-10, fontWeight:'bold', fontSize:'15px',padding:'3px', zIndex:5,backgroundColor:"#d3d3d3"}}> + {!collapsed? : } From 031dd2cf7836ee494dceefb41a37dc8eb84c70f0 Mon Sep 17 00:00:00 2001 From: RismanRJ Date: Wed, 16 Jul 2025 21:59:48 +0530 Subject: [PATCH 3/5] Removed unused variables --- .../molecules/menus/side-menu/side-menu.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx index 4a1221d07..cf8ea4ac2 100644 --- a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx +++ b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' import { makeStyles, useTheme } from '@material-ui/core/styles' -import { MenuList, MenuItem, ListItemIcon, ListItemText, Typography, useMediaQuery, Tooltip, IconButton } from '@material-ui/core' +import { MenuList, MenuItem, ListItemIcon, ListItemText, Typography, Tooltip, IconButton } from '@material-ui/core' import logo from 'images/gitpay-logo.png' import responsiveLogo from 'images/logo-symbol.png' import { @@ -17,7 +17,7 @@ const useStyles = makeStyles((theme) => ({ backgroundColor: '#2c5c46', height: '100%', width: props.collapsed && 70 , - transition: 'width 0.3s ease', + transition: 'width 0.3s ease' }), row: { display: 'flex', @@ -135,8 +135,6 @@ export const SideMenu: React.FC = ({ completed, menuItems }) => { - const [selected, setSelected] = useState(0) - const theme = useTheme() const [collapsed, setCollapsed] = useState(false) const classes = useStyles({collapsed}); @@ -146,7 +144,7 @@ export const SideMenu: React.FC = ({
@@ -158,7 +156,7 @@ export const SideMenu: React.FC = ({ setCollapsed(!collapsed)} style={{ color: 'white' , width:'30px',height:'30px', position:'absolute', right:0,top:-10, fontWeight:'bold', fontSize:'15px',padding:'3px', zIndex:5,backgroundColor:"#d3d3d3"}}> - {!collapsed? : } + {!collapsed? : } From 84e3e8cb5fb3caa9297f70dfb6bcb1e6261261cf Mon Sep 17 00:00:00 2001 From: RismanRJ Date: Sun, 27 Jul 2025 10:58:35 +0530 Subject: [PATCH 4/5] Sync with master branch --- .../molecules/menus/side-menu/side-menu.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx index 9049852e5..f9fa194a5 100644 --- a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx +++ b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx @@ -16,13 +16,12 @@ import ReactPlaceholder from 'react-placeholder' import SideMenuPlaceholder from './side-menu.placeholder' import SideMenuItems from './side-menu-items' + const useStyles = makeStyles((theme) => ({ - sidePaper: (props: { collapsed: boolean }) => ({ + sidePaper: { backgroundColor: '#2c5c46', - height: '100%', - width: props.collapsed && 70 , - transition: 'width 0.3s ease' - }), + height: '100%' + }, row: { display: 'flex', justifyContent: 'center', From 5e2948e60aaac9160d0a47b3d7bc3b276841b166 Mon Sep 17 00:00:00 2001 From: RismanRJ Date: Sun, 27 Jul 2025 11:03:11 +0530 Subject: [PATCH 5/5] Removed unused imports --- .../design-library/molecules/menus/side-menu/side-menu.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx index f9fa194a5..eeff62600 100644 --- a/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx +++ b/frontend/src/components/design-library/molecules/menus/side-menu/side-menu.tsx @@ -1,7 +1,6 @@ import React, { useState } from 'react' import { makeStyles } from '@material-ui/core/styles' import logo from 'images/gitpay-logo.png' -import responsiveLogo from 'images/logo-symbol.png' import { IconHamburger, LeftSide,