From e65b3edbee3d1e3a8f4099aa6e3953bfb554d064 Mon Sep 17 00:00:00 2001 From: yiling Date: Wed, 3 Jun 2026 19:56:07 +0800 Subject: [PATCH] feat(user-avatar): add support for uploading, cropping, and displaying user avatars --- packages/api/src/api/agent.ts | 47 ++-- packages/api/src/api/team.test.ts | 27 +++ packages/api/src/api/team.ts | 16 ++ packages/core/src/asset/asset.ts | 31 ++- packages/core/src/index.ts | 1 + packages/core/src/project/project.ts | 18 +- packages/core/src/team/team.test.ts | 16 ++ packages/core/src/team/team.ts | 40 +++- packages/core/src/user/avatar.ts | 21 ++ packages/dtos/src/asset.ts | 1 + packages/dtos/src/project.ts | 1 + packages/dtos/src/team.ts | 8 + .../webui/components/chat/message-card.tsx | 5 +- .../webui/components/file-browser/toolbar.tsx | 5 +- packages/webui/components/members-dialog.tsx | 6 +- .../components/settings/AvatarCropDialog.tsx | 226 ++++++++++++++++++ packages/webui/components/user-menu.tsx | 9 +- packages/webui/routes/teams/$teamId/index.tsx | 5 +- .../webui/routes/teams/$teamId/settings.tsx | 209 +++++++++++++++- 19 files changed, 638 insertions(+), 54 deletions(-) create mode 100644 packages/core/src/user/avatar.ts create mode 100644 packages/webui/components/settings/AvatarCropDialog.tsx diff --git a/packages/api/src/api/agent.ts b/packages/api/src/api/agent.ts index 74c9972b..9aaba7f2 100644 --- a/packages/api/src/api/agent.ts +++ b/packages/api/src/api/agent.ts @@ -2,6 +2,7 @@ import { Hono } from 'hono' import { zValidator } from '@hono/zod-validator' import { agentService } from '@shumai/core/src/agent/agent' import { authzService, Permission, ResourceType } from '@shumai/core/src/authz/authz' +import { getAvatarUrl } from '@shumai/core/src/user/avatar' import { createAgentRequestSchema, updateAgentRequestSchema, @@ -27,26 +28,28 @@ const route = new Hono<{ Variables: { user: User } }>() const agents = await agentService.listAgents({ teamId }) - const res: AgentInfo[] = agents.map((agent) => { - const config = agent.config as unknown as PrismaJson.AgentConfig - return { - id: agent.id, - name: agent.user.name, - type: agent.type as AgentType, - enabled: agent.enabled, - avatar: agent.user.image || undefined, - providerId: agent.providerId || undefined, - modelId: agent.modelId || undefined, - thinkingLevel: config.thinkingLevel || '', - systemPrompt: config.systemPrompt, - soul: agent.soul || undefined, - skills: agent.skills.map((s) => ({ - id: s.id, - skillId: s.skillId, - skill: s.skill, - })), - } - }) + const res: AgentInfo[] = await Promise.all( + agents.map(async (agent) => { + const config = agent.config as unknown as PrismaJson.AgentConfig + return { + id: agent.id, + name: agent.user.name, + type: agent.type as AgentType, + enabled: agent.enabled, + avatar: (await getAvatarUrl(agent.user.image)) || undefined, + providerId: agent.providerId || undefined, + modelId: agent.modelId || undefined, + thinkingLevel: config.thinkingLevel || '', + systemPrompt: config.systemPrompt, + soul: agent.soul || undefined, + skills: agent.skills.map((s) => ({ + id: s.id, + skillId: s.skillId, + skill: s.skill, + })), + } + }), + ) return c.json(res, 200) }) @@ -75,7 +78,7 @@ const route = new Hono<{ Variables: { user: User } }>() name: agent.user.name, type: agent.type as AgentType, enabled: agent.enabled, - avatar: agent.user.image || undefined, + avatar: (await getAvatarUrl(agent.user.image)) || undefined, providerId: agent.providerId || undefined, modelId: agent.modelId || undefined, thinkingLevel: config.thinkingLevel || '', @@ -113,7 +116,7 @@ const route = new Hono<{ Variables: { user: User } }>() name: agent.user.name, type: agent.type as AgentType, enabled: agent.enabled, - avatar: agent.user.image || undefined, + avatar: (await getAvatarUrl(agent.user.image)) || undefined, providerId: agent.providerId || undefined, modelId: agent.modelId || undefined, thinkingLevel: config.thinkingLevel || '', diff --git a/packages/api/src/api/team.test.ts b/packages/api/src/api/team.test.ts index b1ffc1d1..422ca9ad 100644 --- a/packages/api/src/api/team.test.ts +++ b/packages/api/src/api/team.test.ts @@ -43,6 +43,7 @@ describe('team api', () => { let mockCreateNotification: any // eslint-disable-line @typescript-eslint/no-explicit-any let mockGetSandboxSettings: any // eslint-disable-line @typescript-eslint/no-explicit-any let mockUpdateSandboxSettings: any // eslint-disable-line @typescript-eslint/no-explicit-any + let mockUpdateMe: any // eslint-disable-line @typescript-eslint/no-explicit-any beforeEach(() => { mockCreateTeam = vi.spyOn(teamService, 'createTeam') @@ -57,6 +58,7 @@ describe('team api', () => { mockCreateNotification = vi.spyOn(notificationService, 'create').mockResolvedValue() mockGetSandboxSettings = vi.spyOn(teamService, 'getSandboxSettings') mockUpdateSandboxSettings = vi.spyOn(teamService, 'updateSandboxSettings') + mockUpdateMe = vi.spyOn(teamService, 'updateMe') vi.mocked(authzService.hasPermission).mockResolvedValue(undefined) }) @@ -133,6 +135,31 @@ describe('team api', () => { expect(mockGetMe).toHaveBeenCalledWith({ teamId: 't1', user: expect.any(Object) }) }) + it('PATCH /teams/:teamId/me updates user info', async () => { + mockUpdateMe.mockResolvedValue(undefined) + + const res = await app.request('/teams/t1/me', { + method: 'PATCH', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ name: 'New Name', imageKey: 'avatar-s3-key' }), + }) + + expect(res.status).toBe(200) + const data = await res.json() + expect(data.success).toBe(true) + expect(authzService.hasPermission).toHaveBeenCalledWith( + expect.objectContaining({ + type: ResourceType.Team, + id: 't1', + permission: Permission.Read, + }), + ) + expect(mockUpdateMe).toHaveBeenCalledWith('user1', { + name: 'New Name', + imageKey: 'avatar-s3-key', + }) + }) + it('GET /teams/:teamId/members returns members', async () => { mockGetTeamMembers.mockResolvedValue([{ id: 'user1', name: 'Test User', role: 'owner' }]) diff --git a/packages/api/src/api/team.ts b/packages/api/src/api/team.ts index d20e45f7..a1166f0f 100644 --- a/packages/api/src/api/team.ts +++ b/packages/api/src/api/team.ts @@ -11,6 +11,7 @@ import { updateTeamSettingsRequestSchema, listMembersQuerySchema, updateSandboxSettingsRequestSchema, + updateMeRequestSchema, } from '@shumai/dtos' import { updateUserMetadataRequestSchema } from '@shumai/dtos' import type { Prisma } from '@shumai/db' @@ -77,6 +78,21 @@ const route = new Hono<{ Variables: { user: User } }>() return c.json(me) }) + .patch('/teams/:teamId/me', zValidator('json', updateMeRequestSchema), async (c) => { + const user = c.get('user') + const teamId = c.req.param('teamId') + const req = c.req.valid('json') + + await authzService.hasPermission({ + user, + permission: Permission.Read, + type: ResourceType.Team, + id: teamId, + }) + + await teamService.updateMe(user.id, req) + return c.json({ success: true }) + }) .get('/teams/:teamId/members', zValidator('query', listMembersQuerySchema), async (c) => { const user = c.get('user') const teamId = c.req.param('teamId') diff --git a/packages/core/src/asset/asset.ts b/packages/core/src/asset/asset.ts index 602855b4..4cb8b4bd 100644 --- a/packages/core/src/asset/asset.ts +++ b/packages/core/src/asset/asset.ts @@ -22,6 +22,7 @@ import { logger } from '@shumai/core/src/logger' import { PaginatedData, paginateQuery, PaginationParams } from '@shumai/core/src/pagination' import { s3Service } from '@shumai/core/src/s3/s3' import { generateKeyBetween } from 'jittered-fractional-indexing' +import { getAvatarUrl } from '@shumai/core/src/user/avatar' type AssetWithIncludes = Prisma.AssetGetPayload<{ include: { @@ -1459,7 +1460,13 @@ export class AssetService { id: v.id, name: v.name, previewUrl: preview?.thumbnailUrl || null, - creator: v.creator ? { id: v.creator.id, name: v.creator.name } : null, + creator: v.creator + ? { + id: v.creator.id, + name: v.creator.name, + image: await getAvatarUrl(v.creator.image), + } + : null, } }), ), @@ -1504,7 +1511,11 @@ export class AssetService { const preview = await this.toPreviewInfo(latestVersion as Asset) const creator = latestVersion.creator - ? { id: latestVersion.creator.id, name: latestVersion.creator.name } + ? { + id: latestVersion.creator.id, + name: latestVersion.creator.name, + image: await getAvatarUrl(latestVersion.creator.image), + } : null const fieldValues: FieldValueInfo[] = [] @@ -1599,7 +1610,13 @@ export class AssetService { version: versions.length - i, name: v.name, previewUrl: preview?.thumbnailUrl || null, - creator: v.creator ? { id: v.creator.id, name: v.creator.name } : null, + creator: v.creator + ? { + id: v.creator.id, + name: v.creator.name, + image: await getAvatarUrl(v.creator.image), + } + : null, } }), ) @@ -1678,7 +1695,11 @@ export class AssetService { where: { id: { in: userIds } }, }) for (const u of users) { - mentions.push({ id: u.id, name: u.name }) + mentions.push({ + id: u.id, + name: u.name, + image: await getAvatarUrl(u.image), + }) } } @@ -1686,9 +1707,11 @@ export class AssetService { if (c.sessionId) { creator.id = c.creatorId || '' creator.name = c.creator?.name || 'Ai Bot' + creator.image = await getAvatarUrl(c.creator?.image) } else if (c.creator) { creator.id = c.creator.id creator.name = c.creator.name + creator.image = await getAvatarUrl(c.creator.image) } return { diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index b0f71394..39271f22 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -15,6 +15,7 @@ export * from './skill/skill' export * from './team/team' export * from './upload/upload' export * from './user-metadata/user-metadata' +export * from './user/avatar' export * from './versionStack/versionStack' export * from './hyrumtoken' export * from './pagination' diff --git a/packages/core/src/project/project.ts b/packages/core/src/project/project.ts index eaa6c766..a2ae56a0 100644 --- a/packages/core/src/project/project.ts +++ b/packages/core/src/project/project.ts @@ -2,6 +2,7 @@ import { prisma } from '@shumai/db' import { Prisma } from '@shumai/db' import { s3Service } from '@shumai/core/src/s3/s3' import { paginateQuery, PaginatedData } from '@shumai/core/src/pagination' +import { getAvatarUrl } from '@shumai/core/src/user/avatar' import { ServiceCreateProjectRequest, ServiceUpdateProjectRequest, @@ -215,13 +216,16 @@ export class ProjectService { }, }) - return members - .filter((pm) => pm.teamMember && pm.teamMember.user) - .map((pm) => ({ - id: pm.teamMember.user.id, - name: pm.teamMember.user.name, - role: pm.role, - })) + return Promise.all( + members + .filter((pm) => pm.teamMember && pm.teamMember.user) + .map(async (pm) => ({ + id: pm.teamMember.user.id, + name: pm.teamMember.user.name, + role: pm.role, + image: await getAvatarUrl(pm.teamMember.user.image), + })), + ) } async deleteProject(projectId: string): Promise { diff --git a/packages/core/src/team/team.test.ts b/packages/core/src/team/team.test.ts index b31b3616..3f29e89c 100644 --- a/packages/core/src/team/team.test.ts +++ b/packages/core/src/team/team.test.ts @@ -92,6 +92,22 @@ describe('TeamService', () => { expect(me.role).toBe('owner') }) + it('should update me', async () => { + const user = await prisma.user.create({ + data: { name: 'Old Name', email: `test-${Date.now()}@example.com`, password: 'pw' }, + }) + await teamService.updateMe(user.id, { + name: 'New Name', + imageKey: 'avatar-s3-key', + }) + + const updatedUser = await prisma.user.findUnique({ + where: { id: user.id }, + }) + expect(updatedUser?.name).toBe('New Name') + expect(updatedUser?.image).toBe('avatar-s3-key') + }) + it('should get team members', async () => { const user1 = await prisma.user.create({ data: { name: 'Test User 1', email: `test1-${Date.now()}@example.com`, password: 'pw' }, diff --git a/packages/core/src/team/team.ts b/packages/core/src/team/team.ts index ae36c12c..3d239afb 100644 --- a/packages/core/src/team/team.ts +++ b/packages/core/src/team/team.ts @@ -3,6 +3,7 @@ import { Prisma } from '@shumai/db' import { PaginatedData, paginateQuery } from '@shumai/core/src/pagination' import { ProviderService, providerService } from '@shumai/core/src/provider/provider' import { notificationService } from '@shumai/core/src/notification/notification' +import { getAvatarUrl } from '@shumai/core/src/user/avatar' import { ServiceCreateTeamRequest, ServiceGetUserTeamsRequest, @@ -136,6 +137,7 @@ export class TeamService { userId: req.user.id, }, }, + include: { user: true }, }) if (!member) throw new Error('user is not a team member') @@ -146,14 +148,29 @@ export class TeamService { ) return { - id: req.user.id, - name: req.user.name, - email: undefined, + id: member.user.id, + name: member.user.name, + email: member.user.email || undefined, role: member.role, + image: await getAvatarUrl(member.user.image), unreadNotificationCount, } } + async updateMe(userId: string, req: { name?: string; imageKey?: string | null }): Promise { + const data: Prisma.UserUpdateInput = {} + if (req.name !== undefined) { + data.name = req.name + } + if (req.imageKey !== undefined) { + data.image = req.imageKey + } + await prisma.user.update({ + where: { id: userId }, + data, + }) + } + async getTeamMembers(req: ServiceGetTeamMembersRequest): Promise { const members = await prisma.teamMember.findMany({ where: { @@ -178,13 +195,16 @@ export class TeamService { include: { user: true }, }) - return members.map((m) => ({ - id: m.user.id, - name: m.user.name, - email: undefined, - role: m.role, - type: m.user.type || undefined, - })) + return Promise.all( + members.map(async (m) => ({ + id: m.user.id, + name: m.user.name, + email: undefined, + role: m.role, + type: m.user.type || undefined, + image: await getAvatarUrl(m.user.image), + })), + ) } // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/packages/core/src/user/avatar.ts b/packages/core/src/user/avatar.ts new file mode 100644 index 00000000..ce42b70d --- /dev/null +++ b/packages/core/src/user/avatar.ts @@ -0,0 +1,21 @@ +import { s3Service } from '@shumai/core/src/s3/s3' + +/** + * Returns the signed avatar URL if the image is an S3 key, + * or returns it directly if it's already an external URL (e.g. OAuth avatar). + */ +export async function getAvatarUrl( + imageKeyOrUrl: string | null | undefined, +): Promise { + if (!imageKeyOrUrl) return undefined + if (imageKeyOrUrl.startsWith('http://') || imageKeyOrUrl.startsWith('https://')) { + return imageKeyOrUrl + } + try { + const bucket = process.env.S3_BUCKET || 'shumai' + return await s3Service.presign(bucket, imageKeyOrUrl, 'GET') + } catch (e) { + console.error(`Failed to presign avatar URL for key ${imageKeyOrUrl}:`, e) + return undefined + } +} diff --git a/packages/dtos/src/asset.ts b/packages/dtos/src/asset.ts index 18aa6946..1b81ec2d 100644 --- a/packages/dtos/src/asset.ts +++ b/packages/dtos/src/asset.ts @@ -25,6 +25,7 @@ export type ChildPreview = z.infer export const assetUserInfoSchema = z.object({ id: z.string(), name: z.string(), + image: z.string().optional(), }) export type AssetUserInfo = z.infer diff --git a/packages/dtos/src/project.ts b/packages/dtos/src/project.ts index 8f434cc9..dcbd39dd 100644 --- a/packages/dtos/src/project.ts +++ b/packages/dtos/src/project.ts @@ -47,6 +47,7 @@ export const projectUserInfoSchema = z.object({ id: z.string(), name: z.string(), role: z.string(), + image: z.string().optional(), }) export type ProjectUserInfo = z.infer diff --git a/packages/dtos/src/team.ts b/packages/dtos/src/team.ts index 188ca82e..3ce6270f 100644 --- a/packages/dtos/src/team.ts +++ b/packages/dtos/src/team.ts @@ -34,16 +34,24 @@ export const getMeResponseSchema = z.object({ name: z.string(), email: z.string().optional(), role: z.string(), + image: z.string().optional(), unreadNotificationCount: z.number().optional(), }) export type GetMeResponse = z.infer +export const updateMeRequestSchema = z.object({ + name: z.string().optional(), + imageKey: z.string().nullable().optional(), +}) +export type UpdateMeRequest = z.infer + export const userInfoSchema = z.object({ id: z.string(), name: z.string(), role: z.string(), email: z.string().optional(), type: z.enum(['human', 'agent']).optional(), + image: z.string().optional(), }) export type UserInfo = z.infer diff --git a/packages/webui/components/chat/message-card.tsx b/packages/webui/components/chat/message-card.tsx index 4b4a5b99..5be374a6 100644 --- a/packages/webui/components/chat/message-card.tsx +++ b/packages/webui/components/chat/message-card.tsx @@ -15,7 +15,7 @@ import { useQuery } from '@tanstack/react-query' import { Download, File, Terminal } from 'lucide-react' import React from 'react' import Markdown from 'react-markdown' -import { Avatar, AvatarFallback } from '../ui/avatar' +import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar' import { DrawAnnotation } from '../ui/icons' import { Skeleton } from '../ui/skeleton' import { formatTimestamp } from '../viewers/utils' @@ -147,6 +147,9 @@ export const MessageCard: React.FC = ({ )} + {creator?.image && ( + + )} {creator?.name?.[0]?.toUpperCase() || 'U'} diff --git a/packages/webui/components/file-browser/toolbar.tsx b/packages/webui/components/file-browser/toolbar.tsx index bab56c18..47bfcff0 100644 --- a/packages/webui/components/file-browser/toolbar.tsx +++ b/packages/webui/components/file-browser/toolbar.tsx @@ -13,7 +13,7 @@ import { MembersDialog } from '../members-dialog' import { FilterPanel } from '../search/filter-panel' import { SearchFilterDialog } from '../search/search-filter-dialog' import { SortControl } from '../search/sort-control' -import { Avatar, AvatarFallback } from '../ui/avatar' +import { Avatar, AvatarFallback, AvatarImage } from '../ui/avatar' import { Button } from '../ui/button' import { Popover, PopoverContent, PopoverTrigger } from '../ui/popover' import { Separator } from '../ui/separator' @@ -280,6 +280,9 @@ export function FileBrowserToolbar({ > {members?.slice(0, 3).map((member) => ( + {member.image && ( + + )} {getInitials(member.name)} ))} diff --git a/packages/webui/components/members-dialog.tsx b/packages/webui/components/members-dialog.tsx index 85893ff3..41c4d1c7 100644 --- a/packages/webui/components/members-dialog.tsx +++ b/packages/webui/components/members-dialog.tsx @@ -1,4 +1,4 @@ -import { Avatar, AvatarFallback } from '@/ui/components/ui/avatar' +import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar' import { Button } from '@/ui/components/ui/button' import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/ui/components/ui/dialog' import { @@ -17,6 +17,7 @@ export interface Member { id?: string name?: string role?: string + image?: string } interface MembersDialogProps { @@ -99,6 +100,9 @@ export function MembersDialog({ >
+ {member.image && ( + + )} {getInitials(member.name)}
diff --git a/packages/webui/components/settings/AvatarCropDialog.tsx b/packages/webui/components/settings/AvatarCropDialog.tsx new file mode 100644 index 00000000..a98d0098 --- /dev/null +++ b/packages/webui/components/settings/AvatarCropDialog.tsx @@ -0,0 +1,226 @@ +import React, { useState, useRef, useEffect } from 'react' +import { + Dialog, + DialogContent, + DialogHeader, + DialogTitle, + DialogFooter, +} from '@/ui/components/ui/dialog' +import { Button } from '@/ui/components/ui/button' +import { Move, ZoomIn, ZoomOut, Loader2 } from 'lucide-react' + +interface AvatarCropDialogProps { + isOpen: boolean + onClose: () => void + imageSrc: string | null + onConfirm: (croppedBlob: Blob) => Promise +} + +export function AvatarCropDialog({ isOpen, onClose, imageSrc, onConfirm }: AvatarCropDialogProps) { + const [zoom, setZoom] = useState(1.0) + const [offset, setOffset] = useState({ x: 0, y: 0 }) + const [isDragging, setIsDragging] = useState(false) + const [isSaving, setIsSaving] = useState(false) + const dragStart = useRef({ x: 0, y: 0 }) + const imageRef = useRef(null) + const containerRef = useRef(null) + + // Layout parameters + const VIEWPORT_SIZE = 250 // Diameter of the circle crop in pixels + + // Reset parameters when a new image is loaded + useEffect(() => { + if (isOpen) { + setZoom(1.0) + setOffset({ x: 0, y: 0 }) + setIsSaving(false) + } + }, [isOpen, imageSrc]) + + const handleMouseDown = (e: React.MouseEvent) => { + e.preventDefault() + setIsDragging(true) + dragStart.current = { x: e.clientX - offset.x, y: e.clientY - offset.y } + } + + const handleMouseMove = (e: React.MouseEvent) => { + if (!isDragging) return + setOffset({ + x: e.clientX - dragStart.current.x, + y: e.clientY - dragStart.current.y, + }) + } + + const handleMouseUp = () => { + setIsDragging(false) + } + + // Touch support for mobile devices + const handleTouchStart = (e: React.TouchEvent) => { + if (e.touches.length !== 1) return + setIsDragging(true) + const touch = e.touches[0] + dragStart.current = { x: touch.clientX - offset.x, y: touch.clientY - offset.y } + } + + const handleTouchMove = (e: React.TouchEvent) => { + if (!isDragging || e.touches.length !== 1) return + const touch = e.touches[0] + setOffset({ + x: touch.clientX - dragStart.current.x, + y: touch.clientY - dragStart.current.y, + }) + } + + const handleConfirm = async () => { + const img = imageRef.current + const container = containerRef.current + if (!img || !container) return + + setIsSaving(true) + + try { + // Natural dimensions of the image vs rendered dimensions + const rect = img.getBoundingClientRect() + + // Canvas dimensions (high quality cropped resolution) + const CROP_RESOLUTION = 512 + const canvas = document.createElement('canvas') + canvas.width = CROP_RESOLUTION + canvas.height = CROP_RESOLUTION + const ctx = canvas.getContext('2d') + + if (ctx) { + // Clear canvas + ctx.clearRect(0, 0, CROP_RESOLUTION, CROP_RESOLUTION) + + // Draw a circular clipping path + ctx.beginPath() + ctx.arc(CROP_RESOLUTION / 2, CROP_RESOLUTION / 2, CROP_RESOLUTION / 2, 0, Math.PI * 2) + ctx.clip() + + // Calculate translation and scaling factors + // Rendered image center in container coordinates: + // center_x = container_width / 2 + offset.x + // center_y = container_height / 2 + offset.y + // Image rendered width = rect.width, height = rect.height + + // We map these container coordinate space values to the canvas coordinate space: + // Scale factor between canvas and UI container viewport (e.g. 512 / 250) + const scaleToCanvas = CROP_RESOLUTION / VIEWPORT_SIZE + + // Rendered width/height at zoom 1.0 (before scaling) + const baseWidth = rect.width / zoom + const baseHeight = rect.height / zoom + + // Calculate centered offset in canvas coordinates + const canvasX = CROP_RESOLUTION / 2 + offset.x * scaleToCanvas + const canvasY = CROP_RESOLUTION / 2 + offset.y * scaleToCanvas + + // Draw the image scaled and panned + ctx.translate(canvasX, canvasY) + ctx.scale(zoom * scaleToCanvas, zoom * scaleToCanvas) + ctx.drawImage(img, -baseWidth / 2, -baseHeight / 2, baseWidth, baseHeight) + + // Export canvas as blob + const blob = await new Promise((resolve) => { + canvas.toBlob((b) => resolve(b), 'image/jpeg', 0.9) + }) + + if (blob) { + await onConfirm(blob) + } + } + } catch (err) { + console.error('Failed to crop image', err) + } finally { + setIsSaving(false) + } + } + + return ( + !open && onClose()}> + + + + + Position and resize + + + +
+ {/* Viewport Container */} +
+ {imageSrc && ( + Avatar Source + )} + + {/* Circular Mask Overlay */} +
+
+
+ + {/* Zoom Slider */} +
+ + setZoom(parseFloat(e.target.value))} + className="flex-1 h-1.5 bg-muted rounded-lg appearance-none cursor-pointer accent-primary focus:outline-none" + /> + +
+
+ + + + + + +
+ ) +} diff --git a/packages/webui/components/user-menu.tsx b/packages/webui/components/user-menu.tsx index f2ee9585..daed3d46 100644 --- a/packages/webui/components/user-menu.tsx +++ b/packages/webui/components/user-menu.tsx @@ -1,5 +1,5 @@ import { client } from '@/ui/api/client' -import { Avatar, AvatarFallback } from '@/ui/components/ui/avatar' +import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar' import { DropdownMenu, DropdownMenuContent, @@ -57,6 +57,13 @@ export function UserMenu() { + {me?.image && ( + + )} {getInitials(me?.name)} diff --git a/packages/webui/routes/teams/$teamId/index.tsx b/packages/webui/routes/teams/$teamId/index.tsx index f2938171..09b940ba 100644 --- a/packages/webui/routes/teams/$teamId/index.tsx +++ b/packages/webui/routes/teams/$teamId/index.tsx @@ -13,7 +13,7 @@ import { AlertDialogHeader, AlertDialogTitle, } from '@/ui/components/ui/alert-dialog' -import { Avatar, AvatarFallback } from '@/ui/components/ui/avatar' +import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar' import { Button } from '@/ui/components/ui/button' import { DropdownMenu, @@ -238,6 +238,9 @@ function TeamPage() { > {safeMembers.slice(0, 3).map((member) => ( + {member.image && ( + + )} {getInitials(member.name)} ))} diff --git a/packages/webui/routes/teams/$teamId/settings.tsx b/packages/webui/routes/teams/$teamId/settings.tsx index 2c6c7987..1b06d64e 100644 --- a/packages/webui/routes/teams/$teamId/settings.tsx +++ b/packages/webui/routes/teams/$teamId/settings.tsx @@ -10,7 +10,12 @@ import { cn } from '@/ui/lib/utils' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { createFileRoute } from '@tanstack/react-router' import { Bot, Cpu, Film, Loader2, Puzzle, Shield, User, Bell } from 'lucide-react' -import { useState } from 'react' +import { useState, useRef, useEffect } from 'react' +import { Avatar, AvatarFallback, AvatarImage } from '@/ui/components/ui/avatar' +import { Input } from '@/ui/components/ui/input' +import { Button } from '@/ui/components/ui/button' +import { AvatarCropDialog } from '@/ui/components/settings/AvatarCropDialog' +import { toast } from 'sonner' type SettingsTab = | 'general' @@ -25,6 +30,11 @@ function TeamSettingsPage() { const { teamId } = Route.useParams() const queryClient = useQueryClient() const [activeTab, setActiveTab] = useState('general') + const [profileName, setProfileName] = useState('') + const [isCropOpen, setIsCropOpen] = useState(false) + const [cropImageSrc, setCropImageSrc] = useState(null) + const fileInputRef = useRef(null) + const [isUpdatingProfile, setIsUpdatingProfile] = useState(false) const { data: settings, @@ -53,6 +63,102 @@ function TeamSettingsPage() { enabled: !!teamId, }) + useEffect(() => { + if (me?.name) { + setProfileName(me.name) + } + }, [me]) + + const getInitials = (name?: string) => { + if (!name) return 'U' + const names = name.split(' ') + if (names.length > 1) { + return `${names[0][0]}${names[names.length - 1][0]}`.toUpperCase() + } + return name.substring(0, 2).toUpperCase() + } + + const handleAvatarFileChange = (e: React.ChangeEvent) => { + const file = e.target.files?.[0] + if (file) { + const reader = new FileReader() + reader.onload = () => { + setCropImageSrc(reader.result as string) + setIsCropOpen(true) + } + reader.readAsDataURL(file) + e.target.value = '' + } + } + + const handleConfirmCrop = async (blob: Blob) => { + setIsUpdatingProfile(true) + try { + const fileToUpload = new File([blob], 'avatar.jpg', { type: 'image/jpeg' }) + const uploadRes = await client.api.teams[':teamId'].files.$post({ + param: { teamId }, + form: { file: fileToUpload }, + }) + if (!uploadRes.ok) throw new Error('Failed to upload avatar') + const uploadData = await uploadRes.json() + const key = (uploadData as { key: string }).key + + const patchRes = await client.api.teams[':teamId'].me.$patch({ + param: { teamId }, + json: { imageKey: key }, + }) + if (!patchRes.ok) throw new Error('Failed to save profile') + + toast.success('Avatar updated successfully') + queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'me'] }) + setIsCropOpen(false) + } catch (err) { + console.error(err) + toast.error('Failed to update avatar') + } finally { + setIsUpdatingProfile(false) + } + } + + const handleRemoveAvatar = async () => { + setIsUpdatingProfile(true) + try { + const patchRes = await client.api.teams[':teamId'].me.$patch({ + param: { teamId }, + json: { imageKey: null }, + }) + if (!patchRes.ok) throw new Error('Failed to remove avatar') + + toast.success('Avatar removed successfully') + queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'me'] }) + } catch (err) { + console.error(err) + toast.error('Failed to remove avatar') + } finally { + setIsUpdatingProfile(false) + } + } + + const handleUpdateProfile = async () => { + if (!profileName.trim()) return + setIsUpdatingProfile(true) + try { + const patchRes = await client.api.teams[':teamId'].me.$patch({ + param: { teamId }, + json: { name: profileName.trim() }, + }) + if (!patchRes.ok) throw new Error('Failed to update name') + + toast.success('Profile updated successfully') + queryClient.invalidateQueries({ queryKey: ['teams', teamId, 'me'] }) + } catch (err) { + console.error(err) + toast.error('Failed to update profile') + } finally { + setIsUpdatingProfile(false) + } + } + const { mutate: updateSettings } = useMutation({ // eslint-disable-next-line @typescript-eslint/no-explicit-any mutationFn: async (data: { teamId: string; data: { key: string; value: any } }) => { @@ -265,15 +371,106 @@ function TeamSettingsPage() { Personal Info - View your personal information. + Manage your profile name and avatar image. - -
- Name - {me?.name} + +
+ {/* Avatar Column */} +
+ Avatar +
fileInputRef.current?.click()} + > + + {me?.image && ( + + )} + + {getInitials(me?.name)} + + +
+ Change +
+
+
+ + {me?.image && ( + + )} +
+ +
+ + {/* Details Column */} +
+
+ + setProfileName(e.target.value)} + placeholder="Enter your name" + className="max-w-md" + /> +
+
+ + +

+ Email address is managed by authentication provider. +

+
+ +
+ + setIsCropOpen(false)} + imageSrc={cropImageSrc} + onConfirm={handleConfirmCrop} + />
)}