Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create Progress bar component and use on card and details page,logout button add and functionality #30

Merged
merged 3 commits into from
Jan 29, 2025
Merged

create Progress bar component and use on card and details page,logout button add and functionality #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7cbfc8
Progress bar,logout button
namita-25 Jan 28, 2025
c36152d
logout menu from common topapp bar
namita-25 Jan 28, 2025
099cfb7
logout option added in all pages
namita-25 Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libs/shared-lib/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export * from './lib/Dialog/CommonDialog';
export * from './lib/theme';
export * from './lib/ThemeProvider';
export * from './lib/Progress/Circular';
export * from './lib/Progress/Progress';
import Image from '../images/default.png';
export const IMAGES = {
DEFAULT_PLACEHOLDER: Image,
Expand Down
108 changes: 84 additions & 24 deletions libs/shared-lib/src/lib/Card/CommonCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Avatar from '@mui/material/Avatar';
import Typography from '@mui/material/Typography';
import { red } from '@mui/material/colors';
import { Box } from '@mui/material';
import { Progress } from '../Progress/Progress';

interface CommonCardProps {
title: string;
Expand All @@ -21,6 +22,8 @@ interface CommonCardProps {
children?: React.ReactNode;
orientation?: 'vertical' | 'horizontal';
minheight?: string;
status?: 'Not started' | 'Completed' | 'In progress' | string;
progress?: number;
onClick?: () => void;
}

Expand All @@ -36,6 +39,8 @@ export const CommonCard: React.FC<CommonCardProps> = ({
children,
orientation,
minheight,
status,
progress,
onClick,
}) => {
return (
Expand All @@ -58,22 +63,83 @@ export const CommonCard: React.FC<CommonCardProps> = ({
}}
onClick={onClick}
>
{image && orientation === 'horizontal' && (
<CardMedia
component="img"
image={image || '/assets/images/default.png'}
alt={imageAlt || ''}
sx={{
width: orientation === 'horizontal' ? '100%' : '40%',
height: orientation === 'horizontal' ? '297px' : 'auto',
objectFit: 'cover',
'@media (max-width: 600px)': {
{/* Image and Progress Overlay */}
<Box sx={{ position: 'relative', width: '100%' }}>
{image && (
<CardMedia
component="img"
image={image || '/assets/images/default.png'}
alt={imageAlt || 'Image'}
sx={{
width: '100%',
height: '200px',
},
}}
/>
)}
height: orientation === 'horizontal' ? '297px' : 'auto',
objectFit: 'cover', //set contain
'@media (max-width: 600px)': {
height: '200px',
},
}}
/>
)}

{/* Progress Bar Overlay */}
{progress !== undefined && (
<Box
sx={{
position: 'absolute',
height: '40px',
top: 0,
width: '100%',
display: 'flex',
// justifyContent: 'center',
alignItems: 'center',
background: 'rgba(0, 0, 0, 0.5)',
}}
>
<Progress
variant="determinate"
value={100}
size={30}
thickness={5}
sx={{
color: '#fff8fb',
position: 'absolute',
left: '10px',
}}
/>
<Progress
variant="determinate"
value={progress}
size={30}
thickness={5}
sx={{
color: progress === 100 ? '#21A400' : '#FFB74D',
position: 'absolute',
left: '10px',
}}
/>
<Typography
sx={{
fontSize: '12px',
fontWeight: 'bold',
marginLeft: '12px',
color: progress === 100 ? '#21A400' : '#FFB74D',
position: 'absolute',
left: '50px',
}}
>
{status &&
actions &&
actions?.toString().toLowerCase() === 'resource' &&
status}
{status &&
actions &&
actions?.toString().toLowerCase() === 'course' &&
`${progress}%`}
</Typography>
</Box>
)}
</Box>

<CardHeader
avatar={
avatarLetter && (
Expand All @@ -82,11 +148,6 @@ export const CommonCard: React.FC<CommonCardProps> = ({
</Avatar>
)
}
action={
orientation === 'vertical' ? (
<CardMedia component="img" image={image} />
) : undefined
}
title={
<Typography
sx={{
Expand All @@ -98,7 +159,6 @@ export const CommonCard: React.FC<CommonCardProps> = ({
WebkitBoxOrient: 'vertical',
WebkitLineClamp: 1,
paddingLeft: '5px',
// height: '70px',
}}
>
{title}
Expand All @@ -124,9 +184,9 @@ export const CommonCard: React.FC<CommonCardProps> = ({
<Typography
sx={{
display: '-webkit-box',
WebkitLineClamp: 2, // Limit text to 2 lines
WebkitBoxOrient: 'vertical', // Set the box orientation
overflow: 'hidden', // Hide overflow
WebkitLineClamp: 2,
WebkitBoxOrient: 'vertical',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}
>
Expand Down
30 changes: 28 additions & 2 deletions libs/shared-lib/src/lib/Header/TopAppBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import MenuIcon from '@mui/icons-material/Menu';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import { Menu, MenuItem } from '@mui/material';
interface ActionIcon {
icon: React.ReactNode;
ariaLabel: string;
onClick: () => void;
anchorEl?: HTMLElement | null;
onLogoutClick: (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
) => void;
}
interface CommonAppBarProps {
title?: string;
Expand All @@ -24,6 +28,7 @@ interface CommonAppBarProps {
color?: 'primary' | 'secondary' | 'default' | 'transparent' | 'inherit';
actionIcons?: ActionIcon[];
bgcolor?: string;
onMenuClose?: () => void;
}

export const TopAppBar: React.FC<CommonAppBarProps> = ({
Expand All @@ -32,6 +37,7 @@ export const TopAppBar: React.FC<CommonAppBarProps> = ({
showBackIcon = false,
menuIconClick,
backIconClick,
onMenuClose,
actionButtonLabel = 'Action',
actionButtonClick,
actionButtonColor = 'inherit',
Expand All @@ -40,6 +46,7 @@ export const TopAppBar: React.FC<CommonAppBarProps> = ({
actionIcons = [],
bgcolor = '#FDF7FF',
}) => {
const accountIcon = actionIcons.find((icon) => icon.ariaLabel === 'Account');
return (
<Box sx={{ flexGrow: 1 }}>
<AppBar
Expand Down Expand Up @@ -100,13 +107,32 @@ export const TopAppBar: React.FC<CommonAppBarProps> = ({
key={index}
color={actionButtonColor}
aria-label={action.ariaLabel}
// onClick={action.onClick}
onClick={action.onLogoutClick}
namita-25 marked this conversation as resolved.
Show resolved Hide resolved
>
{action.icon}
</IconButton>
))}
</Toolbar>
</AppBar>
{accountIcon?.anchorEl && (
<Menu
id="menu-appbar"
anchorEl={accountIcon.anchorEl}
anchorOrigin={{
vertical: 'top',
horizontal: 'right',
}}
keepMounted
transformOrigin={{
vertical: 'top',
horizontal: 'right',
}}
open={Boolean(accountIcon.anchorEl)}
onClose={onMenuClose}
>
<MenuItem onClick={onMenuClose}>Logout</MenuItem>
</Menu>
)}
</Box>
);
};
20 changes: 14 additions & 6 deletions libs/shared-lib/src/lib/Layout/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ interface LayoutProps {
showMenuIcon?: boolean;
showBackIcon?: boolean;
menuIconClick?: () => void;

onMenuClose?: () => void;
actionButtonLabel?: string;
actionButtonClick?: () => void;
actionButtonColor?: 'inherit' | 'primary' | 'secondary' | 'default';
Expand All @@ -70,7 +70,10 @@ interface LayoutProps {
actionIcons?: {
icon: React.ReactNode;
ariaLabel: string;
onClick: () => void;
anchorEl?: HTMLElement | null;
onLogoutClick?: (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
) => void;
}[];
};
topAppBarIcons?: {
Expand All @@ -83,7 +86,8 @@ interface LayoutProps {
language?: string[];
subject?: string[];
contentType?: string[];
};currentSelectedValues
};
currentSelectedValues?;
language?: string;
selectedSubjects?: string[];
selectedContentTypes?: string[];
Expand Down Expand Up @@ -144,7 +148,10 @@ const FilterDialog = ({
open={open}
onClose={onClose}
fullWidth
sx={{ borderRadius: '16px' }}
sx={{
borderRadius: '16px',
'& .MuiDialog-paper': { backgroundColor: '#FEF7FF' },
}}
>
<DialogTitle>Filters</DialogTitle>
<IconButton
Expand Down Expand Up @@ -173,8 +180,8 @@ const FilterDialog = ({
value: term.code,
}));

// Get the selected values for the current category
const currentSelectedValues = selectedValues[filterCode] || [];
// Get the selected values for the current category
const currentSelectedValues = selectedValues[filterCode] || [];

return (
<FormControl
Expand Down Expand Up @@ -459,6 +466,7 @@ export const Layout: React.FC<LayoutProps> = ({
bgcolor="#FDF7FF"
actionIcons={topAppBarIcons}
menuIconClick={() => setIsDrawerOpen(true)}
onLogoutClick={(event) => action.onLogoutClick(event)}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix undefined 'action' reference in onLogoutClick handler.

There's a critical bug where action is undefined. This will cause a runtime error when the logout button is clicked.

-              onLogoutClick={(event) => action.onLogoutClick(event)}
+              onLogoutClick={(event) => showTopAppBar?.actionIcons?.[0]?.onLogoutClick?.(event)}

Note: The fix assumes the logout action is the first icon. Consider passing the logout handler directly through props for better maintainability.

Committable suggestion skipped: line range outside the PR's diff.

{...showTopAppBar}
/>
</Box>
Expand Down
34 changes: 34 additions & 0 deletions libs/shared-lib/src/lib/Progress/Progress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import React from 'react';
import CircularProgress from '@mui/material/CircularProgress';
import { SxProps, Theme } from '@mui/material/styles';

interface CommonCircularProgressProps {
variant?: 'determinate' | 'indeterminate';
value?: number;
size?: number;
thickness?: number;
color?: string;
sx?: SxProps<Theme>;
}

export const Progress: React.FC<CommonCircularProgressProps> = ({
variant = 'determinate',
value = 0,
size = 40,
thickness = 3.6,
color = 'primary',
sx = {},
}) => {
return (
<CircularProgress
variant={variant}
value={value}
size={size}
thickness={thickness}
sx={{
color,
...sx,
}}
/>
);
};
Loading