fixes tasks

Reviewed-on: #42

src/components/Common/AuthHeader/AuthHeader.jsx

@@ -39,13 +39,13 @@ export const AuthHeader = () => {
         <div className="auth-nav">
           <ul>
             <li>
-              <NavLink to={"/stack"}>аутстафинг</NavLink>
+              <NavLink to={"/stack"}>Аутстафинг</NavLink>
             </li>
             <li>
-              <NavLink to={"/tracker-intro"}>трекер</NavLink>
+              <NavLink to={"/tracker-intro"}>Трекер</NavLink>
             </li>
             <li>
-              <NavLink to={"/auth-candidate"}>работа в IT</NavLink>
+              <NavLink to={"/auth-candidate"}>Работа в IT</NavLink>
             </li>
           </ul>
         </div>

src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx

@@ -490,8 +490,10 @@ export const ModalTiсket = ({
   }, [taskTags]);
 
   async function handleUpload(event) {
+    try {
       const formData = new FormData();
       formData.append("uploadFile", event.target.files[0]);
+
       const res = await fetch("https://itguild.info/api/file/upload", {
         method: "POST",
         body: formData,
@@ -502,6 +504,13 @@ export const ModalTiсket = ({
 
       // setUploadedFile(data);
       attachFile(data[0].id);
+    } catch {
+      showNotification({
+        show: true,
+        text: "Неверный формат файла",
+        type: "error"
+      });
+    }
   }
 
   // function deleteLoadedFile() {
@@ -543,7 +552,7 @@ export const ModalTiсket = ({
 
   function run() {
     updateTimerSec++;
-    if (updateTimerSec > 60) {
+    if (updateTimerSec > 59) {
       updateTimerMinute++;
       updateTimerSec = 0;
     }
@@ -561,7 +570,7 @@ export const ModalTiсket = ({
 
   function correctTimerTime(time) {
     if (time < 10) return `0${time}`;
-    if (time > 10) return time;
+    if (time >= 10) return time;
   }
 
   useEffect(() => {
@@ -800,7 +809,7 @@ export const ModalTiсket = ({
                     name="file"
                     id="input__file"
                     type="file"
-                    accept="image/*,.png,.jpg,.svg,.jpeg"
+                    accept="image/*,.png,.jpg,.svg,.jpeg,.doc,.docx,.xls,.xlsx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                     className="input__file"
                     onChange={handleUpload}
                   />

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

@@ -381,7 +381,7 @@ export const TicketFullScreen = () => {
 
   function run() {
     updateTimerSec++;
-    if (updateTimerSec > 60) {
+    if (updateTimerSec > 59) {
       updateTimerMinute++;
       updateTimerSec = 0;
     }
@@ -399,7 +399,7 @@ export const TicketFullScreen = () => {
 
   function correctTimerTime(time) {
     if (time < 10) return `0${time}`;
-    if (time > 10) return time;
+    if (time >= 10) return time;
   }
 
   function deleteTaskExecutor() {
@@ -479,8 +479,10 @@ export const TicketFullScreen = () => {
   }
 
   async function handleUpload(event) {
+    try {
       const formData = new FormData();
       formData.append("uploadFile", event.target.files[0]);
+
       const res = await fetch("https://itguild.info/api/file/upload", {
         method: "POST",
         body: formData,
@@ -489,7 +491,15 @@ export const TicketFullScreen = () => {
 
       const data = await res.json();
 
-    setUploadedFile(data);
+      // setUploadedFile(data);
+      attachFile(data[0].id);
+    } catch {
+      showNotification({
+        show: true,
+        text: "Неверный формат файла",
+        type: "error"
+      });
+    }
   }
 
   function attachFile() {
@@ -774,7 +784,7 @@ export const TicketFullScreen = () => {
                           name="file"
                           id="input__file"
                           type="file"
-                          accept="image/*,.png,.jpg,.svg,.jpeg"
+                          accept="image/*,.png,.jpg,.svg,.jpeg,.doc,.docx,.xls,.xlsx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
                           className="input__file"
                           onChange={handleUpload}
                         />

src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx

@@ -844,7 +844,7 @@ export const TrackerModal = ({
       )}
       {modalType === "create-project" && (
         <div>
-          <div className="title-project">
+          <div className="title-project" style={{ minWidth: "350px" }}>
             <h4>{titleProject}</h4>
             <div className="input-container">
               <input

src/pages/Landing/Landing.jsx

@@ -88,12 +88,12 @@ export const Landing = () => {
             регистрация
           </div>
           <BurgerButton active={menuActive} setActive={setMenuActive} />
-          <div className="head__tracker">
+          <Link className="head__tracker" to="/tracker-intro">
             <div>
               <img src={tracker} alt="tracker" />
             </div>
             <span>трекер</span>
-          </div>
+          </Link>
           <SVG className="head__auth" src={authIcon} />
         </div>
         <div className="landing__info">

src/pages/PartnerSettings/PartnerSettings.jsx

@@ -34,13 +34,13 @@ export const PartnerSettings = () => {
   const [loader, setLoader] = useState(false);
   const [tgLoader, setTgLoader] = useState(false);
 
-  useEffect(() => {
+  // useEffect(() => {
-    apiRequest("/user-tg-bot/get-token", {
+  //   apiRequest("/user-tg-bot/get-token", {
-      method: "GET"
+  //     method: "GET"
-    }).then((data) => {
+  //   }).then((data) => {
-      setTgToken(data.token);
+  //     setTgToken(data.token);
-    });
+  //   });
-  }, []);
+  // }, []);
 
   const setSettings = () => {
     if (inputsValue.name.length < 2) {
@@ -92,7 +92,25 @@ export const PartnerSettings = () => {
     });
   };
 
+  const handleGenerate = async () => {
+    if (tgToken == undefined) {
+      setTgLoader(true);
+      apiRequest("/user-tg-bot/get-token", {
+        method: "GET"
+      }).then((data) => {
+        setTgToken(data.token);
+        showNotification({
+          show: true,
+          text: "Телеграм токен успешно сгенерирован",
+          type: "success"
+        });
+        setTgLoader(false);
+      });
+    }
+  };
+
   const handleCopy = async () => {
+    if (tgToken !== undefined) {
       try {
         await navigator.clipboard.writeText(tgToken);
         showNotification({
@@ -107,6 +125,13 @@ export const PartnerSettings = () => {
           type: "error"
         });
       }
+    } else {
+      showNotification({
+        show: true,
+        text: "Необходимо сгенерировать код",
+        type: "error"
+      });
+    }
   };
 
   return (
@@ -225,13 +250,19 @@ export const PartnerSettings = () => {
                 {tgLoader ? (
                   <Loader style={"green"} width={"40px"} height={"40px"} />
                 ) : (
+                  <BaseButton
+                    onClick={handleGenerate}
+                    styles={"settings__buttons-save"}
+                  >
+                    Сгенерировать
+                  </BaseButton>
+                )}
                 <BaseButton
                   onClick={handleCopy}
                   styles={"settings__buttons-save"}
                 >
                   Скопировать
                 </BaseButton>
-                )}
               </div>
               <div className="settings__agreement-tg">
                 <a href="#" target="_blank" rel="noopener noreferrer">

src/pages/PartnerSettings/partnerSettings.scss

@@ -94,8 +94,7 @@
     width: 100%;
     display: flex;
     flex-direction: row;
-    justify-content: flex-start;
+    justify-content: space-around;
-    gap: 20px;
     margin: 30px 0 20px;
 
     &-cancel,
@@ -130,21 +129,11 @@
     }
   }
 
-  @media (max-width: 800px) {
+  @media (max-width: 440px) {
-    &__input {
-      width: 95%;
-    }
-
     &__buttons {
-      margin: 15px 0 14px 0;
+      flex-direction: column;
-      width: 100%;
+      gap: 10px;
-      flex-direction: column-reverse;
       align-items: center;
-      gap: 0px;
-
-      &-save {
-        margin-bottom: 15px;
-      }
     }
   }
 }

src/pages/roles/PartnerPage.jsx

@@ -28,6 +28,7 @@ import { WelcomePage } from "@pages/WelcomePage/WelcomePage";
 
 import { Calendar } from "@components/Calendar/Calendar";
 import { Candidate } from "@components/Candidate/Candidate";
+import TicketFullScreen from "@components/Modal/Tracker/TicketFullScreen/TicketFullScreen";
 
 export const PartnerPage = () => {
   return (
@@ -46,6 +47,7 @@ export const PartnerPage = () => {
       <Route exact path="/candidate/:id/form" element={<FormPage />} />
       <Route path="/:userId/calendar" element={<Calendar />} />
 
+      <Route exact path="/tracker/task/:id" element={<TicketFullScreen />} />
       <Route
         exact
         path="/tracker/project/:id/task/:taskId"