diff --git a/web/src/lib/components/album-page/album-summary.svelte b/web/src/lib/components/album-page/album-summary.svelte index 4a49eeb444..c1832544f8 100644 --- a/web/src/lib/components/album-page/album-summary.svelte +++ b/web/src/lib/components/album-page/album-summary.svelte @@ -26,7 +26,7 @@ -

{getDateRange(startDate, endDate)}

-

·

-

{album.assetCount} items

+ {getDateRange(startDate, endDate)} + + {album.assetCount} items
diff --git a/web/src/lib/components/asset-viewer/album-list-item-details.svelte b/web/src/lib/components/asset-viewer/album-list-item-details.svelte new file mode 100644 index 0000000000..60e49526ef --- /dev/null +++ b/web/src/lib/components/asset-viewer/album-list-item-details.svelte @@ -0,0 +1,10 @@ + + +{album.assetCount} items +{#if album.shared} + • Shared +{/if} diff --git a/web/src/lib/components/asset-viewer/album-list-item.svelte b/web/src/lib/components/asset-viewer/album-list-item.svelte index 23c06e1bd5..0cde7c8465 100644 --- a/web/src/lib/components/asset-viewer/album-list-item.svelte +++ b/web/src/lib/components/asset-viewer/album-list-item.svelte @@ -3,13 +3,13 @@ import { ThumbnailFormat, type AlbumResponseDto } from '@immich/sdk'; import { createEventDispatcher } from 'svelte'; import { normalizeSearchString } from '$lib/utils/string-utils.js'; + import AlbumListItemDetails from './album-list-item-details.svelte'; const dispatch = createEventDispatcher<{ album: void; }>(); export let album: AlbumResponseDto; - export let variant: 'simple' | 'full' = 'full'; export let searchQuery = ''; let albumNameArray: string[] = ['', '', '']; @@ -31,7 +31,7 @@ on:click={() => dispatch('album')} class="flex w-full gap-4 px-6 py-2 text-left transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl" > -
+ {#if album.albumThumbnailAssetId} {/if} -
-
+ + {albumNameArray[0]}{albumNameArray[1]}{albumNameArray[2]} - {#if variant === 'simple'} - {album.shared ? 'Shared' : ''} - {:else} - {album.assetCount} items{album.shared ? ' - Shared' : ''} - {/if} + -
+ diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte index 653d5903d2..d2590b3db1 100644 --- a/web/src/lib/components/asset-viewer/detail-panel.svelte +++ b/web/src/lib/components/asset-viewer/detail-panel.svelte @@ -33,8 +33,8 @@ import { DateTime } from 'luxon'; import { createEventDispatcher, onMount } from 'svelte'; import { slide } from 'svelte/transition'; - import { asByteUnitString } from '../../utils/byte-units'; - import { handleError } from '../../utils/handle-error'; + import { asByteUnitString } from '$lib/utils/byte-units'; + import { handleError } from '$lib/utils/handle-error'; import ImageThumbnail from '../assets/thumbnail/image-thumbnail.svelte'; import CircleIconButton from '../elements/buttons/circle-icon-button.svelte'; import PersonSidePanel from '../faces-page/person-side-panel.svelte'; @@ -43,6 +43,7 @@ import LoadingSpinner from '../shared-components/loading-spinner.svelte'; import { NotificationType, notificationController } from '../shared-components/notification/notification'; import { shortcut } from '$lib/utils/shortcut'; + import AlbumListItemDetails from './album-list-item-details.svelte'; export let asset: AssetResponseDto; export let albums: AlbumResponseDto[] = []; @@ -607,10 +608,7 @@

{album.albumName}

- {album.assetCount} items - {#if album.shared} - • Shared - {/if} +
diff --git a/web/src/lib/components/shared-components/album-selection-modal.svelte b/web/src/lib/components/shared-components/album-selection-modal.svelte index a3ef3a9ff3..385e70d83b 100644 --- a/web/src/lib/components/shared-components/album-selection-modal.svelte +++ b/web/src/lib/components/shared-components/album-selection-modal.svelte @@ -89,7 +89,7 @@ {#if !shared && search.length === 0}

RECENT

{#each recentAlbums as album (album.id)} - handleSelect(album)} /> + handleSelect(album)} /> {/each} {/if}