ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor UI fixes

Browse Source
This commit is contained in:
IRBorisov 2023-09-18 15:25:25 +03:00
parent 5d266420e1
commit a1016d136b
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/frontend/src/App.tsx
View File

@ -21,7 +21,7 @@ function Root() {
const { noNavigation, noFooter, viewportHeight, mainHeight, showScroll } = useConceptTheme(); const { noNavigation, noFooter, viewportHeight, mainHeight, showScroll } = useConceptTheme();
return ( return (
<NavigationState> <NavigationState>
<div className='w-screen antialiased clr-app'> <div className='w-screen antialiased clr-app min-w-[30rem]'>
<ConceptToaster <ConceptToaster
className='mt-[4rem] text-sm' className='mt-[4rem] text-sm'

2
rsconcept/frontend/src/components/BackendError.tsx
View File

@ -59,7 +59,7 @@ function DescribeError(error: ErrorInfo) {
function BackendError({ error }: BackendErrorProps) { function BackendError({ error }: BackendErrorProps) {
return ( 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)} {DescribeError(error)}
</div> </div>
); );

1
rsconcept/frontend/src/components/RequireAuth.tsx
View File

@ -13,7 +13,6 @@ function RequireAuth({ children }: RequireAuthProps) {
{user && children} {user && children}
{!user && {!user &&
<div className='flex flex-col items-center gap-1 mt-2'> <div className='flex flex-col items-center gap-1 mt-2'>
<p><b>Данная страница доступна только зарегистрированным пользователям</b></p>
<p className='mb-2'>Пожалуйста войдите в систему</p> <p className='mb-2'>Пожалуйста войдите в систему</p>
<TextURL text='Войти в Портал' href='/login'/> <TextURL text='Войти в Портал' href='/login'/>
<TextURL text='Зарегистрироваться' href='/signup'/> <TextURL text='Зарегистрироваться' href='/signup'/>

13
rsconcept/frontend/src/pages/LoginPage.tsx
View File

@ -29,7 +29,7 @@ function LoginPage() {
const location = useLocation(); const location = useLocation();
const { navigateTo, navigateHistory } = useConceptNavigation(); const { navigateTo, navigateHistory } = useConceptNavigation();
const search = useLocation().search; const search = useLocation().search;
const { user, login, loading, error, setError } = useAuth(); const { user, login, logout, loading, error, setError } = useAuth();
const [username, setUsername] = useState(''); const [username, setUsername] = useState('');
const [password, setPassword] = useState(''); const [password, setPassword] = useState('');
@ -61,6 +61,10 @@ function LoginPage() {
} }
} }
function logoutAndRedirect() {
logout(() => navigateTo('/login/'));
}
return ( return (
<div className='flex items-start justify-center w-full pt-4 select-none' style={{minHeight: mainHeight}}> <div className='flex items-start justify-center w-full pt-4 select-none' style={{minHeight: mainHeight}}>
{ user && { user &&
@ -73,7 +77,12 @@ function LoginPage() {
<span> | </span> <span> | </span>
<TextURL text='Справка' href='/manuals'/> <TextURL text='Справка' href='/manuals'/>
<span> | </span> <span> | </span>
<TextURL text='Выйти' href='/logout'/> <span
className='cursor-pointer hover:underline text-url'
onClick={logoutAndRedirect}
>
Выйти
</span>
</p> </p>
</div>} </div>}
{ !user && { !user &&