Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pages/acknowledged.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Footer from '../components/footer'
import Bio from '../components/bio'
import BoardBox from '../components/boardbio'
import ForceTheme from '../components/force-theme'
import { fetchTeam } from './api/team'
import { fetchAcknowledged } from './api/team'


export default function Acknowleged({ team }) {
Expand Down Expand Up @@ -102,8 +102,8 @@ export default function Acknowleged({ team }) {

export const getServerSideProps = async () => {
try {
const team = await fetchTeam()
return { props: { team } }
const acknowledged = await fetchAcknowledged()
return { props: { team: { acknowledged } } }
} catch (e) {
return { props: { team: {} } }
}
Expand Down
21 changes: 7 additions & 14 deletions pages/api/team.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import teamMembers from '../../public/team.json'
import acknowledgedMembers from '../../public/acknowledged.json'
import type { NextApiRequest, NextApiResponse } from 'next'

interface TeamMember {
export interface TeamMember {
name: string
department: string
role: string | string[]
acknowledged: boolean
acknowledged?: boolean
bio: string
bioHackFoundation: string
slackId: string
overrideAvatar: string
email: string
Expand All @@ -19,18 +19,11 @@ interface TeamMember {
}

export async function fetchTeam() {
const current: TeamMember[] = []
const acknowledged: TeamMember[] = []

for (const member of teamMembers as TeamMember[]) {
if (member.acknowledged) {
acknowledged.push(member)
} else {
current.push(member)
}
}
return teamMembers as TeamMember[]
}

return { current, acknowledged }
export async function fetchAcknowledged() {
return acknowledgedMembers as TeamMember[]
}

export default async function handler(
Expand Down
4 changes: 2 additions & 2 deletions pages/team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@ export default function Team({ team }) {

export const getServerSideProps = async () => {
try {
const team = await fetchTeam()
return { props: { team } }
const current = await fetchTeam()
return { props: { team: { current } } }
} catch (e) {
return { props: { team: {} } }
}
Expand Down
Loading