Merge pull request #138 from pyconjp/develop

Release 2024/09/28 2
pyconjp · Sep 28, 2024 · 2f352bd · 2f352bd
2 parents eca9891 + d2f612a
commit 2f352bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/components/elements/TimetableBody.tsx b/src/components/elements/TimetableBody.tsx
@@ -13,8 +13,8 @@ export default async function TimetableBody({lang, date, talks, events, categori
   categories: Category,
   keynoteSpeaker: { keynote_day1: string, keynote_day2: string },
 }) {
-  const floor20 = [...talks, ...events].filter(talk => [3086, 3418, 1, 2].includes(talk.slot.room_id));
-  const floor4 = [...talks, ...events].filter(talk => [3419, 3420, 1, 4].includes(talk.slot.room_id));
+  const floor20 = [...talks, ...events].filter(talk => [3086, 3418, 1, 2, 3].includes(talk.slot.room_id));
+  const floor4 = [...talks, ...events].filter(talk => [3419, 3420, 1, 3, 4].includes(talk.slot.room_id));
 
   const floor20StartMinutes = [...new Set(floor20.filter(talk => !talk.hide_start).map(talk => talk.start_minute))];
   const floor4StartMinutes = [...new Set(floor4.filter(talk => !talk.hide_start).map(talk => talk.start_minute))];

diff --git a/src/data/event.ts b/src/data/event.ts
@@ -324,40 +324,40 @@ export const conferenceEvents: ConferenceEvent[] = [
     is_keynote: false,
   },
   {
+    code: 'talk_relay',
     speakers: [],
-    code: 'keynote_day2',
+    title: '#pyconjp_3 Relay',
     slot: {
-      room_id: 2,
-      start: '2024-09-28T17:30:00+09:00',
-      end: '2024-09-28T18:20:00+09:00',
+      room_id: 3420,
+      start: '2024-09-28T17:00:00+09:00',
+      end: '2024-09-28T17:15:00+09:00',
     },
     date: 'day2',
     is_event: true,
-    start_minute: 450,
-    end_minute: 500,
-    is_keynote: true,
+    start_minute: 420,
+    end_minute: 435,
+    is_keynote: false,
   },
   {
-    code: 'keynote2_relay1',
     speakers: [],
-    title: 'Keynote Relay',
+    code: 'keynote_day2',
     slot: {
-      room_id: 3419,
+      room_id: 2,
       start: '2024-09-28T17:30:00+09:00',
       end: '2024-09-28T18:20:00+09:00',
     },
     date: 'day2',
     is_event: true,
     start_minute: 450,
     end_minute: 500,
-    is_keynote: false,
+    is_keynote: true,
   },
   {
-    code: 'keynote2_relay2',
+    code: 'keynote2_relay1',
     speakers: [],
-    title: 'Keynote Relay',
+    title: 'Keynote Relay (English)',
     slot: {
-      room_id: 3420,
+      room_id: 3419,
       start: '2024-09-28T17:30:00+09:00',
       end: '2024-09-28T18:20:00+09:00',
     },