From 2751332356181bd85d4dd0e526474abf222faa63 Mon Sep 17 00:00:00 2001 From: Kirill Date: Thu, 21 May 2026 20:52:43 +0500 Subject: [PATCH] feat: avatar column in admin users table --- client/src/entities/user/model/types.ts | 3 +++ client/src/pages/admin-users/ui/AdminUsersPage.tsx | 13 ++++++++++++- server/src/routes/api/admin-users.js | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/client/src/entities/user/model/types.ts b/client/src/entities/user/model/types.ts index 15dc992..66b4871 100644 --- a/client/src/entities/user/model/types.ts +++ b/client/src/entities/user/model/types.ts @@ -2,6 +2,9 @@ export type AdminUser = { id: string email: string name: string | null + avatar?: string | null + avatarType?: string | null + avatarStyle?: string | null createdAt: string updatedAt: string } diff --git a/client/src/pages/admin-users/ui/AdminUsersPage.tsx b/client/src/pages/admin-users/ui/AdminUsersPage.tsx index 6a18d72..e5f1eb6 100644 --- a/client/src/pages/admin-users/ui/AdminUsersPage.tsx +++ b/client/src/pages/admin-users/ui/AdminUsersPage.tsx @@ -21,6 +21,7 @@ import { $user } from '@/shared/model/auth' import { AdminDialog } from '@/shared/ui/AdminDialog/AdminDialog' import { AdminTable } from '@/shared/ui/AdminTable' import { EntityRowActions } from '@/shared/ui/EntityRowActions' +import { UserAvatar } from '@/shared/ui/UserAvatar' type UserFormState = { email: string @@ -171,6 +172,7 @@ export function AdminUsersPage() { {users.length === 0 && !usersQuery.isLoading ? ( - + Пользователей пока нет. ) : ( users.map((u) => ( + + + {u.email} {u.name ?? '—'} {formatDt(u.createdAt)} diff --git a/server/src/routes/api/admin-users.js b/server/src/routes/api/admin-users.js index cc26341..e6fc7b4 100644 --- a/server/src/routes/api/admin-users.js +++ b/server/src/routes/api/admin-users.js @@ -33,6 +33,9 @@ export async function registerAdminUserRoutes(fastify) { id: true, email: true, displayName: true, + avatar: true, + avatarType: true, + avatarStyle: true, createdAt: true, updatedAt: true, }, @@ -44,6 +47,9 @@ export async function registerAdminUserRoutes(fastify) { id: u.id, email: u.email, displayName: u.displayName, + avatar: u.avatar, + avatarType: u.avatarType, + avatarStyle: u.avatarStyle, createdAt: u.createdAt, updatedAt: u.updatedAt, }))