Skip to content

Commit dc73e93

Browse files
committed
Show only current year speakers
1 parent 4a2bec8 commit dc73e93

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

src/app/conf/2023/_data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import "server-only"
22

33
import { SchedSpeaker, ScheduleSession } from "../_api/sched-types"
4+
import { readSpeakers } from "../_api/sched-data"
45

56
export const schedule: ScheduleSession[] = require("../../../../scripts/sync-sched/schedule-2023.json")
6-
export const speakers: SchedSpeaker[] = require("../../../../scripts/sync-sched/speakers.json")
7+
export const speakers: SchedSpeaker[] = readSpeakers(2023)

src/app/conf/2024/_data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import "server-only"
22

33
import { SchedSpeaker, ScheduleSession } from "../_api/sched-types"
4+
import { readSpeakers } from "../_api/sched-data"
45

56
export const schedule: ScheduleSession[] = require("../../../../scripts/sync-sched/schedule-2024.json")
6-
export const speakers: SchedSpeaker[] = require("../../../../scripts/sync-sched/speakers.json")
7+
export const speakers: SchedSpeaker[] = readSpeakers(2024)

src/app/conf/2025/_data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import "server-only"
22

33
import { SchedSpeaker, ScheduleSession } from "@/app/conf/2023/types"
4+
import { readSpeakers } from "../_api/sched-data"
45

56
export const schedule: ScheduleSession[] = require("../../../../scripts/sync-sched/schedule-2025.json")
6-
export const speakers: SchedSpeaker[] = require("../../../../scripts/sync-sched/speakers.json")
7+
export const speakers: SchedSpeaker[] = readSpeakers(2025)
78

89
type SpeakerUsername = SchedSpeaker["username"]
910

src/app/conf/_api/sched-data.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ import { ConferenceYear, SchedSpeaker } from "./sched-types"
22

33
const allSpeakers: SchedSpeaker[] = require("../../../../scripts/sync-sched/speakers.json")
44

5-
export async function readSpeakers(year: ConferenceYear) {
6-
return allSpeakers.filter(speaker => speaker["~years"].includes(year))
5+
export async function readSpeakers(year: ConferenceYear): SchedSpeaker[] {
6+
return (
7+
allSpeakers
8+
.filter(speaker => speaker["~years"].includes(year))
9+
.sort((a, b) => a.name.localeCompare(b.name))
10+
// show speakers without avatars last
11+
.sort((a, b) => {
12+
if (a.avatar && !b.avatar) return -1
13+
if (!a.avatar && b.avatar) return 1
14+
return 0
15+
})
16+
)
717
}

0 commit comments

Comments
 (0)