Merge pull request #3 from apuc/authentication

auth page reload fix
This commit is contained in:
kavalar 2021-08-04 16:50:10 +03:00 committed by GitHub
commit 5b42702ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 14 deletions

View File

@ -4,20 +4,17 @@ import 'bootstrap/dist/css/bootstrap.min.css'
import './fonts/stylesheet.css'
import { ProtectedRoute } from './components/ProtectedRoute/ProtectedRoute';
const AuthPageForDevelopers = lazy(() =>
import('./pages/AuthPageForDevelopers')
)
const AuthPageForPartners = lazy(() => import('./pages/AuthPageForPartners'))
const HomePage = lazy(() => import('./pages/HomePage'))
const CandidatePage = lazy(() => import('./pages/CandidatePage'))
const CalendarPage = lazy(() => import('./pages/CalendarPage'))
const ReportPage = lazy(() => import('./pages/ReportFormPage.js'))
const FormPage = lazy(() => import('./pages/FormPage.js'))
import AuthPageForDevelopers from './pages/AuthPageForDevelopers';
import AuthPageForPartners from './pages/AuthPageForPartners';
import HomePage from './pages/HomePage';
import CandidatePage from './pages/CandidatePage';
import CalendarPage from'./pages/CalendarPage';
import ReportPage from './pages/ReportFormPage.js';
import FormPage from './pages/FormPage.js';
const App = () => {
return (
<Router>
<Suspense fallback={<div>Loading...</div>}>
<Switch>
<Route path='/auth' exact>
{/* <AuthPageForPartners /> */}
@ -32,7 +29,6 @@ const App = () => {
<div>Page not found</div>
</Route>
</Switch>
</Suspense>
</Router>
)
}

View File

@ -14,12 +14,23 @@ import vector from '../../images/Vector_Smart_Object.png'
import vectorBlack from '../../images/Vector_Smart_Object_black.png'
import { fetchAuth } from '../../server/server'
import { useSelector } from 'react-redux'
import { selectAuth } from '../../redux/outstaffingSlice';
import { Redirect } from 'react-router-dom';
const AuthForDevelopers = () => {
const dispatch = useDispatch()
const isAuth = useSelector(selectAuth)
const [username, setUsername] = useState('')
const [password, setPassword] = useState('')
console.log('i', isAuth)
if(isAuth) {
return <Redirect to='/' />
}
return (
<section className={style.developers}>
<div className={style.developers__background}>
@ -57,14 +68,14 @@ const AuthForDevelopers = () => {
<button
className={style.form__btn}
type='submit'
onClick={() =>
onClick={(e) => {
e.preventDefault();
fetchAuth({
username,
password,
dispatch: ()=> dispatch(auth(true))
})
}
}}
>
Войти
</button>