Переписываю спорные решения

src/App.js

@@ -1,12 +1,9 @@
 import React from 'react'
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
-import 'bootstrap/dist/css/bootstrap.min.css'
-import './fonts/stylesheet.css'
+import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom';
 
-import { ProtectedRoute } from './components/ProtectedRoute/ProtectedRoute'
 
-import AuthPageForDevelopers from './pages/AuthPageForDevelopers'
-import AuthPageForPartners from './pages/AuthPageForPartners'
+import AuthForPartners from "./pages/AuthForPartners/AuthForPartners";
+import AuthForDevelopers from "./pages/AuthForDevelopers/AuthForDevelopers";
 import HomePage from './pages/HomePage'
 import CandidatePage from './pages/CandidatePage'
 import CalendarPage from './pages/CalendarPage'
@@ -14,59 +11,56 @@ import ReportPage from './pages/ReportFormPage.js'
 import ProfileCalendarPage from './pages/ProfileCalendarPage.js'
 import FormPage from './pages/FormPage.js'
 import SingleReportPage from './pages/SingleReportPage'
-import { QuizPage } from './pages/quiz/QuizPage'
-import { InterjacentPage } from './pages/quiz/InterjacentPage'
-import { QuizTestPage } from './pages/quiz/QuizTestPage'
-import { InstructionPage } from './pages/quiz/InstructionPage'
-import { ResultPage } from './pages/quiz/ResultPage'
-import { Profile } from './pages/Profile.js'
-import { Summary } from './pages/Summary'
+import {QuizPage} from './pages/quiz/QuizPage'
+import {InterjacentPage} from './pages/quiz/InterjacentPage'
+import {QuizTestPage} from './pages/quiz/QuizTestPage'
+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 './fonts/stylesheet.css'
+import 'bootstrap/dist/css/bootstrap.min.css'
+
 
 const App = () => {
   return (
-    <>
-      <h1>IT Аутстаффинг в России</h1>
-      <Router>
-        <Switch>
-          <Route path='/authdev' exact>
-            <AuthPageForDevelopers />
-          </Route>
-          <Route path='/auth' exact>
-            <AuthPageForPartners />
-          </Route>
-          <ProtectedRoute exact path='/' component={HomePage} />
-          <ProtectedRoute
-            exact
-            path='/candidate/:id'
-            component={CandidatePage}
-          />
-          <ProtectedRoute path='/:userId/calendar' component={CalendarPage} />
-          <ProtectedRoute
-            exact
-            path='/candidate/:id/form'
-            component={FormPage}
-          />
-          <ProtectedRoute exact path='/report' component={ReportPage} />
-          <ProtectedRoute path='/report/:id' component={SingleReportPage} />
-          <ProtectedRoute path='/ProfileCalendar' component={ProfileCalendarPage} />
-          <ProtectedRoute path='/quiz' component={QuizPage} />
-          <ProtectedRoute
-            path='/quiz-interjacent'
-            component={InterjacentPage}
-          />
-          <ProtectedRoute path='/quiz-test' component={QuizTestPage} />
-          <ProtectedRoute
-            path='/quiz-instruction'
-            component={InstructionPage}
-          />
-          <ProtectedRoute path='/profile' component={Profile} />
-          <ProtectedRoute path='/summary' component={Summary} />
-          <ProtectedRoute path='/quiz-result' component={ResultPage} />
-          <ProtectedRoute component={() => <div>Page not found</div>} />
-        </Switch>
-      </Router>
-    </>
+      <>
+        <h1>IT Аутстаффинг в России</h1>
+        <Router>
+
+          <Routes>
+            <Route exact path='/' element={<HomePage/>}/>
+
+            <Route exact path='/authdev' element={<AuthForDevelopers/>}/>
+            <Route exact path='/auth' element={<AuthForPartners/>}/>
+
+            <Route exact path='/candidate/:id' element={<CandidatePage/>}/>
+            <Route exact path='/candidate/:id/form' element={<FormPage/>}/>
+            <Route path='/:userId/calendar' element={<CalendarPage/>}/>
+
+            <Route exact path='/report' element={<ReportPage/>}/>
+            <Route path='/report/:id' element={<SingleReportPage/>}/>
+
+            <Route path='/quiz' element={<QuizPage/>}/>
+            <Route path='/quiz-interjacent' element={<InterjacentPage/>}/>
+            <Route path='/quiz-test' element={<QuizTestPage/>}/>
+            <Route path='/quiz-instruction' element={<InstructionPage/>}/>
+            <Route path='/quiz-result' element={<ResultPage/>}/>
+
+            <Route exact path='/profile' element={<Profile/>}>
+              <Route exact path='calendar' element={<ProfileCalendarPage/>}/>
+              <Route exact path='summary' element={<Summary/>}/>
+            </Route>
+
+            {/*<Route component={() => <div>Page not found</div>} />*/}
+            {/*<Route path='*' component={() => <div>Page not found</div>}/>*/}
+
+            <Route path="*" element={<Navigate to="/" replace/>}/>
+          </Routes>
+        </Router>
+      </>
   )
-}
+};
 
 export default App