diff --git a/web/src/components/sidebar/Sidebar.svelte b/web/src/components/sidebar/Sidebar.svelte index ca3a963e..39407a19 100644 --- a/web/src/components/sidebar/Sidebar.svelte +++ b/web/src/components/sidebar/Sidebar.svelte @@ -19,8 +19,8 @@ let aboutLink = defaultNavPage("about"); $: screenWidth, - settingsLink = defaultNavPage("settings"), - aboutLink = defaultNavPage("about"); + (settingsLink = defaultNavPage("settings")), + (aboutLink = defaultNavPage("about")); @@ -29,26 +29,14 @@ diff --git a/web/src/components/sidebar/SidebarTab.svelte b/web/src/components/sidebar/SidebarTab.svelte index 9f3b51ef..2330039f 100644 --- a/web/src/components/sidebar/SidebarTab.svelte +++ b/web/src/components/sidebar/SidebarTab.svelte @@ -3,8 +3,10 @@ import { t } from "$lib/i18n/translations"; - export let tabName: string; - export let tabLink: string; + export let name: string; + export let path: string; + export let icon: ConstructorOfATypedSvelteComponent; + export let beta = false; const firstTabPage = ["save", "remux", "settings"]; @@ -12,14 +14,14 @@ let tab: HTMLElement; $: currentTab = $page.url.pathname.split("/")[1]; - $: baseTabPath = tabLink.split("/")[1]; + $: baseTabPath = path.split("/")[1]; $: isTabActive = currentTab === baseTabPath; const showTab = (e: HTMLElement) => { if (e) { e.scrollIntoView({ - inline: firstTabPage.includes(tabName) ? "end" : "start", + inline: firstTabPage.includes(name) ? "end" : "start", block: "nearest", behavior: "smooth", }); @@ -32,10 +34,10 @@ showTab(tab)} role="tab" @@ -44,8 +46,9 @@ {#if beta}
β
{/if} - - {$t(`tabs.${tabName}`)} + + + {$t(`tabs.${name}`)}