fix(islamic-website): update codebase to work with latest next-intl

- cleaup
haqq-network · Jan 3, 2024 · 6ab1061 · 6ab1061
1 parent 2f291c0
commit 6ab1061
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/apps/haqq-website/tsconfig.json b/apps/haqq-website/tsconfig.json
@@ -23,8 +23,7 @@
     "**/*.tsx",
     "**/*.js",
     "**/*.jsx",
-    "../../apps/haqq-website/.next/types/**/*.ts",
-    "../../dist/apps/haqq-website/.next/types/**/*.ts",
+    ".next/types/**/*.ts",
     "next-env.d.ts"
   ],
   "exclude": [

diff --git a/apps/islamic-website/app/[locale]/layout.tsx b/apps/islamic-website/app/[locale]/layout.tsx
@@ -87,6 +87,7 @@ export default async function LocaleLayout({
       >
         <body className="bg-islamic-bg-black font-alexandria flex min-h-screen flex-col text-white antialiased">
           {isScamBannerShow && <ScamBanner />}
+
           {isMobileUserAgent ? (
             <MobileHeader locale={locale} isBannerVisible={isScamBannerShow} />
           ) : (
@@ -95,9 +96,9 @@ export default async function LocaleLayout({
           <main className="flex-1">{children}</main>
           <Footer socialLinks={SOCIAL_LINKS} />
 
-          <div>
-            {VERCEL_ENV === 'production' && (
-              <script
+          {VERCEL_ENV === 'production' && (
+            <div>
+              <Script
                 async={true}
                 defer={true}
                 id="fb-pixel"
@@ -117,8 +118,6 @@ export default async function LocaleLayout({
                   `,
                 }}
               />
-            )}
-            {VERCEL_ENV === 'production' && (
               <Script
                 async={true}
                 defer={true}
@@ -134,10 +133,10 @@ export default async function LocaleLayout({
                   `,
                 }}
               />
-            )}
-            {VERCEL_ENV === 'production' && <CookieConsentModal />}
-            {VERCEL_ENV === 'production' && <Analytics mode="auto" />}
-          </div>
+              <CookieConsentModal />
+              <Analytics mode="auto" />
+            </div>
+          )}
         </body>
       </html>
     </NextIntlClientProvider>

diff --git a/apps/islamic-website/app/api/sentry-test/route.ts b/apps/islamic-website/app/api/sentry-test/route.ts
diff --git a/apps/islamic-website/constants.ts b/apps/islamic-website/constants.ts
@@ -9,5 +9,5 @@ export const VERCEL_ENV = process.env['VERCEL_ENV'];
 export const REVALIDATE_TIME = 300;
 export const FALCONER_ENDPOINT = process.env['FALCONER_ENDPOINT'];
 export const TURNSTILE_SITEKEY = process.env['TURNSTILE_SITEKEY'];
-export const SUPPORTED_LOCALES = ['en', 'ar', 'id'] as const;
+export const SUPPORTED_LOCALES: Readonly<string[]> = ['en', 'ar', 'id'];
 export const SITE_URL = 'https://islamiccoin.net';
diff --git a/apps/islamic-website/i18n.ts b/apps/islamic-website/i18n.ts
@@ -1,6 +1,13 @@
+import { notFound } from 'next/navigation';
 import { getRequestConfig } from 'next-intl/server';
+import { SUPPORTED_LOCALES } from './constants';
+
+export default getRequestConfig(async ({ locale }) => {
+  // Validate that the incoming `locale` parameter is valid
+  if (!SUPPORTED_LOCALES.includes(locale)) {
+    notFound();
+  }
 
-export default getRequestConfig(async ({ locale }: { locale: string }) => {
   return {
     messages: (await import(`./messages/${locale}.json`)).default,
   };

diff --git a/apps/islamic-website/middleware.ts b/apps/islamic-website/middleware.ts
@@ -5,6 +5,7 @@ export default createMiddleware({
   locales: SUPPORTED_LOCALES,
   defaultLocale: SUPPORTED_LOCALES[0],
   localePrefix: 'as-needed',
+  localeDetection: true,
 });
 
 export const config = {

diff --git a/apps/islamic-website/tsconfig.json b/apps/islamic-website/tsconfig.json
@@ -23,10 +23,8 @@
     "**/*.tsx",
     "**/*.js",
     "**/*.jsx",
-    "../../apps/islamic-website/.next/types/**/*.ts",
-    "../../dist/apps/islamic-website/.next/types/**/*.ts",
-    "next-env.d.ts",
-    ".next/types/**/*.ts"
+    ".next/types/**/*.ts",
+    "next-env.d.ts"
   ],
   "exclude": [
     "node_modules",