diff --git a/rsconcept/frontend/src/App.tsx b/rsconcept/frontend/src/App.tsx index cebdf2d5..433a87d3 100644 --- a/rsconcept/frontend/src/App.tsx +++ b/rsconcept/frontend/src/App.tsx @@ -21,7 +21,7 @@ function Root() { const { noNavigation, noFooter, viewportHeight, mainHeight, showScroll } = useConceptTheme(); return ( -
+
+
{DescribeError(error)}
); diff --git a/rsconcept/frontend/src/components/RequireAuth.tsx b/rsconcept/frontend/src/components/RequireAuth.tsx index 7af7a854..e1a5464f 100644 --- a/rsconcept/frontend/src/components/RequireAuth.tsx +++ b/rsconcept/frontend/src/components/RequireAuth.tsx @@ -13,7 +13,6 @@ function RequireAuth({ children }: RequireAuthProps) { {user && children} {!user &&
-

Данная страница доступна только зарегистрированным пользователям

Пожалуйста войдите в систему

diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx index e6456882..57228333 100644 --- a/rsconcept/frontend/src/pages/LoginPage.tsx +++ b/rsconcept/frontend/src/pages/LoginPage.tsx @@ -29,7 +29,7 @@ function LoginPage() { const location = useLocation(); const { navigateTo, navigateHistory } = useConceptNavigation(); const search = useLocation().search; - const { user, login, loading, error, setError } = useAuth(); + const { user, login, logout, loading, error, setError } = useAuth(); const [username, setUsername] = useState(''); const [password, setPassword] = useState(''); @@ -61,6 +61,10 @@ function LoginPage() { } } + function logoutAndRedirect() { + logout(() => navigateTo('/login/')); + } + return (
{ user && @@ -73,7 +77,12 @@ function LoginPage() { | | - + + Выйти +

} { !user &&