完善概览页，实现公告查询展示，引入 recharts 展示取用数据

src/actions/announcement.ts

@@ -0,0 +1,19 @@
+'use server'
+
+import { PageRecord } from "@/lib/api"
+import { Announcement } from "@/lib/models"
+import { callByUser } from "./base"
+
+export async function listAnnouncements(props: {
+  page: number
+  size: number
+  title?: string
+  type?: number
+  status?: number
+  create_after?: Date
+  create_before?: Date
+  update_after?: Date
+  update_before?: Date
+}) {
+  return await callByUser<PageRecord<Announcement>>('/api/announcement/list', props)
+}

src/app/admin/(dashboard)/_client/chart.tsx

@@ -0,0 +1,35 @@
+'use client'
+
+import { ChartConfig, ChartContainer } from "@/components/ui/chart"
+import { Area, AreaChart, Bar, BarChart, CartesianGrid, Tooltip, XAxis, YAxis } from "recharts"
+import { addDays, format } from "date-fns"
+
+const data = Array(100).fill(0).map((_, i) => {
+  let time = new Date()
+  time = addDays(time, i)
+  return {
+    time: format(time, `MM/dd`),
+    count: Math.floor(Math.random() * 100) + 1,
+  }
+})
+
+const config = {
+  count: {
+    label: `套餐使用量`,
+    color: `var(--color-primary)`,
+  }
+} satisfies ChartConfig
+
+export default function DashboardChart() {
+  return (
+    <ChartContainer config={config} className={`w-full h-full`}>
+      <AreaChart data={data} margin={{top: 0, right: 20, left: 0, bottom: 0}}>
+        <CartesianGrid vertical={false}/>
+        <XAxis dataKey={`time`} tickLine={false} />
+        <YAxis tickLine={false}/>
+        <Tooltip animationDuration={100}/>
+        <Area dataKey={`count`} radius={20} className="fill-[var(--color-primary)]"/>
+      </AreaChart>
+    </ChartContainer>
+  )
+}

src/app/admin/(dashboard)/page.tsx

@@ -1,16 +1,23 @@
 import Page from '@/components/page'
 import Image from 'next/image'
-import banner from './_assets/banner.webp'
 import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card'
 import {Tabs, TabsContent, TabsList, TabsTrigger} from '@/components/ui/tabs'
-import soon from './_assets/coming-soon.svg'
 import {getProfile} from '@/actions/auth'
 import {format} from 'date-fns'
-import {CheckCircleIcon, CircleAlertIcon, LinkIcon} from 'lucide-react'
-import {Button} from '@/components/ui/button'
+import {CheckCircleIcon, CircleAlertIcon} from 'lucide-react'
+import {Button, buttonVariants} from '@/components/ui/button'
 import RechargeModal from '@/components/composites/recharge'
 import {merge} from '@/lib/utils'
 
