Join site configs for languages, add language to URL

vivid-planet · Jul 11, 2024 · b44b43a · b44b43a
1 parent 62c308b
commit b44b43a
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 46 deletions.
diff --git a/admin/src/App.tsx b/admin/src/App.tsx
@@ -58,7 +58,10 @@ export function App() {
                         value={{
                             configs: config.sitesConfig,
                             resolveSiteConfigForScope: (configs, scope: ContentScope) => {
-                                const siteConfig = configs.find((config) => config.contentScope.domain === scope.domain);
+                                const siteConfig = configs.find((config) => {
+                                    return config.contentScope.domain === scope.domain && config.contentScope.language === scope.language;
+                                });
+
                                 if (!siteConfig) throw new Error(`siteConfig not found for domain ${scope.domain}`);
                                 return {
                                     url: siteConfig.url,

diff --git a/admin/src/documents/pages/EditPage.tsx b/admin/src/documents/pages/EditPage.tsx
@@ -129,7 +129,7 @@ export const EditPage: React.FC<Props> = ({ id, category }) => {
                             startIcon={<Preview />}
                             disabled={!pageState}
                             onClick={() => {
-                                openSitePreviewWindow(pageState.path, contentScopeMatch.url);
+                                openSitePreviewWindow(`/${scope.language}${pageState.path}`, contentScopeMatch.url);
                             }}
                             color="info"
                         >

diff --git a/site-configs.ts b/site-configs.ts
@@ -3,7 +3,11 @@ import { SiteConfig } from "./site-configs.d";
 
 // Types for files in site-configs/
 type Environment = "local" | "dev" | "test" | "staging" | "prod";
-export type Config = Omit<SiteConfig, "domains"> & {
+export type Config = Omit<SiteConfig, "domains" | "contentScope"> & {
+    contentScope: {
+        domain: string;
+        languages: string[];
+    }
     domains: {
         preliminary?: string;
     } & {
@@ -17,17 +21,25 @@ const getSiteConfigs = async (env: Environment): Promise<SiteConfig[]> => {
 
     const files = (await fs.readdir(path)).filter((file) => !file.startsWith("_"));
     const imports = (await Promise.all(files.map((file) => import(`${path}/${file}`)))) as { default: Config }[];
-    return imports.map((imprt, index) => {
+    return imports.flatMap((imprt, index) => {
         const { domains, ...site } = imprt.default;
+        const languages = site.contentScope.languages
 
-        const ret: SiteConfig = {
-            ...site,
-            domains: {
-                main: domains[env] ?? "",
-                preliminary: env === "prod" ? domains["preliminary"] : undefined,
-            },
-            preloginEnabled: env === "prod" ? site.preloginEnabled : true,
-        };
+        const ret = languages.map((language):SiteConfig => {
+            return {
+                ...site,
+                name: `${site.name} ${language.toUpperCase()}`,
+                contentScope: {
+                    domain: site.contentScope.domain,
+                    language
+                },
+                domains: {
+                    main: `${domains[env]}/${language}` ?? "",
+                    preliminary: env === "prod" ? `${domains["preliminary"]}/${language}` : undefined,
+                },
+                preloginEnabled: env === "prod" ? site.preloginEnabled : true,
+            }
+        })
 
         return ret;
     });

diff --git a/site-configs/main-en.ts b/site-configs/main-en.ts
diff --git a/site-configs/main-de.ts → site-configs/main.ts b/site-configs/main-de.ts → site-configs/main.ts
@@ -1,10 +1,10 @@
 import { Config } from "../site-configs";
 
 export default {
-    name: "Starter Main DE",
+    name: "Starter Main",
     contentScope: {
         domain: "main",
-        language: "de",
+        languages: ["en", "de"],
     },
     domains: {
         local: "localhost:3000",

diff --git a/site-configs/secondary-en.ts b/site-configs/secondary-en.ts
diff --git a/site-configs/secondary-de.ts → site-configs/secondary.ts b/site-configs/secondary-de.ts → site-configs/secondary.ts
@@ -1,10 +1,10 @@
 import { Config } from "../site-configs";
 
 export default {
-    name: "Starter Secondary DE",
+    name: "Starter Secondary",
     contentScope: {
         domain: "secondary",
-        language: "de",
+        languages: ["en", "de"],
     },
     domains: {
         local: "secondary.localhost:3000",

diff --git a/site/src/app/[[...path]]/layout.tsx → site/src/app/[lang]/[[...path]]/layout.tsx b/site/src/app/[[...path]]/layout.tsx → site/src/app/[lang]/[[...path]]/layout.tsx
diff --git a/site/src/app/[[...path]]/page.tsx → site/src/app/[lang]/[[...path]]/page.tsx b/site/src/app/[[...path]]/page.tsx → site/src/app/[lang]/[[...path]]/page.tsx
diff --git a/site/src/config.ts b/site/src/config.ts
@@ -10,9 +10,10 @@ export type { SiteConfig };
 
 export async function getSiteConfig() {
     const host = getHost(headers());
+    const language = headers().get("x-current-language");
+    const domain = `${host}/${language}`;
 
-    let siteConfig = getSiteConfigs().find((siteConfig) => siteConfig.domains.main === host || siteConfig.domains.preliminary === host);
-
+    let siteConfig = getSiteConfigs().find((siteConfig) => siteConfig.domains.main === domain || siteConfig.domains.preliminary === domain);
     if (!siteConfig) {
         const preview = await previewParams();
         if (preview && preview.scope) {

diff --git a/site/src/middleware.ts b/site/src/middleware.ts
@@ -9,24 +9,32 @@ import { getSiteConfigs } from "./siteConfigs";
 export async function middleware(request: NextRequest) {
     const headers = request.headers;
     const host = getHost(headers);
+    const { pathname } = new URL(request.url);
+    const language = pathname.split("/")?.[1] ?? "";
+
+    if (!language) {
+        return NextResponse.redirect(new URL("/en", request.url));
+    }
+    headers.set("x-current-language", language);
+
+    const domain = `${host}/${language}`;
 
     // Site-Preview is handled in getSiteConfigs since draftMode() is not set yet in middleware (https://github.com/vercel/next.js/issues/52080)
 
     // Redirect to Main Host
-    const siteConfig = getSiteConfigs().find((siteConfig) => siteConfig.domains.main === host || siteConfig.domains.preliminary === host);
+    const siteConfig = getSiteConfigs().find((siteConfig) => siteConfig.domains.main === domain || siteConfig.domains.preliminary === domain);
     if (!siteConfig) {
         const redirectSiteConfig = getSiteConfigs().find(
             (siteConfig) =>
-                siteConfig.domains.additional?.includes(host) || (siteConfig.domains.pattern && host.match(new RegExp(siteConfig.domains.pattern))),
+                siteConfig.domains.additional?.includes(domain) ||
+                (siteConfig.domains.pattern && domain.match(new RegExp(siteConfig.domains.pattern))),
         );
         if (redirectSiteConfig) {
             return NextResponse.redirect(redirectSiteConfig.url);
         }
         return; // Fallback for Site-Preview
     }
 
-    const { pathname } = new URL(request.url);
-
     const redirects = await createRedirects();
 
     const redirect = redirects.get(pathname);