diff --git a/src/common/utils/parser/groupParticipantsByRole.ts b/src/common/utils/parser/groupParticipantsByRole.ts index 8e40f3c..6bba7b9 100644 --- a/src/common/utils/parser/groupParticipantsByRole.ts +++ b/src/common/utils/parser/groupParticipantsByRole.ts @@ -29,8 +29,9 @@ import { User } from '../../types'; } */ -export function groupParticipantsByRole(membersObj: User[], administrator: User) { - const grouped = membersObj.concat(administrator).reduce( +export function groupParticipantsByRole(membersObj: User[], administratorObj: User) { + const grouped = [administratorObj].concat(membersObj).reduce( + // thanks Marcos <3! (acc, obj) => { if (!acc[obj.role]) { acc[obj.role] = []; diff --git a/src/components/Cards/ProjectCard/ProjectCard.tsx b/src/components/Cards/ProjectCard/ProjectCard.tsx index dff81b7..afd0638 100644 --- a/src/components/Cards/ProjectCard/ProjectCard.tsx +++ b/src/components/Cards/ProjectCard/ProjectCard.tsx @@ -41,7 +41,8 @@ export const ProjectCard = ({ list: cn('flex flex-wrap gap-4 mt-4 text-3.5'), popoverTrigger: cn( 'bg-gradient-to-rb from-primary-600 to-secondary-500 w-5 h-5 rounded-full text-xs flex items-center justify-center cursor-pointer select-none' - ) + ), + adminBadge: cn('text-xs bg-gradient-to-rb from-primary-600 to-secondary-500 text-transparent bg-clip-text rounded-full') }; const handleDescription = () => { @@ -60,9 +61,9 @@ export const ProjectCard = ({ const participantList = participantsByRole[role].map((participant, idx) => { const isAdmin = Object.values(administrator).includes(participant.name); return ( -
  • +
  • {participant.name} - {isAdmin && {'(Adm)'}} + {isAdmin && {'(admin)'}}
  • ); }); @@ -70,9 +71,9 @@ export const ProjectCard = ({ return (
  • {/** TODO: change key later 😒 Why later?*/} - -
    - {role} + + {role} +
    {participantList}}> {groupLength} diff --git a/src/components/Tag/Tag.tsx b/src/components/Tag/Tag.tsx index 10b8e87..1f81fa4 100644 --- a/src/components/Tag/Tag.tsx +++ b/src/components/Tag/Tag.tsx @@ -57,7 +57,7 @@ interface TagProps { export const Tag = ({ children, variant = TagVariant.primary, size = TagSize.sm, className, borderSize = TagSize.xs }: TagProps) => { const classes = { container: cn('flex items-center justify-center rounded-full w-fit', TagContainerVariants[variant], BorderSizes[borderSize], className), - tag: cn('rounded-full py-px px-2', TagVariants[variant], Sizes[size]) + tag: cn('rounded-full py-0.5 px-3', TagVariants[variant], Sizes[size]) }; return (