Nearle_express/dailygrubs_console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

overall updates

Browse Source
This commit is contained in:
joshikannan
2025-11-26 18:24:03 +05:30
parent 12df2e9dc4
commit e71e44319c
35 changed files with 3145 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavCollapse.js
View File

@@ -211,7 +211,16 @@ const NavCollapse = ({ menu, level, parentId, setSelectedItems, selectedItems, s
const isSelected = selected === menu.id;
const borderIcon = level === 1 ? <BorderOutlined style={{ fontSize: '1rem' }} /> : false;
const Icon = menu.icon;
const menuIcon = menu.icon ? <Icon style={{ fontSize: drawerOpen ? '1rem' : '1.25rem', color: 'white' }} /> : borderIcon;
const menuIcon = menu.icon ? (
<Icon
style={{
fontSize: drawerOpen ? '1rem' : '1.25rem'
// color: 'white'
}}
/>
) : (
borderIcon
);
// const textColor = theme.palette.mode === ThemeMode.DARK ? 'grey.400' : 'text.primary';
// const iconSelectedColor = theme.palette.mode === ThemeMode.DARK && drawerOpen ? theme.palette.text.primary : theme.palette.primary.main;
const popperId = miniMenuOpened ? `collapse-pop-${menu.id}` : undefined;
@@ -237,11 +246,10 @@ const NavCollapse = ({ menu, level, parentId, setSelectedItems, selectedItems, s
sx={{
pl: drawerOpen ? `${level * 28}px` : 1.5,
py: !drawerOpen && level === 1 ? 1.25 : 1,
...(drawerOpen && {
'&:hover': {
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter'
bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : '#7b1fa2'
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'divider' : 'primary.lighter',
bgcolor: '#7b1fa2'
},
'&.Mui-selected': {
bgcolor: 'transparent',
@@ -250,14 +258,14 @@ const NavCollapse = ({ menu, level, parentId, setSelectedItems, selectedItems, s
}
}),
...(!drawerOpen && {
bgcolor: theme.palette.primary.main,
'&:hover': {
bgcolor: 'transparent'
bgcolor: theme.palette.primary.light
},
'&.Mui-selected': {
'&:hover': {
bgcolor: 'transparent'
},
bgcolor: 'transparent'
bgcolor: theme.palette.primary.light
}
}
})
}}
@@ -269,30 +277,25 @@ const NavCollapse = ({ menu, level, parentId, setSelectedItems, selectedItems, s
minWidth: 28,
// color: selected === menu.id ? 'primary.main' : textColor,
// color: selected === menu.id ? textColor : textColor,
// bgcolor:'white',
// color:'white',
color: 'white',
...(!drawerOpen && {
borderRadius: 1.5,
width: 36,
height: 36,
alignItems: 'center',
justifyContent: 'center',
color: 'white',
'&:hover': {
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter'
bgcolor: '#7b1fa2',
color: 'white'
bgcolor: theme.palette.primary.light
}
}),
...(!drawerOpen &&
selected === menu.id && {
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'primary.900' : 'primary.lighter',
// bgcolor:'white',
bgcolor: '#7b1fa2',
bgcolor: theme.palette.primary.lighter,
color: theme.palette.primary.main,
'&:hover': {
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'primary.darker' : 'primary.lighter'
bgcolor: '#7b1fa2'
// color:'white'
bgcolor: theme.palette.primary.lighter
}
})
}}

22
src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.js
View File

@@ -78,7 +78,7 @@ const NavItem = ({ item, level }) => {
{...listItemProps}
disabled={item.disabled}
selected={isSelected}
onMouseEnter={(e, val) => {
onMouseEnter={(e) => {
console.log(e);
}}
onMouseLeave={() => {
@@ -104,18 +104,15 @@ const NavItem = ({ item, level }) => {
}
}),
...(!drawerOpen && {
bgcolor: '#662582',
bgcolor: theme.palette.primary.main,
'&:hover': {
// bgcolor: 'transparent',
// bgcolor:'#7b1fa2'
bgcolor: '#662582'
bgcolor: theme.palette.primary.light
},
'&.Mui-selected': {
'&:hover': {
bgcolor: 'transparent'
bgcolor: 'white'
},
bgcolor: 'transparent'
// bgcolor:'#7b1fa2'
bgcolor: 'white'
}
})
}}
@@ -133,15 +130,13 @@ const NavItem = ({ item, level }) => {
color: isSelected ? iconSelectedColor : textColor,
...(!drawerOpen && {
borderRadius: 1.5,
width: 36,
height: 36,
alignItems: 'center',
justifyContent: 'center',
'&:hover': {
// bgcolor: theme.palette.mode === ThemeMode.DARK ? 'secondary.light' : 'secondary.lighter'
bgcolor: '#7b1fa2'
// bgcolor: theme.palette.primary.light
}
}),
...(!drawerOpen &&
@@ -149,7 +144,8 @@ const NavItem = ({ item, level }) => {
bgcolor: theme.palette.mode === ThemeMode.DARK ? 'primary.900' : 'primary.lighter',
'&:hover': {
bgcolor: theme.palette.mode === ThemeMode.DARK ? 'primary.darker' : 'primary.lighter'
}
},
borderRadius: 2
})
}}
>
@@ -164,7 +160,7 @@ const NavItem = ({ item, level }) => {
// sx={{ color: isSelected ? iconSelectedColor : textColor }}
sx={{
color: isSelected && !drawerOpen ? theme.palette.primary.main : !isSelected ? 'white' : theme.palette.primary.main,
bgcolor: isSelected && !drawerOpen ? theme.palette.primary.lighter : 'none',
bgcolor: isSelected && theme.palette.primary.lighter,
padding: isSelected && !drawerOpen ? 0.8 : 'none',
borderRadius: isSelected && !drawerOpen ? 2 : 'none',
ml: isSelected && !drawerOpen ? 0.5 : 'none'

29
src/layout/MainLayout/Header/HeaderContent/Profile/ProfileTab.js
View File

@@ -5,53 +5,54 @@ import { useState } from 'react';
import { List, ListItemButton, ListItemIcon, ListItemText } from '@mui/material';
// assets
import { EditOutlined, ProfileOutlined, LogoutOutlined, UserOutlined, WalletOutlined,CommentOutlined } from '@ant-design/icons';
import { EditOutlined, ProfileOutlined, LogoutOutlined, UserOutlined, WalletOutlined, CommentOutlined } from '@ant-design/icons';
import { useNavigate } from 'react-router';
// ==============================|| HEADER PROFILE - PROFILE TAB ||============================== //
const ProfileTab = ({ handleLogout }) => {
const [selectedIndex, setSelectedIndex] = useState(0);
const navigate=useNavigate();
const navigate = useNavigate();
const handleListItemClick = (event, index) => {
setSelectedIndex(index);
if(index == 1){
if (index == 1) {
navigate('/accountsettings');
}
};
return (
<List component="nav" sx={{ p: 0, '& .MuiListItemIcon-root': { minWidth: 32 } }}>
<ListItemButton selected={selectedIndex === 0} onClick={(event) => handleListItemClick(event, 0)}>
{/* <ListItemButton selected={selectedIndex === 0} onClick={(event) => handleListItemClick(event, 0)}>
<ListItemIcon>
<EditOutlined />
</ListItemIcon>
<ListItemText primary="Edit Profile" />
</ListItemButton>
<ListItemButton selected={selectedIndex === 1} onClick={(event) => handleListItemClick(event, 1)}>
</ListItemButton> */}
<ListItemButton selected={selectedIndex === 0} onClick={(event) => handleListItemClick(event, 1)}>
<ListItemIcon>
<UserOutlined />
</ListItemIcon>
<ListItemText primary="View Profile" />
</ListItemButton>
<ListItemButton selected={selectedIndex === 2} onClick={(event) => handleListItemClick(event, 2)}>
{/* <ListItemButton selected={selectedIndex === 1} onClick={(event) => handleListItemClick(event, 2)}>
<ListItemIcon>
<CommentOutlined />
<CommentOutlined />
</ListItemIcon>
<ListItemText primary="Support Ticket" />
</ListItemButton>
</ListItemButton> */}
{/* <ListItemButton selected={selectedIndex === 4} onClick={(event) => handleListItemClick(event, 4)}>
<ListItemIcon>
<WalletOutlined />
</ListItemIcon>
<ListItemText primary="Billing" />
</ListItemButton> */}
<ListItemButton selected={selectedIndex === 3}
onClick={handleLogout}
// onClick={()=>{
// navigate('/login')
// }}
<ListItemButton
selected={selectedIndex === 1}
onClick={handleLogout}
// onClick={()=>{
// navigate('/login')
// }}
>
<ListItemIcon>
<LogoutOutlined />

12
src/layout/MainLayout/Header/HeaderContent/index.js
View File

@@ -71,7 +71,7 @@ const HeaderContent = () => {
<Stack width="100%" direction="row" justifyContent="space-between" spacing={2} alignItems="center">
{/* {!matchesXs && megaMenu} */}
<Typography variant="h5" sx={{ ml: 2, color: '#fff', whiteSpace: 'nowrap' }}>
{localStorage.getItem('fullname') || ''}
{localStorage.getItem('tenantname') || ''}
</Typography>
{matchesXs && <Box sx={{ width: '100%', ml: 1 }} />}
<Stack direction={'row'} spacing={2}>
@@ -169,7 +169,7 @@ const HeaderContent = () => {
<ListItemIcon sx={{ mr: 1, fontSize: '20px' }}>
<TbBoxMultiple1 />
</ListItemIcon>
<Typography color="textPrimary">Create Order</Typography>
<Typography color="textPrimary"> Orders</Typography>
</Grid>
}
/>
@@ -178,7 +178,7 @@ const HeaderContent = () => {
selected={location.pathname === 'nearle/orders/create'}
onClick={() => {
// console.log(const location = useLocation();)
navigate('nearle/orders/createorders');
navigate('nearle/orders/create/grouporders');
handleClickAway();
}}
>
@@ -188,7 +188,7 @@ const HeaderContent = () => {
<ListItemIcon sx={{ mr: 1, fontSize: '20px' }}>
<GrMultiple />
</ListItemIcon>
<Typography color="textPrimary">Create Group Order</Typography>
<Typography color="textPrimary"> Group Orders</Typography>
</Grid>
}
/>
@@ -224,7 +224,7 @@ const HeaderContent = () => {
<ListItemIcon sx={{ mr: 1, fontSize: '20px' }}>
<TbUserEdit />
</ListItemIcon>
<Typography color="textPrimary">Create Customer</Typography>
<Typography color="textPrimary"> Customers</Typography>
</Grid>
}
/>
@@ -273,7 +273,7 @@ const HeaderContent = () => {
</Popper>
</Box>
<Notification />
{/* <Notification /> */}
{/* <Message /> */}
{/* {!matchesXs && <Profile />}