Merge pull request #95 from cniajp/feature/dk-next-day-talk-obs

Fix conference day index for API calls and add next day's talk inform…

Author: dero1to

src/app/page.tsx

@@ -22,7 +22,7 @@ export default function Home() {
       <div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-3 lg:text-left">
         <div className="text-center my-auto">{dkEventAbbr}</div>
         <Link
-          href="/break-dk/menu/0"
+          href="/break-dk/menu/1"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>
@@ -37,7 +37,7 @@ export default function Home() {
         </Link>
 
         <Link
-          href="/break-dk/menu/1"
+          href="/break-dk/menu/2"
           className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
         >
           <h2 className={`mb-3 text-2xl font-semibold`}>

src/components/hooks/useGetTalksAndTracks.ts

@@ -64,7 +64,7 @@ export const useGetTalksAndTracksForMenu = (
       return null
     }
     console.log(event.data!.conferenceDays!)
-    return event.data!.conferenceDays![parseInt(dayNum)].id
+    return event.data!.conferenceDays![parseInt(dayNum) - 1].id
   }, [event.data, dayNum])
   const talksResult = useGetTalks(confDayId)
   const tracksResult = useGetTracks()

src/pages/break-dk/obs.tsx

@@ -21,10 +21,13 @@ export default function ObsPage() {
 
   const eventResult = useGetEvent(dkEventAbbr)
   const trackResult = useGetTracks()
-  const apiConfDayId = eventResult.data?.conferenceDays?.[Number(confDay)]?.id
+  const apiConfDayId =
+    eventResult.data?.conferenceDays?.[Number(confDay) - 1]?.id
   const apiTrackId =
     trackResult.data?.filter((t) => t.name === trackName)[0]?.id || null
   const talkResult = useGetTalks(apiConfDayId)
+  const nextDayId: number | undefined =
+    eventResult.data?.conferenceDays?.[Number(confDay)]?.id
 
   useEffect(() => {
     if (!isClient) return
@@ -92,6 +95,14 @@ export default function ObsPage() {
       }
     )
 
+    if (nextDayId) {
+      // 次の日の最初のトークの時間も追加する
+      template.push({
+        name: 'NextDayTalk',
+        url_path: `/break-dk/talks/2764`, // ハードコーディング
+      })
+    }
+
     // obsSceneGenerate.tsxを実行
     ObsSceneGenerate({
       eventAbbr: dkEventAbbr,
@@ -113,6 +124,7 @@ export default function ObsPage() {
     apiTrackId,
     trackName,
     router,
+    nextDayId,
   ])
 
   if (!isClient) {