diff --git a/.gitignore b/.gitignore index 4cedcb20..17515ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -56,4 +56,5 @@ bower_components # Environments -venv/ \ No newline at end of file +venv/ +/GitExtensions.settings diff --git a/rsconcept/frontend/src/context/UserProfileContext.tsx b/rsconcept/frontend/src/context/UserProfileContext.tsx index 6179b18f..d0f40871 100644 --- a/rsconcept/frontend/src/context/UserProfileContext.tsx +++ b/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] diff --git a/rsconcept/frontend/src/pages/HomePage.tsx b/rsconcept/frontend/src/pages/HomePage.tsx index 19b7429e..9927e87f 100644 --- a/rsconcept/frontend/src/pages/HomePage.tsx +++ b/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'); - }, TIMEOUT_UI_REFRESH); + navigate('/library?filter=common'); } else if(!user.is_staff) { - setTimeout(() => { - navigate('/library?filter=personal'); - }, TIMEOUT_UI_REFRESH); + navigate('/library?filter=personal'); } }, [navigate, user]) diff --git a/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx b/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx index 2fd0c475..74f83b23 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/ChangePassword.tsx +++ b/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) { 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)} /> { - setNewPassword(event.target.value); - setPasswordEqual(true); + setNewPassword(event.target.value); + setNewPassColor(''); }} /> - { - setNewPasswordRepeat(event.target.value); - setPasswordEqual(true); + setNewPasswordRepeat(event.target.value); + setNewPassColor(''); }} />
@@ -69,4 +69,4 @@ export function ChangePassword() {
- )} \ No newline at end of file + )} diff --git a/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx b/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx index 8f359508..05072506 100644 --- a/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx +++ b/rsconcept/frontend/src/pages/UserProfilePage/UserProfile.tsx @@ -70,4 +70,4 @@ export function UserProfile() { - )} \ No newline at end of file + )}