diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
index c3e3fad8..0c6f64aa 100644
--- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
+++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
@@ -490,18 +490,27 @@ export const ModalTiсket = ({
}, [taskTags]);
async function handleUpload(event) {
- 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,
- headers: { ...getToken() }
- });
+ try {
+ const formData = new FormData();
+ formData.append("uploadFile", event.target.files[0]);
- const data = await res.json();
+ const res = await fetch("https://itguild.info/api/file/upload", {
+ method: "POST",
+ body: formData,
+ headers: { ...getToken() }
+ });
- // setUploadedFile(data);
- attachFile(data[0].id);
+ const data = await res.json();
+
+ // 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}
/>
diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index be52aee7..972b3635 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/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();
- formData.append("uploadFile", event.target.files[0]);
- const res = await fetch("https://itguild.info/api/file/upload", {
- method: "POST",
- body: formData,
- headers: { ...getToken() }
- });
+ try {
+ const formData = new FormData();
+ formData.append("uploadFile", event.target.files[0]);
- 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}
/>
diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx
index e23dd8c1..a5b27dae 100644
--- a/src/pages/PartnerSettings/PartnerSettings.jsx
+++ b/src/pages/PartnerSettings/PartnerSettings.jsx
@@ -34,13 +34,13 @@ export const PartnerSettings = () => {
const [loader, setLoader] = useState(false);
const [tgLoader, setTgLoader] = useState(false);
- useEffect(() => {
- apiRequest("/user-tg-bot/get-token", {
- method: "GET"
- }).then((data) => {
- setTgToken(data.token);
- });
- }, []);
+ // useEffect(() => {
+ // apiRequest("/user-tg-bot/get-token", {
+ // method: "GET"
+ // }).then((data) => {
+ // setTgToken(data.token);
+ // });
+ // }, []);
const setSettings = () => {
if (inputsValue.name.length < 2) {
@@ -92,18 +92,43 @@ export const PartnerSettings = () => {
});
};
- const handleCopy = async () => {
- try {
- await navigator.clipboard.writeText(tgToken);
- showNotification({
- show: true,
- text: "Телеграм токен успешно скопирован",
- type: "success"
+ 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);
});
- } 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 = () => {
) : (
- Скопировать
+ Сгенерировать
)}
+
+ Скопировать
+