Merge branch 'main' of https://github.com/IRBorisov/ConceptPortal

.gitignore

@@ -57,4 +57,5 @@ bower_components
 
 
 # Environments
-venv/
+venv/
+/GitExtensions.settings

rsconcept/frontend/src/context/UserProfileContext.tsx

@@ -77,7 +77,7 @@ export const UserProfileState = ({ children }: UserProfileStateProps) => {
         onError: error => { setError(error); },
         onSuccess: () => {
           setUser(undefined);
-          auth.logout();
+          auth.reload();
           if (callback) callback();       
       }});
     }, [setUser, auth]

rsconcept/frontend/src/pages/HomePage.tsx

@@ -2,7 +2,6 @@ import { useLayoutEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { useAuth } from '../context/AuthContext';
-import { TIMEOUT_UI_REFRESH } from '../utils/constants';
 
 function HomePage() {
   const navigate = useNavigate();
@@ -10,13 +9,9 @@ function HomePage() {
   
   useLayoutEffect(() => {
     if (!user) {
-      setTimeout(() => {
+      navigate('/library?filter=common');
-        navigate('/library?filter=common');
-      }, TIMEOUT_UI_REFRESH);
     } else if(!user.is_staff) {
-      setTimeout(() => {
+      navigate('/library?filter=personal');
-        navigate('/library?filter=personal');
-      }, TIMEOUT_UI_REFRESH);
     }
   }, [navigate, user])
 

rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx

@@ -13,13 +13,13 @@ export function ChangePassword() {
   const [old_password, setOldPassword] = useState('');
   const [new_password, setNewPassword] = useState('');
   const [new_password_repeat, setNewPasswordRepeat] = useState('');
-  const [password_equal, setPasswordEqual] = useState(true);
+  const [new_pass_color, setNewPassColor] = useState('');
   const navigate = useNavigate();
   
   function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
     event.preventDefault();
     if (new_password !== new_password_repeat) {
-      setPasswordEqual(false);
+      setNewPassColor('bg-red-500');
       toast.error('Пароли не совпадают');
     }
     else {
@@ -41,21 +41,21 @@ export function ChangePassword() {
           onChange={event => setOldPassword(event.target.value)}
         />
         <TextInput id='new_password'
-          colorClass={`${password_equal ? "" : "text-red-500"}`}
+          colorClass={new_pass_color}
           label="Введите новый пароль:"
           value={new_password}
           onChange={event => {
-            setNewPassword(event.target.value);
+            setNewPassword(event.target.value); 
-            setPasswordEqual(true);
+            setNewPassColor('');
           }}
         />
-        <TextInput id='new_password'
+        <TextInput id='new_password_repeat'
-          colorClass={`${password_equal ? "" : "text-red-500"}`}
+          colorClass={new_pass_color}
           label="Повторите новый пароль:"
           value={new_password_repeat}
           onChange={event => {
-            setNewPasswordRepeat(event.target.value);
+            setNewPasswordRepeat(event.target.value); 
-            setPasswordEqual(true);
+            setNewPassColor('');
           }}
         />
         <div className='relative flex justify-center my-4 border'>
@@ -69,4 +69,4 @@ export function ChangePassword() {
          
     </form>   
     </div>  
-  )}
+  )}

rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx

@@ -70,4 +70,4 @@ export function UserProfile() {
     <ChangePassword /> 
     </div>
     </div>
-  )}
+  )}