3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-06-17 01:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix date and time formatting and tz adjustment (#808)

Browse source
This commit is contained in:
Luke Vella 2023-08-11 10:18:51 +01:00 • committed by GitHub
parent acd28441a4
commit 58a04c63cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/web/src/components/event-card.tsx
View file

@ -71,7 +71,7 @@ export const EventCard = () => {
: `${adjustTimeZone( : `${adjustTimeZone(
poll.event.start, poll.event.start,
!poll.timeZone, !poll.timeZone,
).format("LLL")} - ${adjustTimeZone( ).format("LL LT")} - ${adjustTimeZone(
dayjs(poll.event.start).add( dayjs(poll.event.start).add(
poll.event.duration, poll.event.duration,
"minutes", "minutes",

2
apps/web/src/pages/polls.tsx
View file

@ -121,7 +121,7 @@ const Page: NextPageWithLayout = () => {
? `${adjustTimeZone( ? `${adjustTimeZone(
poll.event.start, poll.event.start,
!poll.timeZone, !poll.timeZone,
).format("LLL")} - ${adjustTimeZone( ).format("LL LT")} - ${adjustTimeZone(
dayjs(poll.event.start).add( dayjs(poll.event.start).add(
poll.event.duration, poll.event.duration,
"minutes", "minutes",

9
apps/web/src/utils/dayjs.tsx
View file

@ -213,10 +213,11 @@ export const DayjsProvider: React.FunctionComponent<{
return ( return (
<DayjsContext.Provider <DayjsContext.Provider
value={{ value={{
adjustTimeZone: (date, keepLocalTime) => adjustTimeZone: (date, keepLocalTime) => {
keepLocalTime return keepLocalTime
? dayjs(date).tz("GMT") ? dayjs(date).utc()
: dayjs(date).tz(preferredTimeZone), : dayjs(date).tz(preferredTimeZone);
},
dayjs, dayjs,
locale, locale,
timeZone: preferredTimeZone, timeZone: preferredTimeZone,