Skip to content

Commit 18208e0

Browse files
committed
split team and ack to separate files
1 parent 0d45c1a commit 18208e0

File tree

5 files changed

+758
-958
lines changed

5 files changed

+758
-958
lines changed

pages/acknowledged.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Footer from '../components/footer'
66
import Bio from '../components/bio'
77
import BoardBox from '../components/boardbio'
88
import ForceTheme from '../components/force-theme'
9-
import { fetchTeam } from './api/team'
9+
import { fetchAcknowledged } from './api/team'
1010

1111

1212
export default function Acknowleged({ team }) {
@@ -102,8 +102,8 @@ export default function Acknowleged({ team }) {
102102

103103
export const getServerSideProps = async () => {
104104
try {
105-
const team = await fetchTeam()
106-
return { props: { team } }
105+
const acknowledged = await fetchAcknowledged()
106+
return { props: { team: { acknowledged } } }
107107
} catch (e) {
108108
return { props: { team: {} } }
109109
}

pages/api/team.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import teamMembers from '../../public/team.json'
2+
import acknowledgedMembers from '../../public/acknowledged.json'
23
import type { NextApiRequest, NextApiResponse } from 'next'
34

4-
interface TeamMember {
5+
export interface TeamMember {
56
name: string
67
department: string
78
role: string | string[]
8-
acknowledged: boolean
9+
acknowledged?: boolean
910
bio: string
10-
bioHackFoundation: string
1111
slackId: string
1212
overrideAvatar: string
1313
email: string
@@ -19,18 +19,11 @@ interface TeamMember {
1919
}
2020

2121
export async function fetchTeam() {
22-
const current: TeamMember[] = []
23-
const acknowledged: TeamMember[] = []
24-
25-
for (const member of teamMembers as TeamMember[]) {
26-
if (member.acknowledged) {
27-
acknowledged.push(member)
28-
} else {
29-
current.push(member)
30-
}
31-
}
22+
return teamMembers as TeamMember[]
23+
}
3224

33-
return { current, acknowledged }
25+
export async function fetchAcknowledged() {
26+
return acknowledgedMembers as TeamMember[]
3427
}
3528

3629
export default async function handler(

pages/team.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ export default function Team({ team }) {
439439

440440
export const getServerSideProps = async () => {
441441
try {
442-
const team = await fetchTeam()
443-
return { props: { team } }
442+
const current = await fetchTeam()
443+
return { props: { team: { current } } }
444444
} catch (e) {
445445
return { props: { team: {} } }
446446
}

0 commit comments

Comments
 (0)