mirror of
https://github.com/immich-app/immich.git
synced 2024-11-24 08:52:28 +02:00
fix(web): update avatar color immediately (#10393)
This commit is contained in:
parent
010eb1e0d6
commit
0b08af7082
@ -29,6 +29,7 @@
|
||||
}
|
||||
|
||||
$preferences = await updateMyPreferences({ userPreferencesUpdateDto: { avatar: { color } } });
|
||||
$user = { ...$user, profileImagePath: '', avatarColor: $preferences.avatar.color };
|
||||
isShowSelectAvatar = false;
|
||||
|
||||
notificationController.show({
|
||||
@ -52,9 +53,7 @@
|
||||
class="mx-4 mt-4 flex flex-col items-center justify-center gap-4 rounded-3xl bg-white p-4 dark:bg-immich-dark-primary/10"
|
||||
>
|
||||
<div class="relative">
|
||||
{#key $user}
|
||||
<UserAvatar user={$user} size="xl" />
|
||||
{/key}
|
||||
<UserAvatar user={$user} size="xl" />
|
||||
<div class="absolute z-10 bottom-0 right-0 rounded-full w-6 h-6">
|
||||
<CircleIconButton
|
||||
color="primary"
|
||||
@ -96,6 +95,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</FocusTrap>
|
||||
|
||||
{#if isShowSelectAvatar}
|
||||
<AvatarSelector
|
||||
user={$user}
|
||||
|
@ -5,7 +5,6 @@
|
||||
<script lang="ts">
|
||||
import { getProfileImageUrl } from '$lib/utils';
|
||||
import { type UserAvatarColor } from '@immich/sdk';
|
||||
import { onMount, tick } from 'svelte';
|
||||
|
||||
interface User {
|
||||
id: string;
|
||||
@ -16,7 +15,7 @@
|
||||
}
|
||||
|
||||
export let user: User;
|
||||
export let color: UserAvatarColor = user.avatarColor;
|
||||
export let color: UserAvatarColor | undefined = undefined;
|
||||
export let size: Size = 'full';
|
||||
export let rounded = true;
|
||||
export let interactive = false;
|
||||
@ -27,15 +26,16 @@
|
||||
let img: HTMLImageElement;
|
||||
let showFallback = true;
|
||||
|
||||
onMount(async () => {
|
||||
if (!user.profileImagePath) {
|
||||
return;
|
||||
}
|
||||
$: img, user, void tryLoadImage();
|
||||
|
||||
await img.decode();
|
||||
await tick();
|
||||
showFallback = false;
|
||||
});
|
||||
const tryLoadImage = async () => {
|
||||
try {
|
||||
await img.decode();
|
||||
showFallback = false;
|
||||
} catch {
|
||||
showFallback = true;
|
||||
}
|
||||
};
|
||||
|
||||
const colorClasses: Record<UserAvatarColor, string> = {
|
||||
primary: 'bg-immich-primary dark:bg-immich-dark-primary text-immich-dark-fg dark:text-immich-fg',
|
||||
@ -60,7 +60,7 @@
|
||||
xxxl: 'w-28 h-28',
|
||||
};
|
||||
|
||||
$: colorClass = colorClasses[color];
|
||||
$: colorClass = colorClasses[color || user.avatarColor];
|
||||
$: sizeClass = sizeClasses[size];
|
||||
$: title = label ?? `${user.name} (${user.email})`;
|
||||
$: interactiveClass = interactive
|
||||
|
Loading…
Reference in New Issue
Block a user