feat: add detail page

hamster1963 · Oct 17, 2024 · fe20952 · fe20952
1 parent 78da53f
commit fe20952
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 57 deletions.
diff --git a/app/[locale]/(main)/ClientComponents/NetworkChart.tsx b/app/[locale]/(main)/ClientComponents/NetworkChart.tsx
@@ -28,9 +28,9 @@ import { useLocale } from "next-intl";
 import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
 import * as React from "react";
+import { useCallback, useMemo } from "react";
 import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
 import useSWR from "swr";
-import { useMemo, useCallback } from 'react';
 
 interface ResultItem {
   created_at: number;
@@ -64,7 +64,6 @@ export function NetworkChartClient({ server_id }: { server_id: number }) {
 
   if (!data) return <NetworkChartLoading />;
 
-
   const transformedData = transformData(data);
 
   const formattedData = formatData(data);
@@ -109,32 +108,40 @@ export const NetworkChart = React.memo(function NetworkChart({
 
   const [activeChart, setActiveChart] = React.useState(defaultChart);
 
-  const handleButtonClick = useCallback((chart: string) => {
-    setActiveChart(prev => prev === chart ? defaultChart : chart);
-  }, [defaultChart]);
+  const handleButtonClick = useCallback(
+    (chart: string) => {
+      setActiveChart((prev) => (prev === chart ? defaultChart : chart));
+    },
+    [defaultChart],
+  );
 
-  const getColorByIndex = useCallback((chart: string) => {
-    const index = chartDataKey.indexOf(chart);
-    return `hsl(var(--chart-${(index % 10) + 1}))`;
-  }, [chartDataKey]);
+  const getColorByIndex = useCallback(
+    (chart: string) => {
+      const index = chartDataKey.indexOf(chart);
+      return `hsl(var(--chart-${(index % 10) + 1}))`;
+    },
+    [chartDataKey],
+  );
 
-  const chartButtons = useMemo(() => (
-    chartDataKey.map((key) => (
-      <button
-        key={key}
-        data-active={activeChart === key}
-        className={`relative z-30 flex flex-1 flex-col justify-center gap-1 border-b px-6 py-4 text-left data-[active=true]:bg-muted/50 sm:border-l sm:border-t-0 sm:px-6`}
-        onClick={() => handleButtonClick(key)}
-      >
-        <span className="whitespace-nowrap text-xs text-muted-foreground">
-          {key}
-        </span>
-        <span className="text-md font-bold leading-none sm:text-lg">
-          {chartData[key][chartData[key].length - 1].avg_delay.toFixed(2)}ms
-        </span>
-      </button>
-    ))
-  ), [chartDataKey, activeChart, chartData, handleButtonClick]);
+  const chartButtons = useMemo(
+    () =>
+      chartDataKey.map((key) => (
+        <button
+          key={key}
+          data-active={activeChart === key}
+          className={`relative z-30 flex flex-1 flex-col justify-center gap-1 border-b px-6 py-4 text-left data-[active=true]:bg-muted/50 sm:border-l sm:border-t-0 sm:px-6`}
+          onClick={() => handleButtonClick(key)}
+        >
+          <span className="whitespace-nowrap text-xs text-muted-foreground">
+            {key}
+          </span>
+          <span className="text-md font-bold leading-none sm:text-lg">
+            {chartData[key][chartData[key].length - 1].avg_delay.toFixed(2)}ms
+          </span>
+        </button>
+      )),
+    [chartDataKey, activeChart, chartData, handleButtonClick],
+  );
 
   const chartLines = useMemo(() => {
     if (activeChart !== defaultChart) {
@@ -180,9 +187,7 @@ export const NetworkChart = React.memo(function NetworkChart({
             {chartDataKey.length} {t("ServerMonitorCount")}
           </CardDescription>
         </div>
-        <div className="flex flex-wrap">
-          {chartButtons}
-        </div>
+        <div className="flex flex-wrap">{chartButtons}</div>
       </CardHeader>
       <CardContent className="px-2 sm:p-6">
         <ChartContainer
@@ -191,7 +196,11 @@ export const NetworkChart = React.memo(function NetworkChart({
         >
           <LineChart
             accessibilityLayer
-            data={activeChart === defaultChart ? formattedData : chartData[activeChart]}
+            data={
+              activeChart === defaultChart
+                ? formattedData
+                : chartData[activeChart]
+            }
             margin={{ left: 12, right: 12 }}
           >
             <CartesianGrid vertical={false} />
@@ -235,7 +244,6 @@ export const NetworkChart = React.memo(function NetworkChart({
   );
 });
 
-
 const transformData = (data: NezhaAPIMonitor[]) => {
   const monitorData: ServerMonitorChart = {};
 
@@ -255,7 +263,7 @@ const transformData = (data: NezhaAPIMonitor[]) => {
   });
 
   return monitorData;
-}
+};
 
 const formatData = (rawData: NezhaAPIMonitor[]) => {
   const result: { [time: number]: ResultItem } = {};
@@ -282,4 +290,4 @@ const formatData = (rawData: NezhaAPIMonitor[]) => {
   });
 
   return Object.values(result).sort((a, b) => a.created_at - b.created_at);
-};
+};
diff --git a/app/[locale]/(main)/detail/[id]/page.tsx b/app/[locale]/(main)/detail/[id]/page.tsx
@@ -0,0 +1,7 @@
+export default function Page({ params }: { params: { id: string } }) {
+  return (
+    <div className="mx-auto grid w-full max-w-5xl gap-4 md:gap-6">
+      {params.id}
+    </div>
+  );
+}
diff --git a/bun.lockb b/bun.lockb
diff --git a/components/ServerCard.tsx b/components/ServerCard.tsx
@@ -36,35 +36,39 @@ export default function ServerCard({
         "flex flex-col items-center justify-start gap-3 p-3 md:px-5 lg:flex-row"
       }
     >
-      <Popover>
+      {/* <Popover>
         <PopoverTrigger asChild>
-          <section
-            className="grid items-center gap-2 lg:w-28"
-            style={{ gridTemplateColumns: "auto 1fr auto" }}
-          >
-            <div
-              className={cn(
-                "flex items-center justify-center",
-                showFlag ? "min-w-[17px]" : "min-w-0",
-              )}
-            >
-              {showFlag ? <ServerFlag country_code={country_code} /> : null}
-            </div>
-            <p
-              className={cn(
-                "break-all font-bold tracking-tight",
-                showFlag ? "text-xs" : "text-sm",
-              )}
-            >
-              {name}
-            </p>
-            <span className="h-2 w-2 shrink-0 rounded-full bg-green-500 self-center"></span>
-          </section>
+          
         </PopoverTrigger>
         <PopoverContent side="top">
           <ServerCardPopover status={props.status} host={props.host} />
         </PopoverContent>
-      </Popover>
+      </Popover> */}
+      <section
+        className="grid items-center gap-2 lg:w-28 cursor-pointer"
+        style={{ gridTemplateColumns: "auto 1fr auto" }}
+        onClick={() => {
+          router.push(`/${locale}/detail/${id}`);
+        }}
+      >
+        <div
+          className={cn(
+            "flex items-center justify-center",
+            showFlag ? "min-w-[17px]" : "min-w-0",
+          )}
+        >
+          {showFlag ? <ServerFlag country_code={country_code} /> : null}
+        </div>
+        <p
+          className={cn(
+            "break-all font-bold tracking-tight",
+            showFlag ? "text-xs" : "text-sm",
+          )}
+        >
+          {name}
+        </p>
+        <span className="h-2 w-2 shrink-0 rounded-full bg-green-500 self-center"></span>
+      </section>
       <div
         onClick={() => {
           router.push(`/${locale}/${id}`);