From a1016d136b3897f6901431f7025f30bd3460435e Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 18 Sep 2023 15:25:25 +0300
Subject: [PATCH] Minor UI fixes

---
 rsconcept/frontend/src/App.tsx                     |  2 +-
 rsconcept/frontend/src/components/BackendError.tsx |  2 +-
 rsconcept/frontend/src/components/RequireAuth.tsx  |  1 -
 rsconcept/frontend/src/pages/LoginPage.tsx         | 13 +++++++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

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 (
     <NavigationState>
-    <div className='w-screen antialiased clr-app'>
+    <div className='w-screen antialiased clr-app min-w-[30rem]'>
       
       <ConceptToaster
         className='mt-[4rem] text-sm'
diff --git a/rsconcept/frontend/src/components/BackendError.tsx b/rsconcept/frontend/src/components/BackendError.tsx
index 86a9869f..95c66e2a 100644
--- a/rsconcept/frontend/src/components/BackendError.tsx
+++ b/rsconcept/frontend/src/components/BackendError.tsx
@@ -59,7 +59,7 @@ function DescribeError(error: ErrorInfo) {
 
 function BackendError({ error }: BackendErrorProps) {
   return (
-    <div className='py-2 text-sm font-semibold select-text text-warning'>
+    <div className='px-3 py-2 min-w-[15rem] text-sm font-semibold select-text text-warning'>
       {DescribeError(error)}
     </div>
   );
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 &&
         <div className='flex flex-col items-center gap-1 mt-2'>
-          <p><b>Данная страница доступна только зарегистрированным пользователям</b></p>
           <p className='mb-2'>Пожалуйста войдите в систему</p>
           <TextURL text='Войти в Портал' href='/login'/>
           <TextURL text='Зарегистрироваться' href='/signup'/>
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 (
     <div className='flex items-start justify-center w-full pt-4 select-none' style={{minHeight: mainHeight}}>
     { user &&
@@ -73,7 +77,12 @@ function LoginPage() {
         <span> | </span>
         <TextURL text='Справка' href='/manuals'/>
         <span> | </span>
-        <TextURL text='Выйти' href='/logout'/>
+        <span
+          className='cursor-pointer hover:underline text-url'
+          onClick={logoutAndRedirect}
+        >
+          Выйти
+        </span>
       </p>
     </div>}
     { !user &&