PenaSide/adminFront
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

мейк реквест в обёртке

Browse Source
This commit is contained in:
Nastya 2024-04-16 22:01:22 +03:00
parent 98eebec4b5
commit b8c4a44867
30 changed files with 53 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/account.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

5
src/api/auth.ts
View File

@ -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}`];
}
};

4
src/api/discounts.ts
View File

@ -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;
}

2
src/api/history/requests.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

2
src/api/history/swr.ts
View File

@ -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,

22
src/api/makeRequest.ts Normal file
View File

@ -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<TRequest = unknown, TResponse = unknown> (data:MakeRequest): Promise<TResponse> {
try {
const response = await KIT.makeRequest<unknown>(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;

3
src/api/privilegies.ts
View File

@ -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";

3
src/api/promocode/requests.ts
View File

@ -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);

12
src/api/promocode/swr.ts
View File

@ -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" });
},
});

2
src/api/quizStatistic.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
export type QuizStatisticResponse = {
Registrations: number;

2
src/api/roles.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

2
src/api/tariffs.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

2
src/api/tickets.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

2
src/api/user/requests.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

6
src/api/user/swr.ts
View File

@ -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,

2
src/api/verification.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
import { parseAxiosError } from "@root/utils/parse-error";

1
src/index.tsx
View File

@ -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", <Users />],

5
src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx
View File

@ -59,7 +59,6 @@ export default function CreateDiscount() {
values: Values,
formikHelpers: FormikHelpers<Values>
) => {
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;
}

5
src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
View File

@ -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,

2
src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx
View File

@ -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);
}

3
src/pages/dashboard/Content/PromocodeManagement/CreatePromocodeForm.tsx
View File

@ -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,

1
src/pages/dashboard/Content/PromocodeManagement/index.tsx
View File

@ -36,7 +36,6 @@ export const PromocodeManagement = () => {
setShowStatisticsModalId,
deleteModalHC
);
console.log(showStatisticsModalId);
if (error) return <Typography>Ошибка загрузки промокодов</Typography>;
return (

12
src/pages/dashboard/Content/Support/Chat/Chat.tsx
View File

@ -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() {
</IconButton>
<IconButton
onClick={() => {
console.log(disableFileButton)
if (!disableFileButton) fileInputRef.current?.click()
}}
sx={{

1
src/pages/dashboard/Content/Support/Chat/Message.tsx
View File

@ -18,7 +18,6 @@ export default function Message({ message, isSelf }: Props) {
{new Date(message.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
</Typography>
);
console.log(isSelf)
return (
<Box sx={{
display: "flex",

1
src/pages/dashboard/Content/Support/ChatImageNewWindow.tsx
View File

@ -3,7 +3,6 @@ import { useLocation } from "react-router-dom";
export default function ChatImageNewWindow() {
const location = useLocation();
console.log(location);
const srcImage = location.pathname.split("image/")[1];
return (
<>

1
src/pages/dashboard/Content/Tariffs/CreateTariff.tsx
View File

@ -48,7 +48,6 @@ export default function CreateTariff() {
if (values.privilegeIdField.length === 0) {
errors.privilegeIdField = "Не выбрана привилегия"
}
console.log(errors)
return errors;
};

3
src/pages/dashboard/ModalUser/QuizTab.tsx
View File

@ -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<string>("")
console.log(quizId)
return(
<Box sx={{ padding: "25px" }}>
<Typography

4
src/pages/dashboard/ModalUser/VerificationTab.tsx
View File

@ -6,7 +6,7 @@ import { useDebouncedCallback } from "use-debounce";
import type { ChangeEvent } from "react";
import type { Verification } from "@root/api/verification";
import { makeRequest } from "@frontend/kitui";
import makeRequest from "@root/api/makeRequest";
type VerificationTabProps = {
userId: string;
@ -24,7 +24,6 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => {
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 (
<Box sx={{ padding: "25px" }}>
<Typography

2
src/utils/hooks/useQuizStatistic.ts
View File

@ -20,8 +20,6 @@ export function useQuizStatistic({ to, from }: useQuizStatisticProps) {
useEffect(() => {
const requestStatistics = async () => {
console.log("работаю раз")
console.log("работаю два")
const gottenData = await getStatistic(Number(formatTo), Number(formatFrom));
setData(gottenData)

1
src/utils/parse-error.ts
View File

@ -19,7 +19,6 @@ const translateMessage: Record<string, string> = {
export const parseAxiosError = (nativeError: unknown): [string, number?] => {
const error = nativeError as AxiosError;
console.log(error)
if (
error.response?.data && error.response?.data !== "Not Found" &&