Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
⏪️ Revert changes to optimized image
Luke Vellab858e8747b25
diff --git a/apps/web/src/components/optimized-avatar-image.tsx b/apps/web/src/components/optimized-avatar-image.tsxindex 30e01da1a..cbd9160ab 100644--- a/apps/web/src/components/optimized-avatar-image.tsx+++ b/apps/web/src/components/optimized-avatar-image.tsx@@ -3,8 +3,8 @@ import { cn } from "@rallly/ui";import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";import { Icon } from "@rallly/ui/icon";import { UserIcon } from "lucide-react";+import Image from "next/image";import React from "react";-import { resolveStorageUrl } from "@/utils/storage";async function getGravatarUrl(email: string): Promise<string | null> {if (typeof crypto === "undefined" || !crypto.subtle) {@@ -35,6 +35,7 @@ export function OptimizedAvatarImage({className?: string;email?: string;}) {+ const [isLoaded, setLoaded] = React.useState(false);const [gravatarUrl, setGravatarUrl] = React.useState<string | null>(null);React.useEffect(() => {@@ -61,17 +62,32 @@ export function OptimizedAvatarImage({return (<Avatar className={cn("rounded-full", className)} size={size}>{imageSrc ? (- <AvatarImage src={resolveStorageUrl(imageSrc)} alt={name} />- ) : null}- <AvatarFallback seed={name} className={cn("shrink-0")}>- {/^\p{L}+$/u.test(initials) ? (- initials+ imageSrc.startsWith("https") || imageSrc.startsWith("data:") ? (+ <AvatarImage src={imageSrc} alt={name} />) : (- <Icon>- <UserIcon />- </Icon>- )}- </AvatarFallback>+ <Image+ src={`/api/storage/${imageSrc}`}+ width={128}+ height={128}+ alt={name}+ style={{ objectFit: "cover" }}+ onLoad={() => {+ setLoaded(true);+ }}+ />+ )+ ) : null}+ {!imageSrc || !isLoaded ? (+ <AvatarFallback seed={name} className={cn("shrink-0")}>+ {/^\p{L}+$/u.test(initials) ? (+ initials+ ) : (+ <Icon>+ <UserIcon />+ </Icon>+ )}+ </AvatarFallback>+ ) : null}</Avatar>);}diff --git a/apps/web/src/features/space/components/space-icon.tsx b/apps/web/src/features/space/components/space-icon.tsxindex 9e2b38fb7..9bc42281b 100644--- a/apps/web/src/features/space/components/space-icon.tsx+++ b/apps/web/src/features/space/components/space-icon.tsx@@ -2,8 +2,8 @@import { cn } from "@rallly/ui";import type { AvatarProps } from "@rallly/ui/avatar";-import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";-import { resolveStorageUrl } from "@/utils/storage";+import { Avatar, AvatarFallback } from "@rallly/ui/avatar";+import Image from "next/image";type SpaceIconProps = {name: string;@@ -14,10 +14,19 @@ type SpaceIconProps = {export function SpaceIcon({ name, src, className, size }: SpaceIconProps) {return (<Avatar className={cn(className)} size={size}>- {src ? <AvatarImage src={resolveStorageUrl(src)} alt={name} /> : null}- <AvatarFallback seed={name}>- {name.slice(0, 2).toUpperCase()}- </AvatarFallback>+ {src ? (+ <Image+ src={`/api/storage/${src}`}+ width={128}+ height={128}+ alt={name}+ style={{ objectFit: "cover" }}+ />+ ) : (+ <AvatarFallback seed={name}>+ {name.slice(0, 2).toUpperCase()}+ </AvatarFallback>+ )}</Avatar>);}