fix URL handling for different base URLs

camdendotlol · camdendotlol · commit 19fe4f40b33f · 2025-01-27T12:05:22.000-05:00
diff --git a/.astro/settings.json b/.astro/settings.json
@@ -1,5 +1,5 @@
 {
 	"_variables": {
-		"lastUpdateCheck": 1736350943893
+		"lastUpdateCheck": 1737997215950
 	}
 }
diff --git a/src/components/Navbar.astro b/src/components/Navbar.astro
@@ -1,14 +1,15 @@
 ---
+import { getUrl } from '../util/path'
 
 ---
 
 <div class="navbar">
   <a href={import.meta.env.BASE_URL} class="logo">
-    <img alt="EditionCrafter logo" src=`${import.meta.env.BASE_URL}/ec_logo.svg` />
-    <img alt="EditionCrafter" src=`${import.meta.env.BASE_URL}/ec_name.svg` />
+    <img alt="EditionCrafter logo" src=`${getUrl('ec_logo.svg')}` />
+    <img alt="EditionCrafter" src=`${getUrl('ec_name.svg')}` />
   </a>
-  <a href=`${import.meta.env.BASE_URL}/records`>Record List</a>
-  <a href=`${import.meta.env.BASE_URL}/about`>About</a>
+  <a href=`${getUrl('records')}`>Record List</a>
+  <a href=`${getUrl('about')}`>About</a>
 </div>
 <style>
   .navbar {
diff --git a/src/pages/about.astro b/src/pages/about.astro
@@ -1,9 +1,10 @@
 ---
 import Navbar from "../components/Navbar.astro";
+import { getUrl } from "../util/path";
 ---
 
 <html>
-  <link rel="icon" type="image/x-icon" href=`${import.meta.env.BASE_URL}/ec_logo.svg` />
+  <link rel="icon" type="image/x-icon" href=`${getUrl('ec_logo.svg')}` />
   <title>About</title>
   <body>
     <Navbar />
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -2,10 +2,11 @@
 import config from "../../data/config.json";
 import EditionCrafter from "@cu-mkp/editioncrafter";
 import Navbar from "../components/Navbar.astro";
+import { getUrl } from "../util/path";
 ---
 
 <html>
-  <link rel="icon" type="image/x-icon" href=`${import.meta.env.BASE_URL}/ec_logo.svg` />
+  <link rel="icon" type="image/x-icon" href=`${getUrl('ec_logo.svg')}` />
   <title>EditionCrafter</title>
   <body>
     <Navbar />
diff --git a/src/pages/records.astro b/src/pages/records.astro
@@ -2,10 +2,11 @@
 import { RecordList } from "@cu-mkp/editioncrafter";
 import Navbar from "../components/Navbar.astro";
 import config from "../../data/config.json";
+import { getUrl } from '../util/path'
 ---
 
 <html>
-  <link rel="icon" type="image/x-icon" href=`${import.meta.env.BASE_URL}/ec_logo.svg` />
+  <link rel="icon" type="image/x-icon" href=`${getUrl('ec_logo.svg')}` />
   <title>Record List</title>
   <body>
     <Navbar />
diff --git a/src/util/path.js b/src/util/path.js
@@ -0,0 +1,9 @@
+export const getUrl = (path) => {
+  const base = import.meta.env.BASE_URL
+
+  if (base === '/') {
+    return `/${path}`
+  }
+
+  return `${base}/${path}`
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"_variables": {`
`3`		`- "lastUpdateCheck": 1736350943893`
	`3`	`+ "lastUpdateCheck": 1737997215950`
`4`	`4`	`}`
`5`	`5`	`}`