From 63629afede2c8d839f0c0cab7f2eadc338c45d53 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:40:40 +0300
Subject: [PATCH] Fix navigation after login

---
 .../src/pages/LibraryPage/SearchPanel.tsx         |  2 +-
 rsconcept/frontend/src/pages/LoginPage.tsx        | 15 ++++++++++++---
 .../frontend/src/pages/RSFormPage/RSTabs.tsx      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
index 23815f43..e0ed8a2f 100644
--- a/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
+++ b/rsconcept/frontend/src/pages/LibraryPage/SearchPanel.tsx
@@ -51,7 +51,7 @@ function SearchPanel({ total, filtered, setFilter }: SearchPanelProps) {
   useLayoutEffect(() => {
     const searchFilter = new URLSearchParams(search).get('filter')  as LibraryFilterStrategy | null;
     if (searchFilter === null) {
-      navigate(`/library?filter=${strategy}`);
+      navigate(`/library?filter=${strategy}`, { replace: true });
       return;
     }
     const inputStrategy = searchFilter && Object.values(LibraryFilterStrategy).includes(searchFilter) ? searchFilter : LibraryFilterStrategy.MANUAL;
diff --git a/rsconcept/frontend/src/pages/LoginPage.tsx b/rsconcept/frontend/src/pages/LoginPage.tsx
index bceee23d..5b4f7505 100644
--- a/rsconcept/frontend/src/pages/LoginPage.tsx
+++ b/rsconcept/frontend/src/pages/LoginPage.tsx
@@ -61,10 +61,19 @@ function LoginPage() {
   }
 
   return (
-    <div className='flex items-center justify-center w-full select-none' style={{minHeight: mainHeight}}>
+    <div className='flex items-start justify-center w-full pt-4 select-none' style={{minHeight: mainHeight}}>
     { user &&
-    <div className='py-2 font-semibold'>
-      {`Вы вошли в систему как ${user.username}`}
+    <div className='flex flex-col items-center gap-2'>
+      <p className='font-semibold'>{`Вы вошли в систему как ${user.username}`}</p>
+      <p>
+        <TextURL text='Создать схему' href='/rsform-create'/>
+        <span> | </span>
+        <TextURL text='Библиотека' href='/library'/>
+        <span> | </span>
+        <TextURL text='Справка' href='/manuals'/>
+        <span> | </span>
+        <TextURL text='Выйти' href='/logout'/>
+      </p>
     </div>}
     { !user &&
     <Form
diff --git a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
index 6752957f..299b84c1 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
@@ -5,8 +5,8 @@ import { TabList, TabPanel, Tabs } from 'react-tabs';
 import { toast } from 'react-toastify';
 
 import BackendError from '../../components/BackendError';
-import ConceptTab from '../../components/Common/ConceptTab';
 import { ConceptLoader } from '../../components/Common/ConceptLoader';
+import ConceptTab from '../../components/Common/ConceptTab';
 import { useLibrary } from '../../context/LibraryContext';
 import { useRSForm } from '../../context/RSFormContext';
 import { useConceptTheme } from '../../context/ThemeContext';