single report page and mobile avatar fix
This commit is contained in:
52
src/App.js
52
src/App.js
@ -1,26 +1,28 @@
|
||||
import React, { Suspense, lazy } from 'react'
|
||||
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
|
||||
import { useSelector } from 'react-redux'
|
||||
import { selectAuth } from './redux/outstaffingSlice';
|
||||
import { selectAuth } from './redux/outstaffingSlice'
|
||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
||||
import './fonts/stylesheet.css'
|
||||
import { ProtectedRoute } from './components/ProtectedRoute/ProtectedRoute';
|
||||
import { ProtectedRoute } from './components/ProtectedRoute/ProtectedRoute'
|
||||
|
||||
import { YMInitializer } from 'react-yandex-metrika';
|
||||
import { YMInitializer } from 'react-yandex-metrika'
|
||||
|
||||
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';
|
||||
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'
|
||||
import SingleReportPage from './pages/SingleReportPage'
|
||||
|
||||
const App = (props) => {
|
||||
const isAuth = useSelector(selectAuth)
|
||||
return (<>
|
||||
<h1>IT Аутстаффинг в России</h1>
|
||||
<Router>
|
||||
return (
|
||||
<>
|
||||
<h1>IT Аутстаффинг в России</h1>
|
||||
<Router>
|
||||
<Switch>
|
||||
<Route path='/authdev' exact>
|
||||
<AuthPageForDevelopers />
|
||||
@ -29,15 +31,24 @@ const App = (props) => {
|
||||
<AuthPageForPartners />
|
||||
</Route>
|
||||
<ProtectedRoute exact path='/' component={HomePage} />
|
||||
<ProtectedRoute exact path='/candidate/:id' component={CandidatePage} />
|
||||
<ProtectedRoute
|
||||
exact
|
||||
path='/candidate/:id'
|
||||
component={CandidatePage}
|
||||
/>
|
||||
<ProtectedRoute path='/calendar' component={CalendarPage} />
|
||||
<ProtectedRoute exact path='/candidate/:id/form' component={FormPage} />
|
||||
<ProtectedRoute path='/report' component={ReportPage} />
|
||||
<ProtectedRoute component={()=><div>Page not found</div>} />
|
||||
<ProtectedRoute
|
||||
exact
|
||||
path='/candidate/:id/form'
|
||||
component={FormPage}
|
||||
/>
|
||||
<ProtectedRoute exact path='/report' component={ReportPage} />
|
||||
<ProtectedRoute path='/report/:id' component={SingleReportPage} />
|
||||
<ProtectedRoute component={() => <div>Page not found</div>} />
|
||||
</Switch>
|
||||
</Router>
|
||||
|
||||
{/* <YMInitializer
|
||||
</Router>
|
||||
|
||||
{/* <YMInitializer
|
||||
accounts={[84188125]}
|
||||
options={{
|
||||
clickmap:true,
|
||||
@ -51,5 +62,4 @@ const App = (props) => {
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
export default App
|
||||
|
Reference in New Issue
Block a user