Merge branch 'main' into webpack-5

# Conflicts:
#	src/components/ProfileCalendar/ProfileCalendar.js
#	src/hooks/useRequest.js
This commit is contained in:
2023-01-25 16:52:34 +03:00
12 changed files with 545 additions and 26 deletions

View File

@ -18,6 +18,7 @@ import {InstructionPage} from './pages/quiz/InstructionPage'
import {ResultPage} from './pages/quiz/ResultPage'
import {Profile} from './pages/Profile/Profile.js'
import {Summary} from './pages/Summary/Summary'
import {ViewReport} from './pages/ViewReport/ViewReport'
import './fonts/stylesheet.css'
import 'bootstrap/dist/css/bootstrap.min.css'
@ -56,6 +57,7 @@ const App = () => {
<Route index element={<Profile/>}/>
<Route exact path='calendar' element={<ProfileCalendar/>}/>
<Route exact path='summary' element={<Summary/>}/>
<Route exact path='view' element={<ViewReport/>}/>
</Route>
<Route path="*" element={<Navigate to="/" replace/>}/>