Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Create a separate component for server avatars

Hakan Shehu5d72dfe2d848
diff --git a/apps/desktop/index.html b/apps/desktop/index.html
index b26cdff8..00f19c7e 100644
--- a/apps/desktop/index.html
+++ b/apps/desktop/index.html
@@ -6,7 +6,7 @@
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
<meta
http-equiv="Content-Security-Policy"
- content="default-src 'self' 'unsafe-inline' data: avatar: local-file: local-file-preview: asset:;"
+ content="default-src 'self' 'unsafe-inline' data: avatar: local-file: local-file-preview: asset:; img-src 'self' https:;"
/>
</head>
diff --git a/apps/desktop/src/renderer/components/servers/server-avatar.tsx b/apps/desktop/src/renderer/components/servers/server-avatar.tsx
new file mode 100644
index 00000000..a2f89480
--- /dev/null
+++ b/apps/desktop/src/renderer/components/servers/server-avatar.tsx
@@ -0,0 +1,33 @@
+import { getColorForId } from '@/shared/lib/avatars';
+import { cn } from '@/shared/lib/utils';
+
+interface ServerAvatarProps {
+ url: string | null;
+ name: string;
+ className?: string;
+}
+
+export const ServerAvatar = ({ url, name, className }: ServerAvatarProps) => {
+ if (!url) {
+ const color = getColorForId(name);
+ return (
+ <div
+ className={cn(
+ 'inline-flex items-center justify-center overflow-hidden rounded text-white shadow',
+ className
+ )}
+ style={{ backgroundColor: color }}
+ >
+ <span className="font-medium">{name[0]?.toLocaleUpperCase()}</span>
+ </div>
+ );
+ }
+
+ return (
+ <img
+ src={url}
+ className={cn('object-cover rounded', className)}
+ alt={name}
+ />
+ );
+};
diff --git a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx b/apps/desktop/src/renderer/components/servers/server-dropdown.tsx
index ce299b2e..da55c1d2 100644
--- a/apps/desktop/src/renderer/components/servers/server-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/servers/server-dropdown.tsx
@@ -2,7 +2,7 @@ import { DropdownMenuSeparator } from '@radix-ui/react-dropdown-menu';
import { ChevronDown } from 'lucide-react';
import React from 'react';
-import { Avatar } from '@/renderer/components/avatars/avatar';
+import { ServerAvatar } from '@/renderer/components/servers/server-avatar';
import { ServerCreateDialog } from '@/renderer/components/servers/server-create-dialog';
import {
DropdownMenu,
@@ -29,8 +29,12 @@ export const ServerDropdown = ({
<React.Fragment>
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <div className="flex w-full flex-grow flex-row items-center gap-2 rounded-md border border-input p-2 hover:cursor-pointer hover:bg-gray-100">
- <Avatar id={value.domain} name={value.name} />
+ <div className="flex w-full flex-grow flex-row items-center gap-3 rounded-md border border-input p-2 hover:cursor-pointer hover:bg-gray-100">
+ <ServerAvatar
+ url={value.avatar}
+ name={value.name}
+ className="size-8"
+ />
<div className="flex-grow">
<p className="flex-grow font-semibold">{value.name}</p>
<p className="text-xs text-muted-foreground">{value.domain}</p>
@@ -47,9 +51,13 @@ export const ServerDropdown = ({
onChange(server);
}
}}
- className="flex w-full flex-grow flex-row items-center gap-2 rounded-md border-b border-input p-2 hover:cursor-pointer hover:bg-gray-100"
+ className="flex w-full flex-grow flex-row items-center gap-3 rounded-md border-b border-input p-2 hover:cursor-pointer hover:bg-gray-100"
>
- <Avatar id={server.domain} name={server.name} />
+ <ServerAvatar
+ url={server.avatar}
+ name={server.name}
+ className="size-8"
+ />
<div className="flex-grow">
<p className="flex-grow font-semibold">{server.name}</p>
<p className="text-xs text-muted-foreground">{server.domain}</p>