nsarrazin commited on
Commit
03869b5
·
1 Parent(s): 6839f7c

fix: close modal properly when no base path

Browse files
src/routes/settings/(nav)/+layout.svelte CHANGED
@@ -26,7 +26,7 @@
26
 
27
  let { data, children }: Props = $props();
28
 
29
- let previousPage: string = $state(base);
30
  let assistantsSection: HTMLHeadingElement | undefined = $state();
31
  let showContent: boolean = $state(false);
32
 
@@ -60,7 +60,7 @@
60
 
61
  afterNavigate(({ from }) => {
62
  if (from?.url && !from.url.pathname.includes("settings")) {
63
- previousPage = from.url.toString() || previousPage || base;
64
  }
65
  // Show content when not on the root settings page
66
  showContent = page.url.pathname !== `${base}/settings`;
 
26
 
27
  let { data, children }: Props = $props();
28
 
29
+ let previousPage: string = $state(base || "/");
30
  let assistantsSection: HTMLHeadingElement | undefined = $state();
31
  let showContent: boolean = $state(false);
32
 
 
60
 
61
  afterNavigate(({ from }) => {
62
  if (from?.url && !from.url.pathname.includes("settings")) {
63
+ previousPage = from.url.toString() || previousPage || base || "/";
64
  }
65
  // Show content when not on the root settings page
66
  showContent = page.url.pathname !== `${base}/settings`;
src/routes/settings/+layout.svelte CHANGED
@@ -12,11 +12,11 @@
12
 
13
  let { children }: Props = $props();
14
 
15
- let previousPage: string = $state(base);
16
 
17
  afterNavigate(({ from }) => {
18
  if (from?.url && !from.url.pathname.includes("settings")) {
19
- previousPage = from.url.toString() || previousPage || base;
20
  }
21
  });
22
 
 
12
 
13
  let { children }: Props = $props();
14
 
15
+ let previousPage: string = $state(base || "/");
16
 
17
  afterNavigate(({ from }) => {
18
  if (from?.url && !from.url.pathname.includes("settings")) {
19
+ previousPage = from.url.toString() || previousPage || base || "/";
20
  }
21
  });
22
 
src/routes/tools/[toolId]/+page.svelte CHANGED
@@ -25,11 +25,11 @@
25
 
26
  const settings = useSettingsStore();
27
 
28
- let previousPage: string = $state(base);
29
 
30
  afterNavigate(({ from }) => {
31
  if (from?.url && !from.url.pathname.includes("tools/")) {
32
- previousPage = from.url.toString() || previousPage || base;
33
  }
34
  });
35
 
 
25
 
26
  const settings = useSettingsStore();
27
 
28
+ let previousPage: string = $state(base || "/");
29
 
30
  afterNavigate(({ from }) => {
31
  if (from?.url && !from.url.pathname.includes("tools/")) {
32
+ previousPage = from.url.toString() || previousPage || base || "/";
33
  }
34
  });
35