+import banner from './_assets/banner.webp'
+import soon from './_assets/coming-soon.svg'
+import actionBill from './_assets/action-bill.webp'
+import actionBuy from './_assets/action-buy.webp'
+import actionLogout from './_assets/action-logout.webp'
+import Link from 'next/link'
+import { listAnnouncements } from '@/actions/announcement'
+import DashboardChart from './_client/chart'
+
 export type DashboardPageProps = {}
 
 export default async function DashboardPage(props: DashboardPageProps) {
@@ -29,84 +36,104 @@ export default async function DashboardPage(props: DashboardPageProps) {
         </div>
       </section>
 
-      {/* 短效 */}
-      <Card className={`col-start-1 row-start-2 py-4`}>
-        <CardHeader>
-          <CardTitle>短效动态套餐</CardTitle>
-        </CardHeader>
-        <CardContent className={`flex-auto flex flex-col gap-2`}>
-          <div className={`flex-1 flex items-center justify-between`}>
-            <h4>包时</h4>
-            <p className={`flex flex-col items-end`}>
-              <span className={`text-sm text-weak`}>当日可提取数量</span>
-              <span className={`text-lg`}>todo</span>
-            </p>
-          </div>
-          <div className={`border-b`}></div>
-          <div className={`flex-1 flex items-center justify-between`}>
-            <h4>包量</h4>
-            <p className={`flex flex-col items-end`}>
-              <span className={`text-sm text-weak`}>剩余可提取数量</span>
-              <span className={`text-lg`}>todo</span>
-            </p>
-          </div>
-        </CardContent>
-      </Card>
-
-      {/* 长效 */}
-      <Card className={`col-start-2 row-start-2`}>
-        <CardHeader>
-          <CardTitle>长效动态套餐</CardTitle>
-        </CardHeader>
-        <CardContent className={`flex-auto flex flex-col gap-2 items-center justify-center`}>
-          <Image alt={`coming soon`} src={soon}/>
-          <p>敬请期待</p>
-        </CardContent>
-      </Card>
-
-      {/* 固定 */}
-      <Card className={`col-start-3 row-start-2 py-4`}>
-        <CardHeader className={`px-4`}>
-          <CardTitle>固定IP套餐</CardTitle>
-        </CardHeader>
-        <CardContent className={`flex-auto flex flex-col gap-2 items-center justify-center`}>
-          <Image alt={`coming soon`} src={soon}/>
-          <p>敬请期待</p>
-        </CardContent>
-      </Card>
+      {/* 磁贴集 */}
+      <Pins/>
 
       {/* 图表 */}
-      <section className={`col-start-1 row-start-3 col-span-3 row-span-2 bg-card p-4 rounded-lg`}>
-        <Tabs defaultValue={`dynamic`}>
-          <TabsList>
-            <TabsTrigger value={`dynamic`} className={`data-[state=active]:text-primary`}>动态 IP 套餐</TabsTrigger>
-            <TabsTrigger value={`static`} className={`data-[state=active]:text-primary`}>静态 IP 套餐</TabsTrigger>
-          </TabsList>
-          <TabsContent value={`dynamic`}>
-            dynamic
-          </TabsContent>
-          <TabsContent value={`static`}>
-            static
-          </TabsContent>
-        </Tabs>
-      </section>
+      <Charts/>
 
       {/* 信息 */}
       <UserCenter/>
 
       {/* 通知 */}
-      <Card className={`col-start-4 row-start-3 row-span-2`}>
-        <CardHeader>
-          <CardTitle>通知</CardTitle>
-        </CardHeader>
-        <CardContent>
-          todo
-        </CardContent>
-      </Card>
+      <Announcements/>
+
     </Page>
   )
 }
 
