From 115b1cfad1ed8b6516de1f0089e29df80e554e5e Mon Sep 17 00:00:00 2001
From: Deflaktor <deflaktor@gmail.com>
Date: Mon, 24 Jun 2024 22:04:49 +0200
Subject: [PATCH] Fix highlight on current active page

---
 src/components/navbar.astro    | 5 ++++-
 src/layouts/boardsLayout.astro | 3 ++-
 src/lib/utils.ts               | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/lib/utils.ts

diff --git a/src/components/navbar.astro b/src/components/navbar.astro
index 68d60f94a..bf31cc3fd 100644
--- a/src/components/navbar.astro
+++ b/src/components/navbar.astro
@@ -1,6 +1,9 @@
 ---
-const currentPagePath = Astro.url.pathname;
+import { getPathnameWithoutExtension } from "~/lib/utils";
+
+const currentPagePath = getPathnameWithoutExtension(Astro.url);
 ---
+
 <nav class="navbar navbar-expand-lg bg-body-tertiary">
   <div class="container-fluid">
     <a class="navbar-brand" href="/">
diff --git a/src/layouts/boardsLayout.astro b/src/layouts/boardsLayout.astro
index 440376b8c..9be5f01df 100644
--- a/src/layouts/boardsLayout.astro
+++ b/src/layouts/boardsLayout.astro
@@ -3,10 +3,11 @@ interface Props {
   title: string;
 }
 const { title } = Astro.props;
+import { getPathnameWithoutExtension } from '~/lib/utils';
 import Layout from './layout.astro';
 import './layout.css';
 import boards from "~/lib/getboards";
-const currentPagePath = Astro.url.pathname;
+const currentPagePath = getPathnameWithoutExtension(Astro.url);
 ---
 <Layout title={title}>
   <section class="jumbotron text-center">
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
new file mode 100644
index 000000000..aeead653c
--- /dev/null
+++ b/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import path from "path";
+
+export function getPathnameWithoutExtension(url: URL) {
+  const parsedPath = path.parse(url.pathname);
+  return path.join(parsedPath.dir, parsedPath.name);
+}
\ No newline at end of file