quiz

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>
   )