From efc182115022a1bbf725f56e287ef792eb0e860d Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Fri, 21 Jul 2023 19:22:10 +0200
Subject: [PATCH] fix(org): Avoid confusing about what slug means

---
 .../org/pages/blog/{[slug].mjs => [dir].mjs}  | 23 ++++++-----------
 .../pages/showcase/{[slug].mjs => [dir].mjs}  | 25 +++++++------------
 2 files changed, 17 insertions(+), 31 deletions(-)
 rename sites/org/pages/blog/{[slug].mjs => [dir].mjs} (83%)
 rename sites/org/pages/showcase/{[slug].mjs => [dir].mjs} (84%)

diff --git a/sites/org/pages/blog/[slug].mjs b/sites/org/pages/blog/[dir].mjs
similarity index 83%
rename from sites/org/pages/blog/[slug].mjs
rename to sites/org/pages/blog/[dir].mjs
index 31afe7d7c77..18152625265 100644
--- a/sites/org/pages/blog/[slug].mjs
+++ b/sites/org/pages/blog/[dir].mjs
@@ -15,9 +15,9 @@ const namespaces = [...layoutNs, ...postNs, ...pageNs]
  * when path and locale come from static props (as here)
  * or set them manually.
  */
-const BlogPage = ({ locale, slug, page }) => {
+const BlogPage = ({ locale, dir, page }) => {
   // function to load the correct markdown
-  const loader = useCallback(() => import(`orgmarkdown/blog/${slug}/${locale}.md`), [slug, locale])
+  const loader = useCallback(() => import(`orgmarkdown/blog/${dir}/${locale}.md`), [dir, locale])
   // load the markdown
   const { frontmatter, MDX } = useDynamicMdx(loader)
 
@@ -28,14 +28,7 @@ const BlogPage = ({ locale, slug, page }) => {
       title={frontmatter.title}
       layout={(props) => <PostLayout {...props} {...{ slug: page.path.join('/'), frontmatter }} />}
     >
-      <PostArticle
-        {...{
-          slug,
-          frontmatter,
-          MDX,
-          page,
-        }}
-      />
+      <PostArticle {...{ frontmatter, MDX }} />
     </PageWrapper>
   )
 }
@@ -51,19 +44,19 @@ const BlogPage = ({ locale, slug, page }) => {
  * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching
  */
 export async function getStaticProps({ params, locale }) {
-  const { slug } = params
+  const { dir } = params
 
-  // if the slug isn't present in the prebuilt posts, return 404
-  if (!Object.keys(posts).includes(`blog/${slug}`)) return { notFound: true }
+  // if the dir isn't present in the prebuilt posts, return 404
+  if (!Object.keys(posts[locale]).includes(`blog/${dir}`)) return { notFound: true }
 
   return {
     props: {
-      slug,
+      dir,
       locale,
       ...(await serverSideTranslations(locale, namespaces)),
       page: {
         locale,
-        path: ['blog', slug],
+        path: ['blog', dir],
       },
     },
   }
diff --git a/sites/org/pages/showcase/[slug].mjs b/sites/org/pages/showcase/[dir].mjs
similarity index 84%
rename from sites/org/pages/showcase/[slug].mjs
rename to sites/org/pages/showcase/[dir].mjs
index ca8b455218d..b9ce76a1bb5 100644
--- a/sites/org/pages/showcase/[slug].mjs
+++ b/sites/org/pages/showcase/[dir].mjs
@@ -15,11 +15,11 @@ const namespaces = [...layoutNs, ...postNs, ...pageNs]
  * when path and locale come from static props (as here)
  * or set them manually.
  */
-const ShowcasePage = ({ locale, slug, page }) => {
+const ShowcasePage = ({ locale, dir, page }) => {
   // function to load the correct markdown
   const loader = useCallback(
-    () => import(`orgmarkdown/showcase/${slug}/${locale}.md`),
-    [slug, locale]
+    () => import(`orgmarkdown/showcase/${dir}/${locale}.md`),
+    [dir, locale]
   )
 
   const { frontmatter, MDX } = useDynamicMdx(loader)
@@ -31,14 +31,7 @@ const ShowcasePage = ({ locale, slug, page }) => {
       title={frontmatter.title}
       layout={(props) => <PostLayout {...props} {...{ slug: page.path.join('/'), frontmatter }} />}
     >
-      <PostArticle
-        {...{
-          slug,
-          frontmatter,
-          MDX,
-          page,
-        }}
-      />
+      <PostArticle {...{ frontmatter, MDX }} />
     </PageWrapper>
   )
 }
@@ -54,19 +47,19 @@ const ShowcasePage = ({ locale, slug, page }) => {
  * To learn more, see: https://nextjs.org/docs/basic-features/data-fetching
  */
 export async function getStaticProps({ params, locale }) {
-  const { slug } = params
+  const { dir } = params
 
-  // if the slug isn't present in the prebuilt posts, return 404
-  if (!Object.keys(posts).includes(`showcase/${slug}`)) return { notFound: true }
+  // if the dir isn't present in the prebuilt posts, return 404
+  if (!Object.keys(posts[locale]).includes(`showcase/${dir}`)) return { notFound: true }
 
   return {
     props: {
-      slug,
+      dir,
       locale,
       ...(await serverSideTranslations(locale, namespaces)),
       page: {
         locale,
-        path: ['showcase', slug],
+        path: ['showcase', dir],
       },
     },
   }