From c53b4efd60a91cf71a9c32be5783deefca9018aa Mon Sep 17 00:00:00 2001
From: Mikkel Svartveit <mikkel.svartveit@gmail.com>
Date: Tue, 17 Oct 2023 23:06:04 -0700
Subject: [PATCH] Fix trailing slash issue

asdf

dsfa
---
 src/components/Navbar.svelte      | 7 ++++---
 src/pages/photography/index.astro | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Navbar.svelte b/src/components/Navbar.svelte
index b142459..f0da210 100644
--- a/src/components/Navbar.svelte
+++ b/src/components/Navbar.svelte
@@ -2,6 +2,7 @@
   import { slide, fade } from "svelte/transition";
 
   export let currentPath: string;
+  $: currentPathTrimmed = currentPath.replace(/\/+$/, "");
 
   let scrollPosition = 0;
   $: isScrolled = scrollPosition > 0;
@@ -28,7 +29,7 @@
       href="/"
       data-sveltekit-preload-code="eager"
       class="text-lg tracking-wide text-gray-600 decoration-yellow-400 decoration-2 underline-offset-8 duration-100 hover:text-gray-400"
-      class:underline={"/" === currentPath}
+      class:underline={"" === currentPathTrimmed}
     >
       Mikkel Svartveit
     </a>
@@ -40,7 +41,7 @@
             {href}
             data-sveltekit-preload-code="eager"
             class="text-lg tracking-wide text-gray-600 decoration-yellow-400 decoration-2 underline-offset-8 duration-100 hover:text-gray-400"
-            class:underline={href === currentPath}
+            class:underline={href === currentPathTrimmed}
           >
             {name}
           </a>
@@ -107,7 +108,7 @@
           {href}
           on:click={() => (collapsed = true)}
           class="whitespace-nowrap text-lg tracking-wide text-gray-600 decoration-yellow-400 decoration-2 underline-offset-8"
-          class:underline={href === currentPath}
+          class:underline={href === currentPathTrimmed}
         >
           {name}
         </a>
diff --git a/src/pages/photography/index.astro b/src/pages/photography/index.astro
index e147b48..8eb13c9 100644
--- a/src/pages/photography/index.astro
+++ b/src/pages/photography/index.astro
@@ -17,8 +17,7 @@ const sortFiles = (a: any, b: any) => {
 export const getFileNameFromPath = (path: string) => {
   const parts = path.split("/");
   const fileName = parts[parts.length - 1].split("?")[0];
-  const fileNameParts = fileName.split(".");
-  return fileNameParts[0] + "." + fileNameParts[fileNameParts.length - 1];
+  return fileName.split(".")[0];
 };
 ---