diff --git a/src/components/Events/EventCard.jsx b/src/components/Events/EventCard.jsx index ca85444..1f31448 100644 --- a/src/components/Events/EventCard.jsx +++ b/src/components/Events/EventCard.jsx @@ -125,7 +125,7 @@ const EventCard = ({ - - {name.length > 30 ? ( - - {name.substring(0, 30)}... - - ) : ( - - {name} - - )} + + {name} + { - + {name} diff --git a/src/components/Leaderboard/Leaderboard.jsx b/src/components/Leaderboard/Leaderboard.jsx index 0bfbccb..7845b3f 100644 --- a/src/components/Leaderboard/Leaderboard.jsx +++ b/src/components/Leaderboard/Leaderboard.jsx @@ -89,7 +89,14 @@ const LeaderboardCard = ({ event_id }) => { 2 - + {LeaderboardArray[1] && LeaderboardArray[1].volunteer_first_name}{' '} {LeaderboardArray[1] && LeaderboardArray[1].volunteer_last_name} @@ -118,6 +125,9 @@ const LeaderboardCard = ({ event_id }) => { fontWeight="semibold" fontSize={{ base: '16px', xl: '16px' }} textAlign="center" + whiteSpace="nowrap" + maxWidth={{ base: '100px', xl: '150px' }} + overflow="hidden" > {LeaderboardArray[2] && LeaderboardArray[2].volunteer_first_name}{' '} {LeaderboardArray[2] && LeaderboardArray[2].volunteer_last_name} diff --git a/src/components/Navbar/Navbar.jsx b/src/components/Navbar/Navbar.jsx index 0d48d4b..20e4373 100644 --- a/src/components/Navbar/Navbar.jsx +++ b/src/components/Navbar/Navbar.jsx @@ -309,15 +309,16 @@ const Navbar = () => { > {/* User name */} {user?.first_name} {user?.last_name} diff --git a/src/components/VolunteersTable.jsx b/src/components/VolunteersTable.jsx index c7ac11d..a477ea8 100644 --- a/src/components/VolunteersTable.jsx +++ b/src/components/VolunteersTable.jsx @@ -54,9 +54,9 @@ const RenderVolunteerRow = ({ volunteer }) => { <> - + - + {first_name} {last_name} diff --git a/src/pages/DummyProfilePage.jsx b/src/pages/DummyProfilePage.jsx index e0f846d..c1544b1 100644 --- a/src/pages/DummyProfilePage.jsx +++ b/src/pages/DummyProfilePage.jsx @@ -197,7 +197,16 @@ export const DummyProfilePage = () => { padding={'2%'} > - + {`${user.first_name} ${user.last_name}`}
@@ -260,7 +269,15 @@ export const DummyProfilePage = () => {
- + {`${user.first_name} ${user.last_name}`}
diff --git a/src/pages/QRCodePage.jsx b/src/pages/QRCodePage.jsx index a8546c0..51b3dd3 100644 --- a/src/pages/QRCodePage.jsx +++ b/src/pages/QRCodePage.jsx @@ -46,7 +46,13 @@ function QRCodePage() { /> - + {volunteerFirstName} {volunteerLastName} diff --git a/src/pages/Volunteers.jsx b/src/pages/Volunteers.jsx index 5b2475e..4c15277 100644 --- a/src/pages/Volunteers.jsx +++ b/src/pages/Volunteers.jsx @@ -187,44 +187,65 @@ const Volunteers = () => { bg="#D4E4F9" padding="3" fontSize="lg" - display="flex" - justifyContent="space-between" + justify="space-between" alignItems="center" w="100%" borderRadius={'4.541px'} + maxWidth={{ base: '300px', md: '300px', lg: '300px', xl: '300px' }} > - - - + + + {topThree[0] && topThree[0].volunteer_first_name}{' '} {topThree[0] && topThree[0].volunteer_last_name}{' '} - + + {/* */} {topThree[0] && truncate(topThree[0].total_weight, 2)} lbs - + 2 - - {topThree[1] && topThree[1].volunteer_first_name}{' '} - {topThree[1] && topThree[1].volunteer_last_name}{' '} + + + {topThree[1] && topThree[1].volunteer_first_name}{' '} + {topThree[1] && topThree[1].volunteer_last_name}{' '} + {topThree[1] && truncate(topThree[1].total_weight, 2)} lbs - + 3{' '} {' '} - - {topThree[2] && topThree[2].volunteer_first_name}{' '} - {topThree[2] && topThree[2].volunteer_last_name}{' '} + + + {topThree[2] && topThree[2].volunteer_first_name}{' '} + {topThree[2] && topThree[2].volunteer_last_name}{' '} + {topThree[2] && truncate(topThree[2].total_weight, 2)} lbs