From 3a59499ad87f273502b1188bfec32d3a5a70b4c3 Mon Sep 17 00:00:00 2001 From: Vadim Terentev Date: Thu, 27 Jun 2024 19:51:58 +0300 Subject: [PATCH] Fix Integration,Profile Download Console and Refactoring path * Fix integration skin service * Edit font download console * Edit Gml.Web.Client * Refactoring path --- src/core/providers/QueryProvider.tsx | 6 +----- src/shared/constants/index.ts | 16 ++++++++++++++++ src/shared/hooks/index.ts | 6 +++--- .../{useIntegraions.ts => useIntegrations.ts} | 0 src/widgets/client-hub/ui/DownloadClientHub.tsx | 11 ++++++++++- 5 files changed, 30 insertions(+), 9 deletions(-) rename src/shared/hooks/{useIntegraions.ts => useIntegrations.ts} (100%) diff --git a/src/core/providers/QueryProvider.tsx b/src/core/providers/QueryProvider.tsx index 8edfca8..3842634 100644 --- a/src/core/providers/QueryProvider.tsx +++ b/src/core/providers/QueryProvider.tsx @@ -12,11 +12,7 @@ export function QueryProvider({ children }: PropsWithChildren) { defaultOptions: { queries: { refetchOnWindowFocus: false, - retry: (failureCount, error) => { - return !( - isAxiosError(error) && error.response?.data.statusCode === HttpStatusCode.NotFound - ); - }, + retry: false, }, }, }), diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts index b855519..d74b892 100644 --- a/src/shared/constants/index.ts +++ b/src/shared/constants/index.ts @@ -2,3 +2,19 @@ export const HREF_GET_DATALIFE_ENGINE_AUTH_PHP = "https://raw.githubusercontent.com/GamerVII-NET/Gml.Modules.Auth/master/DLE/auth.php"; export const HREF_DOCUMENTATION_CUSTOM_ENDPOINT = "https://gml-launcher.github.io/Gml.Docs/integrations-auth-custom.html"; + +export const DEFAULT_TIMEOUT = 30000; +export const RETRY_DELAY_MAX = 10; +export const RETRY_ATTEMPTS_MAX = 5; +export const OFFLINE_RETRY_DELAY = 2000; +export const OFFLINE_RETRY_ATTEMPTS_MAX = 0; +export const SECOND = 1000; +export const MINUTE = 60 * SECOND; +export const HOUR = 60 * MINUTE; +export const DAY = 24 * HOUR; +export const WEEK = 7 * DAY; +export const MONTH = 4 * WEEK; +export const YEAR = 12 * MONTH; +export const MINUTE_IN_SECONDS = 60; +export const HOUR_IN_SECONDS = 60 * MINUTE_IN_SECONDS; +export const DAY_IN_SECONDS = 24 * HOUR_IN_SECONDS; diff --git a/src/shared/hooks/index.ts b/src/shared/hooks/index.ts index 7d1b164..2cddc69 100644 --- a/src/shared/hooks/index.ts +++ b/src/shared/hooks/index.ts @@ -1,3 +1,3 @@ -export * from './useProfiles'; -export * from './useAuthorization'; -export * from './useIntegraions'; +export * from "./useProfiles"; +export * from "./useAuthorization"; +export * from "./useIntegrations"; diff --git a/src/shared/hooks/useIntegraions.ts b/src/shared/hooks/useIntegrations.ts similarity index 100% rename from src/shared/hooks/useIntegraions.ts rename to src/shared/hooks/useIntegrations.ts diff --git a/src/widgets/client-hub/ui/DownloadClientHub.tsx b/src/widgets/client-hub/ui/DownloadClientHub.tsx index e8ba5f8..ba3346f 100644 --- a/src/widgets/client-hub/ui/DownloadClientHub.tsx +++ b/src/widgets/client-hub/ui/DownloadClientHub.tsx @@ -2,6 +2,8 @@ import React, { useEffect, useRef } from "react"; +import { Ubuntu_Mono } from "next/font/google"; + import { ProfileExtendedBaseEntity } from "@/shared/api/contracts"; import { Button } from "@/shared/ui/button"; import { Progress } from "@/shared/ui/progress"; @@ -9,12 +11,19 @@ import { Textarea } from "@/shared/ui/textarea"; import { Icons } from "@/shared/ui/icons"; import { useConnectionHub } from "../lib/useConnectionHub"; +import { cn } from "@/shared/lib/utils"; interface DownloadClientHubProps { profile?: ProfileExtendedBaseEntity; isLoading?: boolean; } +const ubuntuMono = Ubuntu_Mono({ + subsets: ["latin"], + variable: "--font-sans", + weight: "400", +}); + export function DownloadClientHub(props: DownloadClientHubProps) { const { onDownloadDistributive, @@ -97,7 +106,7 @@ export function DownloadClientHub(props: DownloadClientHubProps) {