diff --git a/ui/src/components/containers/base-container.tsx b/ui/src/components/containers/base-container.tsx index ba4f1b77d..bef37fae1 100644 --- a/ui/src/components/containers/base-container.tsx +++ b/ui/src/components/containers/base-container.tsx @@ -1,17 +1,15 @@ import React from 'react'; -import { twMerge } from 'tailwind-merge'; -import { BackgroundColor } from '../../interfaces/color'; type BaseContainerProps = { - backgroundColor?: BackgroundColor; + baseClassNames?: string; } & React.HTMLAttributes; export const BaseContainer = React.forwardRef( - ({ children, className, backgroundColor, ...props }, ref) => { + ({ children, className, baseClassNames, ...props }, ref) => { return ( -
+
-
+
{children}
diff --git a/website/src/app/[lang]/[region]/(website)/arts/section-2.tsx b/website/src/app/[lang]/[region]/(website)/arts/section-2.tsx index d2ff11153..d8a105708 100644 --- a/website/src/app/[lang]/[region]/(website)/arts/section-2.tsx +++ b/website/src/app/[lang]/[region]/(website)/arts/section-2.tsx @@ -12,7 +12,7 @@ export default async function Section2({ params }: DefaultPageProps) { const cards = translator.t(`section-2.cards`); return ( - + {translator.t(`section-2.topic`)} diff --git a/website/src/components/footer/footer.tsx b/website/src/components/footer/footer.tsx index b99077efa..3a7c57ba9 100644 --- a/website/src/components/footer/footer.tsx +++ b/website/src/components/footer/footer.tsx @@ -1,9 +1,4 @@ import { DefaultParams } from '@/app/[lang]/[region]'; -import { FooterClient } from '@/components/footer/footer-client'; -import { SILogo } from '@/components/logos/si-logo'; -import { WebsiteLanguage, websiteRegions } from '@/i18n'; -import { DocumentTextIcon, InformationCircleIcon, UserCircleIcon } from '@heroicons/react/24/solid'; -import { SiFacebook, SiGithub, SiInstagram, SiLinkedin, SiMaildotru, SiX } from '@icons-pack/react-simple-icons'; import { Translator } from '@socialincome/shared/src/utils/i18n'; import { BaseContainer, Typography } from '@socialincome/ui'; import Link from 'next/link'; @@ -20,7 +15,7 @@ function FooterLink({ label, url, Icon, target = '_self' }: FooterLinkProps) { return ( {Icon && } - + {label} @@ -33,82 +28,31 @@ export default async function Footer({ lang, region }: DefaultParams) { namespaces: ['common', 'website-common', 'website-me'], }); - const supportedTranslatedLanguages = (['de', 'en', 'it', 'fr'] as WebsiteLanguage[]).map((lang) => { - return { translation: translator.t(`languages.${lang}`), code: lang }; - }); - const supportedTranslatedCountries = websiteRegions.map((region) => { - return { translation: translator.t(`regions.${region}`), code: region }; - }); - return ( - +
-
- -
- -
-
-
- + {translator.t('footer.follow-us')} - - - - - - + + + + + +
- + {translator.t('footer.resources')} - - - + + +
- + {translator.t('navigation.our-work')}
- + {translator.t('navigation.about-us')}
-
- -
);