From 6e6a3315b886d3f8f082bdd57f54510911cd1936 Mon Sep 17 00:00:00 2001
From: hamster1963 <1410514192@qq.com>
Date: Mon, 16 Dec 2024 10:04:50 +0800
Subject: [PATCH] fix: not-found page height

---
 app/(main)/ClientComponents/{ => detail}/NetworkChart.tsx | 2 +-
 .../{ => detail}/ServerDetailChartClient.tsx              | 2 +-
 .../ClientComponents/{ => detail}/ServerDetailClient.tsx  | 2 +-
 app/(main)/ClientComponents/{ => detail}/ServerIPInfo.tsx | 0
 .../ClientComponents/{ => detail}/TooltipContext.tsx      | 0
 app/(main)/ClientComponents/{ => main}/Global.tsx         | 6 +++---
 app/(main)/ClientComponents/{ => main}/GlobalInfo.tsx     | 0
 app/(main)/ClientComponents/{ => main}/InteractiveMap.tsx | 2 +-
 app/(main)/ClientComponents/{ => main}/MapTooltip.tsx     | 2 +-
 .../ClientComponents/{ => main}/ServerListClient.tsx      | 2 +-
 .../ClientComponents/{ => main}/ServerOverviewClient.tsx  | 0
 app/(main)/page.tsx                                       | 4 ++--
 app/(main)/server/[id]/page.tsx                           | 8 ++++----
 app/not-found.tsx                                         | 2 +-
 .../loading}/GlobalLoading.tsx                            | 0
 .../loading}/NetworkChartLoading.tsx                      | 0
 .../loading}/ServerDetailLoading.tsx                      | 0
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename app/(main)/ClientComponents/{ => detail}/NetworkChart.tsx (99%)
 rename app/(main)/ClientComponents/{ => detail}/ServerDetailChartClient.tsx (99%)
 rename app/(main)/ClientComponents/{ => detail}/ServerDetailClient.tsx (99%)
 rename app/(main)/ClientComponents/{ => detail}/ServerIPInfo.tsx (100%)
 rename app/(main)/ClientComponents/{ => detail}/TooltipContext.tsx (100%)
 rename app/(main)/ClientComponents/{ => main}/Global.tsx (89%)
 rename app/(main)/ClientComponents/{ => main}/GlobalInfo.tsx (100%)
 rename app/(main)/ClientComponents/{ => main}/InteractiveMap.tsx (98%)
 rename app/(main)/ClientComponents/{ => main}/MapTooltip.tsx (97%)
 rename app/(main)/ClientComponents/{ => main}/ServerListClient.tsx (98%)
 rename app/(main)/ClientComponents/{ => main}/ServerOverviewClient.tsx (100%)
 rename {app/(main)/ClientComponents => components/loading}/GlobalLoading.tsx (100%)
 rename {app/(main)/ClientComponents => components/loading}/NetworkChartLoading.tsx (100%)
 rename {app/(main)/ClientComponents => components/loading}/ServerDetailLoading.tsx (100%)

diff --git a/app/(main)/ClientComponents/NetworkChart.tsx b/app/(main)/ClientComponents/detail/NetworkChart.tsx
similarity index 99%
rename from app/(main)/ClientComponents/NetworkChart.tsx
rename to app/(main)/ClientComponents/detail/NetworkChart.tsx
index 0760ce6..083a98d 100644
--- a/app/(main)/ClientComponents/NetworkChart.tsx
+++ b/app/(main)/ClientComponents/detail/NetworkChart.tsx
@@ -1,7 +1,7 @@
 "use client"
 
-import NetworkChartLoading from "@/app/(main)/ClientComponents/NetworkChartLoading"
 import { NezhaAPIMonitor, ServerMonitorChart } from "@/app/types/nezha-api"
