From cf61a5c44fea6b96b0a0629b1b1d71c026a84e8b Mon Sep 17 00:00:00 2001 From: Kirill Date: Fri, 22 May 2026 13:41:52 +0500 Subject: [PATCH] fix(client): remove OAuth tab, show VK/Yandex always with separator, fix pill hover offset --- client/src/app/layout/MainLayout.tsx | 2 +- .../pages/auth/__tests__/AuthPage.test.tsx | 17 ++++++++--------- client/src/pages/auth/ui/AuthPage.tsx | 19 +++++++++++-------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/client/src/app/layout/MainLayout.tsx b/client/src/app/layout/MainLayout.tsx index 00208a0..450b0f5 100644 --- a/client/src/app/layout/MainLayout.tsx +++ b/client/src/app/layout/MainLayout.tsx @@ -17,7 +17,7 @@ export function MainLayout({ children }: PropsWithChildren) { const year = new Date().getFullYear() return ( - + diff --git a/client/src/pages/auth/__tests__/AuthPage.test.tsx b/client/src/pages/auth/__tests__/AuthPage.test.tsx index d686ffc..98b3802 100644 --- a/client/src/pages/auth/__tests__/AuthPage.test.tsx +++ b/client/src/pages/auth/__tests__/AuthPage.test.tsx @@ -22,11 +22,17 @@ function renderPage() { } describe('AuthPage', () => { - it('renders three tabs', () => { + it('renders two tabs', () => { renderPage() expect(screen.getByRole('button', { name: 'Пароль' })).toBeTruthy() expect(screen.getByRole('button', { name: 'Код' })).toBeTruthy() - expect(screen.getByRole('button', { name: 'Другой способ' })).toBeTruthy() + }) + + it('shows OAuth buttons and separator always', () => { + renderPage() + expect(screen.getByText('или')).toBeTruthy() + expect(screen.getByText('Войти через VK ID')).toBeTruthy() + expect(screen.getByText('Войти через Яндекс ID')).toBeTruthy() }) it('shows login form by default on tab 0', () => { @@ -49,11 +55,4 @@ describe('AuthPage', () => { fireEvent.click(screen.getByText('Код')) expect(screen.getByText('Отправить код')).toBeTruthy() }) - - it('switches to OAuth tab', () => { - renderPage() - fireEvent.click(screen.getByText('Другой способ')) - expect(screen.getByText('Войти через VK ID')).toBeTruthy() - expect(screen.getByText('Войти через Яндекс ID')).toBeTruthy() - }) }) diff --git a/client/src/pages/auth/ui/AuthPage.tsx b/client/src/pages/auth/ui/AuthPage.tsx index 25c62b5..4efedbc 100644 --- a/client/src/pages/auth/ui/AuthPage.tsx +++ b/client/src/pages/auth/ui/AuthPage.tsx @@ -122,7 +122,7 @@ export function AuthPage() { (