fix: timezone fixed

gdgbari · Sep 18, 2024 · cdaf0cf · cdaf0cf
1 parent 6b7d5de
commit cdaf0cf
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 8 deletions.
diff --git a/src/components/Home/Jumbo.astro b/src/components/Home/Jumbo.astro
@@ -15,6 +15,7 @@ const t = useTranslations(lang);
       <p class="text-3xl md:text-4xl font-semibold">
         {
           WebsiteConfig.EVENT_START.toLocaleDateString(lang, {
+            timeZone: WebsiteConfig.EVENT_TIMEZONE,
             day: "numeric",
             month: "long",
             year: "numeric",

diff --git a/src/components/Schedule/Pages/ScheduleTab.astro b/src/components/Schedule/Pages/ScheduleTab.astro
@@ -3,6 +3,7 @@ import type { ScheduleDay } from "../../../data/types/sessionize";
 import { getLangFromUrl } from "../../../i18n/utils";
 import ScheduleCard from "../ScheduleCard.astro";
 import { capitalizeFirstLetter } from "../../../react/utils";
+import { WebsiteConfig } from "../../../config";
 
 interface Props {
   schedule: ScheduleDay[];
@@ -56,12 +57,12 @@ const calcSlotsTaken = (timeSlots, tsr, ts_idx) => {
         const roomsSelected = rooms?s.rooms.filter((r) => rooms.includes(r.id)):s.rooms
         const timeSlotSelected = s.timeSlots.filter((ts) => ts.rooms.some((tsr) => roomsSelected.map(r => r.id).includes(tsr.id)) || isServiceTimeSlot(ts));
         const totalScheduleCols = roomsSelected.length;
-        const totalScheduleRows = timeSlotSelected.length;
         let skipPadding: {[key:string]:number} = roomsSelected.map((room) => ({[room.id]:0})).reduce((a,b)=>({...a,...b}),{});
         return <>
           <div class="mb-5">
             <p class="text-3xl font-bold mb-5">
               {capitalizeFirstLetter(new Date(s.date).toLocaleDateString(lang, {
+                timeZone: WebsiteConfig.EVENT_TIMEZONE,
                 day: "numeric",
                 month: "long",
                 weekday: "long",
@@ -107,7 +108,7 @@ const calcSlotsTaken = (timeSlots, tsr, ts_idx) => {
 
                   return [
                   <div class="font-medium text-2xl">
-                      <p>{ts.slotStart.substring(0, 5)}</p>
+                      <p>{ts.slotStart}</p>
                   </div>,
                   ...orderedSessions
                   ];

diff --git a/src/components/Sessions/Pages/SessionDetail.astro b/src/components/Sessions/Pages/SessionDetail.astro
@@ -6,6 +6,7 @@ import AddToCalendar from '../../Common/AddToCalendar.astro';
 import BaseLayout from '../../Common/BaseLayout.astro';
 import SessionTopic from '../SessionTopic.astro';
 import { capitalizeFirstLetter } from "../../../react/utils";
+import { WebsiteConfig } from '../../../config';
 
 interface Props {
   entry: SessionInfo;
@@ -32,16 +33,19 @@ const dateEnd = new Date(entry.endsAt);
 const isScheduled = dateStart.getTime() != 0;
 
 var date = capitalizeFirstLetter(dateStart.toLocaleDateString(lang, {
+  timeZone: WebsiteConfig.EVENT_TIMEZONE,
   day: "numeric",
   month: "short",
 }));
 
 const start = dateStart.toLocaleTimeString(lang, {
+  timeZone: WebsiteConfig.EVENT_TIMEZONE,
   hour: "numeric",
   minute: "numeric",
 });
 
 const end = dateEnd.toLocaleTimeString(lang, {
+  timeZone: WebsiteConfig.EVENT_TIMEZONE,
   hour: "numeric",
   minute: "numeric",
 });

diff --git a/src/components/Speakers/Pages/SpeakerDetail.astro b/src/components/Speakers/Pages/SpeakerDetail.astro
@@ -71,6 +71,7 @@ const pageTitle = `${speaker.fullName} @ ${WebsiteConfig.DEVFEST_NAME}`;
               const dateEnd = new Date(session.endsAt);
 
               const date = dateStart.toLocaleDateString(lang, {
+                timeZone: WebsiteConfig.EVENT_TIMEZONE,
                 month: "long",
                 day: "numeric",
               });

diff --git a/src/config.ts b/src/config.ts
@@ -22,6 +22,7 @@ export class WebsiteConfig {
 
     public static readonly EVENT_START : Date = new Date('2024-10-26');
     public static readonly EVENT_END : Date = new Date('2024-10-26');
+    public static readonly EVENT_TIMEZONE : string = 'Europe/Rome';
     public static readonly EVENT_LOCATION_NAME : String = 'Polythecnic of Bari';
     public static readonly EVENT_LOCATION_CITY : String = 'Bari';
     public static readonly EVENT_LOCATION_ADDRESS : String = 'Via Edoardo Orabona 4';

diff --git a/src/data/api/sessionize_api.ts b/src/data/api/sessionize_api.ts
@@ -1,3 +1,4 @@
+import { WebsiteConfig } from "../../config";
 import type { ScheduleDay, SessionInfo, Speaker } from "../types/sessionize";
 
 const API_ID = "1rh747m6"
@@ -19,12 +20,15 @@ export async function getSchedule(): Promise<Promise<ScheduleDay[]>> {
 
     schedule.forEach(
         day => day.timeSlots.forEach(
-            slot => slot.rooms.forEach(
-                room => {
-                    const sessionInfoFound = sessionsInfo.find((_s) => _s.id == room.session.id);
-                    room.session.info = sessionInfoFound;
-                },
-            ),
+            (slot, slot_idx) => {
+                day.timeSlots[slot_idx].slotStart = new Date(slot.rooms[0].session.startsAt).toLocaleString("it", {timeZone: WebsiteConfig.EVENT_TIMEZONE, hour:"numeric", minute:"numeric"})
+                slot.rooms.forEach(
+                    room => {
+                        const sessionInfoFound = sessionsInfo.find((_s) => _s.id == room.session.id);
+                        room.session.info = sessionInfoFound;
+                    },
+                )
+            }
         ),
     );
 

diff --git a/src/pages/redirect/[url_encoded].astro b/src/pages/redirect/[url_encoded].astro
@@ -69,6 +69,7 @@ const t = useTranslations(lang);
             <p class="text-xl md:text-3xl font-semibold">
                 {
                 WebsiteConfig.EVENT_START.toLocaleDateString(lang, {
+                    timeZone: WebsiteConfig.EVENT_TIMEZONE,
                     day: "numeric",
                     month: "long",
                     year: "numeric",

diff --git a/src/pages/ticket.astro b/src/pages/ticket.astro
@@ -34,6 +34,7 @@ import { WebsiteConfig } from "../config"
             <p class="text-3xl md:text-4xl font-semibold mt-5">
                 {
                 WebsiteConfig.EVENT_START.toLocaleDateString(lang, {
+                    timeZone: WebsiteConfig.EVENT_TIMEZONE,
                     day: "numeric",
                     month: "long",
                     year: "numeric",

diff --git a/src/react/pages/LoginPage.tsx b/src/react/pages/LoginPage.tsx
@@ -88,6 +88,7 @@ export const LoginPage = () => {
                         <p className="text-2xl md:text-3xl font-semibold mt-5">
                             {
                             WebsiteConfig.EVENT_START.toLocaleDateString("en", {
+                                timeZone: WebsiteConfig.EVENT_TIMEZONE,
                                 day: "numeric",
                                 month: "long",
                                 year: "numeric",

diff --git a/src/react/pages/SignupPage.tsx b/src/react/pages/SignupPage.tsx
@@ -94,6 +94,7 @@ export const SignupPage = ({ token }: { token:string }) => {
                         <p className="text-2xl md:text-3xl font-semibold mt-5">
                             {
                             WebsiteConfig.EVENT_START.toLocaleDateString("en", {
+                                timeZone: WebsiteConfig.EVENT_TIMEZONE,
                                 day: "numeric",
                                 month: "long",
                                 year: "numeric",