quiz

src/App.js

@@ -17,7 +17,6 @@ import CalendarPage from './pages/CalendarPage'
 import ReportPage from './pages/ReportFormPage.js'
 import FormPage from './pages/FormPage.js'
 import SingleReportPage from './pages/SingleReportPage'
-<<<<<<< HEAD
 import { Highlighter } from './pages/CodeSnippetPage'
 import { QuizPage } from './pages/quiz/QuizPage'
 import { InterjacentPage } from './pages/quiz/InterjacentPage'
@@ -25,13 +24,6 @@ import { QuizTestPage } from './pages/quiz/QuizTestPage'
 import { Instruction } from './components/features/quiz/Instructions'
 import { InstructionPage } from './pages/quiz/InstructionPage'
 import {ResultPage} from "./pages/quiz/ResultPage";
-=======
-import Bookkeping from './pages/Bookkeeping'
-import { TaxPage } from "./pages/TaxPage"
-import { MoneyPage } from "./pages/MoneyPage"
-import { ActPage } from "./pages/ActPage"
-import { ContractPage } from "./pages/ContractPage"
->>>>>>> documents
 
 const App = (props) => {
   const isAuth = useSelector(selectAuth)
@@ -60,19 +52,11 @@ const App = (props) => {
           />
           <ProtectedRoute exact path='/report' component={ReportPage} />
           <ProtectedRoute path='/report/:id' component={SingleReportPage} />
-<<<<<<< HEAD
           <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='/quiz-result' component={ResultPage} />
-=======
-          <ProtectedRoute exact path='/documents' component={Bookkeping} />
-          <ProtectedRoute exact path='/tax' component={TaxPage} />
-          <ProtectedRoute exact path='/money' component={MoneyPage} />
-          <ProtectedRoute exact path='/documents/act' component={ActPage} />
-          <ProtectedRoute exact path='/documents/contract' component={ContractPage} />
->>>>>>> documents
           <ProtectedRoute component={() => <div>Page not found</div>} />
         </Switch>
       </Router>

src/components/CandidateSidebar/CandidateSidebar.js

@@ -28,17 +28,12 @@ const getYearsString = (years) => {
   return `${years} ${yearsString}`
 }
 
-<<<<<<< HEAD
 const CandidateSidebar = ({ candidate, position, setActiveSnippet, activeSnippet }) => {
-  
+  const userId = localStorage.getItem('id') 
   const showSnippet = () => {
     setActiveSnippet((prev)=>!prev)
   }
 
-=======
-const CandidateSidebar = ({ candidate, position }) => {
-  const userId = localStorage.getItem('id') 
->>>>>>> documents
   return (
     <div className='candidate-sidebar'>
       <div className='candidate-sidebar__info'>
@@ -62,11 +57,12 @@ const CandidateSidebar = ({ candidate, position }) => {
             Выбрать к собеседованию
           </button>
         </Link>
-        {userId && candidate.id === userId && (<Link to={`/${candidate.id}/calendar`}>
+        {userId  && (
+          <>
+        <Link to={`/${candidate.id}/calendar`}>
           <button className='candidate-sidebar__select'>
             Отчёты
           </button>
-<<<<<<< HEAD
         </Link>
         {/* <Link to={`/candidate/${candidate.id}/code`}> */}
           <button 
@@ -81,17 +77,9 @@ const CandidateSidebar = ({ candidate, position }) => {
             candidate.achievements &&
             candidate.achievements.map((item) => {
               return <Achievement key={item.id} achievement={item.achievement} />
-=======
-        </Link>)}
-        <div className='candidate-sidebar__achievements'>
-          {candidate &&
-            candidate.achievements &&
-            candidate.achievements.map((item, index) => {
-              return <Achievement achievement={item.achievement} key={index}/>
->>>>>>> documents
             })}
         </div>
-        
+        </>)}
       </div>
     </div>
   )

src/components/Form/Form.js

@@ -47,7 +47,7 @@ const Form = () => {
     formData.append('comment', data.comment)
 
     fetchPost({
-      link: `${process.env.REACT_APP_API_URL}/api/profile/add-to-interview`,
+      link: `${process.env.REACT_APP_API_URL}/api/interview-request/create-interview-request`,
       params: {
         profile_id: urlParams.id,
         ...data

src/components/features/quiz/Task.js

@@ -48,12 +48,12 @@ export const TaskQuiz = () => {
       if (checkedValues.length || inputValue) {
          switch (questions[index].question_type_id) {
             case '3':
-               await dispatch(fetchUserAnswersMany(checkedValues))
+               dispatch(fetchUserAnswersMany(checkedValues))
                break;
             case '2':
             case '1':
             case '4':
-               await dispatch(fetchUserAnswerOne(checkedValues))
+               dispatch(fetchUserAnswerOne(checkedValues))
                break;
             default:
                break;

src/redux/quizSlice.js

@@ -18,7 +18,7 @@ export const setUserInfo = createAsyncThunk(
   async (id) => {
      try{
         const response = await fetchGet({
-             link: `${process.env.REACT_APP_API_URL}/api/user-card/get-user-card?user_id=${id}`,
+             link: `${process.env.REACT_APP_API_URL}/api/profile/get-main-data?user_id=${id}`,
              Origin: `${process.env.REACT_APP_BASE_URL}`,
           }
         )