fix links

HJfod · Mar 4, 2024 · f56d73c · f56d73c
1 parent 0c09608
commit f56d73c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -36,4 +36,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v4
diff --git a/src/components/Button.astro b/src/components/Button.astro
@@ -1,8 +1,9 @@
 ---
 const { link, style } = Astro.props;
+const url = `${import.meta.env.BASE_URL}${link}`;
 ---
 
-<a href={link} class={style}>
+<a href={url} class={style}>
     <slot name="pre-icon"><span></span></slot>
     <slot />
     <slot name="post-icon" />

diff --git a/src/components/Link.astro b/src/components/Link.astro
@@ -1,8 +1,9 @@
 ---
 const { href, style, noUnderline } = Astro.props;
 const classList = `${style} ${noUnderline === 'true' ? 'no-link-underline' : ''}`;
+const url = `${import.meta.env.BASE_URL}${href}`;
 ---
-<!-- this is to prevent any unintended whitespace appearing after the link --><a href={href} class={classList}><slot/></a><style>
+<!-- this is to prevent any unintended whitespace appearing after the link --><a href={url} class={classList}><slot/></a><style>
     a {
         @apply
             text-tertiary-default

diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro
@@ -5,6 +5,8 @@ import logo from "../images/logo.png"
 import discord from "../images/discord.svg?raw"
 import github from "../images/github.svg?raw"
 import kofi from "../images/kofi.svg?raw"
+
+const base = import.meta.env.BASE_URL;
 ---
 
 <div class="
@@ -20,15 +22,15 @@ import kofi from "../images/kofi.svg?raw"
         <p class="font-head text-xl text-accent-lightest">Globed</p>
     </div>
     <div class="flex flex-row justify-center max-sm:hidden">
-        <a href="/">
+        <a href={base}>
             <HomeIcon/>
             <span class="max-sm:hidden">Home</span>
         </a>
-        <a href="/install">
+        <a href={`${base}/install`}>
             <DownloadIcon/>
             <span class="max-sm:hidden">Install</span>
         </a>
-        <a href="/about">
+        <a href={`${base}/about`}>
             <BookIcon/>
             <span class="max-sm:hidden">About</span>
         </a>

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -46,7 +46,7 @@ const screenshots = (await Astro.glob('../images/screenshot-*.png')).map(file =>
                 About
             </Button>
 
-            <Button link="./install" style="alt">
+            <Button link="/install" style="alt">
                 <ArrowRightIcon slot="post-icon" />
                 Install
             </Button>