bugfix(website): fix broken links (#844)

socialincome-san · Jun 2, 2024 · 31d0d27 · 31d0d27
1 parent 239ccc1
commit 31d0d27
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/website/src/app/[lang]/[region]/(website)/(home)/(sections)/active-campaign.tsx b/website/src/app/[lang]/[region]/(website)/(home)/(sections)/active-campaign.tsx
@@ -1,18 +1,18 @@
-import { WebsiteLanguage } from '@/i18n';
+import { DefaultParams } from '@/app/[lang]/[region]';
 import { BellAlertIcon } from '@heroicons/react/24/solid';
 import { Translator } from '@socialincome/shared/src/utils/i18n';
 import { Badge, BaseContainer, Typography } from '@socialincome/ui';
 import Link from 'next/link';
 
-export async function Campaign({ lang }: { lang: WebsiteLanguage }) {
+export async function Campaign({ params: { lang, region } }: { params: DefaultParams }) {
 	const translator = await Translator.getInstance({
 		language: lang,
 		namespaces: ['website-donate'],
 	});
 
 	return (
 		<BaseContainer className="mb-8 flex flex-col items-center justify-center sm:mb-0">
-			<Link href="https://socialincome.org/campaign/MZmXEVHlDjOOFOMk82jW" className="group">
+			<Link href={`/${lang}/${region}/campaign/MZmXEVHlDjOOFOMk82jW`} className="group">
 				<Badge variant="outline" className="flex-shrink-0">
 					<Typography
 						size="md"
@@ -29,7 +29,7 @@ export async function Campaign({ lang }: { lang: WebsiteLanguage }) {
 						weight="medium"
 						className="group-hover:text-primary-foreground mr-4 flex items-center p-1"
 					>
-						Rebuilding Lives by Ismatu&nbsp;Gwendolyn
+						Rebuilding Lives by Ismatu Gwendolyn
 					</Typography>
 				</Badge>
 			</Link>

diff --git a/website/src/app/[lang]/[region]/(website)/(home)/page.tsx b/website/src/app/[lang]/[region]/(website)/(home)/page.tsx
@@ -16,7 +16,7 @@ export default async function Page({ params: { lang, region } }: DefaultPageProp
 	const vimeoVideoId = Number(translator.t('id.video-02'));
 	return (
 		<>
-			<Campaign lang={lang} />
+			<Campaign params={{ lang, region }} />
 			<Hero lang={lang} region={region} />
 			<Video lang={lang} />
 			<WhatWouldChange

diff --git a/website/src/app/[lang]/[region]/(website)/newsletter/page.tsx b/website/src/app/[lang]/[region]/(website)/newsletter/page.tsx
@@ -11,9 +11,9 @@ export async function generateMetadata({ params }: DefaultPageProps) {
 	return getMetadata(params.lang, 'website-newsletter');
 }
 
-export default async function Page({ params }: DefaultPageProps) {
+export default async function Page({ params: { lang, region } }: DefaultPageProps) {
 	const translator = await Translator.getInstance({
-		language: params.lang,
+		language: lang,
 		namespaces: ['website-newsletter'],
 	});
 
@@ -42,7 +42,10 @@ export default async function Page({ params }: DefaultPageProps) {
 						<Typography className="mt-4">{translator.t('updates.description-2')}</Typography>
 						<hr className="bg-border my-8 h-px border-0" />
 						<Typography>{translator.t('updates.description-3')}</Typography>
-						<Link href="/about-us#team" className="hover:bg-muted mt-4 flex items-center rounded-full p-2">
+						<Link
+							href={`/${lang}/${region}/about-us#team`}
+							className="hover:bg-muted mt-4 flex items-center rounded-full p-2"
+						>
 							<Image
 								alt="Avatar"
 								src={aurelieImage}
@@ -62,8 +65,8 @@ export default async function Page({ params }: DefaultPageProps) {
 							{translator.t('updates.form-title')}
 						</Typography>
 						<SubscriptionInfoForm
-							lang={params.lang}
-							region={params.region}
+							lang={lang}
+							region={region}
 							translations={{
 								firstname: translator.t('updates.firstname'),
 								email: translator.t('updates.email'),

diff --git a/website/src/metadata.ts b/website/src/metadata.ts
@@ -29,11 +29,11 @@ export async function getMetadata(
 		// https://nextjs.org/docs/app/api-reference/functions/generate-metadata
 		metadataBase: null,
 		alternates: {
-			canonical: '/',
+			canonical: '/en/int',
 			languages: {
 				en: '/en/int',
 				de: '/de/int',
-				'de-CH': '/de-ch/',
+				'de-CH': '/de/ch/',
 			},
 		},
 		openGraph: {