From ffedcd348c7494e77b1e3d7bf6da9bc3eb37136e Mon Sep 17 00:00:00 2001 From: Domingo Dirutigliano Date: Wed, 18 Sep 2024 06:28:24 +0200 Subject: [PATCH] fix: fixed scheduling + hardcode bug fix on a talk --- .../Schedule/Pages/ScheduleList.astro | 37 ++++++++--- src/components/Schedule/Pages/grid-style.css | 62 +++++++++++++++++++ tailwind.config.cjs | 10 +-- 3 files changed, 93 insertions(+), 16 deletions(-) create mode 100644 src/components/Schedule/Pages/grid-style.css diff --git a/src/components/Schedule/Pages/ScheduleList.astro b/src/components/Schedule/Pages/ScheduleList.astro index 97260c4..96c353d 100644 --- a/src/components/Schedule/Pages/ScheduleList.astro +++ b/src/components/Schedule/Pages/ScheduleList.astro @@ -3,16 +3,40 @@ import ScheduleCard from "../ScheduleCard.astro"; import { getLangFromUrl, useTranslations } from "../../../i18n/utils"; import { getSchedule } from "../../../data/api/sessionize_api"; +import "./grid-style.css"; -const schedule = await getSchedule(); + +const schedule = (await getSchedule()).map((s) => { + s.rooms = s.rooms.map((r) => { + r.sessions = r.sessions.map((si) => { + if (si.title.indexOf("42!") != -1){ + si.endsAt = "2024-10-26T14:35:00Z" + } + return si + }); + return r + }); + s.timeSlots = s.timeSlots.map((ts) => { + ts.rooms = ts.rooms.map((r) => { + if (r.session.title.indexOf("42!") != -1){ + r.session.endsAt = "2024-10-26T14:35:00Z" + } + return r + }); + return ts + }) + return s +}); const lang = getLangFromUrl(Astro.url); const t = useTranslations(lang); ---
+ + { schedule.map((s) => { - const totalScheduleCols = s.rooms.length + 1; + const totalScheduleCols = s.rooms.length; const totalScheduleRows = s.timeSlots.length; let skipPadding: {[key:string]:number} = s.rooms.map((room) => ({[room.id]:0})).reduce((a,b)=>({...a,...b}),{}) return ( @@ -24,11 +48,10 @@ const t = useTranslations(lang); weekday: "long", })}

-
+ {/* Some classes are created manually due to tilewind issues */} +
{s.timeSlots.map((ts,ts_idx) => { - + const hasServiceSession = ts.rooms.some( (tsr) => tsr.session.isServiceSession, ); @@ -77,7 +100,7 @@ const t = useTranslations(lang); } return { data: tsr, - html:
+ html:
}; diff --git a/src/components/Schedule/Pages/grid-style.css b/src/components/Schedule/Pages/grid-style.css new file mode 100644 index 0000000..a596674 --- /dev/null +++ b/src/components/Schedule/Pages/grid-style.css @@ -0,0 +1,62 @@ +@media (min-width: 1280px) { +.grid-cols-layout-1 { + grid-template-columns: 90px repeat(1, minmax(0, 1fr)); +} +.grid-rows-layout-1 { + grid-template-rows: repeat(1, minmax(0, 1fr)); +} +.grid-cols-layout-2 { + grid-template-columns: 90px repeat(2, minmax(0, 1fr)); +} +.grid-rows-layout-2 { + grid-template-rows: repeat(2, minmax(0, 1fr)); +} +.grid-cols-layout-3 { + grid-template-columns: 90px repeat(3, minmax(0, 1fr)); +} +.grid-rows-layout-3 { + grid-template-rows: repeat(3, minmax(0, 1fr)); +} +.grid-cols-layout-4 { + grid-template-columns: 90px repeat(4, minmax(0, 1fr)); +} +.grid-rows-layout-4 { + grid-template-rows: repeat(4, minmax(0, 1fr)); +} +.grid-cols-layout-5 { + grid-template-columns: 90px repeat(5, minmax(0, 1fr)); +} +.grid-rows-layout-5 { + grid-template-rows: repeat(5, minmax(0, 1fr)); +} +.grid-cols-layout-6 { + grid-template-columns: 90px repeat(6, minmax(0, 1fr)); +} +.grid-rows-layout-6 { + grid-template-rows: repeat(6, minmax(0, 1fr)); +} +.grid-cols-layout-7 { + grid-template-columns: 90px repeat(7, minmax(0, 1fr)); +} +.grid-rows-layout-7 { + grid-template-rows: repeat(7, minmax(0, 1fr)); +} +.grid-cols-layout-8 { + grid-template-columns: 90px repeat(8, minmax(0, 1fr)); +} +.grid-rows-layout-8 { + grid-template-rows: repeat(8, minmax(0, 1fr)); +} +.grid-cols-layout-9 { + grid-template-columns: 90px repeat(9, minmax(0, 1fr)); +} +.grid-rows-layout-9 { + grid-template-rows: repeat(9, minmax(0, 1fr)); +} +.grid-cols-layout-10 { + grid-template-columns: 90px repeat(10, minmax(0, 1fr)); +} +.grid-rows-layout-10 { + grid-template-rows: repeat(10, minmax(0, 1fr)); +} +} diff --git a/tailwind.config.cjs b/tailwind.config.cjs index d14e4f5..3ed10b9 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -75,13 +75,6 @@ module.exports = { "left-[-16rem]", "bg-black/30", "bg-black/0", - "xl:grid-cols-1", - "xl:grid-cols-2", - "xl:grid-cols-3", - "xl:grid-cols-4", - "xl:grid-cols-5", - "xl:grid-cols-6", - "xl:grid-rows-13", "xl:col-span-1", "xl:col-span-2", "xl:col-span-3", @@ -112,7 +105,6 @@ module.exports = { "bg-[url(/assets/images/gallery/07.webp)]", "bg-[url(/assets/images/gallery/08.webp)]", "bg-[url(/assets/images/gallery/09.webp)]", - "bg-[url(/assets/images/gallery/10.webp)]", - "xl:grid-cols-[200px_repeat(5,_minmax(0,_1fr))]" + "bg-[url(/assets/images/gallery/10.webp)]" ], };