apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed sideBar

Browse Source
This commit is contained in:
MaxOvs19 2023-04-27 13:37:41 +03:00
parent 93c4565e26
commit 0c079c2ea2
2 changed files with 80 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/App.js
View File

@ -1,6 +1,10 @@
import React from 'react' import React from "react";
import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom'; import {
BrowserRouter as Router,
Route,
Routes,
Navigate,
} from "react-router-dom";
import AuthForPartners from "./pages/AuthForPartners/AuthForPartners"; import AuthForPartners from "./pages/AuthForPartners/AuthForPartners";
import AuthForDevelopers from "./pages/AuthForDevelopers/AuthForDevelopers"; import AuthForDevelopers from "./pages/AuthForDevelopers/AuthForDevelopers";
@ -9,17 +13,17 @@ import Candidate from "./components/Candidate/Candidate";
import Calendar from "./components/Calendar/Calendar"; import Calendar from "./components/Calendar/Calendar";
import ReportForm from "./components/ReportForm/ReportForm"; import ReportForm from "./components/ReportForm/ReportForm";
import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers"; import FreeDevelopers from "./components/UI/FreeDevelopers/FreeDevelopers";
import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen";
import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar"; import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar";
import FormPage from "./pages/FormPage/FormPage.js"; import FormPage from "./pages/FormPage/FormPage.js";
import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; import SingleReportPage from "./pages/SingleReportPage/SingleReportPage";
import { QuizPage } from "./pages/quiz/QuizPage"; import { QuizPage } from "./pages/quiz/QuizPage";
import {QuizReportPage} from './pages/quiz/QuizReportPage'; import { QuizReportPage } from "./pages/quiz/QuizReportPage";
import { Profile } from "./pages/Profile/Profile.js"; import { Profile } from "./pages/Profile/Profile.js";
import { Summary } from "./pages/Summary/Summary"; import { Summary } from "./pages/Summary/Summary";
import { ViewReport } from "./pages/ViewReport/ViewReport"; import { ViewReport } from "./pages/ViewReport/ViewReport";
import { Tracker } from "./pages/Tracker/Tracker"; import { Tracker } from "./pages/Tracker/Tracker";
import { Payouts } from "./pages/Payouts/Payouts"; import { Payouts } from "./pages/Payouts/Payouts";
import { TicketFullScreen } from "./components/UI/TicketFullScreen/TicketFullScreen";
import { PartnerSettings } from "./pages/PartnerSettings/PartnerSettings"; import { PartnerSettings } from "./pages/PartnerSettings/PartnerSettings";
import { PartnerRequests } from "./pages/PartnerRequests/PartnerRequests"; import { PartnerRequests } from "./pages/PartnerRequests/PartnerRequests";
import { PartnerAddRequest } from "./pages/PartnerAddRequest/PartnerAddRequest"; import { PartnerAddRequest } from "./pages/PartnerAddRequest/PartnerAddRequest";
@ -27,75 +31,78 @@ import { PartnerBid } from "./pages/PartnerBid/PartnerBid";
import { PartnerCategories } from "./pages/PartnerСategories/PartnerСategories"; import { PartnerCategories } from "./pages/PartnerСategories/PartnerСategories";
import { PartnerTreaties } from "./pages/PartnerTreaties/PartnerTreaties"; import { PartnerTreaties } from "./pages/PartnerTreaties/PartnerTreaties";
import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees"; import { PartnerEmployees } from "./pages/PartnerEmployees/PartnerEmployees";
import {AuthForCandidate} from "./pages/AuthForCandidate/AuthForCandidate"; import { AuthForCandidate } from "./pages/AuthForCandidate/AuthForCandidate";
import {RegistrationForCandidate} from "./pages/RegistrationForCandidate/RegistrationForCandidate"; import { RegistrationForCandidate } from "./pages/RegistrationForCandidate/RegistrationForCandidate";
import { ProfileCandidate } from "./pages/ProfileCandidate/ProfileCandidate";
import './assets/global.scss' import { PassingTests } from "./pages/quiz/PassingTests";
import './fonts/stylesheet.css'
import 'bootstrap/dist/css/bootstrap.min.css'
import { ProfileCandidate } from './pages/ProfileCandidate/ProfileCandidate';
import { PassingTests } from './pages/quiz/PassingTests';
import "./assets/global.scss";
import "./fonts/stylesheet.css";
import "bootstrap/dist/css/bootstrap.min.css";
const App = () => { const App = () => {
return ( return (
<> <>
<Router> <Router>
<Routes> <Routes>
<Route exact path="/authdev" element={<AuthForDevelopers />} />
<Route exact path='/authdev' element={<AuthForDevelopers/>}/> <Route exact path="/auth" element={<AuthForPartners />} />
<Route exact path='/auth' element={<AuthForPartners/>}/>
<Route exact path="/worker/:id" element={<FreeDevelopers />} /> <Route exact path="/worker/:id" element={<FreeDevelopers />} />
<Route <Route
exact exact
path="/tracker/:id" path="/tracker/:id"
element={<TicketFullScreen />} element={<TicketFullScreen />}
></Route> ></Route>
<Route exact path='/auth-candidate' element={<AuthForCandidate/>}/> <Route exact path="/auth-candidate" element={<AuthForCandidate />} />
<Route exact path='/registration-candidate' element={<RegistrationForCandidate/>}/> <Route
exact
path="/registration-candidate"
element={<RegistrationForCandidate />}
/>
<Route exact path='/candidate/:id' element={<Candidate/>}/> <Route exact path="/candidate/:id" element={<Candidate />} />
<Route exact path='/candidate/:id/form' element={<FormPage/>}/> <Route exact path="/candidate/:id/form" element={<FormPage />} />
<Route path='/:userId/calendar' element={<Calendar/>}/> <Route path="/:userId/calendar" element={<Calendar />} />
<Route exact path='/report' element={<ReportForm/>}/> <Route exact path="/report" element={<ReportForm />} />
<Route path='/report/:id' element={<SingleReportPage/>}/> <Route path="/report/:id" element={<SingleReportPage />} />
<Route exact path='quiz'> <Route exact path="quiz">
<Route index element={<QuizPage/>}/> <Route index element={<QuizPage />} />
<Route exact path='test' element={<PassingTests />}/> <Route exact path="test" element={<PassingTests />} />
<Route exact path='report' element={<QuizReportPage/>}/> <Route exact path="report" element={<QuizReportPage />} />
</Route> </Route>
<Route exact path='profile'> <Route exact path="profile">
<Route index element={<Profile/>}/> <Route index element={<Profile />} />
<Route exact path='catalog' element={<Home/>}/> <Route exact path="catalog" element={<Home />} />
<Route exact path='calendar' element={<ProfileCalendar/>}/> <Route exact path="calendar" element={<ProfileCalendar />} />
<Route exact path='summary' element={<Summary/>}/> <Route exact path="summary" element={<Summary />} />
<Route exact path='view' element={<ViewReport/>}/> <Route exact path="view" element={<ViewReport />} />
<Route exact path='tracker' element={<Tracker/>}/> <Route exact path="tracker" element={<Tracker />} />
<Route exact path='payouts' element={<Payouts/>}/> <Route exact path="payouts" element={<Payouts />} />
<Route exact path='settings' element={<PartnerSettings/>}/> <Route exact path="settings" element={<PartnerSettings />} />
<Route exact path='requests' element={<PartnerRequests/>}/> <Route exact path="requests" element={<PartnerRequests />} />
<Route exact path='add-request' element={<PartnerAddRequest/>}/> <Route exact path="add-request" element={<PartnerAddRequest />} />
<Route exact path='edit-request' element={<PartnerAddRequest/>}/> <Route exact path="edit-request" element={<PartnerAddRequest />} />
<Route exact path='bid' element={<PartnerBid/>}/> <Route exact path="bid" element={<PartnerBid />} />
<Route exact path='categories' element={<PartnerCategories/>}/> <Route exact path="categories" element={<PartnerCategories />} />
<Route exact path='treaties' element={<PartnerTreaties/>}/> <Route exact path="treaties" element={<PartnerTreaties />} />
<Route exact path='categories/employees' element={<PartnerEmployees/>}/> <Route
exact
path="categories/employees"
element={<PartnerEmployees />}
/>
</Route> </Route>
<Route exact path='profile-candidate/:id'> <Route exact path="profile-candidate/:id">
<Route index element={<ProfileCandidate />}/> <Route index element={<ProfileCandidate />} />
</Route> </Route>
<Route path="*" element={<Navigate to="/auth" replace/>}/> <Route path="*" element={<Navigate to="/auth" replace />} />
</Routes> </Routes>
</Router> </Router>
</> </>
) );
}; };
export default App export default App;

6
src/components/SideBar/SideBar.js
View File

@ -60,6 +60,12 @@ export const SideBar = () => {
<li> <li>
<a href="#">Контакты</a> <a href="#">Контакты</a>
</li> </li>
<li>
<a href="#">Блог</a>
</li>
<li>
<a href="#">FAQ</a>
</li>
</ul> </ul>
<p className="auth-body__politic">Политика конфиденциальности</p> <p className="auth-body__politic">Политика конфиденциальности</p>
<div className="auth-body__contacts"> <div className="auth-body__contacts">