Skip to content

Commit

Permalink
Merge pull request #419 from Rushikesh-Sonawane99/release-1.0.0
Browse files Browse the repository at this point in the history
Issue #PS-000 chore: Added check for displaying board enrollment option only for current year
  • Loading branch information
itsvick authored Nov 23, 2024
2 parents 317704d + a523177 commit fa6bf3b
Showing 1 changed file with 40 additions and 28 deletions.
68 changes: 40 additions & 28 deletions src/components/MenuDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@ const MenuDrawer: React.FC<DrawerProps> = ({
session: (
<>
{item.session} &nbsp;
<span style={{ color: 'green', fontWeight: '500', fontSize:'12px' }}>
<span
style={{
color: 'green',
fontWeight: '500',
fontSize: '12px',
}}
>
({t('COMMON.ACTIVE')})
</span>
</>
Expand Down Expand Up @@ -452,35 +458,41 @@ const MenuDrawer: React.FC<DrawerProps> = ({
</Box>
)}

<Box sx={{ marginTop: '18px' }}>
<Button
className="fs-14 joyride-step-8"
sx={{
width: '100%',
display: 'flex',
justifyContent: 'flex-start',
background: isBoard ? theme.palette.primary.main : 'transparent',
gap: '10px',
padding: isBoard ? '16px 18px !important' : '0px 18px !important',
color: isBoard ? '#2E1500' : theme.palette.warning.A200,
fontWeight: isBoard ? '600' : 500,
'&:hover': {
{isActiveYear && (
<Box sx={{ marginTop: '18px' }}>
<Button
className="fs-14 joyride-step-8"
sx={{
width: '100%',
display: 'flex',
justifyContent: 'flex-start',
background: isBoard
? theme.palette.primary.main
: 'transparent',
},
marginTop: '15px',
}}
startIcon={
<Image src={board} alt="badge Icon" width={24} height={24} />
}
onClick={() => {
router.push(`/board-enrollment`);
}}
>
{t('BOARD_ENROLMENT.BOARD_ENROLLMENT')}
</Button>
</Box>
gap: '10px',
padding: isBoard
? '16px 18px !important'
: '0px 18px !important',
color: isBoard ? '#2E1500' : theme.palette.warning.A200,
fontWeight: isBoard ? '600' : 500,
'&:hover': {
background: isBoard
? theme.palette.primary.main
: 'transparent',
},
marginTop: '15px',
}}
startIcon={
<Image src={board} alt="badge Icon" width={24} height={24} />
}
onClick={() => {
router.push(`/board-enrollment`);
}}
>
{t('BOARD_ENROLMENT.BOARD_ENROLLMENT')}
</Button>
</Box>
)}
{isActiveYear && (
<Box sx={{ marginTop: '18px' }}>
<Button
Expand Down Expand Up @@ -519,4 +531,4 @@ const MenuDrawer: React.FC<DrawerProps> = ({
);
};

export default MenuDrawer;
export default MenuDrawer;

0 comments on commit fa6bf3b

Please sign in to comment.