Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use FormPage for Import Model page #1230

Merged
merged 1 commit into from
Jun 19, 2024
Merged

Use FormPage for Import Model page #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/frontend/src/App.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ onMount(() => {
</script>

<Route path="/*" isAppMounted="{isMounted}" let:meta>
<main class="flex flex-col w-screen h-screen overflow-hidden bg-charcoal-700">
<main class="flex flex-col w-screen h-screen overflow-hidden bg-[var(--pd-content-bg)]">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if we should not use var(--pd-invert-content-bg) as in the preferences, it is what is used however this would make the card of the form hidden :/

<div class="flex flex-row w-full h-full overflow-hidden">
<Navigation meta="{meta}" />

Expand Down
28 changes: 19 additions & 9 deletions packages/frontend/src/pages/ImportModel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
import { faCircleInfo, faFileImport } from '@fortawesome/free-solid-svg-icons';
import { studioClient } from '../utils/client';
import { Uri } from '@shared/src/uri/Uri';
import NavPage from '../lib/NavPage.svelte';
import type { LocalModelImportInfo } from '@shared/src/models/ILocalModelInfo';
import { Button, ErrorMessage, Tooltip } from '@podman-desktop/ui-svelte';
import { Button, ErrorMessage, FormPage, Tooltip } from '@podman-desktop/ui-svelte';
import { InferenceType } from '@shared/src/models/IInference';
import Fa from 'svelte-fa';
import { getFilesFromDropEvent } from '/@/utils/fileUtils';
Expand Down Expand Up @@ -91,13 +90,24 @@ async function onFile(event: DragEvent): Promise<void> {
backend: InferenceType.LLAMA_CPP,
};
}

export function goToUpPage(): void {
router.goto('/models');
}
</script>

<NavPage
lastPage="{{ name: 'Models', path: '/models' }}"
icon="{faFileImport}"
<FormPage
title="Import Model"
searchEnabled="{false}">
breadcrumbLeftPart="Models"
breadcrumbRightPart="Import Model"
breadcrumbTitle="Go back to Models Catalog"
on:close="{goToUpPage}"
on:breadcrumbClick="{goToUpPage}">
<svelte:fragment slot="icon">
<div class="rounded-full w-8 h-8 flex items-center justify-center">
<Fa size="1.125x" class="text-[var(--pd-content-header-icon)]" icon="{faFileImport}" />
</div>
</svelte:fragment>
<svelte:fragment slot="content">
<div class="flex m-5 flex-col w-full">
<!-- Error banner -->
Expand All @@ -108,7 +118,7 @@ async function onFile(event: DragEvent): Promise<void> {
</div>

<!-- form -->
<div class="bg-charcoal-800 space-y-6 px-8 sm:py-6 xl:py-8 rounded-lg h-fit">
<div class="bg-[var(--pd-content-card-bg)] space-y-6 px-8 sm:py-6 xl:py-8 rounded-lg h-fit">
<div class="w-full">
<!-- model input -->
{#if localModel === undefined}
Expand All @@ -123,7 +133,7 @@ async function onFile(event: DragEvent): Promise<void> {
on:dragleave|preventDefault="{() => (dragging = false)}"
class="w-full cursor-pointer flex-col px-4 py-8 border-2 border-dashed rounded flex justify-center items-center">
<Fa size="1.1x" class="cursor-pointer text-purple-400" icon="{faFileImport}" />
<span>Drag & Drop or <strong class="text-purple-400">Choice file</strong> to import</span>
<span>Drag & Drop or <strong class="text-purple-400">Choose file</strong> to import</span>
<span class="text-gray-800 text-sm">Supported format: .guff, .bin</span>
</button>
{:else}
Expand Down Expand Up @@ -183,4 +193,4 @@ async function onFile(event: DragEvent): Promise<void> {
</div>
</div>
</svelte:fragment>
</NavPage>
</FormPage>