diff --git a/src/api/account.ts b/src/api/account.ts index a4c495a..e52526d 100644 --- a/src/api/account.ts +++ b/src/api/account.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/auth.ts b/src/api/auth.ts index 2cf1134..77d5248 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; @@ -23,9 +23,8 @@ export const signin = async ( return [signinResponse]; } catch (nativeError) { - console.log(nativeError) const [error] = parseAxiosError(nativeError); - console.log(error) + console.error(error) return [null, `Ошибка авторизации. ${error}`]; } }; diff --git a/src/api/discounts.ts b/src/api/discounts.ts index 93316c4..7c4077f 100644 --- a/src/api/discounts.ts +++ b/src/api/discounts.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; @@ -106,8 +106,6 @@ export function createDiscountObject({ break; } - console.log("Constructed discount", discount); - return discount; } diff --git a/src/api/history/requests.ts b/src/api/history/requests.ts index fdc638f..920ee64 100644 --- a/src/api/history/requests.ts +++ b/src/api/history/requests.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/history/swr.ts b/src/api/history/swr.ts index 489d37b..80be351 100644 --- a/src/api/history/swr.ts +++ b/src/api/history/swr.ts @@ -31,7 +31,7 @@ export function useHistory(accountId: string) { }, { onError(err) { - console.log("Error fetching users", err); + console.error("Error fetching users", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, diff --git a/src/api/makeRequest.ts b/src/api/makeRequest.ts new file mode 100644 index 0000000..2b9eed1 --- /dev/null +++ b/src/api/makeRequest.ts @@ -0,0 +1,22 @@ +import * as KIT from "@frontend/kitui"; +import { Method, ResponseType, AxiosError, AxiosResponse } from "axios"; +import { clearAuthToken } from "@frontend/kitui"; +import { logout } from "@root/api/auth"; + +interface MakeRequest { method?: Method | undefined; url: string; body?: unknown; useToken?: boolean | undefined; contentType?: boolean | undefined; responseType?: ResponseType | undefined; signal?: AbortSignal | undefined; withCredentials?: boolean | undefined; } + +async function makeRequest (data:MakeRequest): Promise { + try { + const response = await KIT.makeRequest(data) + + return response as TResponse + } catch (e) { + const error = e as AxiosError; + //@ts-ignore + if (error.response?.status === 400 && error.response?.data?.message === "refreshToken is empty") { + logout().then(clearAuthToken); + } + throw e + }; +}; +export default makeRequest; \ No newline at end of file diff --git a/src/api/privilegies.ts b/src/api/privilegies.ts index 65e70a7..3db14a9 100644 --- a/src/api/privilegies.ts +++ b/src/api/privilegies.ts @@ -1,4 +1,5 @@ -import { CustomPrivilege, makeRequest } from "@frontend/kitui"; +import { CustomPrivilege } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/promocode/requests.ts b/src/api/promocode/requests.ts index a8be675..ed10142 100644 --- a/src/api/promocode/requests.ts +++ b/src/api/promocode/requests.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import type { CreatePromocodeBody, @@ -125,7 +125,6 @@ const getPromocodeStatistics = async (id: string, from: number, to: number) => { method: "POST", useToken: false, }); - console.log(promocodeStatisticsResponse); return promocodeStatisticsResponse; } catch (nativeError) { const [error] = parseAxiosError(nativeError); diff --git a/src/api/promocode/swr.ts b/src/api/promocode/swr.ts index bb21130..c11016c 100644 --- a/src/api/promocode/swr.ts +++ b/src/api/promocode/swr.ts @@ -32,7 +32,7 @@ export function usePromocodes( }, { onError(err) { - console.log("Error fetching promocodes", err); + console.error("Error fetching promocodes", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, @@ -46,7 +46,7 @@ export function usePromocodes( await promocodeApi.createPromocode(body); mutate(["promocodes", page, pageSize]); } catch (error) { - console.log("Error creating promocode", error); + console.error("Error creating promocode", error); if (error instanceof Error) enqueueSnackbar(error.message, { variant: "error" }); } @@ -81,7 +81,7 @@ export function usePromocodes( } ); } catch (error) { - console.log("Error deleting promocode", error); + console.error("Error deleting promocode", error); if (error instanceof Error) enqueueSnackbar(error.message, { variant: "error" }); } @@ -103,7 +103,7 @@ export function usePromocodes( }, { onError(err) { - console.log("Error fetching promocode statistics", err); + console.error("Error fetching promocode statistics", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, @@ -117,7 +117,7 @@ export function usePromocodes( await promocodeApi.createFastlink(id); mutate(["promocodes", page, pageSize]); } catch (error) { - console.log("Error creating fast link", error); + console.error("Error creating fast link", error); if (error instanceof Error) enqueueSnackbar(error.message, { variant: "error" }); } @@ -140,7 +140,7 @@ export function useAllPromocodes() { keepPreviousData: true, suspense: true, onError(err) { - console.log("Error fetching all promocodes", err); + console.error("Error fetching all promocodes", err); enqueueSnackbar(err.message, { variant: "error" }); }, }); diff --git a/src/api/quizStatistic.ts b/src/api/quizStatistic.ts index 2cc5f48..0c32a34 100644 --- a/src/api/quizStatistic.ts +++ b/src/api/quizStatistic.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; export type QuizStatisticResponse = { Registrations: number; diff --git a/src/api/roles.ts b/src/api/roles.ts index ea3b0cc..6f302ab 100644 --- a/src/api/roles.ts +++ b/src/api/roles.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/tariffs.ts b/src/api/tariffs.ts index 9ef9a3f..23d09e1 100644 --- a/src/api/tariffs.ts +++ b/src/api/tariffs.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/tickets.ts b/src/api/tickets.ts index ffebe05..8f445ea 100644 --- a/src/api/tickets.ts +++ b/src/api/tickets.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/user/requests.ts b/src/api/user/requests.ts index 4ae9590..5eaedf3 100644 --- a/src/api/user/requests.ts +++ b/src/api/user/requests.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/api/user/swr.ts b/src/api/user/swr.ts index 23dc84d..1c5a462 100644 --- a/src/api/user/swr.ts +++ b/src/api/user/swr.ts @@ -24,7 +24,7 @@ export function useAdmins(page: number, pageSize: number) { }, { onError(err) { - console.log("Error fetching users", err); + console.error("Error fetching users", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, @@ -58,7 +58,7 @@ export function useManagers(page: number, pageSize: number) { }, { onError(err) { - console.log("Error fetching users", err); + console.error("Error fetching users", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, @@ -89,7 +89,7 @@ export function useUsers(page: number, pageSize: number) { }, { onError(err) { - console.log("Error fetching users", err); + console.error("Error fetching users", err); enqueueSnackbar(err.message, { variant: "error" }); }, focusThrottleInterval: 60e3, diff --git a/src/api/verification.ts b/src/api/verification.ts index 4c14d9d..d19e6d4 100644 --- a/src/api/verification.ts +++ b/src/api/verification.ts @@ -1,4 +1,4 @@ -import { makeRequest } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import { parseAxiosError } from "@root/utils/parse-error"; diff --git a/src/index.tsx b/src/index.tsx index 31299ff..5959a90 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,7 +28,6 @@ import QuizStatistic from "@pages/dashboard/Content/QuizStatistic"; import theme from "./theme"; import "./index.css"; -import { makeRequest } from "@frontend/kitui"; const componentsArray = [ ["/users", ], diff --git a/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx b/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx index 5eabd34..84dbb36 100644 --- a/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx +++ b/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx @@ -59,7 +59,6 @@ export default function CreateDiscount() { values: Values, formikHelpers: FormikHelpers ) => { - console.log("работаю") const purchasesAmount = Number(parseFloat(values.purchasesAmountField.replace(",", "."))) * 100; const discountFactor = @@ -87,7 +86,7 @@ export default function CreateDiscount() { }); if (createdDiscountError) { - console.log("Error creating discount", createdDiscountError); + console.error("Error creating discount", createdDiscountError); return enqueueSnackbar(createdDiscountError); } @@ -127,7 +126,7 @@ export default function CreateDiscount() { if (values.discountType === ("service" || "privilege") && !isFinite(parseFloat(values.discountMinValueField.replace(",", ".")))) { errors.discountMinValueField = 'Поле "Минимальное значение" не число' } - console.log(errors) + console.error(errors) return errors; } diff --git a/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx b/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx index 5dcb364..b746f11 100644 --- a/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx +++ b/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx @@ -132,11 +132,6 @@ export default function DiscountDataGrid({ selectedRowsHC }: Props) { const rowBackDicounts: GridRowsProp = realDiscounts .filter(({ Layer }) => Layer > 0) .map((discount) => { - console.log( - discount.Condition[ - layerValue[discount.Layer] as keyof typeof discount.Condition - ] - ); return { id: discount.ID, name: discount.Name, diff --git a/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx b/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx index 06fab07..62c8b6d 100644 --- a/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx +++ b/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx @@ -132,7 +132,7 @@ export default function EditDiscountDialog() { ); if (patchedDiscountError) { - console.log("Error patching discount", patchedDiscountError); + console.error("Error patching discount", patchedDiscountError); return enqueueSnackbar(patchedDiscountError); } diff --git a/src/pages/dashboard/Content/PromocodeManagement/CreatePromocodeForm.tsx b/src/pages/dashboard/Content/PromocodeManagement/CreatePromocodeForm.tsx index 7ff68c3..657ef7a 100644 --- a/src/pages/dashboard/Content/PromocodeManagement/CreatePromocodeForm.tsx +++ b/src/pages/dashboard/Content/PromocodeManagement/CreatePromocodeForm.tsx @@ -74,13 +74,10 @@ export const CreatePromocodeForm = ({ createPromocode }: Props) => { }, []); const submitForm = (values: FormValues) => { - console.log("полученные вельюсы", values) const currentPrivilege = privileges.find( (item) => item.privilegeId === values.privilegeId ); - console.log("привилегия", currentPrivilege) - console.log("bonusType", bonusType) const body = { ...values, diff --git a/src/pages/dashboard/Content/PromocodeManagement/index.tsx b/src/pages/dashboard/Content/PromocodeManagement/index.tsx index c2335e9..ba726f4 100644 --- a/src/pages/dashboard/Content/PromocodeManagement/index.tsx +++ b/src/pages/dashboard/Content/PromocodeManagement/index.tsx @@ -36,7 +36,6 @@ export const PromocodeManagement = () => { setShowStatisticsModalId, deleteModalHC ); - console.log(showStatisticsModalId); if (error) return Ошибка загрузки промокодов; return ( diff --git a/src/pages/dashboard/Content/Support/Chat/Chat.tsx b/src/pages/dashboard/Content/Support/Chat/Chat.tsx index 8907b0a..d03f39b 100644 --- a/src/pages/dashboard/Content/Support/Chat/Chat.tsx +++ b/src/pages/dashboard/Content/Support/Chat/Chat.tsx @@ -9,7 +9,8 @@ import { TicketMessage } from "@root/model/ticket"; import { sendTicketMessage } from "@root/api/tickets"; import { enqueueSnackbar } from "notistack"; import { useTicketStore } from "@root/stores/tickets"; -import { getMessageFromFetchError, makeRequest, throttle, useEventListener, useSSESubscription, useTicketMessages, useToken } from "@frontend/kitui"; +import { getMessageFromFetchError, throttle, useEventListener, useSSESubscription, useTicketMessages, useToken } from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; import ChatImage from "./ChatImage"; import ChatDocument from "./ChatDocument"; import ChatVideo from "./ChatVideo"; @@ -24,7 +25,6 @@ const checkAcceptableMediaType = (file: File) => { const extension = segments[segments.length - 1]; const type = extension.toLowerCase(); - console.log(type) switch (type) { case ACCEPT_SEND_MEDIA_TYPES_MAP.document.find(name => name === type): if (file.size > MAX_FILE_SIZE) return tooLarge @@ -143,11 +143,6 @@ export default function Chat() { const sendFile = async (file: File) => { if (file === undefined) return true; - // const isFileTypeAccepted = ACCEPT_SEND_FILE_TYPES_MAP.some( - // fileType => file.name.toLowerCase().endsWith(fileType) - // ); - // console.log(file.name.toLowerCase().endsWith(".png")) - // if (!isFileTypeAccepted) return setModalWarningType("errorType"); let data; const ticketId = ticket?.id @@ -170,7 +165,6 @@ export default function Chat() { } }; const sendFileHC = async (file: File) => { - console.log(file) const check = checkAcceptableMediaType(file) if (check.length > 0) { enqueueSnackbar(check) @@ -179,7 +173,6 @@ export default function Chat() { setDisableFileButton(true) await sendFile(file) setDisableFileButton(false) - console.log(disableFileButton) }; function handleTextfieldKeyPress(e: KeyboardEvent) { @@ -308,7 +301,6 @@ export default function Chat() { { - console.log(disableFileButton) if (!disableFileButton) fileInputRef.current?.click() }} sx={{ diff --git a/src/pages/dashboard/Content/Support/Chat/Message.tsx b/src/pages/dashboard/Content/Support/Chat/Message.tsx index a17792a..ad9c249 100644 --- a/src/pages/dashboard/Content/Support/Chat/Message.tsx +++ b/src/pages/dashboard/Content/Support/Chat/Message.tsx @@ -18,7 +18,6 @@ export default function Message({ message, isSelf }: Props) { {new Date(message.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} ); -console.log(isSelf) return ( diff --git a/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx b/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx index b7f0ea4..fad5d30 100644 --- a/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx +++ b/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx @@ -48,7 +48,6 @@ export default function CreateTariff() { if (values.privilegeIdField.length === 0) { errors.privilegeIdField = "Не выбрана привилегия" } - console.log(errors) return errors; }; diff --git a/src/pages/dashboard/ModalUser/QuizTab.tsx b/src/pages/dashboard/ModalUser/QuizTab.tsx index 0781d50..ce79b86 100644 --- a/src/pages/dashboard/ModalUser/QuizTab.tsx +++ b/src/pages/dashboard/ModalUser/QuizTab.tsx @@ -1,6 +1,6 @@ import {Box, Button, TextField, Typography} from "@mui/material"; import {ChangeEvent, useState} from "react"; -import {makeRequest} from "@frontend/kitui"; +import makeRequest from "@root/api/makeRequest"; type QuizTabProps = { userId: string; @@ -8,7 +8,6 @@ type QuizTabProps = { export default function QuizTab({ userId }: QuizTabProps) { const [quizId, setQuizId] = useState("") - console.log(quizId) return( { const [verificationResponse, verificationError] = await verification( userId ); - console.log(verificationResponse) setIsLoading(false); @@ -84,7 +83,6 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { await requestVefification(); }; - console.log("verificationInfo", verificationInfo) return ( { const requestStatistics = async () => { - console.log("работаю раз") - console.log("работаю два") const gottenData = await getStatistic(Number(formatTo), Number(formatFrom)); setData(gottenData) diff --git a/src/utils/parse-error.ts b/src/utils/parse-error.ts index f626a33..24f16a0 100644 --- a/src/utils/parse-error.ts +++ b/src/utils/parse-error.ts @@ -19,7 +19,6 @@ const translateMessage: Record = { export const parseAxiosError = (nativeError: unknown): [string, number?] => { const error = nativeError as AxiosError; - console.log(error) if ( error.response?.data && error.response?.data !== "Not Found" &&