diff --git a/client/src/components/ContentDrawer.tsx b/client/src/components/ContentDrawer.tsx index 79b9cf5..678295d 100644 --- a/client/src/components/ContentDrawer.tsx +++ b/client/src/components/ContentDrawer.tsx @@ -2,6 +2,7 @@ import { Drawer } from 'antd'; import { useEffect, useState } from 'react'; import { Avatar, Typography } from 'antd'; import { useTranslation } from 'react-i18next'; +import { useUserSelector } from '@/store/userStore'; interface ContentDrawerProps { open: boolean; @@ -22,6 +23,7 @@ export default function ContentDrawer({ name, email, }: ContentDrawerProps) { + const user = useUserSelector(); const { t } = useTranslation(); const [width, setWidth] = useState('30%'); @@ -36,6 +38,7 @@ export default function ContentDrawer({ window.addEventListener('resize', calculateWidths); return () => window.removeEventListener('resize', calculateWidths); }, []); + console.log(login, user?.login, login === user?.login); const editDrawerTitle = (
- - {name} + + {name} {login === user?.login ? t('you') : ''} {email} diff --git a/client/src/config/i18n.ts b/client/src/config/i18n.ts index bc44352..360cde1 100644 --- a/client/src/config/i18n.ts +++ b/client/src/config/i18n.ts @@ -49,6 +49,7 @@ i18n createdAt: 'Created', saving: 'Saving...', createdAccountMessage: 'User successfully created!', + you: '(You)', }, }, ru: { @@ -89,7 +90,8 @@ i18n nameLogin: 'Имя, Логин', createdAt: 'Создано', saving: 'Сохранение...', - createdAccountMessage: 'Пользователь успешно создан!' + createdAccountMessage: 'Пользователь успешно создан!', + you: '(Вы)', }, }, }, diff --git a/client/src/pages/AccountsPage.tsx b/client/src/pages/AccountsPage.tsx index c226b64..317cfee 100644 --- a/client/src/pages/AccountsPage.tsx +++ b/client/src/pages/AccountsPage.tsx @@ -138,7 +138,10 @@ export default function AccountsPage() { const onTableChange: TableProps['onChange'] = (pagination) => { console.log(pagination); - UserService.getUsers(pagination.current as number, 10).then((data) => { + UserService.getUsers( + pagination.current as number, + pagination.pageSize + ).then((data) => { setAccounts(data); }); };