chore: rebased

Signed-off-by: Evzen Gasta <[email protected]>
gastoner · Aug 26, 2024 · a1aff7a · a1aff7a
1 parent 1bdf3cc
commit a1aff7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/packages/renderer/src/AppNavigation.svelte b/packages/renderer/src/AppNavigation.svelte
@@ -5,6 +5,8 @@ import { Tooltip } from '@podman-desktop/ui-svelte';
 import { onMount } from 'svelte';
 import type { TinroRouteMeta } from 'tinro';
 
+import { NavigationPage } from '/@api/navigation-page';
+
 import AuthActions from './lib/authentication/AuthActions.svelte';
 import { CommandRegistry } from './lib/CommandRegistry';
 import NewContentOnDashboardBadge from './lib/dashboard/NewContentOnDashboardBadge.svelte';
@@ -14,21 +16,16 @@ import SettingsIcon from './lib/images/SettingsIcon.svelte';
 import NavItem from './lib/ui/NavItem.svelte';
 import NavRegistryEntry from './lib/ui/NavRegistryEntry.svelte';
 import NavSection from './lib/ui/NavSection.svelte';
+import { handleNavigation } from './navigation';
 import { navigationRegistry } from './stores/navigation/navigation-registry';
 
-let {
-  exitSettingsCallback,
-  meta = $bindable(),
-}: {
-  exitSettingsCallback: () => void;
-  meta: TinroRouteMeta;
-} = $props();
-
-const iconSize = '22';
+let { exitSettingsCallback, meta = $bindable() }: { exitSettingsCallback: () => void; meta: TinroRouteMeta } = $props();
 
 let authActions = $state<AuthActions>();
 let outsideWindow = $state<HTMLDivElement>();
 
+const iconSize = '22';
+
 onMount(async () => {
   const commandRegistry = new CommandRegistry();
   commandRegistry.init();
@@ -38,7 +35,7 @@ function clickSettings(b: boolean) {
   if (b) {
     exitSettingsCallback();
   } else {
-    window.location.href = '#/preferences/resources';
+    handleNavigation({ page: NavigationPage.RESOURCES });
   }
 }
 </script>
@@ -61,6 +58,7 @@ function clickSettings(b: boolean) {
       {@const allItemsHidden = (navigationRegistryItem.items ?? []).every(item => item.hidden)}
       {#if !allItemsHidden}
         <NavSection tooltip={navigationRegistryItem.name}>
+          <!-- svelte-ignore svelte_component_deprecated -->
           <svelte:component this={navigationRegistryItem.icon.iconComponent} size={iconSize} slot="icon" />
 
           {#if navigationRegistryItem.items}

diff --git a/packages/renderer/src/lib/authentication/AuthActions.svelte b/packages/renderer/src/lib/authentication/AuthActions.svelte
@@ -47,7 +47,6 @@ export function onButtonClick(e: MouseEvent): void {
       onClick={() => handleNavigation({ page: NavigationPage.AUTHENTICATION })} />
 
     {#each $authenticationProviders as provider}
-      {console.error(provider)}
       {@const sessionRequests = provider.sessionRequests ?? []}
       {#if provider?.accounts?.length > 0}
         {#each provider.accounts as account}