Merge pull request #11 from scroll-tech/add-redirects

remove docs in path and add redirects

Author: dghelm

src/components/LeftSidebar/LeftSidebar.astro

@@ -58,9 +58,11 @@ const currentPageMatch = removeSlashes(currentPage.slice(1))
                   <>
                     <li class="nav-link">
                       <a
-                        href={isExternal(child.url) ? `${child.url}` : localizePath("/docs/" + child.url)}
+                        href={isExternal(child.url) ? `${child.url}` : localizePath(child.url)}
                         target={isExternal(child.url) ? "_blank" : "_self"}
-                        aria-current={`${currentPage === localizePath("/docs/" + child.url) ? "page" : "false"}`}
+                        aria-current={`${
+                          currentPageMatch === removeSlashes(localizePath(child.url)) ? "page" : "false"
+                        }`}
                       >
                         {child.title}
                         {isExternal(child.url) && (
@@ -77,10 +79,10 @@ const currentPageMatch = removeSlashes(currentPage.slice(1))
                         {child.children.map((childItem) => (
                           <li class="nav-link nested">
                             <a
-                              href={isExternal(childItem.url) ? childItem.url : localizePath("/docs/" + childItem.url)}
+                              href={isExternal(childItem.url) ? childItem.url : localizePath(childItem.url)}
                               target={isExternal(child.url) ? "_blank" : "_self"}
                               aria-current={`${
-                                currentPage === localizePath("/docs/" + childItem.url) ? "page" : "false"
+                                currentPageMatch === removeSlashes(localizePath(childItem.url)) ? "page" : "false"
                               }`}
                             >
                               {childItem.title}

src/config/menu.ts

@@ -10,21 +10,21 @@ export const MENU: MenuItems = {
   en: [
     {
       text: "Getting Started",
-      link: "/en/docs/getting-started/overview",
+      link: "/en/getting-started/overview",
       section: "gettingStarted",
     },
-    { text: "Developers", link: "/en/docs/developers", section: "developers" },
-    { text: "Technology", link: "/en/docs/technology", section: "technology" },
-    { text: "Learn", link: "/en/docs/learn", section: "learn" },
+    { text: "Developers", link: "/en/developers", section: "developers" },
+    { text: "Technology", link: "/en/technology", section: "technology" },
+    { text: "Learn", link: "/en/learn", section: "learn" },
   ],
   zh: [
     {
       text: "入门",
-      link: "/zh/docs/getting-started/overview",
+      link: "/zh/getting-started/overview",
       section: "gettingStarted",
     },
-    { text: "开发者", link: "/zh/docs/developers", section: "developers" },
-    { text: "技术", link: "/zh/docs/technology", section: "technology" },
-    { text: "学习", link: "/zh/docs/learn", section: "learn" },
+    { text: "开发者", link: "/zh/developers", section: "developers" },
+    { text: "技术", link: "/zh/technology", section: "technology" },
+    { text: "学习", link: "/zh/learn", section: "learn" },
   ],
 }

src/config/sidebar.ts

@@ -1,4 +1,6 @@
-import { t } from "i18next"
+import i18next, { t } from "i18next"
+
+const formatUrl = (url) => `${i18next.language}/${url}`
 
 export const getSidebar = () => {
   return {
@@ -12,27 +14,27 @@ export const getSidebar = () => {
         contents: [
           {
             title: t("sidebar.gettingStarted.userGuide"),
-            url: "user-guide/",
+            url: formatUrl("user-guide/"),
             children: [
               {
                 title: t("sidebar.gettingStarted.setup"),
-                url: "user-guide/setup",
+                url: formatUrl("user-guide/setup"),
               },
               {
                 title: t("sidebar.gettingStarted.faucet"),
-                url: "user-guide/faucet",
+                url: formatUrl("user-guide/faucet"),
               },
               {
                 title: t("sidebar.gettingStarted.bridge"),
-                url: "user-guide/bridge",
+                url: formatUrl("user-guide/bridge"),
               },
               {
                 title: t("sidebar.gettingStarted.transferTokens"),
-                url: "user-guide/transfer-tokens",
+                url: formatUrl("user-guide/transfer-tokens"),
               },
               {
                 title: t("sidebar.gettingStarted.commonErrors"),
-                url: "user-guide/common-errors",
+                url: formatUrl("user-guide/common-errors"),
               },
             ],
           },
@@ -66,7 +68,7 @@ export const getSidebar = () => {
           { title: t("sidebar.developers.integrations"), url: "developers/integrations" },
           {
             title: t("sidebar.developers.ethereum&AlphaTestnetDifferences"),
-            url: "developers/ethereum-and-alpha-testnet-differences",
+            url: formatUrl("developers/ethereum-and-alpha-testnet-differences"),
           },
         ],
       },
@@ -75,7 +77,7 @@ export const getSidebar = () => {
         contents: [
           {
             title: t("sidebar.developers.contractDeploymentTutorial"),
-            url: "developers/guides/contract-deployment-tutorial",
+            url: formatUrl("developers/guides/contract-deployment-tutorial"),
           },
         ],
       },

src/pages/[...redirect].astro

@@ -1,18 +1,28 @@
 ---
-import { changeLanguage } from "i18next"
+import i18next, { t, changeLanguage } from "i18next"
 import { GetStaticPathsResult } from "astro"
 import redirects from "../features/redirects/redirects.json"
+import { getCollection } from "astro:content"
 
 changeLanguage("en")
 
 export async function getStaticPaths(): Promise<GetStaticPathsResult> {
+  const pages = await getCollection("docs")
+  const allSlugs = new Set(
+    pages.map((page) => {
+      const [, ...slug] = page.slug.split("/")
+      return slug.join("/")
+    })
+  )
+
   const sanitizeSource = (source: string) => {
     let newSource = source
     if (newSource[newSource.length - 1] === "/") newSource = newSource.slice(0, newSource.length - 1)
     if (newSource[0] === "/") return newSource.slice(1, newSource.length)
     return newSource
   }
-  return redirects.redirects.map((entry) => {
+
+  const paths = redirects.redirects.map((entry) => {
     return {
       params: { redirect: sanitizeSource(entry.source) },
       props: {
@@ -23,6 +33,11 @@ export async function getStaticPaths(): Promise<GetStaticPathsResult> {
       },
     }
   })
+
+  for (let slug of allSlugs) {
+    paths.push({ params: { redirect: slug }, props: { to: `/en/${slug}` } })
+  }
+  return paths
 }
 const { to } = Astro.props
 ---

src/pages/[lang]/docs/[...slug].astro renamed to src/pages/[lang]/[...slug].astro

@@ -1,7 +1,7 @@
 ---
 import { getCollection } from "astro:content"
 import i18next, { t, changeLanguage } from "i18next"
-import MainLayout from "../../../layouts/MainLayout.astro"
+import MainLayout from "../../layouts/MainLayout.astro"
 
 export async function getStaticPaths() {
   const pages = await getCollection("docs")