+async function Pins() {
+  return <>
+    {/* 短效 */}
+    <Card className={`col-start-1 row-start-2 py-4`}>
+      <CardHeader>
+        <CardTitle>短效动态套餐</CardTitle>
+      </CardHeader>
+      <CardContent className={`flex-auto flex flex-col gap-2`}>
+        <div className={`flex-1 flex items-center justify-between`}>
+          <h4>包时</h4>
+          <p className={`flex flex-col items-end`}>
+            <span className={`text-sm text-weak`}>当日可提取数量</span>
+            <span className={`text-lg`}>todo</span>
+          </p>
+        </div>
+        <div className={`border-b`}></div>
+        <div className={`flex-1 flex items-center justify-between`}>
+          <h4>包量</h4>
+          <p className={`flex flex-col items-end`}>
+            <span className={`text-sm text-weak`}>剩余可提取数量</span>
+            <span className={`text-lg`}>todo</span>
+          </p>
+        </div>
+      </CardContent>
+    </Card>
+
+    {/* 长效 */}
+    <Card className={`col-start-2 row-start-2`}>
+      <CardHeader>
+        <CardTitle>长效动态套餐</CardTitle>
+      </CardHeader>
+      <CardContent className={`flex-auto flex flex-col gap-2 items-center justify-center`}>
+        <Image alt={`coming soon`} src={soon}/>
+        <p>敬请期待</p>
+      </CardContent>
+    </Card>
+
+    {/* 固定 */}
+    <Card className={`col-start-3 row-start-2 py-4`}>
+      <CardHeader className={`px-4`}>
+        <CardTitle>固定IP套餐</CardTitle>
+      </CardHeader>
+      <CardContent className={`flex-auto flex flex-col gap-2 items-center justify-center`}>
+        <Image alt={`coming soon`} src={soon}/>
+        <p>敬请期待</p>
+      </CardContent>
+    </Card>
+  </>
+}
+
+async function Charts() {
+
+  const data = [
+    {time: `2023-10-01`, count: 100},
+    {time: `2023-10-02`, count: 50},
+    {time: `2023-10-03`, count: 80},
+    {time: `2023-10-04`, count: 200},
+    {time: `2023-10-05`, count: 150},
+  ]
+
+  return (
+    <Card className={`col-start-1 row-start-3 col-span-3 row-span-2`}>
+      <CardContent className={`overflow-hidden`}>
+        <Tabs defaultValue={`dynamic`} className='h-full gap-4'>
+          <TabsList>
+            <TabsTrigger value={`dynamic`} className={`data-[state=active]:text-primary`}>动态 IP 套餐</TabsTrigger>
+            <TabsTrigger value={`static`} className={`data-[state=active]:text-primary`}>静态 IP 套餐</TabsTrigger>
+          </TabsList>
+
+          <TabsContent value={`dynamic`} className={`overflow-hidden`}>
+            <DashboardChart/>
+          </TabsContent>
+          <TabsContent value={`static`} className={`flex flex-col items-center justify-center gap-2`}>
+            <Image alt={`coming soon`} src={soon}/>
+            <p>敬请期待</p>
+          </TabsContent>
+        </Tabs>
+      </CardContent>
+    </Card>
+  )
+}
+
 async function UserCenter() {
 
   const resp = await getProfile()
@@ -160,21 +187,66 @@ async function UserCenter() {
         <div className={`flex flex-col gap-3`}>
           <h4 className={`text-sm text-weak`}>快捷入口</h4>
           <div className={`flex justify-around gap-2`}>
-            <Button theme={`ghost`} className={`flex flex-col gap-2 h-auto p-2`}>
-              <LinkIcon className={`size-8`}/>
-              <span>功能入口</span>
-            </Button>
-            <Button theme={`ghost`} className={`flex flex-col gap-2 h-auto p-2`}>
-              <LinkIcon className={`size-8`}/>
-              <span>功能入口</span>
-            </Button>
-            <Button theme={`ghost`} className={`flex flex-col gap-2 h-auto p-2`}>
-              <LinkIcon className={`size-8`}/>
-              <span>功能入口</span>
-            </Button>
+            <Link href="/admin/bills" className={merge(buttonVariants({variant: `ghost`}), `flex flex-col gap-2 py-2 px-3 h-auto`)}>
+              <Image alt={`bill icon`} src={actionBill} height={48}/>
+              <span className={`text-sm text-weak`}>我的帐单</span>
+            </Link>
+            <Link href='/admin/purchase' className={merge(buttonVariants({variant: `ghost`}), `flex flex-col gap-2 py-2 px-3 h-auto`)}>
+              <Image alt={`buy icon`} src={actionBuy} height={48}/>
+              <span className={`text-sm text-weak`}>购买产品</span>
+            </Link>
+            <Link href='/admin/profile' className={merge(buttonVariants({variant: `ghost`}), `flex flex-col gap-2 py-2 px-3 h-auto`)}>
+              <Image alt={`logout icon`} src={actionLogout} height={48}/>
+              <span className={`text-sm text-weak`}>个人中心</span>
+            </Link>
           </div>
         </div>
       </CardContent>
     </Card>
   )
 }
