Skip to content

Commit 5b06bf6

Browse files
committed
refactored display components to use combined data file
1 parent db83bf8 commit 5b06bf6

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

frontend/src/components/About/ExecDisplay.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import { useState } from "react";
2-
import { EXECS } from "@/../public/data/execs";
2+
import { Exec } from "@/../public/data/members";
33

4-
const ExecDisplay = () => {
4+
type ExecDisplayProps = {
5+
execs: Exec[];
6+
};
7+
8+
const ExecDisplay = ({ execs }: ExecDisplayProps) => {
59
return (
610
<div className="my-5">
711
<h2 className="text-xl font-bold mb-2">Execs</h2>
812
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
9-
{EXECS.map(exec => (
13+
{execs.map(exec => (
1014
<div>
1115
<div>
1216
<p>{exec.name}</p>

frontend/src/components/About/PortfolioDisplay.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
import { useState } from "react";
22
import PortfolioCard from "./PortfolioCard";
3-
import { PORTFOLIOS } from "@/../public/data/portfolios";
3+
import { PortfolioData } from "@/../public/data/members";
44

5-
const PortfolioDisplay = () => {
5+
type PortfolioDisplayProps = {
6+
execs: PortfolioData[];
7+
};
8+
9+
const PortfolioDisplay = ({ portfolios }: PortfolioDisplayProps) => {
610
const [selectedPortfolio, setSelectedPortfolio] = useState("Careers");
711

8-
const names = PORTFOLIOS.map(port => port.name);
12+
const names = portfolios.map(port => port.name);
913

1014
return (
1115
<div>
@@ -25,7 +29,7 @@ const PortfolioDisplay = () => {
2529
))}
2630
</div>
2731

28-
<PortfolioCard portfolio={PORTFOLIOS.find(port => port.name === selectedPortfolio) ?? PORTFOLIOS[0]} />
32+
<PortfolioCard portfolio={portfolios.find(port => port.name === selectedPortfolio) ?? portfolios[0]} />
2933
</div>
3034
)
3135
}

frontend/src/pages/about/execs-directors-subcoms.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ExecDisplay from "@/components/About/ExecDisplay";
33
import Layout from "@/components/Layout";
44
import PageBody from "@/components/PageBody";
55
import PageTitle from "@/components/PageTitle";
6-
import { EXECS } from "@/../public/data/execs";
6+
import { teamData } from "@/../public/data/years/2025";
77

88
const ExecsDirectorsSubcommitteesPage = () => {
99
return (
@@ -25,7 +25,7 @@ const ExecsDirectorsSubcommitteesPage = () => {
2525
</div>
2626

2727
{/* EXECS */}
28-
<ExecDisplay />
28+
<ExecDisplay execs={teamData.execs} />
2929

3030
<div className="border-t border-gray-300 my-10"></div>
3131

@@ -38,7 +38,7 @@ const ExecsDirectorsSubcommitteesPage = () => {
3838
</p>
3939
</div>
4040

41-
<PortfolioDisplay />
41+
<PortfolioDisplay portfolios={teamData.portfolios} />
4242

4343
</div>
4444
</PageBody>

0 commit comments

Comments
 (0)