From d27c01ef70ec0535d613fa5ec1ed714bc02d65cf Mon Sep 17 00:00:00 2001 From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com> Date: Mon, 10 Nov 2025 19:16:49 +0100 Subject: [PATCH] chore: migrate remaining usages of the logo to use the UI lib (#23430) --- .../components/album-page/album-viewer.svelte | 7 +- .../lib/components/layouts/ErrorLayout.svelte | 5 +- .../onboarding-page/onboarding-hello.svelte | 4 +- .../components/pages/SharedLinkPage.svelte | 7 +- .../individual-shared-viewer.svelte | 7 +- .../drag-and-drop-upload-overlay.svelte | 4 +- .../immich-logo-small-link.svelte | 8 -- .../shared-components/immich-logo.svelte | 112 ------------------ .../navigation-bar/navigation-bar.svelte | 5 +- .../side-bar/purchase-info.svelte | 10 +- .../side-bar/supporter-badge.svelte | 4 +- 11 files changed, 25 insertions(+), 148 deletions(-) delete mode 100644 web/src/lib/components/shared-components/immich-logo-small-link.svelte delete mode 100644 web/src/lib/components/shared-components/immich-logo.svelte diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 460cf4e63b..d0d03eef80 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -16,11 +16,10 @@ import { cancelMultiselect } from '$lib/utils/asset-utils'; import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader'; import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk'; - import { IconButton } from '@immich/ui'; + import { IconButton, Logo } from '@immich/ui'; import { mdiDownload, mdiFileImagePlusOutline } from '@mdi/js'; import { t } from 'svelte-i18n'; import ControlAppBar from '../shared-components/control-app-bar.svelte'; - import ImmichLogoSmallLink from '../shared-components/immich-logo-small-link.svelte'; import ThemeButton from '../shared-components/theme-button.svelte'; import AlbumSummary from './album-summary.svelte'; @@ -98,7 +97,9 @@ {:else} {#snippet leading()} - + + + {/snippet} {#snippet trailing()} diff --git a/web/src/lib/components/layouts/ErrorLayout.svelte b/web/src/lib/components/layouts/ErrorLayout.svelte index b97b1f05d5..1df1dbf422 100644 --- a/web/src/lib/components/layouts/ErrorLayout.svelte +++ b/web/src/lib/components/layouts/ErrorLayout.svelte @@ -1,7 +1,6 @@
- +

{$t('onboarding_welcome_user', { values: { user: $user.name } })}

diff --git a/web/src/lib/components/pages/SharedLinkPage.svelte b/web/src/lib/components/pages/SharedLinkPage.svelte index b9ed34c0e8..d30c3ce341 100644 --- a/web/src/lib/components/pages/SharedLinkPage.svelte +++ b/web/src/lib/components/pages/SharedLinkPage.svelte @@ -2,7 +2,6 @@ import AlbumViewer from '$lib/components/album-page/album-viewer.svelte'; import IndividualSharedViewer from '$lib/components/share-page/individual-shared-viewer.svelte'; import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte'; - import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte'; import ThemeButton from '$lib/components/shared-components/theme-button.svelte'; import { assetViewingStore } from '$lib/stores/asset-viewing.store'; import { user } from '$lib/stores/user.store'; @@ -10,7 +9,7 @@ import { handleError } from '$lib/utils/handle-error'; import { navigate } from '$lib/utils/navigation'; import { getMySharedLink, SharedLinkType, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk'; - import { Button, PasswordInput } from '@immich/ui'; + import { Button, Logo, PasswordInput } from '@immich/ui'; import { tick } from 'svelte'; import { t } from 'svelte-i18n'; @@ -87,7 +86,9 @@
{#snippet leading()} - + + + {/snippet} {#snippet trailing()} diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte index f805e92de0..b7d9e548df 100644 --- a/web/src/lib/components/share-page/individual-shared-viewer.svelte +++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte @@ -1,7 +1,6 @@ - - - - diff --git a/web/src/lib/components/shared-components/immich-logo.svelte b/web/src/lib/components/shared-components/immich-logo.svelte deleted file mode 100644 index a57f367964..0000000000 --- a/web/src/lib/components/shared-components/immich-logo.svelte +++ /dev/null @@ -1,112 +0,0 @@ - - - - {$t('immich_logo')} - {#if !noText} - - - - - - - - - {/if} - - - - - - - - - - diff --git a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte index f73f9f3b51..03c5ca3be4 100644 --- a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte +++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte @@ -6,7 +6,6 @@ import { page } from '$app/state'; import { clickOutside } from '$lib/actions/click-outside'; import CastButton from '$lib/cast/cast-button.svelte'; - import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte'; import NotificationPanel from '$lib/components/shared-components/navigation-bar/notification-panel.svelte'; import SearchBar from '$lib/components/shared-components/search-bar/search-bar.svelte'; import { AppRoute } from '$lib/constants'; @@ -17,7 +16,7 @@ import { featureFlags } from '$lib/stores/server-config.store'; import { sidebarStore } from '$lib/stores/sidebar.svelte'; import { user } from '$lib/stores/user.store'; - import { Button, IconButton } from '@immich/ui'; + import { Button, IconButton, Logo } from '@immich/ui'; import { mdiBellBadge, mdiBellOutline, mdiMagnify, mdiMenu, mdiTrayArrowUp } from '@mdi/js'; import { onMount } from 'svelte'; import { t } from 'svelte-i18n'; @@ -78,7 +77,7 @@ class="sidebar:hidden" /> - +
diff --git a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte index eb4433aa2b..8c16e3ba38 100644 --- a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte +++ b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte @@ -1,7 +1,5 @@