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

fix: bump immich/ui #89

Merged
merged 1 commit into from
Jan 8, 2025
Merged

fix: bump immich/ui #89

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 apps/buy.immich.app/routes/success/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</section>

{#if isLoading}
<Card variant="subtle" color="secondary">
<Card color="secondary">
<CardBody>
<section class="flex gap-2">
<Text>Waiting for payment verification...</Text>
Expand Down
12 changes: 6 additions & 6 deletions apps/get.immich.app/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>

<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-2 l gap-4">
<Card color="secondary" variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Android</CardTitle>
</CardHeader>
Expand All @@ -66,7 +66,7 @@
</CardBody>
</Card>

<Card color="secondary" variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>iOS</CardTitle>
</CardHeader>
Expand All @@ -86,7 +86,7 @@
</div>

<section class="grid auto-rows-fr grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
<Card color="secondary" variant="subtle" class="h-full">
<Card color="secondary" class="h-full">
<CardHeader>
<CardTitle>Docker Compose</CardTitle>
<CardDescription>Run Immich on <Link href="https://www.docker.com/">Docker</Link></CardDescription>
Expand All @@ -99,7 +99,7 @@
</CardFooter>
</Card>

<Card color="secondary" variant="subtle" class="h-full">
<Card color="secondary" class="h-full">
<CardHeader>
<CardTitle>Portainer</CardTitle>
<CardDescription>Run Immich on <Link href="https://www.portainer.io/">Portainer</Link></CardDescription>
Expand All @@ -112,7 +112,7 @@
</CardFooter>
</Card>

<Card color="secondary" variant="subtle" class="h-full">
<Card color="secondary" class="h-full">
<CardHeader>
<CardTitle>Unraid</CardTitle>
<CardDescription>Run Immich on <Link href="https://unraid.net/">Unraid</Link></CardDescription>
Expand All @@ -125,7 +125,7 @@
</CardFooter>
</Card>

<Card color="secondary" variant="subtle" class="h-full">
<Card color="secondary" class="h-full">
<CardHeader>
<CardTitle>TrueNAS SCALE</CardTitle>
<CardDescription
Expand Down
14 changes: 7 additions & 7 deletions apps/get.immich.app/routes/docker-compose/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<CodePreview code={spec}>
<div class="flex flex-col lg:flex-row-reverse gap-2">
<div>
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Settings</CardTitle>
</CardHeader>
Expand Down Expand Up @@ -144,7 +144,7 @@

<form class="grow">
<Stack>
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Options</CardTitle>
</CardHeader>
Expand All @@ -158,7 +158,7 @@
</Card>

{#if settings.customFolders}
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Custom Folders</CardTitle>
</CardHeader>
Expand Down Expand Up @@ -186,7 +186,7 @@
</CardBody>
</Card>
{:else}
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Folders</CardTitle>
</CardHeader>
Expand All @@ -201,7 +201,7 @@
{/if}

{#if settings.externalPostgres}
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>External Postgres</CardTitle>
</CardHeader>
Expand All @@ -212,7 +212,7 @@
</CardBody>
</Card>
{:else}
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Postgres</CardTitle>
</CardHeader>
Expand Down Expand Up @@ -244,7 +244,7 @@
{/if}

{#if settings.externalRedis}
<Card variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>External Redis</CardTitle>
</CardHeader>
Expand Down
36 changes: 14 additions & 22 deletions apps/my.immich.app/routes/[...rest]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
Card,
CardBody,
CardDescription,
CardFooter,
CardHeader,
CardTitle,
Heading,
Expand Down Expand Up @@ -58,33 +57,26 @@
<Text>My Immich allows public links to link you to specific areas of your personal Immich instance.</Text>

<form onsubmit={handleSubmit}>
<Card color="secondary" variant="subtle">
<Card color="secondary">
<CardHeader>
<CardTitle>Instance URL</CardTitle>
<CardDescription>This URL is only stored in your browser</CardDescription>
</CardHeader>
<CardBody>
<section>
<Stack gap={4}>
<Input
type="text"
placeholder="https://demo.immich.app/"
bind:value={instanceUrl}
oninput={handleChange}
/>
</Stack>
</section>
<Stack gap={4}>
<Input type="text" placeholder="https://demo.immich.app/" bind:value={instanceUrl} oninput={handleChange} />
<div class="flex justify-end">
<Button type="submit" class="w-full sm:w-auto" disabled={saved}>
{#if saved}
<Icon icon={mdiCheckCircleOutline} />
Saved!
{:else}
{targetUrl ? 'Save & Redirect' : 'Save'}
{/if}
</Button>
</div>
</Stack>
</CardBody>
<CardFooter class="justify-end">
<Button type="submit" class="w-full sm:w-auto" disabled={saved}>
{#if saved}
<Icon icon={mdiCheckCircleOutline} />
Saved!
{:else}
{targetUrl ? 'Save & Redirect' : 'Save'}
{/if}
</Button>
</CardFooter>
</Card>
</form>
</Stack>
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"format:fix": "prettier --write ."
},
"devDependencies": {
"@immich/ui": "^0.9.0",
"@immich/ui": "^0.10.0",
"@sveltejs/adapter-static": "^3.0.6",
"@sveltejs/kit": "^2.12.1",
"@sveltejs/vite-plugin-svelte": "^5.0.2",
Expand Down
56 changes: 27 additions & 29 deletions src/lib/components/CodePreview.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { Button, Card, CardBody, CardHeader, Heading, HStack, Icon } from '@immich/ui';
import { Button, Card, Heading, HStack, Icon } from '@immich/ui';
import { mdiPencilOutline, mdiXml } from '@mdi/js';
import type { Snippet } from 'svelte';
import { HighlightSvelte, LineNumbers } from 'svelte-highlight';
Expand All @@ -23,39 +23,37 @@
{@html atomOneDark}
</svelte:head>

<Card color="primary">
<CardHeader>
<div class="flex justify-between">
<Heading size="medium">docker-compose.yaml</Heading>
<HStack gap={1} class="lg:border rounded-xl p-1">
<Button
disabled={viewMode === 'children'}
onclick={handleToggle}
size="small"
class={viewMode === 'children' ? 'hidden md:flex' : ''}
>
<Icon icon={mdiPencilOutline} size="1.5em" />
<span>Configure</span>
</Button>
<Button
disabled={viewMode === 'code'}
onclick={handleToggle}
size="small"
class={viewMode === 'code' ? 'hidden md:flex' : ''}
>
<Icon icon={mdiXml} size="1.5em" />
<span>View</span>
</Button>
</HStack>
</div>
</CardHeader>
<CardBody class={viewMode === 'code' ? 'p-0 pt-4' : ''}>
<Card>
<div class="flex justify-between items-center p-4">
<Heading size="medium">docker-compose.yaml</Heading>
<HStack gap={1} class="lg:border rounded-xl p-1">
<Button
disabled={viewMode === 'children'}
onclick={handleToggle}
size="small"
class={viewMode === 'children' ? 'hidden md:flex' : ''}
>
<Icon icon={mdiPencilOutline} size="1.5em" />
<span>Configure</span>
</Button>
<Button
disabled={viewMode === 'code'}
onclick={handleToggle}
size="small"
class={viewMode === 'code' ? 'hidden md:flex' : ''}
>
<Icon icon={mdiXml} size="1.5em" />
<span>View</span>
</Button>
</HStack>
</div>
<div class={viewMode === 'children' ? 'px-4 pb-4' : ''}>
{#if viewMode === 'children'}
{@render children()}
{:else}
<HighlightSvelte code={code.trim().replaceAll(/\t/gm, ' ')} let:highlighted>
<LineNumbers {highlighted} hideBorder wrapLines />
</HighlightSvelte>
{/if}
</CardBody>
</div>
</Card>
2 changes: 1 addition & 1 deletion src/lib/components/LicenseKey.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
};
</script>

<Card variant="subtle" {color}>
<Card {color}>
<CardHeader>
<CardTitle size="tiny">{type} Product Key</CardTitle>
</CardHeader>
Expand Down
Loading