From c9966297397f65ee9ab79c50dc7475b0faa3a6de Mon Sep 17 00:00:00 2001 From: YassinEldeeb Date: Thu, 15 Aug 2024 12:10:53 +0100 Subject: [PATCH 1/4] fix --- src/app/conf/2024/schedule/[id]/page.tsx | 1 + src/app/conf/_components/schedule/schedule-list.tsx | 4 ++-- src/app/conf/_components/schedule/session-list.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/conf/2024/schedule/[id]/page.tsx b/src/app/conf/2024/schedule/[id]/page.tsx index 0e419d7b01..0241f91094 100644 --- a/src/app/conf/2024/schedule/[id]/page.tsx +++ b/src/app/conf/2024/schedule/[id]/page.tsx @@ -78,6 +78,7 @@ export default function SessionPage({ params }: SessionProps) { if (!event) { notFound() } + // @ts-expect-error -- fixme event.speakers = (event.speakers || []).map(speaker => speakers.find(s => s.username === speaker.username), diff --git a/src/app/conf/_components/schedule/schedule-list.tsx b/src/app/conf/_components/schedule/schedule-list.tsx index 515ff219b4..7d6f06b5d4 100644 --- a/src/app/conf/_components/schedule/schedule-list.tsx +++ b/src/app/conf/_components/schedule/schedule-list.tsx @@ -63,7 +63,7 @@ function getSessionsByDay( } sessionsByDay[day] = { ...sessionsByDay[day], - [date]: sessions.sort((a, b) => a.venue.localeCompare(b.venue)), + [date]: sessions.sort((a, b) => a?.venue.localeCompare(b?.venue)), } }) @@ -249,7 +249,7 @@ export function ScheduleList({ d="M215.7 499.2C267 435 384 279.4 384 192C384 86 298 0 192 0S0 86 0 192c0 87.4 117 243 168.3 307.2c12.3 15.3 35.1 15.3 47.4 0zM192 128a64 64 0 1 1 0 128 64 64 0 1 1 0-128z" /> - {session.venue} + {session?.venue} diff --git a/src/app/conf/_components/schedule/session-list.tsx b/src/app/conf/_components/schedule/session-list.tsx index 3ea0715b39..905bccc4f5 100644 --- a/src/app/conf/_components/schedule/session-list.tsx +++ b/src/app/conf/_components/schedule/session-list.tsx @@ -78,7 +78,7 @@ function getSessionsByDay( } sessionsByDay[day] = { ...sessionsByDay[day], - [date]: sessions.sort((a, b) => a.venue.localeCompare(b.venue)), + [date]: sessions.sort((a, b) => a?.venue.localeCompare(b?.venue)), } }) From fc7172a5fa8e5ac7f18eccde5f0712cefb219032 Mon Sep 17 00:00:00 2001 From: YassinEldeeb Date: Thu, 15 Aug 2024 12:32:37 +0100 Subject: [PATCH 2/4] fix --- src/app/conf/_components/schedule/schedule-list.tsx | 4 ++-- src/app/conf/_components/schedule/session-list.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/conf/_components/schedule/schedule-list.tsx b/src/app/conf/_components/schedule/schedule-list.tsx index 7d6f06b5d4..44c0a8ff9d 100644 --- a/src/app/conf/_components/schedule/schedule-list.tsx +++ b/src/app/conf/_components/schedule/schedule-list.tsx @@ -63,7 +63,7 @@ function getSessionsByDay( } sessionsByDay[day] = { ...sessionsByDay[day], - [date]: sessions.sort((a, b) => a?.venue.localeCompare(b?.venue)), + [date]: sessions.sort((a, b) => (a?.venue ?? "").localeCompare(b?.venue ?? "")), } }) @@ -249,7 +249,7 @@ export function ScheduleList({ d="M215.7 499.2C267 435 384 279.4 384 192C384 86 298 0 192 0S0 86 0 192c0 87.4 117 243 168.3 307.2c12.3 15.3 35.1 15.3 47.4 0zM192 128a64 64 0 1 1 0 128 64 64 0 1 1 0-128z" /> - {session?.venue} + {session.venue} diff --git a/src/app/conf/_components/schedule/session-list.tsx b/src/app/conf/_components/schedule/session-list.tsx index 905bccc4f5..3c6b3ffcdf 100644 --- a/src/app/conf/_components/schedule/session-list.tsx +++ b/src/app/conf/_components/schedule/session-list.tsx @@ -16,7 +16,7 @@ export interface ScheduleSession { event_subtype: string event_type: string name: string - venue: string + venue?: string speakers?: SchedSpeaker[] | string files?: { name: string; path: string }[] } @@ -78,7 +78,7 @@ function getSessionsByDay( } sessionsByDay[day] = { ...sessionsByDay[day], - [date]: sessions.sort((a, b) => a?.venue.localeCompare(b?.venue)), + [date]: sessions.sort((a, b) => (a?.venue ?? "").localeCompare(b?.venue ?? "")), } }) From 3af22800423d0a5d705a2f791ff9c261bac8fb2f Mon Sep 17 00:00:00 2001 From: YassinEldeeb Date: Thu, 15 Aug 2024 12:50:31 +0100 Subject: [PATCH 3/4] fix --- src/app/conf/2024/schedule/[id]/page.tsx | 4 ++-- src/app/conf/_components/speakers/avatar.tsx | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/conf/2024/schedule/[id]/page.tsx b/src/app/conf/2024/schedule/[id]/page.tsx index 0241f91094..8c5dde611d 100644 --- a/src/app/conf/2024/schedule/[id]/page.tsx +++ b/src/app/conf/2024/schedule/[id]/page.tsx @@ -119,10 +119,10 @@ export default function SessionPage({ params }: SessionProps) { - {format(parseISO(event.event_end), "hh:mmaaaa 'PDT'")} -
+
{event.speakers!.map(speaker => (
1 ? "max-w-[320px]": ""}`} key={speaker.username} > = ({ avatar, name, className, href }) => { className={`${className}`} src={avatar} alt={`${name} Profile Image`} + style={{ + margin: 0 + }} /> ) : (
Date: Thu, 15 Aug 2024 12:56:18 +0100 Subject: [PATCH 4/4] chore: prettier --- src/app/conf/2024/schedule/[id]/page.tsx | 2 +- src/app/conf/_components/schedule/schedule-list.tsx | 4 +++- src/app/conf/_components/schedule/session-list.tsx | 4 +++- src/app/conf/_components/speakers/avatar.tsx | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/conf/2024/schedule/[id]/page.tsx b/src/app/conf/2024/schedule/[id]/page.tsx index 8c5dde611d..afe6ecc2fc 100644 --- a/src/app/conf/2024/schedule/[id]/page.tsx +++ b/src/app/conf/2024/schedule/[id]/page.tsx @@ -122,7 +122,7 @@ export default function SessionPage({ params }: SessionProps) {
{event.speakers!.map(speaker => (
1 ? "max-w-[320px]": ""}`} + className={`flex items-center gap-3 w-full ${event?.speakers?.length || 0 > 1 ? "max-w-[320px]" : ""}`} key={speaker.username} > (a?.venue ?? "").localeCompare(b?.venue ?? "")), + [date]: sessions.sort((a, b) => + (a?.venue ?? "").localeCompare(b?.venue ?? ""), + ), } }) diff --git a/src/app/conf/_components/schedule/session-list.tsx b/src/app/conf/_components/schedule/session-list.tsx index 3c6b3ffcdf..b723236e94 100644 --- a/src/app/conf/_components/schedule/session-list.tsx +++ b/src/app/conf/_components/schedule/session-list.tsx @@ -78,7 +78,9 @@ function getSessionsByDay( } sessionsByDay[day] = { ...sessionsByDay[day], - [date]: sessions.sort((a, b) => (a?.venue ?? "").localeCompare(b?.venue ?? "")), + [date]: sessions.sort((a, b) => + (a?.venue ?? "").localeCompare(b?.venue ?? ""), + ), } }) diff --git a/src/app/conf/_components/speakers/avatar.tsx b/src/app/conf/_components/speakers/avatar.tsx index 42a8bacd92..1759f9d7d8 100644 --- a/src/app/conf/_components/speakers/avatar.tsx +++ b/src/app/conf/_components/speakers/avatar.tsx @@ -20,7 +20,7 @@ export const Avatar: FC = ({ avatar, name, className, href }) => { src={avatar} alt={`${name} Profile Image`} style={{ - margin: 0 + margin: 0, }} /> ) : (