some middleware fixes

Author: emilie-chen

app/[lang]/_components/FloatingNavCover.tsx

@@ -12,7 +12,7 @@ const FloatingNavCover = async ({
     return (
         <div
             className="fixed bottom-6 left-1/2 transform -translate-x-1/2 p-4 bg-white rounded-xl shadow-lg gt-sm:flex lt-sm:flex-col">
-            <a href="/about"
+            <a href={`/${params.lang}/about`}
                className="inline-flex justify-center items-center mx-auto py-3 px-3 gt-lg:px-10 gt-lg:w-52 lt-sm:w-72 text-base font-medium text-center text-black rounded-lg bg-amber-100 hover:bg-amber-200 focus:bg-amber-200 dark:focus:bg-amber-400">
                 {learn_more}
             </a>

app/[lang]/page.tsx

@@ -10,6 +10,9 @@ export default function Home({
 								 params
 							 }: {	params: { lang: Language }
 							 }) {
+	if (params.lang !== 'en' && params.lang !== 'fr') {
+		params.lang = 'en';
+	}
 	return (
 		<div className="flex flex-col gt-lg:justify-center w-screen h-screen">
 			<Image src={"/Banner_Unbranded_2024.png"} alt={"McGameJam 2024"}

middleware.ts.a middleware.ts

@@ -18,7 +18,7 @@ function getLocale(request: NextRequest): string | undefined {
 }
 
 export function middleware(request: NextRequest) {
-    console.log("request.url ", request.url);
+    //console.log("request.url ", request.url);
     const pathname = new URL(request.url).pathname ? new URL(request.url).pathname : `/${new URL(request.url).pathname}`;
     // check if the pathname is a resource file
     const isResourceFile = pathname.match(/\.[0-9a-z]+$/i)
@@ -27,22 +27,36 @@ export function middleware(request: NextRequest) {
         locale => !pathname.startsWith(`/${locale}`) && pathname !== `/${locale}`
     )
 
-    console.log("pathnameIsMissingLocale ", pathnameIsMissingLocale);
-    console.log("pathname ", pathname);
+    // console.log("request.url ", request);
+
+    // console.log("pathnameIsMissingLocale ", pathnameIsMissingLocale);
+    // console.log("pathname ", pathname);
 
     // Redirect if there is no locale
     if (pathnameIsMissingLocale) {
-        const locale = getLocale(request)
-        return NextResponse.redirect(
-            new URL(
-                `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`,
-                request.url
+        const locale = getLocale(request);
+        if (locale === 'fr') {
+            console.log("redirecting " + pathname + " to " + `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`);
+            return NextResponse.redirect(
+                new URL(
+                    `/${locale}${pathname.startsWith('/') ? '' : '/'}${pathname}`,
+                    request.url
+                )
+            )
+        } else {
+            //console.log("rewriting " + pathname + " to " + `/en${pathname.startsWith('/') ? '' : '/'}${pathname}`);
+            return NextResponse.redirect(
+                new URL(
+                    `/fr${pathname.startsWith('/') ? '' : '/'}${pathname}`,
+                    request.url
+                )
             )
-        )
+        }
     }
 }
 
 export const config = {
-    // Matcher ignoring `/_next/` and `/api/`
-    matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)']
+    matcher: [
+        '/:path*'
+    ]
 }