+
+async function Announcements() {
+
+  const resp = await listAnnouncements({
+    page: 1,
+    size: 5,
+  })
+
+  if (!resp.success) {
+    return (
+      <div className={`col-start-4 row-start-3 row-span-2 flex justify-center items-center`}>
+        获取公告数据失败
+      </div>
+    )
+  }
+  const announcements = resp.data.list
+
+  return (
+    <Card className={`col-start-4 row-start-3 row-span-2`}>
+      <CardHeader>
+        <CardTitle>公告</CardTitle>
+      </CardHeader>
+      <CardContent className={`flex-auto p-0`}>
+        {announcements.length === 0
+          ? (
+            <div className={`flex flex-col items-center justify-center gap-2 h-full`}>
+              <Image alt={`coming soon`} src={soon}/>
+              <p>暂无公告</p>
+            </div>
+          )
+          : announcements.map(item => (
+            <div key={item.id} className={merge(
+              `transition-colors duration-150 ease-in-out`,
+              `flex flex-col gap-1 px-4 py-2`,
+              `hover:bg-muted cursor-pointer`,
+            )}>
+              <h4>{item.title}</h4>
+              <p className={`text-sm text-weak`}>{format(item.created_at, 'yyyy-MM-dd HH:mm')}</p>
+            </div>
+          ))
+        }
+      </CardContent>
+    </Card>
+  )
+}

src/components/ui/card.tsx

