Skip to content

Commit

Permalink
fix: not-found page height
Browse files Browse the repository at this point in the history
  • Loading branch information
hamster1963 committed Dec 16, 2024
1 parent 4de49cb commit 6e6a331
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions app/(main)/page.tsx
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions app/(main)/server/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 6e6a331

Please sign in to comment.