File tree Expand file tree Collapse file tree 5 files changed +758
-958
lines changed
Expand file tree Collapse file tree 5 files changed +758
-958
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import Footer from '../components/footer'
66import Bio from '../components/bio'
77import BoardBox from '../components/boardbio'
88import ForceTheme from '../components/force-theme'
9- import { fetchTeam } from './api/team'
9+ import { fetchAcknowledged } from './api/team'
1010
1111
1212export default function Acknowleged ( { team } ) {
@@ -102,8 +102,8 @@ export default function Acknowleged({ team }) {
102102
103103export 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 }
Original file line number Diff line number Diff line change 11import teamMembers from '../../public/team.json'
2+ import acknowledgedMembers from '../../public/acknowledged.json'
23import 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
2121export 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
3629export default async function handler (
Original file line number Diff line number Diff line change @@ -439,8 +439,8 @@ export default function Team({ team }) {
439439
440440export 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 }
You can’t perform that action at this time.
0 commit comments