diff --git a/web/src/app.css b/web/src/app.css index a565023d3f0..a683e101747 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -46,9 +46,7 @@ html::-webkit-scrollbar-thumb:hover { } body { - /* min-height: 100vh; */ margin: 0; - /* background-color: #f6f8fe; */ color: #5f6368; } diff --git a/web/src/app.html b/web/src/app.html index b5f19dfba53..0381a288e76 100644 --- a/web/src/app.html +++ b/web/src/app.html @@ -7,7 +7,7 @@ %sveltekit.head% - -
%sveltekit.body%
+ +
%sveltekit.body%
diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 84127a2564b..7cf48c1d285 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -236,25 +236,6 @@ } }; - const assetUploadedToAlbumHandler = async (event: CustomEvent) => { - const { assetIds }: { assetIds: string[] } = event.detail; - try { - const { data } = await api.albumApi.addAssetsToAlbum(album.id, { - assetIds: assetIds - }); - - if (data.album) { - album = data.album; - } - } catch (e) { - console.error('Error [assetUploadedToAlbumHandler] ', e); - notificationController.show({ - type: NotificationType.Error, - message: 'Error adding asset to album, check console for more details' - }); - } - }; - const addUserHandler = async (event: CustomEvent) => { const { selectedUsers }: { selectedUsers: UserResponseDto[] } = event.detail; @@ -591,10 +572,10 @@ {#if isShowAssetSelection} (isShowAssetSelection = false)} on:create-album={createAlbumHandler} - on:asset-uploaded={assetUploadedToAlbumHandler} /> {/if} diff --git a/web/src/lib/components/album-page/asset-selection.svelte b/web/src/lib/components/album-page/asset-selection.svelte index c44282e3ffc..18fb15b2a77 100644 --- a/web/src/lib/components/album-page/asset-selection.svelte +++ b/web/src/lib/components/album-page/asset-selection.svelte @@ -3,8 +3,7 @@ import { quintOut } from 'svelte/easing'; import { fly } from 'svelte/transition'; import { AssetResponseDto } from '@api'; - import { openFileUploadDialog, UploadType } from '$lib/utils/file-uploader'; - import { albumUploadAssetStore } from '$lib/stores/album-upload-asset'; + import { openFileUploadDialog } from '$lib/utils/file-uploader'; import ControlAppBar from '../shared-components/control-app-bar.svelte'; import AssetGrid from '../photos-page/asset-grid.svelte'; import { @@ -15,50 +14,13 @@ const dispatch = createEventDispatcher(); + export let albumId: string; export let assetsInAlbum: AssetResponseDto[]; - let uploadAssets: string[] = []; - let uploadAssetsCount = 9999; - onMount(() => { $assetsInAlbumStoreState = assetsInAlbum; - - albumUploadAssetStore.asset.subscribe((uploadedAsset) => { - uploadAssets = uploadedAsset; - }); - - albumUploadAssetStore.count.subscribe((count) => { - uploadAssetsCount = count; - }); }); - /** - * Watch for the uploading event - when the uploaded assets are the same number of the chosen asset - * navigate back and add them to the album - */ - $: { - if (uploadAssets.length == uploadAssetsCount) { - // Filter assets that are already in the album - const assetIds = uploadAssets.filter( - (asset) => !!asset && !assetsInAlbum.some((a) => a.id === asset) - ); - - // Add the just uploaded assets to the album - if (assetIds.length) { - dispatch('asset-uploaded', { - assetIds - }); - } - - // Clean up states. - albumUploadAssetStore.asset.set([]); - albumUploadAssetStore.count.set(9999); - - assetInteractionStore.clearMultiselect(); - dispatch('go-back'); - } - } - const addSelectedAssets = async () => { dispatch('create-album', { assets: Array.from($selectedAssets) @@ -88,7 +50,11 @@