Fix Welcome page navigation bugs (#4095)

* Use more resilient route identifier * Ensure paths are relative to root
rilldata · Feb 19, 2024 · 5ab4d8c · 5ab4d8c · github-actions · Feb 19, 2024
1 parent fc5455b
commit 5ab4d8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web-common/src/features/welcome/ProjectCards.svelte b/web-common/src/features/welcome/ProjectCards.svelte
@@ -28,15 +28,15 @@
       title: "OpenRTB Programmatic Ads",
       description: "Real-time Bidding (RTB) advertising",
       image: "bg-[url('$img/welcome-bg-openrtb.png')] bg-no-repeat bg-cover",
-      firstPage: "dashboard/auction",
+      firstPage: "/dashboard/auction",
     },
     {
       name: "rill-github-analytics",
       title: "Github Analytics",
       description: "A Git project's commit activity",
       image:
         "bg-[url('$img/welcome-bg-github-analytics.png')] bg-no-repeat bg-cover",
-      firstPage: "dashboard/duckdb_commits",
+      firstPage: "/dashboard/duckdb_commits",
     },
   ];
 

diff --git a/web-common/src/layout/BasicLayout.svelte b/web-common/src/layout/BasicLayout.svelte
@@ -41,7 +41,7 @@ BasicLayout is the backbone of the Rill application.
   setContext("rill:app:navigation-width-tween", navigationWidth);
   setContext("rill:app:navigation-visibility-tween", navVisibilityTween);
 
-  $: showNavigation = $page.url.pathname !== "/welcome";
+  $: showNavigation = $page.route.id !== "/(application)/welcome";
 </script>
 
 <main>