From 6ba7747dd67a7585246c076ce8bf74a7618432f2 Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Sat, 4 Jan 2025 00:12:52 +0800 Subject: [PATCH] fix: lint --- app/(main)/ClientComponents/main/Global.tsx | 11 ++- .../ClientComponents/main/InteractiveMap.tsx | 5 +- .../ClientComponents/main/MapTooltip.tsx | 3 +- .../main/ServerListClient.tsx | 3 +- app/(main)/page.tsx | 4 +- app/(main)/server/[id]/page.tsx | 3 +- app/not-found.tsx | 5 +- components/ServerCardPopover.tsx | 69 ------------------- 8 files changed, 14 insertions(+), 89 deletions(-) delete mode 100644 components/ServerCardPopover.tsx diff --git a/app/(main)/ClientComponents/main/Global.tsx b/app/(main)/ClientComponents/main/Global.tsx index 52c2294..af0fd8b 100644 --- a/app/(main)/ClientComponents/main/Global.tsx +++ b/app/(main)/ClientComponents/main/Global.tsx @@ -1,12 +1,11 @@ "use client" +import { TooltipProvider } from "@/app/(main)/ClientComponents/detail/TooltipContext" +import GlobalInfo from "@/app/(main)/ClientComponents/main/GlobalInfo" +import { InteractiveMap } from "@/app/(main)/ClientComponents/main/InteractiveMap" import { useServerData } from "@/app/lib/server-data-context" - -import GlobalLoading from "../../../../components/loading/GlobalLoading" -import { geoJsonString } from "../../../../lib/geo-json-string" -import { TooltipProvider } from "../detail/TooltipContext" -import GlobalInfo from "./GlobalInfo" -import { InteractiveMap } from "./InteractiveMap" +import GlobalLoading from "@/components/loading/GlobalLoading" +import { geoJsonString } from "@/lib/geo-json-string" export default function ServerGlobal() { const { data: nezhaServerList, error } = useServerData() diff --git a/app/(main)/ClientComponents/main/InteractiveMap.tsx b/app/(main)/ClientComponents/main/InteractiveMap.tsx index 84b1769..bf7b51a 100644 --- a/app/(main)/ClientComponents/main/InteractiveMap.tsx +++ b/app/(main)/ClientComponents/main/InteractiveMap.tsx @@ -1,11 +1,10 @@ "use client" +import { useTooltip } from "@/app/(main)/ClientComponents/detail/TooltipContext" +import MapTooltip from "@/app/(main)/ClientComponents/main/MapTooltip" import { countryCoordinates } from "@/lib/geo-limit" import { geoEquirectangular, geoPath } from "d3-geo" -import { useTooltip } from "../detail/TooltipContext" -import MapTooltip from "./MapTooltip" - interface InteractiveMapProps { countries: string[] serverCounts: { [key: string]: number } diff --git a/app/(main)/ClientComponents/main/MapTooltip.tsx b/app/(main)/ClientComponents/main/MapTooltip.tsx index 7a1a424..4df47a9 100644 --- a/app/(main)/ClientComponents/main/MapTooltip.tsx +++ b/app/(main)/ClientComponents/main/MapTooltip.tsx @@ -1,10 +1,9 @@ "use client" +import { useTooltip } from "@/app/(main)/ClientComponents/detail/TooltipContext" import { useTranslations } from "next-intl" import { memo } from "react" -import { useTooltip } from "../detail/TooltipContext" - const MapTooltip = memo(function MapTooltip() { const { tooltipData } = useTooltip() const t = useTranslations("Global") diff --git a/app/(main)/ClientComponents/main/ServerListClient.tsx b/app/(main)/ClientComponents/main/ServerListClient.tsx index 5868227..a264081 100644 --- a/app/(main)/ClientComponents/main/ServerListClient.tsx +++ b/app/(main)/ClientComponents/main/ServerListClient.tsx @@ -4,6 +4,7 @@ import { useServerData } from "@/app/lib/server-data-context" import ServerCard from "@/components/ServerCard" import ServerCardInline from "@/components/ServerCardInline" import Switch from "@/components/Switch" +import GlobalLoading from "@/components/loading/GlobalLoading" import { Loader } from "@/components/loading/Loader" import getEnv from "@/lib/env-entry" import { useFilter } from "@/lib/network-filter-context" @@ -14,8 +15,6 @@ import { useTranslations } from "next-intl" import dynamic from "next/dynamic" import { useEffect, useRef, useState } from "react" -import GlobalLoading from "../../../../components/loading/GlobalLoading" - const ServerGlobal = dynamic(() => import("./Global"), { ssr: false, loading: () => , diff --git a/app/(main)/page.tsx b/app/(main)/page.tsx index fe92553..1f46b10 100644 --- a/app/(main)/page.tsx +++ b/app/(main)/page.tsx @@ -1,5 +1,5 @@ -import ServerListClient from "./ClientComponents/main/ServerListClient" -import ServerOverviewClient from "./ClientComponents/main/ServerOverviewClient" +import ServerListClient from "@/app/(main)/ClientComponents/main/ServerListClient" +import ServerOverviewClient from "@/app/(main)/ClientComponents/main/ServerOverviewClient" export default async function Home() { return ( diff --git a/app/(main)/server/[id]/page.tsx b/app/(main)/server/[id]/page.tsx index ad3a6b8..838ba40 100644 --- a/app/(main)/server/[id]/page.tsx +++ b/app/(main)/server/[id]/page.tsx @@ -3,13 +3,12 @@ import { NetworkChartClient } from "@/app/(main)/ClientComponents/detail/NetworkChart" import ServerDetailChartClient from "@/app/(main)/ClientComponents/detail/ServerDetailChartClient" import ServerDetailClient from "@/app/(main)/ClientComponents/detail/ServerDetailClient" +import ServerIPInfo from "@/app/(main)/ClientComponents/detail/ServerIPInfo" import TabSwitch from "@/components/TabSwitch" import { Separator } from "@/components/ui/separator" import getEnv from "@/lib/env-entry" import { use, useState } from "react" -import ServerIPInfo from "../../ClientComponents/detail/ServerIPInfo" - export default function Page(props: { params: Promise<{ id: string }> }) { const params = use(props.params) const tabs = ["Detail", "Network"] diff --git a/app/not-found.tsx b/app/not-found.tsx index a4db54b..c80378c 100644 --- a/app/not-found.tsx +++ b/app/not-found.tsx @@ -1,9 +1,8 @@ +import Footer from "@/app/(main)/footer" +import Header from "@/app/(main)/header" import { useTranslations } from "next-intl" import Link from "next/link" -import Footer from "./(main)/footer" -import Header from "./(main)/header" - export default function NotFoundPage() { const t = useTranslations("NotFoundPage") return ( diff --git a/components/ServerCardPopover.tsx b/components/ServerCardPopover.tsx deleted file mode 100644 index c9c43fd..0000000 --- a/components/ServerCardPopover.tsx +++ /dev/null @@ -1,69 +0,0 @@ -import { NezhaAPISafe } from "@/app/types/nezha-api" -import { cn, formatBytes } from "@/lib/utils" -import { useTranslations } from "next-intl" - -export function ServerCardPopoverCard({ - className, - title, - content, - children, -}: { - className?: string - title: string - content?: string - children?: React.ReactNode -}) { - return ( -
-
{title}
- {children ? children :
{content}
} -
- ) -} - -export default function ServerCardPopover({ - host, - status, -}: { - host: NezhaAPISafe["host"] - status: NezhaAPISafe["status"] -}) { - const t = useTranslations("ServerCardPopover") - return ( -
- - item).join(", ")}`} - /> - - - - - - -
- ) -}