Merge branch 'develop' into chore/spell-checker-file-normalization

fleek-platform · Jun 10, 2024 · feaf6cd · feaf6cd
2 parents 4c7946a + 4d84c25
commit feaf6cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -7,6 +7,7 @@ import sitemap from "@astrojs/sitemap";
 import settings from "./src/settings.json";
 import { imagetools } from 'vite-imagetools';
 import mdx from "@astrojs/mdx";
+
 const configRemarkCalloutDirectives = {
   callouts: {
     note: {
@@ -32,8 +33,10 @@ const configRemarkCalloutDirectives = {
   }
 };
 
-// Environment mode
-const env = import.meta.env.MODE || 'staging';
+// Environment
+const env = import.meta.env.PROD
+  ? 'production'
+  : 'staging';
 
 // https://astro.build/config
 export default defineConfig({

diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
@@ -14,8 +14,6 @@ export async function getStaticPaths() {
   }));
 }
 
-const back = () => {};
-
 const { entry } = Astro.props;
 const { Content } = await entry.render();
 const { collection, id, slug } = entry;
@@ -33,7 +31,7 @@ const githubEditUrlPathname = generateGitHubEditLink({
   slug={slug}
 >
   <article class="blog">
-    <div class="mb-10 w-fit" onclick="history.back()">
+    <div class="mb-10 w-fit" id="goBackButton">
       <ButtonGray className="flex items-center justify-center gap-12 px-5">
         <div>Go Back</div>
       </ButtonGray>
@@ -50,3 +48,13 @@ const githubEditUrlPathname = generateGitHubEditLink({
     <GithubEditLink pathname={githubEditUrlPathname} />
   </article>
 </BlogPageLayout>
+
+<script>
+  document.getElementById('goBackButton')?.addEventListener('click', () => {
+    if (history.length > 2) {
+      history.back();
+    } else {
+      window.location.href = '/blog';
+    }
+  });
+</script>