diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 46fbec0bed..9336dc66aa 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -2,8 +2,9 @@ import { shortcut } from '$lib/actions/shortcut'; import CastButton from '$lib/cast/cast-button.svelte'; import AlbumMap from '$lib/components/album-page/album-map.svelte'; - import SelectAllAssets from '$lib/components/photos-page/actions/select-all-assets.svelte'; - import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte'; + import DownloadAction from '$lib/components/timeline/actions/DownloadAction.svelte'; + import SelectAllAssets from '$lib/components/timeline/actions/SelectAllAction.svelte'; + import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte'; import Timeline from '$lib/components/timeline/Timeline.svelte'; import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte'; import { AssetInteraction } from '$lib/stores/asset-interaction.svelte'; @@ -18,7 +19,6 @@ import { mdiDownload, mdiFileImagePlusOutline } from '@mdi/js'; import { onDestroy } from 'svelte'; import { t } from 'svelte-i18n'; - import DownloadAction from '../photos-page/actions/download-action.svelte'; 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'; diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte index d9ab631d35..7f566c41a2 100644 --- a/web/src/lib/components/memory-page/memory-viewer.svelte +++ b/web/src/lib/components/memory-page/memory-viewer.svelte @@ -6,17 +6,6 @@ import { shortcuts } from '$lib/actions/shortcut'; import MemoryPhotoViewer from '$lib/components/memory-page/memory-photo-viewer.svelte'; import MemoryVideoViewer from '$lib/components/memory-page/memory-video-viewer.svelte'; - import AddToAlbum from '$lib/components/photos-page/actions/add-to-album.svelte'; - import ArchiveAction from '$lib/components/photos-page/actions/archive-action.svelte'; - import ChangeDate from '$lib/components/photos-page/actions/change-date-action.svelte'; - import ChangeDescription from '$lib/components/photos-page/actions/change-description-action.svelte'; - import ChangeLocation from '$lib/components/photos-page/actions/change-location-action.svelte'; - import CreateSharedLink from '$lib/components/photos-page/actions/create-shared-link.svelte'; - import DeleteAssets from '$lib/components/photos-page/actions/delete-assets.svelte'; - import DownloadAction from '$lib/components/photos-page/actions/download-action.svelte'; - import FavoriteAction from '$lib/components/photos-page/actions/favorite-action.svelte'; - import TagAction from '$lib/components/photos-page/actions/tag-action.svelte'; - import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte'; import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte'; import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte'; import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte'; @@ -25,6 +14,17 @@ notificationController, NotificationType, } from '$lib/components/shared-components/notification/notification'; + import AddToAlbum from '$lib/components/timeline/actions/AddToAlbumAction.svelte'; + import ArchiveAction from '$lib/components/timeline/actions/ArchiveAction.svelte'; + import ChangeDate from '$lib/components/timeline/actions/ChangeDateAction.svelte'; + import ChangeDescription from '$lib/components/timeline/actions/ChangeDescriptionAction.svelte'; + import ChangeLocation from '$lib/components/timeline/actions/ChangeLocationAction.svelte'; + import CreateSharedLink from '$lib/components/timeline/actions/CreateSharedLinkAction.svelte'; + import DeleteAssets from '$lib/components/timeline/actions/DeleteAssetsAction.svelte'; + import DownloadAction from '$lib/components/timeline/actions/DownloadAction.svelte'; + import FavoriteAction from '$lib/components/timeline/actions/FavoriteAction.svelte'; + import TagAction from '$lib/components/timeline/actions/TagAction.svelte'; + import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte'; import { AppRoute, QueryParameter } from '$lib/constants'; import { authManager } from '$lib/managers/auth-manager.svelte'; import type { TimelineAsset, Viewport } from '$lib/managers/timeline-manager/types'; 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 c677922379..421d4a0b5f 100644 --- a/web/src/lib/components/share-page/individual-shared-viewer.svelte +++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte @@ -2,6 +2,9 @@ import { goto } from '$app/navigation'; import type { Action } from '$lib/components/asset-viewer/actions/action'; import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte'; + import DownloadAction from '$lib/components/timeline/actions/DownloadAction.svelte'; + import RemoveFromSharedLink from '$lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte'; + import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte'; import { AppRoute, AssetAction } from '$lib/constants'; import { authManager } from '$lib/managers/auth-manager.svelte'; import type { Viewport } from '$lib/managers/timeline-manager/types'; @@ -17,9 +20,6 @@ import { mdiArrowLeft, mdiDownload, mdiFileImagePlusOutline, mdiSelectAll } from '@mdi/js'; import { t } from 'svelte-i18n'; import AssetViewer from '../asset-viewer/asset-viewer.svelte'; - import DownloadAction from '../photos-page/actions/download-action.svelte'; - import RemoveFromSharedLink from '../photos-page/actions/remove-from-shared-link.svelte'; - import AssetSelectControlBar from '../photos-page/asset-select-control-bar.svelte'; import ControlAppBar from '../shared-components/control-app-bar.svelte'; import GalleryViewer from '../shared-components/gallery-viewer/gallery-viewer.svelte'; import { NotificationType, notificationController } from '../shared-components/notification/notification'; diff --git a/web/src/lib/components/photos-page/asset-select-control-bar.svelte b/web/src/lib/components/timeline/AssetSelectControlBar.svelte similarity index 100% rename from web/src/lib/components/photos-page/asset-select-control-bar.svelte rename to web/src/lib/components/timeline/AssetSelectControlBar.svelte diff --git a/web/src/lib/components/timeline/Timeline.svelte b/web/src/lib/components/timeline/Timeline.svelte index 7a178bb331..ad0fac1bb5 100644 --- a/web/src/lib/components/timeline/Timeline.svelte +++ b/web/src/lib/components/timeline/Timeline.svelte @@ -4,14 +4,14 @@ import { resizeObserver, type OnResizeCallback } from '$lib/actions/resize-observer'; import { shortcuts, type ShortcutOptions } from '$lib/actions/shortcut'; import type { Action } from '$lib/components/asset-viewer/actions/action'; - import { - setFocusToAsset as setFocusAssetInit, - setFocusTo as setFocusToInit, - } from '$lib/components/photos-page/actions/focus-actions'; import Skeleton from '$lib/components/photos-page/skeleton.svelte'; import type { AbsoluteResult, RelativeResult } from '$lib/components/shared-components/change-date.svelte'; import ChangeDate from '$lib/components/shared-components/change-date.svelte'; import Scrubber from '$lib/components/shared-components/scrubber/scrubber.svelte'; + import { + setFocusToAsset as setFocusAssetInit, + setFocusTo as setFocusToInit, + } from '$lib/components/timeline/actions/focus-actions'; import { AppRoute, AssetAction } from '$lib/constants'; import { authManager } from '$lib/managers/auth-manager.svelte'; import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte'; diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/timeline/actions/AddToAlbumAction.svelte similarity index 93% rename from web/src/lib/components/photos-page/actions/add-to-album.svelte rename to web/src/lib/components/timeline/actions/AddToAlbumAction.svelte index 13a26cd137..2f0f5b21b7 100644 --- a/web/src/lib/components/photos-page/actions/add-to-album.svelte +++ b/web/src/lib/components/timeline/actions/AddToAlbumAction.svelte @@ -1,12 +1,12 @@