diff --git a/src/assets/fonts.ts b/src/assets/fonts.ts index e8eac78..8aee303 100644 --- a/src/assets/fonts.ts +++ b/src/assets/fonts.ts @@ -22,7 +22,7 @@ const cairo = Cairo({ const faustina = Faustina({ subsets: ['latin'], display: 'swap' }) const lato = Lato({ subsets: ['latin'], - weight: ['300', '400', '900'], + weight: ['300', '400', '700', '900'], display: 'swap' }) const merriweather = Merriweather({ diff --git a/src/components/ChurchIcon/ChurchIcon.stories.tsx b/src/components/ChurchIcon/ChurchIcon.stories.tsx index fdf93ab..b65642b 100644 --- a/src/components/ChurchIcon/ChurchIcon.stories.tsx +++ b/src/components/ChurchIcon/ChurchIcon.stories.tsx @@ -56,4 +56,67 @@ export const StAnna: Story = { stroke: 3, color: "#426156", }, +} + +export const StJoseph: Story = { + args: { + church: "joseph", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StFranziskus: Story = { + args: { + church: "franziskus", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StAntonius: Story = { + args: { + church: "antonius", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StMarien: Story = { + args: { + church: "marien", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StMaria: Story = { + args: { + church: "maria", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StAntoniusFalkenberg: Story = { + args: { + church: "antoniusFalkenberg", + style: "outline", + stroke: 3, + color: "#426156", + }, +} + +export const StJohannesNepomuk: Story = { + args: { + church: "johannesNepomuk", + style: "outline", + stroke: 3, + color: "#426156", + }, } \ No newline at end of file diff --git a/src/components/ChurchIcon/ChurchIcon.tsx b/src/components/ChurchIcon/ChurchIcon.tsx index 9cd3780..1d6d200 100644 --- a/src/components/ChurchIcon/ChurchIcon.tsx +++ b/src/components/ChurchIcon/ChurchIcon.tsx @@ -1,5 +1,17 @@ -export type Church = "clara" | "christophorus" | "richard" | "eduard" | "anna" +export type Church = + | 'clara' + | 'christophorus' + | 'richard' + | 'eduard' + | 'anna' + | 'joseph' + | 'franziskus' + | 'antonius' + | 'marien' + | 'maria' + | 'antoniusFalkenberg' + | 'johannesNepomuk' type ChurchIconProps = { church: Church @@ -45,6 +57,124 @@ export const ChurchIcon = ({church, style, stroke, color}: ChurchIconProps) => { } + if (church === 'joseph') { + return ( + + + + + + + ) + } + + if (church === 'franziskus') { + return ( + + + + + + ) + } + + if (church === 'antonius') { + return ( + + + + + + + + + + ) + } + + if (church === 'marien') { + return ( + + + + + + + + + ) + } + + if (church === 'maria') { + return ( + + + + + + ) + } + + if (church === 'antoniusFalkenberg') { + return ( + + + + + + + + + ) + } + + if (church === 'johannesNepomuk') { + return ( + + + + + + + + ) + } + return ( diff --git a/src/components/ChurchIcon/anna_full.svg b/src/components/ChurchIcon/berlin/anna_full.svg similarity index 100% rename from src/components/ChurchIcon/anna_full.svg rename to src/components/ChurchIcon/berlin/anna_full.svg diff --git a/src/components/ChurchIcon/christophorus_full.svg b/src/components/ChurchIcon/berlin/christophorus_full.svg similarity index 100% rename from src/components/ChurchIcon/christophorus_full.svg rename to src/components/ChurchIcon/berlin/christophorus_full.svg diff --git a/src/components/ChurchIcon/clara_full.svg b/src/components/ChurchIcon/berlin/clara_full.svg similarity index 100% rename from src/components/ChurchIcon/clara_full.svg rename to src/components/ChurchIcon/berlin/clara_full.svg diff --git a/src/components/ChurchIcon/eduard_full.svg b/src/components/ChurchIcon/berlin/eduard_full.svg similarity index 100% rename from src/components/ChurchIcon/eduard_full.svg rename to src/components/ChurchIcon/berlin/eduard_full.svg diff --git a/src/components/ChurchIcon/richard_full.svg b/src/components/ChurchIcon/berlin/richard_full.svg similarity index 100% rename from src/components/ChurchIcon/richard_full.svg rename to src/components/ChurchIcon/berlin/richard_full.svg diff --git a/src/components/ChurchIcon/chemnitz/St.Antonius,Falkenberg.svg b/src/components/ChurchIcon/chemnitz/St.Antonius,Falkenberg.svg new file mode 100644 index 0000000..b0195aa --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Antonius,Falkenberg.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.Antonius.svg b/src/components/ChurchIcon/chemnitz/St.Antonius.svg new file mode 100644 index 0000000..dfe49f7 --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Antonius.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.Franziskus.svg b/src/components/ChurchIcon/chemnitz/St.Franziskus.svg new file mode 100644 index 0000000..41d0e23 --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Franziskus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.JohannesNepomuk.svg b/src/components/ChurchIcon/chemnitz/St.JohannesNepomuk.svg new file mode 100644 index 0000000..a33eca6 --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.JohannesNepomuk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.Joseph.svg b/src/components/ChurchIcon/chemnitz/St.Joseph.svg new file mode 100644 index 0000000..dc3faeb --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Joseph.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.Maria.svg b/src/components/ChurchIcon/chemnitz/St.Maria.svg new file mode 100644 index 0000000..39f0bf2 --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Maria.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/ChurchIcon/chemnitz/St.Marien.svg b/src/components/ChurchIcon/chemnitz/St.Marien.svg new file mode 100644 index 0000000..12df64f --- /dev/null +++ b/src/components/ChurchIcon/chemnitz/St.Marien.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/MassTable/MassRow.tsx b/src/components/MassTable/MassRow.tsx deleted file mode 100644 index b00a1e5..0000000 --- a/src/components/MassTable/MassRow.tsx +++ /dev/null @@ -1,13 +0,0 @@ -import styles from "./massrow.module.scss" - -type MassRowProps = { - children: React.ReactNode; -} - -export const MassRow = ({children}: MassRowProps) => { - return ( -
- {children} -
- ) -} \ No newline at end of file diff --git a/src/components/MassTable/MassTable.tsx b/src/components/MassTable/MassTable.tsx index 25ae11f..0a0cc29 100644 --- a/src/components/MassTable/MassTable.tsx +++ b/src/components/MassTable/MassTable.tsx @@ -18,7 +18,7 @@ export const MassTable = ({ location, masses }: MassTableProps) => { {location} -
+
diff --git a/src/components/MassTable/massrow.module.scss b/src/components/MassTable/massrow.module.scss deleted file mode 100644 index 79b65e2..0000000 --- a/src/components/MassTable/massrow.module.scss +++ /dev/null @@ -1,6 +0,0 @@ -.row { - display: flex; - gap: 30px; - justify-content: center; - flex-wrap: wrap; -} \ No newline at end of file diff --git a/src/components/MassTable/styles.module.scss b/src/components/MassTable/styles.module.scss index e353045..e1eb3ed 100644 --- a/src/components/MassTable/styles.module.scss +++ b/src/components/MassTable/styles.module.scss @@ -17,8 +17,7 @@ .location { font-size: 22px; - font-weight: bold; - margin-bottom: 10px; + font-weight: 700; } .cancelled { @@ -44,11 +43,8 @@ .table { width: 200px; - display: flex; - flex-direction: column; - align-items: center; -} - -.church { - margin-bottom: 20px; + display: grid; + grid-row: span 3; + grid-template-rows: subgrid; + justify-items: center; } diff --git a/src/compositions/Blocks/MassTimesBlock.tsx b/src/compositions/Blocks/MassTimesBlock.tsx index 0e78312..bd2c23c 100644 --- a/src/compositions/Blocks/MassTimesBlock.tsx +++ b/src/compositions/Blocks/MassTimesBlock.tsx @@ -5,7 +5,7 @@ import { fetchLastCalendars } from '@/fetch/calendar' import { perParish } from '@/utils/dto/perParish' import { Section } from '@/components/Section/Section' import { Title } from '@/components/Title/Title' -import { MassRow } from '@/components/MassTable/MassRow' +import { MassGrid } from '@/components/MassTable/MassGrid' import { MassTable } from '@/components/MassTable/MassTable' import { PopupButton } from '@/components/PopupButton/PopupButton' import { Button } from '@/components/Button/Button' @@ -67,7 +67,7 @@ export async function MassTimesBlock({ />
- + {worshipPerLocation.map((value) => ( ))} - +
diff --git a/src/pageComponents/Home/Home.tsx b/src/pageComponents/Home/Home.tsx index 79f22c1..33607e4 100644 --- a/src/pageComponents/Home/Home.tsx +++ b/src/pageComponents/Home/Home.tsx @@ -5,7 +5,7 @@ import { Section } from '@/components/Section/Section' import { MainText } from '@/components/MainText/MainText' import { HR } from '@/components/HorizontalRule/HorizontalRule' import { Title } from '@/components/Title/Title' -import { MassRow } from '@/components/MassTable/MassRow' +import { MassGrid } from '@/components/MassTable/MassGrid' import { MassTable } from '@/components/MassTable/MassTable' import { ImageCardSlider } from '@/compositions/ImageCardSlider/ImageCardSlider' import { blogToSlides } from '@/utils/dto/blog' @@ -109,9 +109,9 @@ export const Home = ({ />
- + {worshipPerLocation.map(value => )} - +
diff --git a/src/utils/church.ts b/src/utils/church.ts index 039761c..5f3cbad 100644 --- a/src/utils/church.ts +++ b/src/utils/church.ts @@ -2,27 +2,60 @@ * Convert string to a church * @param s */ -export const church = (s: string) : "anna" | "christophorus" | "richard" | "eduard" | "clara" => { +export const church = (s: string) : "anna" | "christophorus" | "richard" | "eduard" | "clara" | "joseph" | "franziskus" | "antonius" | "marien" | "maria" | "antoniusFalkenberg" | "johannesNepomuk" => { + const lower = s.toLowerCase() - if (s.toLowerCase().includes("anna")) { + + // Berlin - Heilige drei Koenige + if (lower.includes("anna")) { return "anna" } - if (s.toLowerCase().includes("christophorus")) { + if (lower.includes("christophorus")) { return "christophorus" } - if (s.toLowerCase().includes("richard")) { + if (lower.includes("richard")) { return "richard" } - if (s.toLowerCase().includes("eduard")) { + if (lower.includes("eduard")) { return "eduard" } - if (s.toLowerCase().includes("clara")) { + if (lower.includes("clara")) { return "clara" } + // Chemnitz + + if (lower.includes("joseph")) { + return "joseph" + } + + if (lower.includes("franziskus")) { + return "franziskus" + } + + if (lower.includes("falkenberg")) { + return "antoniusFalkenberg" + } + + if (lower.includes("antonius")) { + return "antonius" + } + + if (lower.includes("marien")) { + return "marien" + } + + if (lower.includes("maria")) { + return "maria" + } + + if (lower.includes("johannes") || lower.includes("nepomuk")) { + return "johannesNepomuk" + } + return "clara"; } \ No newline at end of file