Fix: Move /welcome route to application group (#4721)

* move add source modal * unused import * move file drop * less disruptive
rilldata · Apr 26, 2024 · 6be3f7e · 6be3f7e
1 parent 39d9f94
commit 6be3f7e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/web-local/src/routes/(application)/+layout.svelte b/web-local/src/routes/(application)/+layout.svelte
@@ -11,9 +11,14 @@
   import PreparingImport from "@rilldata/web-common/features/sources/modal/PreparingImport.svelte";
   import Navigation from "@rilldata/web-common/layout/navigation/Navigation.svelte";
   import AddSourceModal from "@rilldata/web-common/features/sources/modal/AddSourceModal.svelte";
+  import { page } from "$app/stores";
 
   let showDropOverlay = false;
 
+  $: ({
+    url: { pathname },
+  } = $page);
+
   function isEventWithFiles(event: DragEvent) {
     let types = event?.dataTransfer?.types;
     return types && types.indexOf("Files") != -1;
@@ -31,7 +36,9 @@
     if (isEventWithFiles(e)) showDropOverlay = true;
   }}
 >
-  <Navigation />
+  {#if pathname !== "/welcome"}
+    <Navigation />
+  {/if}
   <section class="size-full overflow-hidden">
     <slot />
   </section>

diff --git a/web-local/src/routes/welcome/+page.svelte → ...routes/(application)/welcome/+page.svelte b/web-local/src/routes/welcome/+page.svelte → ...routes/(application)/welcome/+page.svelte
diff --git a/web-local/src/routes/welcome/+page.ts → ...src/routes/(application)/welcome/+page.ts b/web-local/src/routes/welcome/+page.ts → ...src/routes/(application)/welcome/+page.ts