@@ -69,7 +69,7 @@ function CardContent({className, ...props}: React.ComponentProps<'div'>) {
   return (
     <div
       data-slot="card-content"
-      className={merge('px-4', className)}
+      className={merge('px-4 flex-auto', className)}
       {...props}
     />
   )

src/components/ui/chart.tsx

@@ -0,0 +1,353 @@
+"use client"
+
+import * as React from "react"
+import * as RechartsPrimitive from "recharts"
+
+import { merge } from "@/lib/utils"
+
+// Format: { THEME_NAME: CSS_SELECTOR }
+const THEMES = { light: "", dark: ".dark" } as const
+
+export type ChartConfig = {
+  [k in string]: {
+    label?: React.ReactNode
+    icon?: React.ComponentType
+  } & (
+    | { color?: string, theme?: never }
+    | { color?: never, theme: Record<keyof typeof THEMES, string> }
+  )
+}
+
+type ChartContextProps = {
+  config: ChartConfig
+}
+
+const ChartContext = React.createContext<ChartContextProps | null>(null)
+
+function useChart() {
+  const context = React.useContext(ChartContext)
+
+  if (!context) {
+    throw new Error("useChart must be used within a <ChartContainer />")
+  }
+
+  return context
+}
+
+function ChartContainer({
+  id,
+  className,
+  children,
+  config,
+  ...props
+}: React.ComponentProps<"div"> & {
+  config: ChartConfig
+  children: React.ComponentProps<
+    typeof RechartsPrimitive.ResponsiveContainer
+  >["children"]
+}) {
+  const uniqueId = React.useId()
+  const chartId = `chart-${id || uniqueId.replace(/:/g, "")}`
+
+  return (
+    <ChartContext.Provider value={{ config }}>
+      <div
+        data-slot="chart"
+        data-chart={chartId}
+        className={merge(
+          "[&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border flex aspect-video justify-center text-xs [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-hidden [&_.recharts-sector]:outline-hidden [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-surface]:outline-hidden",
+          className
+        )}
+        {...props}
+      >
+        <ChartStyle id={chartId} config={config} />
+        <RechartsPrimitive.ResponsiveContainer>
+          {children}
+        </RechartsPrimitive.ResponsiveContainer>
+      </div>
+    </ChartContext.Provider>
+  )
+}
+
+const ChartStyle = ({ id, config }: { id: string, config: ChartConfig }) => {
+  const colorConfig = Object.entries(config).filter(
+    ([, config]) => config.theme || config.color
+  )
+
+  if (!colorConfig.length) {
+    return null
+  }
+
+  return (
+    <style
+      dangerouslySetInnerHTML={{
+        __html: Object.entries(THEMES)
+          .map(
+            ([theme, prefix]) => `
+${prefix} [data-chart=${id}] {
+${colorConfig
+  .map(([key, itemConfig]) => {
+    const color =
+      itemConfig.theme?.[theme as keyof typeof itemConfig.theme] ||
+      itemConfig.color
+    return color ? `  --color-${key}: ${color};` : null
+  })
+  .join("\n")}
+}
+`
+          )
+          .join("\n"),
+      }}
+    />
+  )
+}
+
+const ChartTooltip = RechartsPrimitive.Tooltip
+
+function ChartTooltipContent({
+  active,
+  payload,
+  className,
+  indicator = "dot",
+  hideLabel = false,
+  hideIndicator = false,
+  label,
+  labelFormatter,
+  labelClassName,
+  formatter,
+  color,
+  nameKey,
+  labelKey,
+}: React.ComponentProps<typeof RechartsPrimitive.Tooltip> &
+  React.ComponentProps<"div"> & {
+    hideLabel?: boolean
+    hideIndicator?: boolean
+    indicator?: "line" | "dot" | "dashed"
+    nameKey?: string
+    labelKey?: string
+  }) {
+  const { config } = useChart()
+
+  const tooltipLabel = React.useMemo(() => {
+    if (hideLabel || !payload?.length) {
+      return null
+    }
+
+    const [item] = payload
+    const key = `${labelKey || item?.dataKey || item?.name || "value"}`
+    const itemConfig = getPayloadConfigFromPayload(config, item, key)
+    const value =
+      !labelKey && typeof label === "string"
+        ? config[label as keyof typeof config]?.label || label
+        : itemConfig?.label
+
+    if (labelFormatter) {
+      return (
+        <div className={merge("font-medium", labelClassName)}>
+          {labelFormatter(value, payload)}
+        </div>
+      )
+    }
+
+    if (!value) {
+      return null
+    }
+
+    return <div className={merge("font-medium", labelClassName)}>{value}</div>
+  }, [
+    label,
+    labelFormatter,
+    payload,
+    hideLabel,
+    labelClassName,
+    config,
+    labelKey,
+  ])
+
+  if (!active || !payload?.length) {
+    return null
+  }
+
+  const nestLabel = payload.length === 1 && indicator !== "dot"
+
+  return (
+    <div
+      className={merge(
+        "border-border/50 bg-background grid min-w-[8rem] items-start gap-1.5 rounded-lg border px-2.5 py-1.5 text-xs shadow-xl",
+        className
+      )}
+    >
+      {!nestLabel ? tooltipLabel : null}
+      <div className="grid gap-1.5">
+        {payload.map((item, index) => {
+          const key = `${nameKey || item.name || item.dataKey || "value"}`
+          const itemConfig = getPayloadConfigFromPayload(config, item, key)
+          const indicatorColor = color || item.payload.fill || item.color
+
+          return (
+            <div
+              key={item.dataKey}
+              className={merge(
+                "[&>svg]:text-muted-foreground flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5",
+                indicator === "dot" && "items-center"
+              )}
+            >
+              {formatter && item?.value !== undefined && item.name ? (
+                formatter(item.value, item.name, item, index, item.payload)
+              ) : (
+                <>
+                  {itemConfig?.icon ? (
+                    <itemConfig.icon />
+                  ) : (
+                    !hideIndicator && (
+                      <div
+                        className={merge(
+                          "shrink-0 rounded-[2px] border-(--color-border) bg-(--color-bg)",
+                          {
+                            "h-2.5 w-2.5": indicator === "dot",
+                            "w-1": indicator === "line",
+                            "w-0 border-[1.5px] border-dashed bg-transparent":
+                              indicator === "dashed",
+                            "my-0.5": nestLabel && indicator === "dashed",
+                          }
+                        )}
+                        style={
+                          {
+                            "--color-bg": indicatorColor,
+                            "--color-border": indicatorColor,
+                          } as React.CSSProperties
+                        }
+                      />
+                    )
+                  )}
+                  <div
+                    className={merge(
+                      "flex flex-1 justify-between leading-none",
+                      nestLabel ? "items-end" : "items-center"
+                    )}
+                  >
+                    <div className="grid gap-1.5">
+                      {nestLabel ? tooltipLabel : null}
+                      <span className="text-muted-foreground">
+                        {itemConfig?.label || item.name}
+                      </span>
+                    </div>
+                    {item.value && (
+                      <span className="text-foreground font-mono font-medium tabular-nums">
+                        {item.value.toLocaleString()}
+                      </span>
+                    )}
+                  </div>
+                </>
+              )}
+            </div>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
+
+const ChartLegend = RechartsPrimitive.Legend
+
+function ChartLegendContent({
+  className,
+  hideIcon = false,
+  payload,
+  verticalAlign = "bottom",
+  nameKey,
+}: React.ComponentProps<"div"> &
+  Pick<RechartsPrimitive.LegendProps, "payload" | "verticalAlign"> & {
+    hideIcon?: boolean
+    nameKey?: string
+  }) {
+  const { config } = useChart()
+
+  if (!payload?.length) {
+    return null
+  }
+
+  return (
+    <div
+      className={merge(
+        "flex items-center justify-center gap-4",
+        verticalAlign === "top" ? "pb-3" : "pt-3",
+        className
+      )}
+    >
+      {payload.map((item) => {
+        const key = `${nameKey || item.dataKey || "value"}`
+        const itemConfig = getPayloadConfigFromPayload(config, item, key)
+
+        return (
+          <div
+            key={item.value}
+            className={merge(
+              "[&>svg]:text-muted-foreground flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3"
+            )}
+          >
+            {itemConfig?.icon && !hideIcon ? (
+              <itemConfig.icon />
+            ) : (
+              <div
+                className="h-2 w-2 shrink-0 rounded-[2px]"
+                style={{
+                  backgroundColor: item.color,
+                }}
+              />
+            )}
+            {itemConfig?.label}
+          </div>
+        )
+      })}
+    </div>
+  )
+}
+
+// Helper to extract item config from a payload.
+function getPayloadConfigFromPayload(
+  config: ChartConfig,
+  payload: unknown,
+  key: string
+) {
+  if (typeof payload !== "object" || payload === null) {
+    return undefined
+  }
+
+  const payloadPayload =
+    "payload" in payload &&
+    typeof payload.payload === "object" &&
+    payload.payload !== null
+      ? payload.payload
+      : undefined
+
+  let configLabelKey: string = key
+
+  if (
+    key in payload &&
+    typeof payload[key as keyof typeof payload] === "string"
+  ) {
+    configLabelKey = payload[key as keyof typeof payload] as string
+  } else if (
+    payloadPayload &&
+    key in payloadPayload &&
+    typeof payloadPayload[key as keyof typeof payloadPayload] === "string"
+  ) {
+    configLabelKey = payloadPayload[
+      key as keyof typeof payloadPayload
+    ] as string
+  }
+
+  return configLabelKey in config
+    ? config[configLabelKey]
+    : config[key as keyof typeof config]
+}
+
+export {
+  ChartContainer,
+  ChartTooltip,
+  ChartTooltipContent,
+  ChartLegend,
+  ChartLegendContent,
+  ChartStyle,
+}

src/lib/models.ts

@@ -123,3 +123,15 @@ export type Channel = {
   created_at: Date
   updated_at: Date
 }
+
+export type Announcement = {
+  id: number
+  title: string
+  content: string
+  type: number
+  status: number
+  pin: boolean
+  sort: number
+  created_at: Date
+  updated_at: Date
+}