diff --git a/src/components/sections/AboutUsMeetTheTeamSection.tsx b/src/components/sections/AboutUsMeetTheTeamSection.tsx index 9d67d98..0ac60b2 100644 --- a/src/components/sections/AboutUsMeetTheTeamSection.tsx +++ b/src/components/sections/AboutUsMeetTheTeamSection.tsx @@ -25,6 +25,7 @@ export default function AboutUsMeetTheTeamSection() { "UI/UX Head", "Creatives Head", "Public Relations Officer", + "Logistics Head", ], [], ); @@ -69,8 +70,6 @@ export default function AboutUsMeetTheTeamSection() { return "col-span-2 xl:col-span-4"; // First row single item case 1: return "col-span-2 xl:col-span-4"; // Second row single item - case officers.length - 1: - return "col-span-2 xl:col-span-4"; // Last row single item default: return "col-span-1"; // All middle items take 1 column each } diff --git a/src/components/sections/MembersMeetTheTeamSection.tsx b/src/components/sections/MembersMeetTheTeamSection.tsx index f21a775..9bfd7e2 100644 --- a/src/components/sections/MembersMeetTheTeamSection.tsx +++ b/src/components/sections/MembersMeetTheTeamSection.tsx @@ -18,19 +18,19 @@ export const MembersMeetTheTeamSection: React.FC< const router = useRouter(); const [members, setMembers] = React.useState([]); - const officerRoles = [ - "Director", - "Deputy Director", - "Secretary General", - "Treasurer", - "Auditor", - "External Affairs Head", - "Frontend Head", - "Backend Head", - "UI/UX Head", - "Creatives Head", - "Public Relations Officer", - ]; + // const officerRoles = [ + // "Director", + // "Deputy Director", + // "Secretary General", + // "Treasurer", + // "Auditor", + // "External Affairs Head", + // "Frontend Head", + // "Backend Head", + // "UI/UX Head", + // "Creatives Head", + // "Public Relations Officer", + // ]; function extractMembers(res: unknown): RawMember[] { if ( @@ -90,12 +90,12 @@ export const MembersMeetTheTeamSection: React.FC< const membersArray: RawMember[] = extractMembers(res); // ✅ Filter out officers - const filteredMembers = membersArray.filter( - (member) => - !member.roles.some((r) => officerRoles.includes(r.roles.name)), - ); + // const filteredMembers = membersArray.filter( + // (member) => + // !member.roles.some((r) => officerRoles.includes(r.roles.name)), + // ); - setMembers(filteredMembers); + setMembers(membersArray); } fetchData(); diff --git a/src/components/ui/MemberCard.tsx b/src/components/ui/MemberCard.tsx index 3be2dc0..e8aaca3 100644 --- a/src/components/ui/MemberCard.tsx +++ b/src/components/ui/MemberCard.tsx @@ -23,7 +23,7 @@ const positionVariants = cva( defaultVariants: { positionColor: "frontend", }, - } + }, ); export interface MemberCardProps { @@ -35,7 +35,7 @@ export function MemberCard({ member }: MemberCardProps) { // ✅ Normalize roles to string[] const roleNames = roles.map((r) => - typeof r === "string" ? r : r.roles.name + typeof r === "string" ? r : r.roles.name, ); const positions = roleNames.map((role) => ({ @@ -100,6 +100,7 @@ export function MemberCard({ member }: MemberCardProps) { Proj. Man. ); + default: return text; } @@ -112,7 +113,7 @@ export function MemberCard({ member }: MemberCardProps) {
@@ -124,7 +125,7 @@ export function MemberCard({ member }: MemberCardProps) {
@@ -144,7 +145,7 @@ export function MemberCard({ member }: MemberCardProps) { return rows.map((row, rowIndex) => (
0 ? "mt-1" : "" }`} > @@ -155,7 +156,7 @@ export function MemberCard({ member }: MemberCardProps) { >
@@ -195,8 +196,8 @@ export function MemberCard({ member }: MemberCardProps) {
@@ -216,7 +217,7 @@ export function MemberCard({ member }: MemberCardProps) { />
-
+

- typeof r === "string" ? r : r.roles.name + typeof r === "string" ? r : r.roles.name, ); // Find first officer role that matches this member const primaryOfficerRole = roleNames.find((role) => - officerRoles.includes(role) + officerRoles.includes(role), ); // Helper for responsive role display