From 00b74e56d7f93aafad6ff225bffc3bce6c6eee49 Mon Sep 17 00:00:00 2001
From: Kirill <mpak8501@yandex.ru>
Date: Wed, 20 May 2026 11:00:28 +0500
Subject: [PATCH] =?UTF-8?q?refactor:=20rename=20name=E2=86=92displayName?=
 =?UTF-8?q?=20across=20client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/entities/order/api/admin-order-api.ts   |  2 +-
 client/src/entities/review/api/admin-review-api.ts |  2 +-
 client/src/features/user/user-menu/ui/UserMenu.tsx |  2 +-
 client/src/pages/auth/ui/AuthPage.tsx              |  5 ++++-
 client/src/pages/me/ui/MeLayoutPage.tsx            |  2 +-
 client/src/pages/me/ui/MePage.tsx                  | 10 +++++-----
 client/src/pages/me/ui/sections/SettingsPage.tsx   | 13 ++++++++-----
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/client/src/entities/order/api/admin-order-api.ts b/client/src/entities/order/api/admin-order-api.ts
index 2d5b2f6..43df1d6 100644
--- a/client/src/entities/order/api/admin-order-api.ts
+++ b/client/src/entities/order/api/admin-order-api.ts
@@ -37,7 +37,7 @@ export type AdminOrderDetailResponse = {
     comment: string | null
     createdAt: string
     updatedAt: string
-    user: { id: string; email: string; name: string | null; phone: string | null }
+    user: { id: string; email: string; displayName: string | null; phone: string | null }
     items: Array<{
       id: string
       productId: string
diff --git a/client/src/entities/review/api/admin-review-api.ts b/client/src/entities/review/api/admin-review-api.ts
index fdad3b6..b41c1ed 100644
--- a/client/src/entities/review/api/admin-review-api.ts
+++ b/client/src/entities/review/api/admin-review-api.ts
@@ -7,7 +7,7 @@ export type AdminReview = {
   status: string
   createdAt: string
   moderatedAt: string | null
-  user: { id: string; email: string; name: string | null }
+  user: { id: string; email: string; displayName: string | null }
   product: { id: string; title: string }
 }
 
diff --git a/client/src/features/user/user-menu/ui/UserMenu.tsx b/client/src/features/user/user-menu/ui/UserMenu.tsx
index 65607dd..ed93c19 100644
--- a/client/src/features/user/user-menu/ui/UserMenu.tsx
+++ b/client/src/features/user/user-menu/ui/UserMenu.tsx
@@ -54,7 +54,7 @@ export function UserMenu({ user, onNavigate, onLogout }: Props) {
         {user ? (
           <>
             <MenuItem onClick={() => go('/me')}>
-              <ListItemText primary={(user.name && user.name.trim()) || user.email} secondary="Профиль" />
+              <ListItemText primary={(user.displayName && user.displayName.trim()) || user.email} secondary="Профиль" />
             </MenuItem>
             <MenuItem onClick={handleLogout}>Выход</MenuItem>
           </>
diff --git a/client/src/pages/auth/ui/AuthPage.tsx b/client/src/pages/auth/ui/AuthPage.tsx
index 11687da..2ada1ab 100644
--- a/client/src/pages/auth/ui/AuthPage.tsx
+++ b/client/src/pages/auth/ui/AuthPage.tsx
@@ -12,7 +12,10 @@ import { useNavigate, useSearchParams } from 'react-router-dom'
 import { apiClient } from '@/shared/api/client'
 import { $user, tokenSet } from '@/shared/model/auth'
 
-type AuthResponse = { token: string; user: { id: string; email: string; name?: string | null; phone?: string | null } }
+type AuthResponse = {
+  token: string
+  user: { id: string; email: string; displayName?: string | null; phone?: string | null }
+}
 
 function getApiErrorMessage(err: unknown): string | null {
   if (!err || typeof err !== 'object') return null
diff --git a/client/src/pages/me/ui/MeLayoutPage.tsx b/client/src/pages/me/ui/MeLayoutPage.tsx
index 5998257..0c24ad1 100644
--- a/client/src/pages/me/ui/MeLayoutPage.tsx
+++ b/client/src/pages/me/ui/MeLayoutPage.tsx
@@ -81,7 +81,7 @@ export function MeLayoutPage() {
           Кабинет
         </Typography>
         <Typography variant="body2" color="text.secondary">
-          {user.name?.trim() || user.email}
+          {user.displayName?.trim() || user.email}
         </Typography>
       </Box>
       <Divider sx={{ my: 1 }} />
diff --git a/client/src/pages/me/ui/MePage.tsx b/client/src/pages/me/ui/MePage.tsx
index 3a40bb2..107da67 100644
--- a/client/src/pages/me/ui/MePage.tsx
+++ b/client/src/pages/me/ui/MePage.tsx
@@ -38,8 +38,8 @@ export function MePage() {
     mode: 'onChange',
   })
 
-  const profileForm = useForm<{ name: string }>({
-    defaultValues: { name: user?.name ? String(user.name) : '' },
+  const profileForm = useForm<{ displayName: string }>({
+    defaultValues: { displayName: user?.displayName ? String(user.displayName) : '' },
     mode: 'onChange',
   })
 
@@ -80,15 +80,15 @@ export function MePage() {
               label="Имя или ник"
               helperText="До 40 символов"
               slotProps={{ htmlInput: { maxLength: 40 } }}
-              {...profileForm.register('name')}
+              {...profileForm.register('displayName')}
             />
             <Button
               variant="contained"
               disabled={pendingProfile}
               onClick={() => {
-                const raw = profileForm.getValues('name')
+                const raw = profileForm.getValues('displayName')
                 const name = raw.trim()
-                updateProfileFx({ name: name.length ? name : null })
+                updateProfileFx({ displayName: name.length ? name : null })
               }}
             >
               Сохранить имя
diff --git a/client/src/pages/me/ui/sections/SettingsPage.tsx b/client/src/pages/me/ui/sections/SettingsPage.tsx
index 003f11c..338ba1f 100644
--- a/client/src/pages/me/ui/sections/SettingsPage.tsx
+++ b/client/src/pages/me/ui/sections/SettingsPage.tsx
@@ -38,8 +38,11 @@ export function SettingsPage() {
     mode: 'onChange',
   })
 
-  const profileForm = useForm<{ name: string; phone: string }>({
-    defaultValues: { name: user?.name ? String(user.name) : '', phone: user?.phone ? String(user.phone) : '' },
+  const profileForm = useForm<{ displayName: string; phone: string }>({
+    defaultValues: {
+      displayName: user?.displayName ? String(user.displayName) : '',
+      phone: user?.phone ? String(user.phone) : '',
+    },
     mode: 'onChange',
   })
 
@@ -80,7 +83,7 @@ export function SettingsPage() {
               label="Имя или ник"
               helperText="До 40 символов"
               slotProps={{ htmlInput: { maxLength: 40 } }}
-              {...profileForm.register('name')}
+              {...profileForm.register('displayName')}
             />
             <TextField
               label="Телефон"
@@ -91,11 +94,11 @@ export function SettingsPage() {
               variant="contained"
               disabled={pendingProfile}
               onClick={() => {
-                const raw = profileForm.getValues('name')
+                const raw = profileForm.getValues('displayName')
                 const name = raw.trim()
                 const phoneRaw = profileForm.getValues('phone')
                 const phone = phoneRaw.trim()
-                updateProfileFx({ name: name.length ? name : null, phone: phone.length ? phone : null })
+                updateProfileFx({ displayName: name.length ? name : null, phone: phone.length ? phone : null })
               }}
             >
               Сохранить