Adopt NavPage (#1246)

* refactor: use NavPage from ui-svelte package for Applications Signed-off-by: Philippe Martin <[email protected]> * refactor: use NavPage from ui-svelte package for Dashboard Signed-off-by: Philippe Martin <[email protected]> * refactor: use NavPage from ui-svelte package for Services Signed-off-by: Philippe Martin <[email protected]> * refactor: use NavPage from ui-svelte package for Models Signed-off-by: Philippe Martin <[email protected]> * refactor: use NavPage from ui-svelte package for Playgrounds Signed-off-by: Philippe Martin <[email protected]> * refactor: use NavPage from ui-svelte package for Recipes Signed-off-by: Philippe Martin <[email protected]> * refactor: remove local NavPage Signed-off-by: Philippe Martin <[email protected]> --------- Signed-off-by: Philippe Martin <[email protected]>
containers · Jun 21, 2024 · a04ecdf · a04ecdf
1 parent 1bb25b4
commit a04ecdf
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 148 deletions.
diff --git a/packages/frontend/src/lib/NavPage.spec.ts b/packages/frontend/src/lib/NavPage.spec.ts
diff --git a/packages/frontend/src/lib/NavPage.svelte b/packages/frontend/src/lib/NavPage.svelte
diff --git a/packages/frontend/src/pages/Applications.svelte b/packages/frontend/src/pages/Applications.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-import NavPage from '../lib/NavPage.svelte';
 import { applicationStates } from '../stores/application-states';
 import ColumnActions from '../lib/table/application/ColumnActions.svelte';
 import ColumnStatus from '../lib/table/application/ColumnStatus.svelte';
@@ -10,7 +9,7 @@ import ColumnAge from '../lib/table/application/ColumnAge.svelte';
 import { router } from 'tinro';
 import { onMount } from 'svelte';
 import type { ApplicationState } from '@shared/src/models/IApplicationState';
-import { Table, TableColumn, TableRow } from '@podman-desktop/ui-svelte';
+import { Table, TableColumn, TableRow, NavPage } from '@podman-desktop/ui-svelte';
 
 const columns: TableColumn<ApplicationState>[] = [
   new TableColumn<ApplicationState>('Status', { width: '70px', align: 'center', renderer: ColumnStatus }),

diff --git a/packages/frontend/src/pages/Dashboard.svelte b/packages/frontend/src/pages/Dashboard.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-import NavPage from '/@/lib/NavPage.svelte';
 import { router } from 'tinro';
 import { faGithub } from '@fortawesome/free-brands-svg-icons';
 import { studioClient } from '/@/utils/client';
 import DashboardBanner from '/@/lib/images/DashboardBanner.svelte';
-import { Button } from '@podman-desktop/ui-svelte';
+import { Button, NavPage } from '@podman-desktop/ui-svelte';
 
 const openRecipesCatalog = () => {
   router.goto('/recipes');

diff --git a/packages/frontend/src/pages/InferenceServers.svelte b/packages/frontend/src/pages/InferenceServers.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
 import type { InferenceServer } from '@shared/src/models/IInference';
 import ServiceColumnName from '/@/lib/table/service/ServiceColumnName.svelte';
-import NavPage from '/@/lib/NavPage.svelte';
 import { inferenceServers } from '/@/stores/inferenceServers';
 import ServiceStatus from '/@/lib/table/service/ServiceStatus.svelte';
 import ServiceAction from '/@/lib/table/service/ServiceAction.svelte';
@@ -11,7 +10,7 @@ import { studioClient } from '/@/utils/client';
 import { router } from 'tinro';
 import { onMount } from 'svelte';
 import { Button } from '@podman-desktop/ui-svelte';
-import { Table, TableColumn, TableRow } from '@podman-desktop/ui-svelte';
+import { Table, TableColumn, TableRow, NavPage } from '@podman-desktop/ui-svelte';
 
 const columns: TableColumn<InferenceServer>[] = [
   new TableColumn<InferenceServer>('Status', { width: '70px', renderer: ServiceStatus, align: 'center' }),

diff --git a/packages/frontend/src/pages/Models.svelte b/packages/frontend/src/pages/Models.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 import type { ModelInfo } from '@shared/src/models/IModelInfo';
-import NavPage from '../lib/NavPage.svelte';
 import { modelsInfo } from '../stores/modelsInfo';
 import ModelColumnName from '../lib/table/model/ModelColumnName.svelte';
 import ModelColumnLabels from '../lib/table/model/ModelColumnLabels.svelte';
@@ -18,7 +17,7 @@ import ModelColumnIcon from '../lib/table/model/ModelColumnIcon.svelte';
 import { router } from 'tinro';
 import { Button } from '@podman-desktop/ui-svelte';
 import { faFileImport } from '@fortawesome/free-solid-svg-icons';
-import { Table, TableColumn, TableRow } from '@podman-desktop/ui-svelte';
+import { Table, TableColumn, TableRow, NavPage } from '@podman-desktop/ui-svelte';
 
 const columns: TableColumn<ModelInfo>[] = [
   new TableColumn<ModelInfo>('', { width: '40px', renderer: ModelColumnIcon }),
@@ -104,7 +103,7 @@ async function importModel() {
 }
 </script>
 
-<NavPage title="Models" searchEnabled="{false}" loading="{loading}">
+<NavPage title="Models" searchEnabled="{false}">
   <svelte:fragment slot="tabs">
     <Tab title="All" url="/models" selected="{$router.path === '/models'}" />
     <Tab title="Downloaded" url="/models/downloaded" selected="{$router.path === '/models/downloaded'}" />

diff --git a/packages/frontend/src/pages/Playgrounds.svelte b/packages/frontend/src/pages/Playgrounds.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
 import { router } from 'tinro';
-import NavPage from '../lib/NavPage.svelte';
 import PlaygroundColumnModel from '../lib/table/playground/PlaygroundColumnModel.svelte';
 import PlaygroundColumnName from '../lib/table/playground/PlaygroundColumnName.svelte';
 import ConversationColumnAction from '/@/lib/table/playground/ConversationColumnAction.svelte';
 import { conversations } from '/@/stores/conversations';
 import PlaygroundColumnIcon from '/@/lib/table/playground/PlaygroundColumnIcon.svelte';
 import { Button } from '@podman-desktop/ui-svelte';
-import { Table, TableColumn, TableRow } from '@podman-desktop/ui-svelte';
+import { Table, TableColumn, TableRow, NavPage } from '@podman-desktop/ui-svelte';
 import type { Conversation } from '@shared/src/models/IPlaygroundMessage';
 
 const columns = [

diff --git a/packages/frontend/src/pages/Recipes.svelte b/packages/frontend/src/pages/Recipes.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-import NavPage from '/@/lib/NavPage.svelte';
 import RecipesCard from '/@/lib/RecipesCard.svelte';
 import { catalog } from '/@/stores/catalog';
 import type { Recipe } from '@shared/src/models/IRecipe';
 import { onMount } from 'svelte';
 import type { Category } from '@shared/src/models/ICategory';
+import { NavPage } from '@podman-desktop/ui-svelte';
 
 let groups: Map<Category, Recipe[]> = new Map();