Skip to content

Commit d19c407

Browse files
authored
fix(web): let event dates be timezone-independent (vspo-lab#606)
1 parent bbc7ee9 commit d19c407

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

service/vspo-schedule/web/src/pages/events/[yearMonth].tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,7 @@ const IndexPage: NextPageWithLayout<Props> = ({
301301
width: matches ? "130px" : "100px",
302302
}}
303303
>
304-
{formatDate(date, "MM/dd (E)", {
305-
localeCode: locale,
306-
timeZone,
307-
})}
304+
{formatDate(date, "MM/dd (E)", { localeCode: locale })}
308305
</Typography>
309306
</TimelineOppositeContent>
310307
<TimelineSeparator>
@@ -315,13 +312,12 @@ const IndexPage: NextPageWithLayout<Props> = ({
315312
</TimelineSeparator>
316313
<TimelineContent sx={{ py: matches ? "40px" : "20px", px: 2 }}>
317314
{eventsOnDate.map((event, eventIndex) => {
318-
const eventDate = event.startedAt.split("T")[0]; // Get the date part of the ISO string
319315
const today = formatDate(
320316
getCurrentUTCDate(),
321317
"yyyy-MM-dd",
322318
{ timeZone },
323319
);
324-
const isEventToday = eventDate === today;
320+
const isEventToday = date === today;
325321
const eventMembers = getRelevantMembers(
326322
event.contentSummary,
327323
);

service/vspo-schedule/web/src/pages/events/details/[id].tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { DEFAULT_LOCALE, TEMP_TIMESTAMP } from "@/lib/Const";
1717
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
1818
import { useTranslation } from "next-i18next";
1919
import { convertToUTCDate } from "@/lib/dayjs";
20-
import { useTimeZoneContext } from "@/hooks";
2120

2221
type Params = {
2322
id: string;
@@ -103,7 +102,6 @@ const EventPage: NextPageWithLayout<Props> = ({ event }) => {
103102
const router = useRouter();
104103
const { t } = useTranslation(["common"]);
105104
const locale = router.locale ?? DEFAULT_LOCALE;
106-
const { timeZone } = useTimeZoneContext();
107105

108106
if (!event) {
109107
return null;
@@ -132,7 +130,7 @@ const EventPage: NextPageWithLayout<Props> = ({ event }) => {
132130
{formatDate(
133131
convertToUTCDate(event.startedAt.split("T")[0] || TEMP_TIMESTAMP),
134132
"MM/dd (E)",
135-
{ localeCode: locale, timeZone },
133+
{ localeCode: locale },
136134
)}
137135
</Typography>
138136
{getRelevantMembers(event.contentSummary).map((member, index) => (

0 commit comments

Comments
 (0)