fix: link logic

tolocar-project · Oct 17, 2023 · 3f61ce1 · 3f61ce1
1 parent dafe1f4
commit 3f61ce1
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 25 deletions.
diff --git a/src/components/WideCardWrapper.astro b/src/components/WideCardWrapper.astro
@@ -3,7 +3,7 @@ import WideCardComponent from "./WideCard";
 import CommonUtils from "@util/CommonUtils";
 const { target, ...rest } = Astro.props;
 
-const baseUrl = CommonUtils.getBaseUrl(true);
+const baseUrl = CommonUtils.getBaseUrl(false);
 
 const prefixedTarget = target ? baseUrl + target : undefined;
 ---

diff --git a/src/layouts/AcademyContent.astro b/src/layouts/AcademyContent.astro
@@ -11,24 +11,24 @@ import { getParentPage } from "@util/ContentTransformer";
 import fs from "node:fs";
 import Giscus from "@components/Giscus.astro";
 import CommonUtils from "@util/CommonUtils";
+import LanguageUtils from "@util/LanguageUtils";
 import FooterCards from "@components/FooterCards.astro";
 
 const rawAcademyContent = await Astro.glob<AcademyPageFrontmatter>(
   "../pages/en/academy/*/*.mdx"
 );
 
-const baseUrl = CommonUtils.getBaseUrl(false);
 const { frontmatter, url, file, headings } = Astro.props;
 
+const baseUrl = CommonUtils.getBaseUrl(true);
+const localeFromUrl = LanguageUtils.getLocaleFromUrl(url, baseUrl);
+
+
 const statsMtime = fs.statSync(file).mtime;
 const editDate = new Date(statsMtime);
 
 const parentPage = getParentPage(rawAcademyContent, url);
 
-const localeFromUrl =
-  Astro?.url?.pathname.replace(baseUrl, "").split("/").filter(Boolean)[0] ||
-  "en";
-
 ---
 
 <BaseLayout frontmatter={frontmatter}>

diff --git a/src/layouts/AcademyIndex.astro b/src/layouts/AcademyIndex.astro
@@ -3,13 +3,12 @@ import FooterCards from "@components/FooterCards.astro";
 import BaseLayout from "./BaseLayout.astro";
 import { ContentSection } from "@components";
 import CommonUtils from "@util/CommonUtils";
+import LanguageUtils from "@util/LanguageUtils";
 const { frontmatter } = Astro.props;
 
 const baseUrl = CommonUtils.getBaseUrl(false);
 
-const localeFromUrl =
-  Astro?.url?.pathname.replace(baseUrl, "").split("/").filter(Boolean)[0] ||
-  "en";
+const localeFromUrl = LanguageUtils.getLocaleFromUrl(Astro.url, baseUrl);
 ---
 
 <BaseLayout footerGrey={true} frontmatter={frontmatter}>

diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
@@ -2,6 +2,7 @@
 import type { MarkdownLayoutProps } from "astro";
 import { Navigation, Footer } from "@components";
 import CommonUtils from "@util/CommonUtils";
+import LanguageUtils from "@util/LanguageUtils";
 import type { IMenuMarkdown } from "@interfaces/IMenu";
 import "../../base.css";
 
@@ -13,13 +14,9 @@ type Props = MarkdownLayoutProps<{
 
 const { frontmatter } = Astro.props;
 const path = Astro.url.pathname;
-const baseUrl = CommonUtils.getBaseUrl(false);
+const baseUrl = CommonUtils.getBaseUrl(true);
 
-const localeFromUrl = Astro?.url?.pathname
-  .replace(baseUrl, "")
-  .split("/")
-  .filter(Boolean)[0]
-  .toLowerCase();
+const localeFromUrl = LanguageUtils.getLocaleFromUrl(Astro.url, baseUrl);
 
 const rawMenus = await Astro.glob<IMenuMarkdown>("../pages/**/_menu.mdx");
 
@@ -42,6 +39,7 @@ const isProduction = import.meta.env.MODE === "production";
 <!doctype html>
 <html lang={localeFromUrl} class="scroll-smooth h-full">
   <head>
+    <base href={baseUrl} />
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href={"/favicon.png"} />
@@ -61,7 +59,6 @@ const isProduction = import.meta.env.MODE === "production";
         />
       )
     }
-    <base href={baseUrl} />
     <title>{frontmatter?.title} - Tolocar Project</title>
   </head>
   <body class="w-full font-inter antialiased h-full tracking-[-0.02em]">

diff --git a/src/layouts/RedirectToAcademyIndex.astro b/src/layouts/RedirectToAcademyIndex.astro
@@ -1,8 +1,9 @@
 ---
+import CommonUtils from "@util/CommonUtils";
 import GithubSlugger from "github-slugger";
 const { frontmatter } = Astro.props;
 
-const baseUrl = import.meta.env.BASE_URL;
+const baseUrl = CommonUtils.getBaseUrl(true);
 const slugger = new GithubSlugger();
 const targetSlug = slugger.slug(frontmatter.title);
 const targetUrl = baseUrl + "academy/#" + targetSlug;

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -2,7 +2,7 @@
   import LanguageUtils from "@util/LanguageUtils";
   import CommonUtils from "@util/CommonUtils";
   // Redirect user to previously set language preference (or get it from the browser)
-  const baseUrl = CommonUtils.getBaseUrl(true);
+  const baseUrl = CommonUtils.getBaseUrl(false);
   const preferredLanguage =
     LanguageUtils.getOrGuessInitialLanguageFromBrowser();
   window.location.pathname = `${baseUrl}/${preferredLanguage.toLowerCase()}`;

diff --git a/src/util/CommonUtils.ts b/src/util/CommonUtils.ts
@@ -2,13 +2,15 @@ const CommonUtils = {
   /**
    * Return the base URL of the current page with or without trailing slash depending on the given parameter
    */
-  getBaseUrl: (removeTrailingSlash?: boolean): string => {
+  getBaseUrl: (trailingSlash: boolean = false): string => {
     const baseUrl = import.meta.env.BASE_URL;
-    if (removeTrailingSlash) {
-      return baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
-    }
+    const endsWithSlash = baseUrl.endsWith("/");
+    // Add slash
+    if (!endsWithSlash && trailingSlash) return baseUrl + "/";
+    // Remove slash
+    else if (endsWithSlash && !trailingSlash) return baseUrl.slice(0, -1);
     return baseUrl;
-  }
+  },
 };
 
 export default CommonUtils;
diff --git a/src/util/LanguageUtils.ts b/src/util/LanguageUtils.ts
@@ -24,7 +24,16 @@ export const LanguageUtils = {
   },
   setLanguage: function (newLanguage: string) {
     localStorage.setItem(STORAGE_KEY, newLanguage);
-  }
+  },
+  getLocaleFromUrl: function (url: URL, baseUrl: string) {
+    return (
+      url?.pathname
+        .replace(baseUrl, "")
+        .split("/")
+        .filter(Boolean)[0]
+        .toLowerCase() || "en"
+    );
+  },
 };
 
-export default LanguageUtils;
+export default LanguageUtils;