Make links to blog posts relative to the base

sfbrigade · Apr 17, 2024 · d3e459e · d3e459e
1 parent ffdffe5
commit d3e459e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/BlogListItem.astro b/src/components/BlogListItem.astro
@@ -2,6 +2,7 @@
 import type { CollectionEntry } from "astro:content";
 import { dateFromSlug } from "@/utils/dateFromSlug";
 import { getBlogImage } from "@/utils/getBlogImage";
+import { base } from "@/utils/urls";
 
 interface Props {
 	post: CollectionEntry<"blog">;
@@ -21,7 +22,7 @@ const {
 } = Astro.props;
 const imageData = await getBlogImage(image);
 const backgroundImageURL = imageData?.src ?? "";
-const postURL = "/blog/" + slug;
+const postURL = base("/blog/" + slug);
 const dateString = date?.toLocaleDateString("en-US",
 	{ year: "numeric", month: "short", day: "numeric" });
 ---

diff --git a/src/utils/urls.ts b/src/utils/urls.ts
@@ -12,4 +12,4 @@ export const githubURL = "https://github.com/sfbrigade";
 export const facebookURL = "https://www.facebook.com/sfcivictech";
 export const linkedinURL = "https://www.linkedin.com/company/sfbrigade/";
 
-export const base = (url: string) => ((url.startsWith("/") ? import.meta.env.BASE_URL : "") + url).replaceAll("//", "/");
+export const base = (url: string) => url.startsWith("/") ? (import.meta.env.BASE_URL + url).replace("//", "/") : url;