Merge pull request #143 from apuc/fixed-pages

Fixed pages

src/components/Candidate/Candidate.jsx

@@ -32,7 +32,7 @@ const Candidate = () => {
   if (localStorage.getItem("role_status") !== "18") {
     return <Navigate to="/profile" replace />;
   }
-  const { id: candidateId } = useParams();
+  // const { id: candidateId } = useParams();
 
   const navigate = useNavigate();
 
@@ -47,10 +47,10 @@ const Candidate = () => {
   }, []);
 
   useEffect(() => {
-    apiRequest(`/profile/${candidateId}`, {
-      params: Number(candidateId),
-    }).then((el) => dispatch(currentCandidate(el)));
-  }, [dispatch, candidateId]);
+    apiRequest(`/user/me`, {}).then((el) =>
+      dispatch(currentCandidate(el.userCard))
+    );
+  }, [dispatch]);
 
   const { position_id, skillValues, vc_text: text } = currentCandidateObj;
 

src/components/Navigation/Navigation.jsx

@@ -73,8 +73,8 @@ export const Navigation = () => {
     if (localStorage.getItem("role_status") === "18") {
       return;
     }
-    apiRequest(`/profile/${localStorage.getItem("cardId")}`).then(
-      (profileInfo) => dispatch(setProfileInfo(profileInfo))
+    apiRequest(`/user/me`).then((profileInfo) =>
+      dispatch(setProfileInfo(profileInfo.userCard))
     );
   }, [dispatch]);
 

src/components/ProfileCalendar/ProfileCalendarComponent.jsx

@@ -329,6 +329,8 @@ export const ProfileCalendarComponent = React.memo(
               styles={"clear-days"}
               onClick={() => {
                 resetRangeDays();
+                toggleActivePeriod();
+                toggleRangeDays();
               }}
             >
               Сбросить

src/components/ProfileHeader/ProfileHeader.jsx

@@ -26,9 +26,9 @@ export const ProfileHeader = () => {
     if (localStorage.getItem("role_status") === "18") {
       return;
     }
-    apiRequest(`/profile/${localStorage.getItem("cardId")}`).then(
-      (profileInfo) => dispatch(setProfileInfo(profileInfo))
-    );
+    apiRequest(`/user/me`).then((profileInfo) => {
+      dispatch(setProfileInfo(profileInfo.userCard));
+    });
   }, [dispatch]);
 
   const handler = () => {

src/pages/Tracker/Tracker.jsx

@@ -129,7 +129,7 @@ export const Tracker = () => {
     e.target.closest("img").classList.toggle("open-desc-item");
     e.target
       .closest("td")
-      .querySelector(".taskList__table__name-project")
+      ?.querySelector(".taskList__table__name-project")
       .classList.toggle("hide-desc");
   }