fix: root layout

This commit is contained in:
Benno Tielen 2025-02-21 15:22:12 +01:00
parent 2c7b1471a4
commit d6ecb21300
43 changed files with 28 additions and 13 deletions

View file

@ -1,5 +1,5 @@
import { Section } from '@/components/Section/Section' import { Section } from '../../../../components/Section/Section'
import { Container } from '@/components/Container/Container' import { Container } from '../../../../components/Container/Container'
import { Title } from '@/components/Title/Title' import { Title } from '@/components/Title/Title'
import { TextDiv } from '@/components/Text/TextDiv' import { TextDiv } from '@/components/Text/TextDiv'
import { Blog } from '@/payload-types' import { Blog } from '@/payload-types'

View file

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -1,9 +1,9 @@
import type { Metadata } from 'next' import type { Metadata } from 'next'
import { defaultFont } from './fonts' import { defaultFont } from '@/assets/fonts'
import './globals.css' import './globals.css'
import { Menu } from '@/components/Menu/Menu' import { Menu } from '@/components/Menu/Menu'
import { Footer } from '@/compositions/Footer/Footer' import { Footer } from '@/compositions/Footer/Footer'
import { comment } from '@/app/layout-comment' import { comment } from '@/app/(home)/layout-comment'
export const metadata: Metadata = { export const metadata: Metadata = {
title: 'Katholische Pfarrei Heilige drei Könige Berlin', title: 'Katholische Pfarrei Heilige drei Könige Berlin',

View file

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

View file

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 70 KiB

View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View file

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 145 KiB

View file

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

View file

@ -1,7 +1,7 @@
import { Logo } from '@/components/Logo/Logo' import { Logo } from '@/components/Logo/Logo'
import styles from "./styles.module.scss" import styles from "./styles.module.scss"
import classNames from 'classnames' import classNames from 'classnames'
import { faustina } from '@/app/fonts' import { faustina } from '@/assets/fonts'
export const Banner = () => { export const Banner = () => {
return ( return (

View file

@ -1,6 +1,5 @@
import { MassTableRow } from '@/components/MassTable/MassTableRow' import { MassTableRow } from '@/components/MassTable/MassTableRow'
import styles from './styles.module.scss' import styles from './styles.module.scss'
import { faustina } from '@/app/fonts'
import { Worship } from '@/payload-types' import { Worship } from '@/payload-types'
import { ChurchCard } from '@/components/ChurchCard/ChurchCard' import { ChurchCard } from '@/components/ChurchCard/ChurchCard'
import { church } from '@/utils/church' import { church } from '@/utils/church'

View file

@ -1,5 +1,5 @@
import styles from "./styles.module.scss" import styles from "./styles.module.scss"
import { faustina } from '@/app/fonts' import { faustina } from '@/assets/fonts'
import Link from 'next/link' import Link from 'next/link'
type MegaMenuProps = { type MegaMenuProps = {

View file

@ -1,7 +1,7 @@
import styles from './styles.module.scss' import styles from './styles.module.scss'
import { Container } from '@/components/Container/Container' import { Container } from '@/components/Container/Container'
import classNames from 'classnames' import classNames from 'classnames'
import { faustina } from '@/app/fonts' import { faustina } from '@/assets/fonts'
type TestimonyProps = { type TestimonyProps = {
name?: string name?: string

View file

@ -1,6 +1,6 @@
import styles from "./styles.module.scss"; import styles from "./styles.module.scss";
import classNames from 'classnames' import classNames from 'classnames'
import { faustina } from '@/app/fonts' import { faustina } from '@/assets/fonts'
type TitleProps = { type TitleProps = {
title: string; title: string;

View file

@ -1,5 +1,5 @@
import styles from './bannerText.module.css' import styles from './bannerText.module.css'
import { faustina, defaultFont } from '@/app/fonts' import { faustina, defaultFont } from '@/assets/fonts'
export const BannerText = () => { export const BannerText = () => {
return ( return (

View file

@ -1,5 +1,5 @@
import classNames from 'classnames' import classNames from 'classnames'
import { faustina } from '@/app/fonts' import { faustina } from '@/assets/fonts'
import styles from './styles.module.css' import styles from './styles.module.css'
import { Pill } from '@/components/Pill/Pill' import { Pill } from '@/components/Pill/Pill'

View file

@ -4,7 +4,7 @@ import { Input } from '@/components/Input/Input'
import { Button } from '@/components/Button/Button' import { Button } from '@/components/Button/Button'
import styles from "./styles.module.scss" import styles from "./styles.module.scss"
import classNames from 'classnames' import classNames from 'classnames'
import { send } from '@/app/actions' import { send } from '@/utils/actions'
import { useActionState } from 'react' import { useActionState } from 'react'
type ContactFormProps = { type ContactFormProps = {

View file

@ -8,6 +8,9 @@ import { PaginatedDocs } from 'payload'
export const fetchLastAnnouncement = async (parishId: string): Promise<Announcement | undefined> => { export const fetchLastAnnouncement = async (parishId: string): Promise<Announcement | undefined> => {
const date = new Date(); const date = new Date();
date.setDate(date.getDate() - 14) date.setDate(date.getDate() - 14)
const tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
tomorrow.setHours(23,59,59,59);
const query: any = { const query: any = {
and: [ and: [
@ -20,6 +23,11 @@ export const fetchLastAnnouncement = async (parishId: string): Promise<Announcem
date: { date: {
greater_than_equal: date.toISOString(), greater_than_equal: date.toISOString(),
} }
},
{
date: {
less_than_equal: tomorrow.toISOString()
}
} }
] ]

View file

@ -7,7 +7,10 @@ import { Calendar } from '@/payload-types'
*/ */
export const fetchLastCalendar = async (parishId: string): Promise<Calendar | undefined> => { export const fetchLastCalendar = async (parishId: string): Promise<Calendar | undefined> => {
const date = new Date(); const date = new Date();
date.setDate(date.getDate() - 14) date.setDate(date.getDate() - 14);
const tomorrow = new Date();
tomorrow.setDate(tomorrow.getDate() + 1);
tomorrow.setHours(23,59,59,59);
const query: any = { const query: any = {
and: [ and: [
@ -20,6 +23,11 @@ export const fetchLastCalendar = async (parishId: string): Promise<Calendar | u
date: { date: {
greater_than_equal: date.toISOString(), greater_than_equal: date.toISOString(),
} }
},
{
date: {
less_than_equal: tomorrow.toISOString()
}
} }
] ]