Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Update avatar colors (#1351)

Luke Vellaa6bb357acc83
diff --git a/apps/web/src/components/optimized-avatar-image.tsx b/apps/web/src/components/optimized-avatar-image.tsx
index e528bcae3..51b43df59 100644
--- a/apps/web/src/components/optimized-avatar-image.tsx
+++ b/apps/web/src/components/optimized-avatar-image.tsx
@@ -39,6 +39,7 @@ export function OptimizedAvatarImage({
) : null}
{!src || !isLoaded ? (
<AvatarFallback
+ seed={name}
className={cn({
"text-xs": size <= 24,
"text-lg": size >= 48,
diff --git a/apps/web/src/components/participant.tsx b/apps/web/src/components/participant.tsx
index 1cdffa8ac..940cf9bbe 100644
--- a/apps/web/src/components/participant.tsx
+++ b/apps/web/src/components/participant.tsx
@@ -1,5 +1,5 @@
import { cn } from "@rallly/ui";
-import { Avatar, AvatarFallback, getColor } from "@rallly/ui/avatar";
+import { Avatar, AvatarFallback } from "@rallly/ui/avatar";
import React from "react";
export function Participant({ children }: { children: React.ReactNode }) {
@@ -13,11 +13,9 @@ export const ParticipantAvatar = ({
size?: number;
name: string;
}) => {
- const color = getColor(name);
-
return (
<Avatar size={size}>
- <AvatarFallback className="text-xs" color={color}>
+ <AvatarFallback className="text-xs" seed={name}>
{name[0]?.toUpperCase()}
</AvatarFallback>
</Avatar>
diff --git a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
index e64a7354e..4b6ca5d27 100644
--- a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
+++ b/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx
@@ -15,6 +15,7 @@ import { Controller } from "react-hook-form";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Participant, ParticipantName } from "@/components/participant";
import { useVotingForm } from "@/components/poll/voting-form";
+import { YouAvatar } from "@/components/poll/you-avatar";
import { Trans } from "@/components/trans";
import { usePoll } from "../../poll-context";
@@ -60,7 +61,11 @@ const ParticipantRowForm = ({
>
<div className="flex items-center justify-between gap-x-2.5">
<Participant>
- <OptimizedAvatarImage name={participantName} size={20} />
+ {name ? (
+ <OptimizedAvatarImage name={participantName} size={20} />
+ ) : (
+ <YouAvatar />
+ )}
<ParticipantName>{participantName}</ParticipantName>
</Participant>
{!isNew ? (
diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsx
index 7b6aee7dd..010be35b2 100644
--- a/apps/web/src/components/poll/mobile-poll.tsx
+++ b/apps/web/src/components/poll/mobile-poll.tsx
@@ -20,6 +20,7 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Participant, ParticipantName } from "@/components/participant";
import { ParticipantDropdown } from "@/components/participant-dropdown";
import { useVotingForm } from "@/components/poll/voting-form";
+import { YouAvatar } from "@/components/poll/you-avatar";
import { useOptions, usePoll } from "@/components/poll-context";
import { Trans } from "@/components/trans";
import { usePermissions } from "@/contexts/permissions";
@@ -121,7 +122,7 @@ const MobilePoll: React.FunctionComponent = () => {
) : (
<div className="flex grow items-center px-1">
<Participant>
- <OptimizedAvatarImage name={t("you")} size={20} />
+ <YouAvatar />
<ParticipantName>{t("you")}</ParticipantName>
</Participant>
</div>
diff --git a/apps/web/src/components/poll/mobile-poll/poll-option.tsx b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
index b179f2dbf..7065fdd9a 100644
--- a/apps/web/src/components/poll/mobile-poll/poll-option.tsx
+++ b/apps/web/src/components/poll/mobile-poll/poll-option.tsx
@@ -61,8 +61,6 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<div className="truncate text-sm">{name}</div>
</div>
))}
- </div>
- <div className="col-span-1 space-y-2.5">
{participantsWhoVotedIfNeedBe.map(({ name }, i) => (
<div key={i} className="flex">
<div className="relative mr-2.5 flex size-5 items-center justify-center">
@@ -70,12 +68,14 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<VoteIcon
type="ifNeedBe"
size="sm"
- className="absolute bottom-full left-full -translate-x-1/2 translate-y-1/2 rounded-full bg-white"
+ className="absolute bottom-full left-full -translate-x-1.5 translate-y-2.5 rounded-full bg-white"
/>
</div>
<div className="truncate text-sm"> {name}</div>
</div>
))}
+ </div>
+ <div className="col-span-1 space-y-2.5">
{participantsWhoVotedNo.map(({ name }, i) => (
<div key={i} className="flex">
<div className="relative mr-2.5 flex size-5 items-center justify-center">
@@ -83,7 +83,7 @@ const PollOptionVoteSummary: React.FunctionComponent<{ optionId: string }> = ({
<VoteIcon
type="no"
size="sm"
- className="absolute bottom-full left-full -translate-x-1/2 translate-y-1/2 rounded-full bg-white"
+ className="absolute bottom-full left-full -translate-x-1.5 translate-y-2.5 rounded-full bg-white"
/>
</div>
<div className="truncate text-sm">{name}</div>
diff --git a/apps/web/src/components/poll/you-avatar.tsx b/apps/web/src/components/poll/you-avatar.tsx
new file mode 100644
index 000000000..44a4ff0a4
--- /dev/null
+++ b/apps/web/src/components/poll/you-avatar.tsx
@@ -0,0 +1,11 @@
+import { useTranslation } from "@/app/i18n/client";
+
+export function YouAvatar() {
+ const { t } = useTranslation();
+
+ return (
+ <div className="inline-flex size-5 items-center justify-center rounded-full bg-gray-200 text-xs font-medium">
+ {t("you")[0]}
+ </div>
+ );
+}
diff --git a/packages/ui/src/avatar.tsx b/packages/ui/src/avatar.tsx
index b7986a7fe..60b8085bc 100644
--- a/packages/ui/src/avatar.tsx
+++ b/packages/ui/src/avatar.tsx
@@ -2,24 +2,9 @@
import * as React from "react";
import * as AvatarPrimitive from "@radix-ui/react-avatar";
-import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@rallly/ui";
-export const avatarColors = [
- "indigo",
- "green",
- "blue",
- "purple",
- "emerald",
- "violet",
- "sky",
- "cyan",
- "pink",
-] as const;
-
-export type AvatarColor = (typeof avatarColors)[number];
-
const Avatar = React.forwardRef<
React.ElementRef<typeof AvatarPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Root> & {
@@ -50,47 +35,54 @@ const AvatarImage = React.forwardRef<
));
AvatarImage.displayName = AvatarPrimitive.Image.displayName;
-const avatarFallbackVariants = cva(
- "flex h-full w-full items-center justify-center rounded-full font-medium",
- {
- variants: {
- color: {
- indigo: "bg-indigo-50 text-indigo-600",
- green: "bg-green-50 text-green-600",
- blue: "bg-blue-50 text-blue-600",
- purple: "bg-purple-50 text-purple-600",
- emerald: "bg-emerald-50 text-emerald-600",
- violet: "bg-violet-50 text-violet-600",
- sky: "bg-sky-50 text-sky-600",
- cyan: "bg-cyan-50 text-cyan-600",
- pink: "bg-pink-50 text-pink-600",
- },
- },
- defaultVariants: {
- color: "indigo",
- },
- },
-);
+const colorPairs = [
+ { bg: "#E6F4FF", text: "#0065BD" }, // Light blue
+ { bg: "#DCFCE7", text: "#15803D" }, // Light green
+ { bg: "#FFE6F4", text: "#BD007A" }, // Light pink
+ { bg: "#F4E6FF", text: "#6200BD" }, // Light purple
+ { bg: "#FFE6E6", text: "#BD0000" }, // Light red
+ { bg: "#FFE6FF", text: "#A300A3" }, // Bright pink
+ { bg: "#F0E6FF", text: "#5700BD" }, // Lavender
+ { bg: "#FFE6F9", text: "#BD0066" }, // Rose
+ { bg: "#E6E6FF", text: "#0000BD" }, // Periwinkle
+ { bg: "#FFE6EC", text: "#BD001F" }, // Salmon pink
+ { bg: "#EBE6FF", text: "#4800BD" }, // Light indigo
+];
-export function getColor(seed: string): AvatarColor {
+export function getColor(seed?: string): {
+ bgColor: string;
+ textColor: string;
+} {
+ if (!seed) {
+ return { bgColor: "#E6F4FF", textColor: "#0065BD" };
+ }
let hash = 0;
for (let i = 0; i < seed.length; i++) {
hash = seed.charCodeAt(i) + ((hash << 5) - hash);
}
- return avatarColors[Math.abs(hash) % avatarColors.length];
+ const colorPair = colorPairs[Math.abs(hash) % colorPairs.length];
+ return { bgColor: colorPair.bg, textColor: colorPair.text };
}
const AvatarFallback = React.forwardRef<
React.ElementRef<typeof AvatarPrimitive.Fallback>,
- React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback> &
- VariantProps<typeof avatarFallbackVariants>
->(({ className, color, ...props }, ref) => (
- <AvatarPrimitive.Fallback
- ref={ref}
- className={cn(avatarFallbackVariants({ color }), className)}
- {...props}
- />
-));
+ React.ComponentPropsWithoutRef<typeof AvatarPrimitive.Fallback> & {
+ seed: string;
+ }
+>(({ className, seed, ...props }, ref) => {
+ const { bgColor, textColor } = getColor(seed);
+ return (
+ <AvatarPrimitive.Fallback
+ ref={ref}
+ className={cn(
+ "flex h-full w-full items-center justify-center rounded-full font-medium",
+ className,
+ )}
+ style={{ backgroundColor: bgColor, color: textColor }}
+ {...props}
+ />
+ );
+});
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
export { Avatar, AvatarImage, AvatarFallback };