Merge branch 'main' of https://git.itguild.info/apuc/guild_front

(Tracker/ModalTicket) fix tgToken(PartnerSettings)

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

@@ -490,18 +490,27 @@ export const ModalTiсket = ({
   }, [taskTags]);
 
   async function handleUpload(event) {
-    const formData = new FormData();
+    try {
-    formData.append("uploadFile", event.target.files[0]);
+      const formData = new FormData();
-    const res = await fetch("https://itguild.info/api/file/upload", {
+      formData.append("uploadFile", event.target.files[0]);
-      method: "POST",
-      body: formData,
-      headers: { ...getToken() }
-    });
 
-    const data = await res.json();
+      const res = await fetch("https://itguild.info/api/file/upload", {
+        method: "POST",
+        body: formData,
+        headers: { ...getToken() }
+      });
 
-    // setUploadedFile(data);
+      const data = await res.json();
-    attachFile(data[0].id);
+
+      // 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,17 +479,27 @@ export const TicketFullScreen = () => {
   }
 
   async function handleUpload(event) {
-    const formData = new FormData();
+    try {
-    formData.append("uploadFile", event.target.files[0]);
+      const formData = new FormData();
-    const res = await fetch("https://itguild.info/api/file/upload", {
+      formData.append("uploadFile", event.target.files[0]);
-      method: "POST",
-      body: formData,
-      headers: { ...getToken() }
-    });
 
-    const data = await res.json();
+      const res = await fetch("https://itguild.info/api/file/upload", {
+        method: "POST",
+        body: formData,
+        headers: { ...getToken() }
+      });
 
-    setUploadedFile(data);
+      const data = await res.json();
+
+      // 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/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,18 +92,43 @@ export const PartnerSettings = () => {
     });
   };
 
-  const handleCopy = async () => {
+  const handleGenerate = async () => {
-    try {
+    if (tgToken == undefined) {
-      await navigator.clipboard.writeText(tgToken);
+      setTgLoader(true);
-      showNotification({
+      apiRequest("/user-tg-bot/get-token", {
-        show: true,
+        method: "GET"
-        text: "Телеграм токен успешно скопирован",
+      }).then((data) => {
-        type: "success"
+        setTgToken(data.token);
+        showNotification({
+          show: true,
+          text: "Телеграм токен успешно сгенерирован",
+          type: "success"
+        });
+        setTgLoader(false);
       });
-    } catch (err) {
+    }
+  };
+
+  const handleCopy = async () => {
+    if (tgToken !== undefined) {
+      try {
+        await navigator.clipboard.writeText(tgToken);
+        showNotification({
+          show: true,
+          text: "Телеграм токен успешно скопирован",
+          type: "success"
+        });
+      } catch (err) {
+        showNotification({
+          show: true,
+          text: "Ошибка копирования",
+          type: "error"
+        });
+      }
+    } else {
       showNotification({
         show: true,
-        text: "Ошибка копирования",
+        text: "Необходимо сгенерировать код",
         type: "error"
       });
     }
@@ -226,12 +251,18 @@ export const PartnerSettings = () => {
                   <Loader style={"green"} width={"40px"} height={"40px"} />
                 ) : (
                   <BaseButton
-                    onClick={handleCopy}
+                    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,

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"