diff --git a/src/components/TeamMembers/TeamMembers.tsx b/src/components/TeamMembers/TeamMembers.tsx index eda24ac..647314f 100644 --- a/src/components/TeamMembers/TeamMembers.tsx +++ b/src/components/TeamMembers/TeamMembers.tsx @@ -33,7 +33,7 @@ type VolunteerEmailProps = { } const VolunteerEmail: FC = withUserRole(ROLES.TEAMLEAD, ({ email }) => ( -
{email}
+ {email} )) type DaysAvailabilityProps = { @@ -44,19 +44,15 @@ const DaysAvailability: FC = ({ volunteer }): JSX.Element if (volunteer.dayWishes.length === 0) { return ( <> -
S
-
D
+ S + D ) } return ( <> -
- S -
-
- D -
+ + ) } @@ -73,20 +69,23 @@ const TeamMembers: FC = ({ teamId }): JSX.Element => { if (volunteers.length === 0) return
return ( -
-
-
S ({volunteers.filter(hasDay("S")).length})
-
D ({volunteers.filter(hasDay("D")).length})
+ + + + + + + {volunteers.map((volunteer) => ( - <> -
+
+ - + ))} - +
VolontairesS ({volunteers.filter(hasDay("S")).length})D ({volunteers.filter(hasDay("D")).length})@
{volunteer.firstname} {volunteer.lastname} - +
) } diff --git a/src/components/TeamMembers/styles.module.scss b/src/components/TeamMembers/styles.module.scss index 4a1f350..5756a47 100755 --- a/src/components/TeamMembers/styles.module.scss +++ b/src/components/TeamMembers/styles.module.scss @@ -1,24 +1,16 @@ @import "../../theme/variables"; @import "../../theme/mixins"; .volunteers { - padding: 0; - list-style: none; -} - -$height: 24px; -.volunteer { - display: grid; + //display: grid; grid-template-columns: minmax(min-content, 5fr) min-content min-content; } +.volunteerName { + grid-column: first; +} + .day { - display: inline-block; - width: 50px; - height: $height; - margin: 0 2px; - text-align: center; background-color: $color-red; - color: transparent; &.unknown { background-color: $color-grey-medium; }