From e43f1aa18d2c3e8ae6704df5e37c54d351bcddec Mon Sep 17 00:00:00 2001
From: Mathieu Schimmerling <mathieu.schimmerling@protonmail.com>
Date: Tue, 5 Mar 2024 09:09:45 +0100
Subject: [PATCH] fix(app): fix router lookup on search params

---
 build/template/footer.eta | 6 +++---
 src/Index.svelte          | 8 ++++----
 src/Router.svelte         | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build/template/footer.eta b/build/template/footer.eta
index 2d39928..a75577f 100644
--- a/build/template/footer.eta
+++ b/build/template/footer.eta
@@ -1,6 +1,6 @@
-<footer class="bg-gray-900 pb-20">
-  <h2 id="footer-heading" class="sr-only">Footer</h2>
-  <div class="mx-auto max-w-7xl px-6 pb-8 pt-16 sm:pt-24 lg:px-8 lg:pt-32">
+<footer class="bg-gray-900">
+  <h2 class="sr-only">Footer</h2>
+  <div class="mx-auto max-w-7xl px-6 pb-20 pt-16 sm:pt-24 lg:px-8">
     <div class="xl:grid xl:grid-cols-3 xl:gap-8">
       <div class="space-y-8">
         <a class="font-semibold text-xl flex items-center space-x-3" href="/">
diff --git a/src/Index.svelte b/src/Index.svelte
index 87cc00d..464f39d 100644
--- a/src/Index.svelte
+++ b/src/Index.svelte
@@ -95,11 +95,11 @@
     }
 
     if (frameworkIdsSelectedOnInit.length === 0) {
-      const frameworkIdsFromStorage = frameworkIdsStorage.getJSON();
+      const frameworkIdsFromStorage = frameworkIdsStorage
+        .getJSON()
+        ?.filter(matchFrameworkId);
       if (frameworkIdsFromStorage?.length > 0) {
-        frameworkIdsSelectedOnInit = frameworkIdsFromStorage.map((x) =>
-          x === "svelte" ? "svelte4" : x
-        );
+        frameworkIdsSelectedOnInit = frameworkIdsFromStorage;
       }
     }
 
diff --git a/src/Router.svelte b/src/Router.svelte
index a32cb17..07f37be 100644
--- a/src/Router.svelte
+++ b/src/Router.svelte
@@ -17,7 +17,8 @@
   const currentRoute = writable({ component: null });
 
   function navigate(path) {
-    const routePayload = router.lookup(path);
+    const urlParsed = new URL(path);
+    const routePayload = router.lookup(urlParsed.pathname);
     if (routePayload) {
       if (routePayload.component.toString().startsWith("class")) {
         currentRoute.set(routePayload);
@@ -36,7 +37,7 @@
   }
 
   window.onpopstate = () => {
-    navigate(window.location.pathname);
+    navigate(window.location.href);
   };
 
   function handleClick(event) {
@@ -53,7 +54,7 @@
 
   onMount(() => {
     document.addEventListener("click", handleClick);
-    navigate(window.location.pathname);
+    navigate(window.location.href);
   });
 
   onDestroy(() => {