Skip to content

Commit 8fbd2b4

Browse files
Merge pull request #202 from UWB-ACM/meet-the-team-changes
Meet the team changes
2 parents 3ba3fa4 + 26cf416 commit 8fbd2b4

4 files changed

Lines changed: 22 additions & 18 deletions

File tree

src/components/landing-page/(MeetTheTeamSectionComponents)/Committees.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const committees = [
5656
name: "Jonah Uellenberg",
5757
role: "Digital Experience Co-lead, Developer",
5858
photo: "/MeetTheTeamPhotos/jonah-uellenberg.jpg",
59-
link: "https://www.linkedin.com/in/uellenberg",
59+
link: "https://uellenberg.org",
6060
},
6161
{
6262
id: "jui-bangali",
@@ -173,14 +173,14 @@ export const committees = [
173173
name: "Jonah Uellenberg",
174174
role: "Digital Experience Co-lead, Developer",
175175
photo: "/MeetTheTeamPhotos/jonah-uellenberg.jpg",
176-
link: "https://www.linkedin.com/in/uellenberg",
176+
link: "https://uellenberg.org",
177177
},
178178
{
179179
id: "khushpreet-gobindpuri",
180180
name: "Preeti Gobindpuri",
181181
role: "Lead Frontend Developer",
182182
photo: "/MeetTheTeamPhotos/default.jpg",
183-
link: undefined,
183+
link: null,
184184
},
185185
{
186186
id: "kat-tran",

src/components/landing-page/(MeetTheTeamSectionComponents)/MemberCard.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ interface MemberCardProps {
88
name: string;
99
role: string;
1010
photo: string;
11-
link?: string;
11+
link: string | null;
1212
};
1313
}
1414

1515
const MemberCard: React.FC<MemberCardProps> = ({ member }) => {
16-
const isClickable = !!member.link;
17-
1816
const cardContent = (
1917
<div className="relative flex flex-col sm:flex-row items-center sm:items-start p-4 border-4 border-black shadow-lg bg-white transition-transform transform group hover:scale-105 cursor-pointer duration-300 w-[130px] h-[180px] sm:w-[340px] sm:h-[160px] flex-shrink-0">
2018
{/* Profile Image */}
2119
<Image
2220
src={member.photo}
23-
alt={member.name}
21+
// No alt because it'll get read out below.
22+
alt=""
2423
className="border-4 border-black w-24 h-24 object-cover object-center"
2524
width={96}
2625
height={96}
@@ -38,19 +37,19 @@ const MemberCard: React.FC<MemberCardProps> = ({ member }) => {
3837

3938
{/* LinkedIn Logo */}
4039
<div className="pl-8">
41-
{isClickable && (
40+
{member.link && (
4241
<Image
4342
src={LinkedInImage}
4443
width={30}
45-
alt="LinkedIn"
44+
alt="Open Profile"
4645
className="absolute top-2 right-2 hidden sm:block"
4746
/>
4847
)}
4948
</div>
5049
</div>
5150
);
5251

53-
return isClickable ? (
52+
return member.link ? (
5453
<a href={member.link} target="_blank" rel="noopener noreferrer">
5554
{cardContent}
5655
</a>

src/components/landing-page/(MeetTheTeamSectionComponents)/MembersGrid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface TeamMembersGridProps {
88
name: string;
99
role: string;
1010
photo: string;
11-
link?: string;
11+
link: string | null;
1212
}[];
1313
}
1414

src/components/landing-page/MeetTheTeamSection.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ const MeetTheTeamSection = () => {
1515
committees[0].id,
1616
);
1717

18-
const activeCommittee = committees.find(
19-
(committee) => committee.id === activeCommitteeId,
20-
);
21-
2218
return (
2319
<Panel id="meetTheTeamPanel" panelColor="white" className={panelMargin}>
2420
{/* Heading */}
@@ -42,9 +38,18 @@ const MeetTheTeamSection = () => {
4238
/>
4339

4440
{/* Team Members */}
45-
{activeCommittee && (
46-
<MembersGrid members={activeCommittee.members} />
47-
)}
41+
{committees.map((committee) => (
42+
<div
43+
className={
44+
committee.id === activeCommitteeId
45+
? undefined
46+
: "hidden w-0 h-0"
47+
}
48+
key={committee.id}
49+
>
50+
<MembersGrid members={committee.members} />
51+
</div>
52+
))}
4853
</PanelContent>
4954
</Panel>
5055
);

0 commit comments

Comments
 (0)