bennot/church-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: time issues

Browse source
This commit is contained in:
Benno Tielen 2024-12-19 08:28:56 +01:00
parent b55b92f83e
commit ab580d341a
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/page.tsx
View file

@ -9,8 +9,8 @@ export const dynamic = 'force-dynamic'
export default async function HomePage() { export default async function HomePage() {
const fromDate = moment().isoWeekday(1); const fromDate = moment().isoWeekday(1).hours(0).minutes(0);
const tillDate = moment().isoWeekday(7); const tillDate = moment().isoWeekday(7).hours(23).minutes(59);
const events = await fetchEvents() const events = await fetchEvents()
const worship = await fetchWorship({ const worship = await fetchWorship({
fromDate: fromDate.toDate(), fromDate: fromDate.toDate(),

2
src/components/EventRow/EventRow.tsx
View file

@ -79,7 +79,7 @@ export const EventRow = ({date, title, location, cancelled, href, color = "base"
{ showDate && { showDate &&
<> <>
{dateObj.toLocaleDateString("de-DE", { weekday: "long" })} {dateObj.toLocaleDateString("de-DE", { weekday: "long" })}
{dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "medium" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short" })} Uhr {dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "medium" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })} Uhr
<br /> <br />
</> </>
} }

2
src/hooks/useTime.ts
View file

@ -3,5 +3,5 @@
*/ */
export const useTime = (datetime: string) => { export const useTime = (datetime: string) => {
let date = new Date(datetime) let date = new Date(datetime)
return date.toLocaleTimeString('de-De', { timeStyle: 'short' }) return date.toLocaleTimeString('de-DE', { timeStyle: 'short', timeZone: "Europe/Berlin" })
} }

2
src/pageComponents/Worship/Worship.tsx
View file

@ -22,7 +22,7 @@ export const Worship = ({ worship }: WorshipPageProps) => {
const localeDate = useDate(worship.date) const localeDate = useDate(worship.date)
const liturgicalDay = worship.liturgicalDay ? worship.liturgicalDay : liturgicalDayName(worship.date); const liturgicalDay = worship.liturgicalDay ? worship.liturgicalDay : liturgicalDayName(worship.date);
const what = worship.title ? worship.title : transformCategory(worship.type); const what = worship.title ? worship.title : transformCategory(worship.type);
const time = date.toLocaleTimeString("de-DE", { timeStyle: "short" }); const time = date.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" });
return ( return (
<> <>