From 2d3e3b9493f5dd1bde32d164d1f56e73be474761 Mon Sep 17 00:00:00 2001 From: not-nullptr <62841684+not-nullptr@users.noreply.github.com> Date: Sun, 13 Apr 2025 12:56:08 +0100 Subject: [PATCH] Revert "fix: navigation issues (#57)" This reverts commit 36e186c90dc0e8ab28bce151a892b1dad6bf6f20. --- src/lib/components/layout/Navbar/Base.svelte | 10 ++++------ src/routes/+layout.ts | 1 - svelte.config.js | 3 --- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/lib/components/layout/Navbar/Base.svelte b/src/lib/components/layout/Navbar/Base.svelte index 3b02dd1..ee69a19 100644 --- a/src/lib/components/layout/Navbar/Base.svelte +++ b/src/lib/components/layout/Navbar/Base.svelte @@ -39,21 +39,20 @@ }, { name: "Convert", - url: "/convert/", - activeMatch: (pathname) => - pathname === "/convert/" || pathname === "/convert", + url: "/convert", + activeMatch: (pathname) => pathname === "/convert", icon: RefreshCw, badge: files.files.length, }, { name: "Settings", - url: "/settings/", + url: "/settings", activeMatch: (pathname) => pathname.startsWith("/settings"), icon: SettingsIcon, }, { name: "About", - url: "/about/", + url: "/about", activeMatch: (pathname) => pathname.startsWith("/about"), icon: InfoIcon, }, @@ -79,7 +78,6 @@ const newIndex = items.findIndex((i) => i.activeMatch(e.to?.url.pathname || ""), ); - console.log(oldIndex, newIndex); if (newIndex < oldIndex) { goingLeft.set(true); } else { diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index fcc463c..a0bb4fa 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -14,4 +14,3 @@ export const load = ({ data }) => { }; export const prerender = true; -export const trailingSlash = "always"; diff --git a/svelte.config.js b/svelte.config.js index 0349799..76b86fe 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -12,9 +12,6 @@ const config = { // If your environment is not supported, or you settled on a specific environment, switch out the adapter. // See https://svelte.dev/docs/kit/adapters for more information about adapters. adapter: adapter(), - paths: { - relative: false, - }, env: { publicPrefix: "PUB_", privatePrefix: "PRI_",