fix timezone #2

JuhG · Jul 28, 2022 · 82db5a9 · 82db5a9 · vercel · Jul 28, 2022
1 parent e7499fd
commit 82db5a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/components/Box.tsx b/components/Box.tsx
@@ -5,11 +5,6 @@ import { Favorites } from "pages";
 import { FC } from "react";
 import { Item } from "types";
 
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
 export const SCALE_MINUTES_TO_PIXELS = 3.8;
 
 interface BoxProps {
@@ -103,13 +98,9 @@ export const Box: FC<BoxProps> = ({ item, startOfDay, favorites, setDetailId })
           }}
         >
           <p>
-            <span>{dayjs(item.date).tz("Europe/Budapest").format("HH:mm")}</span>
+            <span>{dayjs(item.date).format("HH:mm")}</span>
             <span style={{ paddingLeft: 4, paddingRight: 4 }}>-</span>
-            <span>
-              {dayjs(item.date + item.duration * 60 * 1000)
-                .tz("Europe/Budapest")
-                .format("HH:mm")}
-            </span>
+            <span>{dayjs(item.date + item.duration * 60 * 1000).format("HH:mm")}</span>
           </p>
           <p>{item.duration} perc</p>
         </div>

diff --git a/components/Detail.tsx b/components/Detail.tsx
@@ -5,11 +5,6 @@ import { Favorites, FavoriteState } from "pages";
 import { FC } from "react";
 import { Item } from "types";
 
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
 interface DetailProps {
   item: Item;
   favorites: Favorites;
@@ -33,13 +28,9 @@ export const Detail: FC<DetailProps> = ({ item, favorites, setFavoriteState }) =
           }}
         >
           <p>
-            <span>{dayjs(item.date).tz("Europe/Budapest").format("HH:mm")}</span>
+            <span>{dayjs(item.date).format("HH:mm")}</span>
             <span style={{ paddingLeft: 4, paddingRight: 4 }}>-</span>
-            <span>
-              {dayjs(item.date + item.duration * 60 * 1000)
-                .tz("Europe/Budapest")
-                .format("HH:mm")}
-            </span>
+            <span>{dayjs(item.date + item.duration * 60 * 1000).format("HH:mm")}</span>
           </p>
           <p>{item.duration} perc</p>
         </div>

diff --git a/pages/api/filter.ts b/pages/api/filter.ts
@@ -1,6 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 import { Day, Village, Topic, Item, Stage } from "types";
 import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
 
 const getUrl = (host?: string) => {
   if (!host) {
@@ -33,7 +38,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       return item.time?.name;
     })
     .map((item) => {
-      item.date = new Date("2022 " + item.time?.name).getTime();
+      item.date = dayjs.tz("2022 " + item.time?.name, "Europe/Budapest").unix() * 1000;
       item.dateInMinutes = item.date / 1000 / 60;
       item.id = item.productionId + "_" + item.dateInMinutes;
       return item;