helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(web): use ImmichApi to create urls (#2435)

Browse source
This commit is contained in:
Michel Heusschen 2023-05-14 04:52:29 +02:00 • committed by GitHub
parent 15fa8250cb
commit 4524aa0d06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
web/src/lib/components/asset-viewer/album-list-item.svelte
View file

@ -1,5 +1,5 @@
<script lang="ts">
import { AlbumResponseDto, ThumbnailFormat } from '@api';
import { AlbumResponseDto, ThumbnailFormat, api } from '@api';
import { createEventDispatcher } from 'svelte';
const dispatcher = createEventDispatcher();
@ -29,7 +29,8 @@
>
<div class="h-12 w-12">
<img
src={`/api/asset/thumbnail/${album.albumThumbnailAssetId}?format=${ThumbnailFormat.Webp}`}
src={album.albumThumbnailAssetId &&
api.getAssetThumbnailUrl(album.albumThumbnailAssetId, ThumbnailFormat.Webp)}
alt={album.albumName}
class={`object-cover h-full w-full transition-all z-0 rounded-xl duration-300 hover:shadow-lg`}
data-testid="album-image"

5
web/src/lib/components/asset-viewer/detail-panel.svelte
View file

@ -5,7 +5,7 @@
import CameraIris from 'svelte-material-icons/CameraIris.svelte';
import MapMarkerOutline from 'svelte-material-icons/MapMarkerOutline.svelte';
import { createEventDispatcher } from 'svelte';
import { AssetResponseDto, AlbumResponseDto, api } from '@api';
import { AssetResponseDto, AlbumResponseDto, api, ThumbnailFormat } from '@api';
import { asByteUnitString } from '../../utils/byte-units';
import { locale } from '$lib/stores/preferences.store';
import { DateTime } from 'luxon';
@ -241,7 +241,8 @@
<img
alt={album.albumName}
class="w-[50px] h-[50px] object-cover rounded"
src={`/api/asset/thumbnail/${album.albumThumbnailAssetId}?format=JPEG`}
src={album.albumThumbnailAssetId &&
api.getAssetThumbnailUrl(album.albumThumbnailAssetId, ThumbnailFormat.Jpeg)}
draggable="false"
/>
</div>

6
web/src/lib/components/asset-viewer/video-viewer.svelte
View file

@ -1,11 +1,11 @@
<script lang="ts">
import { api } from '@api';
import { fade } from 'svelte/transition';
import { createEventDispatcher } from 'svelte';
import LoadingSpinner from '../shared-components/loading-spinner.svelte';
import { getFileUrl } from '@api';
export let assetId: string;
export let publicSharedKey = '';
export let publicSharedKey: string | undefined = undefined;
let isVideoLoading = true;
const dispatch = createEventDispatcher();
@ -31,7 +31,7 @@
on:canplay={handleCanPlay}
on:ended={() => dispatch('onVideoEnded')}
>
<source src={getFileUrl(assetId, false, true, publicSharedKey)} type="video/mp4" />
<source src={api.getAssetFileUrl(assetId, false, true, publicSharedKey)} type="video/mp4" />
<track kind="captions" />
</video>