fix types/imports

This commit is contained in:
nflnkr 2023-06-17 19:01:02 +03:00
parent a74473b484
commit b013a80250
5 changed files with 8 additions and 12 deletions

@ -1,11 +1,9 @@
import { makeRequest } from "@frontend/kitui";
import { CustomTariff } from "@root/model/customTariffs"; import { CustomTariff } from "@root/model/customTariffs";
import { PrivilegeMap } from "@root/model/privilege"; import { PrivilegeMap } from "@root/model/privilege";
import { authStore } from "@root/stores/makeRequest";
import axios, { AxiosResponse } from "axios"; import axios, { AxiosResponse } from "axios";
const makeRequest = authStore.getState().makeRequest;
export async function fetchCustomTariffs(signal: AbortSignal) { export async function fetchCustomTariffs(signal: AbortSignal) {
const response = await axios<never, AxiosResponse<PrivilegeMap>>({ const response = await axios<never, AxiosResponse<PrivilegeMap>>({
url: "https://admin.pena.digital/strator/privilege/service", url: "https://admin.pena.digital/strator/privilege/service",

@ -1,3 +1,4 @@
import { useThrottle } from "@frontend/kitui";
import { Box, SliderProps, Typography, useMediaQuery, useTheme } from "@mui/material"; import { Box, SliderProps, Typography, useMediaQuery, useTheme } from "@mui/material";
import CustomSlider from "@root/components/CustomSlider"; import CustomSlider from "@root/components/CustomSlider";
import CalendarIcon from "@root/components/icons/CalendarIcon"; import CalendarIcon from "@root/components/icons/CalendarIcon";
@ -6,7 +7,6 @@ import { Privilege, PrivilegeValueType } from "@root/model/privilege";
import { setCustomTariffsUserValue, useCustomTariffsStore } from "@root/stores/customTariffs"; import { setCustomTariffsUserValue, useCustomTariffsStore } from "@root/stores/customTariffs";
import { formatDateWithDeclention } from "@root/utils/date"; import { formatDateWithDeclention } from "@root/utils/date";
import { getDeclension } from "@root/utils/declension"; import { getDeclension } from "@root/utils/declension";
import { useThrottle } from "@root/utils/hooks/useThrottle";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";

@ -6,12 +6,12 @@ import ComplexNavText from "@root/components/ComplexNavText";
import { useTariffs } from "@root/utils/hooks/useTariffs"; import { useTariffs } from "@root/utils/hooks/useTariffs";
import { setTariffs, useTariffStore } from "@root/stores/tariffs"; import { setTariffs, useTariffStore } from "@root/stores/tariffs";
import { enqueueSnackbar } from "notistack"; import { enqueueSnackbar } from "notistack";
import { getMessageFromFetchError } from "@root/utils/backendMessageHandler";
import { CustomTab } from "@root/components/CustomTab"; import { CustomTab } from "@root/components/CustomTab";
import TariffCard from "./TariffCard"; import TariffCard from "./TariffCard";
import NumberIcon from "@root/components/NumberIcon"; import NumberIcon from "@root/components/NumberIcon";
import { currencyFormatter } from "@root/utils/currencyFormatter"; import { currencyFormatter } from "@root/utils/currencyFormatter";
import { calcTariffPrices } from "@root/utils/calcTariffPrices"; import { calcTariffPrices } from "@root/utils/calcTariffPrices";
import { getMessageFromFetchError } from "@frontend/kitui";
export default function TariffPage() { export default function TariffPage() {

@ -1,18 +1,18 @@
import { devlog } from "@frontend/kitui"; import { devlog } from "@frontend/kitui";
import { CustomTariffsMap } from "@root/model/customTariffs"; import { PrivilegeMap } from "@root/model/privilege";
import axios, { AxiosResponse } from "axios"; import axios, { AxiosResponse } from "axios";
import { useEffect } from "react"; import { useEffect } from "react";
export function useCustomTariffs({ onError, onNewUser, url }: { export function useCustomTariffs({ onError, onNewUser, url }: {
url: string; url: string;
onNewUser: (response: CustomTariffsMap) => void; onNewUser: (response: PrivilegeMap) => void;
onError: (error: any) => void; onError: (error: any) => void;
}) { }) {
useEffect(function fetchUserData() { useEffect(function fetchUserData() {
const controller = new AbortController(); const controller = new AbortController();
axios<never, AxiosResponse<CustomTariffsMap>>({ axios<never, AxiosResponse<PrivilegeMap>>({
url, url,
signal: controller.signal, signal: controller.signal,
}).then(result => { }).then(result => {

@ -1,10 +1,8 @@
import { devlog, makeRequest } from "@frontend/kitui";
import { GetTariffsResponse, Tariff } from "@root/model/tariff"; import { GetTariffsResponse, Tariff } from "@root/model/tariff";
import { authStore } from "@root/stores/makeRequest";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
const makeRequest = authStore.getState().makeRequest;
export function useTariffs({ url, tariffsPerPage, apiPage, onNewTariffs, onError }: { export function useTariffs({ url, tariffsPerPage, apiPage, onNewTariffs, onError }: {
url: string; url: string;
tariffsPerPage: number; tariffsPerPage: number;
@ -24,7 +22,7 @@ export function useTariffs({ url, tariffsPerPage, apiPage, onNewTariffs, onError
useToken: true, useToken: true,
signal: controller.signal, signal: controller.signal,
}).then((result) => { }).then((result) => {
// devlog("GetTicketsResponse", result); devlog("GetTicketsResponse", result);
if (result.tariffs.length > 0) { if (result.tariffs.length > 0) {
onNewTariffs(result.tariffs); onNewTariffs(result.tariffs);
setFetchState("idle"); setFetchState("idle");