Skip to content

Commit

Permalink
Merge branch 'dev' into events-redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
Haliax committed Dec 17, 2024
2 parents f37eea4 + 75de5cb commit 6fc29a0
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 11 deletions.
16 changes: 14 additions & 2 deletions components/common/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@ const Footer = (): ReactElement => {
<footer className="mb-auto" key="footer">
<div className="mt-5 bg-black py-2">
<div className="text-center font-serif font-bold text-white">
<Link
href="/anfahrt"
aria-label={
locale !== 'en'
? 'Alle rechtlichen Angaben sind hier zu finden'
: 'All legal information can be found here'
}
className="font-serif text-base font-bold hover:text-orange-500 md:text-lg"
>
{locale !== 'en' ? 'Anfahrt' : 'Arrival'}
</Link>
<span className="px-1 sm:px-2">|</span>
<Link
href="/impressum"
aria-label={
Expand All @@ -68,7 +80,7 @@ const Footer = (): ReactElement => {
>
{locale !== 'en' ? 'Impressum' : 'Imprint'}
</Link>
<span className="px-2">|</span>
<span className="px-1 sm:px-2">|</span>
<Link
href="/datenschutz"
aria-label={
Expand All @@ -80,7 +92,7 @@ const Footer = (): ReactElement => {
>
{locale !== 'en' ? 'Datenschutz' : 'Privacy Policy'}
</Link>
<span className="px-2">|</span>
<span className="px-1 sm:px-2">|</span>
<Link
href="/kontakt"
aria-label={
Expand Down
2 changes: 1 addition & 1 deletion components/layout/header/HeaderBarDesktop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
import type { ReactElement } from 'react';
import HeaderBanner from '@/components/layout/header/HeaderBanner';
import { DesktopNavigationItems } from '@/components/layout/navigation/desktop/DesktopNavigationItems';
import DesktopNavigationLink from '@/components/layout/navigation/desktop/DesktopNavigationLink';
import { DesktopNavigationLink } from '@/components/layout/navigation/desktop/DesktopNavigationLink';
import Heart from '@/components/svg/Heart';

const HeaderBarDesktop = (): ReactElement => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,9 @@ export const DesktopNavigationItems = new Array<DesktopNavigationItemProps>(
labelDe: 'Aktuelles',
labelEn: 'News',
},
{
link: '/support',
labelDe: 'Unterstützen',
labelEn: 'Support us',
},
);
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export interface DesktopNavigationItemLocaleProps {
subLabel?: string;
}

const DesktopNavigationLink = ({
export const DesktopNavigationLink = ({
link,
label,
subLabel,
Expand All @@ -29,5 +29,3 @@ const DesktopNavigationLink = ({
</Link>
);
};

export default DesktopNavigationLink;
14 changes: 9 additions & 5 deletions components/layout/navigation/mobile/MobileNavigationItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@ const MobileNavigationItems = (): ReactElement => {
</div>
</MobileNavigationLink>

<MobileNavigationLink href="/news" color={colors[5 % colors.length]!}>
Aktuelles
<MobileNavigationLink href="/news" color={colors[4 % colors.length]!}>
{locale === 'en' ? 'News' : 'Aktuelles'}
</MobileNavigationLink>

<MobileNavigationLink href="/quartier" color={colors[4 % colors.length]!}>
<MobileNavigationLink href="/support" color={colors[5 % colors.length]!}>
{locale === 'en' ? 'Support us' : 'Unterstützen'}
</MobileNavigationLink>

<MobileNavigationLink href="/quartier" color={colors[6 % colors.length]!}>
<div className="leading-4">
{locale === 'en' ? 'Neighbourhood work' : 'Quartiersarbeit'}
<span className="text-sm">
Expand All @@ -46,7 +50,7 @@ const MobileNavigationItems = (): ReactElement => {
</div>
</MobileNavigationLink>

<MobileNavigationLink href="/quartier/b-side-cafe" color={colors[5 % colors.length]!}>
<MobileNavigationLink href="/quartier/b-side-cafe" color={colors[7 % colors.length]!}>
<div className="leading-4">
B-Side Café
<span className="text-sm">
Expand All @@ -56,7 +60,7 @@ const MobileNavigationItems = (): ReactElement => {
</div>
</MobileNavigationLink>

<MobileNavigationLink href="/kontakt" color={colors[6 % colors.length]!}>
<MobileNavigationLink href="/kontakt" color={colors[8 % colors.length]!}>
{locale === 'en' ? 'Contact' : 'Kontakt'}
</MobileNavigationLink>

Expand Down

0 comments on commit 6fc29a0

Please sign in to comment.