+import NetworkChartLoading from "@/components/loading/NetworkChartLoading"
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
 import {
   ChartConfig,
diff --git a/app/(main)/ClientComponents/ServerDetailChartClient.tsx b/app/(main)/ClientComponents/detail/ServerDetailChartClient.tsx
similarity index 99%
rename from app/(main)/ClientComponents/ServerDetailChartClient.tsx
rename to app/(main)/ClientComponents/detail/ServerDetailChartClient.tsx
index b2357b6..f3aa06b 100644
--- a/app/(main)/ClientComponents/ServerDetailChartClient.tsx
+++ b/app/(main)/ClientComponents/detail/ServerDetailChartClient.tsx
@@ -1,7 +1,7 @@
 "use client"
 
-import { ServerDetailChartLoading } from "@/app/(main)/ClientComponents/ServerDetailLoading"
 import { NezhaAPISafe, ServerApi } from "@/app/types/nezha-api"
+import { ServerDetailChartLoading } from "@/components/loading/ServerDetailLoading"
 import AnimatedCircularProgressBar from "@/components/ui/animated-circular-progress-bar"
 import { Card, CardContent } from "@/components/ui/card"
 import { ChartConfig, ChartContainer } from "@/components/ui/chart"
diff --git a/app/(main)/ClientComponents/ServerDetailClient.tsx b/app/(main)/ClientComponents/detail/ServerDetailClient.tsx
similarity index 99%
rename from app/(main)/ClientComponents/ServerDetailClient.tsx
rename to app/(main)/ClientComponents/detail/ServerDetailClient.tsx
index 06e65a0..62f79d1 100644
--- a/app/(main)/ClientComponents/ServerDetailClient.tsx
+++ b/app/(main)/ClientComponents/detail/ServerDetailClient.tsx
@@ -1,9 +1,9 @@
 "use client"
 
-import { ServerDetailLoading } from "@/app/(main)/ClientComponents/ServerDetailLoading"
 import { NezhaAPISafe, ServerApi } from "@/app/types/nezha-api"
 import { BackIcon } from "@/components/Icon"
 import ServerFlag from "@/components/ServerFlag"
+import { ServerDetailLoading } from "@/components/loading/ServerDetailLoading"
 import { Badge } from "@/components/ui/badge"
 import { Card, CardContent } from "@/components/ui/card"
 import getEnv from "@/lib/env-entry"
diff --git a/app/(main)/ClientComponents/ServerIPInfo.tsx b/app/(main)/ClientComponents/detail/ServerIPInfo.tsx
similarity index 100%
rename from app/(main)/ClientComponents/ServerIPInfo.tsx
rename to app/(main)/ClientComponents/detail/ServerIPInfo.tsx
diff --git a/app/(main)/ClientComponents/TooltipContext.tsx b/app/(main)/ClientComponents/detail/TooltipContext.tsx
similarity index 100%
rename from app/(main)/ClientComponents/TooltipContext.tsx
rename to app/(main)/ClientComponents/detail/TooltipContext.tsx
diff --git a/app/(main)/ClientComponents/Global.tsx b/app/(main)/ClientComponents/main/Global.tsx
similarity index 89%
rename from app/(main)/ClientComponents/Global.tsx
rename to app/(main)/ClientComponents/main/Global.tsx
index c14fbb6..8e5fb31 100644
--- a/app/(main)/ClientComponents/Global.tsx
+++ b/app/(main)/ClientComponents/main/Global.tsx
@@ -4,11 +4,11 @@ import { ServerApi } from "@/app/types/nezha-api"
 import { nezhaFetcher } from "@/lib/utils"
 import useSWRImmutable from "swr/immutable"
 
-import { geoJsonString } from "../../../lib/geo-json-string"
+import GlobalLoading from "../../../../components/loading/GlobalLoading"
+import { geoJsonString } from "../../../../lib/geo-json-string"
+import { TooltipProvider } from "../detail/TooltipContext"
 import GlobalInfo from "./GlobalInfo"
-import GlobalLoading from "./GlobalLoading"
 import { InteractiveMap } from "./InteractiveMap"
-import { TooltipProvider } from "./TooltipContext"
 
 export default function ServerGlobal() {
   const { data: nezhaServerList, error } = useSWRImmutable<ServerApi>("/api/server", nezhaFetcher)
diff --git a/app/(main)/ClientComponents/GlobalInfo.tsx b/app/(main)/ClientComponents/main/GlobalInfo.tsx
similarity index 100%
rename from app/(main)/ClientComponents/GlobalInfo.tsx
rename to app/(main)/ClientComponents/main/GlobalInfo.tsx
diff --git a/app/(main)/ClientComponents/InteractiveMap.tsx b/app/(main)/ClientComponents/main/InteractiveMap.tsx
similarity index 98%
rename from app/(main)/ClientComponents/InteractiveMap.tsx
rename to app/(main)/ClientComponents/main/InteractiveMap.tsx
index 99598dd..84b1769 100644
--- a/app/(main)/ClientComponents/InteractiveMap.tsx
+++ b/app/(main)/ClientComponents/main/InteractiveMap.tsx
@@ -3,8 +3,8 @@
 import { countryCoordinates } from "@/lib/geo-limit"
 import { geoEquirectangular, geoPath } from "d3-geo"
 
+import { useTooltip } from "../detail/TooltipContext"
 import MapTooltip from "./MapTooltip"
-import { useTooltip } from "./TooltipContext"
 
 interface InteractiveMapProps {
   countries: string[]
diff --git a/app/(main)/ClientComponents/MapTooltip.tsx b/app/(main)/ClientComponents/main/MapTooltip.tsx
similarity index 97%
rename from app/(main)/ClientComponents/MapTooltip.tsx
rename to app/(main)/ClientComponents/main/MapTooltip.tsx
index 8f7d408..b684d27 100644
--- a/app/(main)/ClientComponents/MapTooltip.tsx
+++ b/app/(main)/ClientComponents/main/MapTooltip.tsx
@@ -4,7 +4,7 @@ import { AnimatePresence, m } from "framer-motion"
 import { useTranslations } from "next-intl"
 import { memo } from "react"
 
-import { useTooltip } from "./TooltipContext"
+import { useTooltip } from "../detail/TooltipContext"
 
 const MapTooltip = memo(function MapTooltip() {
   const { tooltipData } = useTooltip()
diff --git a/app/(main)/ClientComponents/ServerListClient.tsx b/app/(main)/ClientComponents/main/ServerListClient.tsx
similarity index 98%
rename from app/(main)/ClientComponents/ServerListClient.tsx
rename to app/(main)/ClientComponents/main/ServerListClient.tsx
index 02e5506..46e0efb 100644
--- a/app/(main)/ClientComponents/ServerListClient.tsx
+++ b/app/(main)/ClientComponents/main/ServerListClient.tsx
@@ -14,7 +14,7 @@ import dynamic from "next/dynamic"
 import { useEffect, useRef, useState } from "react"
 import useSWR from "swr"
 
-import GlobalLoading from "./GlobalLoading"
+import GlobalLoading from "../../../../components/loading/GlobalLoading"
 
 const ServerGlobal = dynamic(() => import("./Global"), {
   ssr: false,
diff --git a/app/(main)/ClientComponents/ServerOverviewClient.tsx b/app/(main)/ClientComponents/main/ServerOverviewClient.tsx
similarity index 100%
rename from app/(main)/ClientComponents/ServerOverviewClient.tsx
rename to app/(main)/ClientComponents/main/ServerOverviewClient.tsx
diff --git a/app/(main)/page.tsx b/app/(main)/page.tsx
index db7eb6d..fe92553 100644
--- a/app/(main)/page.tsx
+++ b/app/(main)/page.tsx
@@ -1,5 +1,5 @@
-import ServerListClient from "./ClientComponents/ServerListClient"
-import ServerOverviewClient from "./ClientComponents/ServerOverviewClient"
+import ServerListClient from "./ClientComponents/main/ServerListClient"
+import ServerOverviewClient from "./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 94fecf4..ad3a6b8 100644
--- a/app/(main)/server/[id]/page.tsx
+++ b/app/(main)/server/[id]/page.tsx
@@ -1,14 +1,14 @@
 "use client"
 
-import { NetworkChartClient } from "@/app/(main)/ClientComponents/NetworkChart"
-import ServerDetailChartClient from "@/app/(main)/ClientComponents/ServerDetailChartClient"
-import ServerDetailClient from "@/app/(main)/ClientComponents/ServerDetailClient"
+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 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/ServerIPInfo"
+import ServerIPInfo from "../../ClientComponents/detail/ServerIPInfo"
 
 export default function Page(props: { params: Promise<{ id: string }> }) {
   const params = use(props.params)
diff --git a/app/not-found.tsx b/app/not-found.tsx
index 2d05791..a4db54b 100644
--- a/app/not-found.tsx
+++ b/app/not-found.tsx
@@ -10,7 +10,7 @@ export default function NotFoundPage() {
     <div className="flex min-h-screen w-full flex-col">
       <main className="flex min-h-[calc(100vh-calc(var(--spacing)*16))] flex-1 flex-col gap-4 bg-background p-4 md:p-10 md:pt-8">
         <Header />
-        <section className="flex flex-col items-center min-h-44 justify-center gap-2">
+        <section className="flex flex-col items-center flex-1 justify-center gap-2">
           <p className="text-sm font-semibold">{t("h1_490-590_404NotFound")}</p>
           <Link href="/" className="flex items-center gap-1">
             <p className="text-sm font-medium opacity-40">{t("h1_490-590_404NotFoundBack")}</p>
diff --git a/app/(main)/ClientComponents/GlobalLoading.tsx b/components/loading/GlobalLoading.tsx
similarity index 100%
rename from app/(main)/ClientComponents/GlobalLoading.tsx
rename to components/loading/GlobalLoading.tsx
diff --git a/app/(main)/ClientComponents/NetworkChartLoading.tsx b/components/loading/NetworkChartLoading.tsx
similarity index 100%
rename from app/(main)/ClientComponents/NetworkChartLoading.tsx
rename to components/loading/NetworkChartLoading.tsx
diff --git a/app/(main)/ClientComponents/ServerDetailLoading.tsx b/components/loading/ServerDetailLoading.tsx
similarity index 100%
rename from app/(main)/ClientComponents/ServerDetailLoading.tsx
rename to components/loading/ServerDetailLoading.tsx