Clean up layouts and types.

Author: nikoshell

src/components/schedule/day.astro

@@ -1,6 +1,6 @@
 
 ---
-import { getEntry, getCollection } from "astro:content";
+import { type CollectionEntry, getEntry, getCollection } from "astro:content";
 import Break from "@components/schedule/break.astro";
 import Session from "@components/schedule/session.astro";
 import { addMinutes, differenceInMinutes, parseISO } from "date-fns";
@@ -11,12 +11,10 @@ import { Select } from "@components/form/select";
 import { formatInTimeZone } from "date-fns-tz";
 
 
-export interface props {
-  dayName: string;
-  eventType?: string | null;
+interface Props {
+  day: CollectionEntry<"days">;
 }
 
-
 const format = (date: Date, format: string) => {
   return formatInTimeZone(date, "Europe/Prague", format);
 };
@@ -41,14 +39,11 @@ export const getStaticPaths = async () => {
 };
 
 
-const { dayName } = Astro.props;
-
-const days = await getCollection("days");
-
-//const day = await getEntry("days", dayName);
-const day = await getEntry("days", dayName);
+const { day } = Astro.props;
+const dayName = day.id;
+//const day = getEntry("days", dayName);
 
-const ROOMS = (day?.data.rooms ?? [])
+const ROOMS = (day.data.rooms ?? [])
   .filter((room) => room.toLowerCase() !== "exhibit hall")
   .sort();
 
@@ -67,7 +62,7 @@ type ScheduleSession = {
 // hack for posters :)
 const posters: Array<ScheduleSession> = [];
 
-const sessions = day?.data.events
+const sessions = day.data.events
   .map((event) => {
     const start = parseISO(event.start);
     const startTime = format(start, "HH:mm");

src/pages/schedule.astro

@@ -5,6 +5,10 @@ import ScheduleDay from "@components/schedule/day.astro";
 import Headline from "@ui/Headline.astro";
 import Button from "@ui/Button.astro";
 
+interface Props {
+  dayName: string;
+}
+
 export const getStaticPaths = async () => {
   const days = await getCollection("days");
 
@@ -15,18 +19,14 @@ export const getStaticPaths = async () => {
 
 const days = await getCollection("days");
 
-const allDays = Array.from(
-  new Set(days.map((day) => day.id).filter((id) => id))
-).sort();
-
 ---
 
 <Layout title="" description="">
 
   <Headline as="h2" id=`schedule-main` title="2025 Schedule" />
   {
     days.map((day) => (
-      <ScheduleDay dayName={day.id} />
+      <ScheduleDay day={day} />
     ))
   }
 </Layout>

src/pages/schedule/_[type].astro

@@ -1,5 +1,5 @@
 ---
-import { getEntry, getCollection } from "astro:content";
+import { type CollectionEntry, getEntry, getCollection } from "astro:content";
 import Layout from "@layouts/ScheduleLayout.astro";
 import ScheduleDay from "@components/schedule/day.astro";
 import Headline from "@ui/Headline.astro";
@@ -13,15 +13,18 @@ export const getStaticPaths = async () => {
   });
 };
 
-const days = await getCollection("days");
 
-const allDays = Array.from(
-  new Set(days.map((day) => day.id).filter((id) => id))
-).sort();
-let isActive = true;
+type Day = CollectionEntry<"days">;
+const dayEntry = await getEntry("days", Astro.params.day);
+
+if (!dayEntry) {
+  throw new Error(`Day entry "${Astro.params.day}" not found`);
+}
+
+const day: Day = dayEntry;
 ---
 
 <Layout title="" description="">
   <Headline as="h2" id=`schedule-main` title="2025 Schedule" />
-  <ScheduleDay dayName={Astro.params.day} />
+  <ScheduleDay day={day} />
 </Layout>

src/pages/schedule/day/[day].astro

@@ -1,5 +1,5 @@
 ---
-import { getCollection } from "astro:content";
+import { type CollectionEntry, getCollection } from "astro:content";
 import Layout from "@layouts/ScheduleLayout.astro";
 import ScheduleDay from "@components/schedule/day.astro";
 import { slugify } from '@utils/content';
@@ -22,11 +22,6 @@ export const getStaticPaths = async () => {
 
 const days = await getCollection("days");
 
-const allDays = Array.from(
-  new Set(days.map((day) => day.id).filter((id) => id))
-).sort();
-
-
 ---
 
 <Layout title="" description="">
@@ -39,7 +34,7 @@ const allDays = Array.from(
       return dayOfWeek !== 1 && dayOfWeek !== 2;
     })
     .map((day) => (
-      <ScheduleDay dayName={day.id} />
+      <ScheduleDay day={day} />
     ))
   }
 </Layout>

src/pages/schedule/talks.astro

@@ -22,10 +22,6 @@ export const getStaticPaths = async () => {
 
 const days = await getCollection("days");
 
-const allDays = Array.from(
-  new Set(days.map((day) => day.id).filter((id) => id))
-).sort();
-
 ---
 
 <Layout title="" description="">
@@ -38,7 +34,7 @@ const allDays = Array.from(
       return dayOfWeek == 1 || dayOfWeek == 2;
     })
     .map((day) => (
-      <ScheduleDay dayName={day.id} />
+      <ScheduleDay day={day} />
     ))
   }
 </Layout>