From 42d8653d3d6ddc838626bd99b587bc4b03b9e166 Mon Sep 17 00:00:00 2001
From: Ou <orongxing@gmail.com>
Date: Sat, 12 Oct 2024 21:31:33 +0800
Subject: [PATCH] pref: ui

---
 package.json                     |  1 +
 pnpm-lock.yaml                   |  3 +++
 server/routes/[id].ts            |  4 ----
 shared/colors.ts                 | 30 +++++-------------------------
 shared/type.util.ts              |  4 ++++
 src/components/header.tsx        |  7 +++++--
 src/components/section/card.tsx  | 24 ++++++++++++++++--------
 src/components/section/index.tsx |  8 ++++----
 src/routes/__root.tsx            | 31 +++++++++++++++++--------------
 src/styles/globals.css           |  2 +-
 uno.config.ts                    | 27 +++++++++++++++++++--------
 11 files changed, 75 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index b540590..b366914 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "@types/md5": "^2.3.5",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
+    "@unocss/rule-utils": "^0.63.4",
     "@vitejs/plugin-react-swc": "^3.7.1",
     "bumpp": "^9.7.1",
     "eslint": "^9.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e2ee696..11f760f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -126,6 +126,9 @@ importers:
       '@types/react-dom':
         specifier: ^18.3.0
         version: 18.3.0
+      '@unocss/rule-utils':
+        specifier: ^0.63.4
+        version: 0.63.4
       '@vitejs/plugin-react-swc':
         specifier: ^3.7.1
         version: 3.7.1(vite@5.4.8(@types/node@22.6.1)(terser@5.33.0))
diff --git a/server/routes/[id].ts b/server/routes/[id].ts
index 3776004..7046d64 100644
--- a/server/routes/[id].ts
+++ b/server/routes/[id].ts
@@ -1,7 +1,6 @@
 import { TTL } from "@shared/consts"
 import type { SourceID, SourceResponse } from "@shared/types"
 import { sources } from "@shared/sources"
-import { delay } from "@shared/utils"
 import { sourcesFn } from "#/sources"
 import { Cache } from "#/cache"
 
@@ -29,9 +28,6 @@ export default defineEventHandler(async (event): Promise<SourceResponse> => {
         // 默认 10 分钟，是低于 TTL 的，但部分 Source 的间隔会超过 TTL，甚至有的一天刷新一次。
         const interval = sources[id].interval
         if (now - cache.updated < interval) {
-          if (id === "cankaoxiaoxi") {
-            await delay(2000)
-          }
           return {
             status: "success",
             data: {
diff --git a/shared/colors.ts b/shared/colors.ts
index dc952aa..3542851 100644
--- a/shared/colors.ts
+++ b/shared/colors.ts
@@ -1,26 +1,6 @@
-export const colors = [
-  "blue", // #0000FF
-  "indigo", // #4B0082
-  "violet", // #EE82EE
-  "purple", // #800080
-  "fuchsia", // #FF00FF
-  "pink", // #FFC0CB
-  "rose", // #FF007F
-  "amber", // #FFBF00
-  "yellow", // #FFFF00
-  "lime", // #00FF00
-  "green", // #008000
-  "emerald", // #50C878
-  "teal", // #008080
-  "cyan", // #00FFFF
-  "sky", // #87CEEB
-  "slate", // #708090
-  "gray", // #808080
-  "zinc", // #A0A0A0
-  "neutral", // #828282
-  "stone", // #D2B48C
-  "red", // #FF0000
-  "orange", // #FFA500
-] as const
+import { colors as c } from "unocss/preset-mini"
+import { typeSafeObjectKeys } from "./type.util"
 
-export type Color = typeof colors[number]
+export const colors = typeSafeObjectKeys(c)
+
+export type Color = Exclude<typeof colors[number], "current" | "inherit" | "transparent" | "black" | "white">
diff --git a/shared/type.util.ts b/shared/type.util.ts
index a5178f6..0257517 100644
--- a/shared/type.util.ts
+++ b/shared/type.util.ts
@@ -13,3 +13,7 @@ export function typeSafeObjectFromEntries<
 export function typeSafeObjectEntries<T extends Record<PropertyKey, unknown>>(obj: T): { [K in keyof T]: [K, T[K]] }[keyof T][] {
   return Object.entries(obj) as { [K in keyof T]: [K, T[K]] }[keyof T][]
 }
+
+export function typeSafeObjectKeys<T extends Record<PropertyKey, unknown>>(obj: T): (keyof T)[] {
+  return Object.keys(obj) as (keyof T)[]
+}
diff --git a/src/components/header.tsx b/src/components/header.tsx
index b3ad988..ababbfa 100644
--- a/src/components/header.tsx
+++ b/src/components/header.tsx
@@ -59,14 +59,17 @@ export function Header() {
           <img src={logo} alt="logo" className="h-12" />
           <span className="flex flex-col">
             <span>News</span>
-            <span>Now</span>
+            <span>
+              <span className="color-red-6">N</span>
+              <span>ow</span>
+            </span>
           </span>
         </Link>
         <a className="btn-pure text-sm ml-1">
           {`v${Version}`}
         </a>
       </span>
-      <span className="flex gap-2 items-center text-2xl text-primary">
+      <span className="flex gap-2 items-center text-xl text-primary-600 dark:text-primary ">
         <RefreshButton />
         <ThemeToggle />
         <GithubIcon />
diff --git a/src/components/section/card.tsx b/src/components/section/card.tsx
index 4b1decb..6dc0434 100644
--- a/src/components/section/card.tsx
+++ b/src/components/section/card.tsx
@@ -4,7 +4,7 @@ import { useQuery } from "@tanstack/react-query"
 import clsx from "clsx"
 import { useInView } from "react-intersection-observer"
 import { useAtom } from "jotai"
-import { forwardRef, useCallback, useImperativeHandle, useRef } from "react"
+import { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from "react"
 import { sources } from "@shared/sources"
 import type { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities"
 import { ofetch } from "ofetch"
@@ -42,7 +42,7 @@ export const CardWrapper = forwardRef<HTMLDivElement, ItemsProps>(({ id, isDragg
     <div
       ref={ref}
       className={clsx(
-        "flex flex-col h-500px rounded-2xl bg-op-50 p-4 backdrop-blur-5",
+        "flex flex-col h-500px rounded-2xl bg-op-40 p-4 backdrop-blur-5",
         isDragged && "op-50",
         `bg-${sources[id].color}`,
       )}
@@ -78,19 +78,19 @@ export function CardOverlay({ id }: { id: SourceID }) {
               <span className="text-xl font-bold">
                 {sources[id].name}
               </span>
-              {sources[id]?.title && <span className="text-sm">{sources[id].title}</span>}
+              {sources[id]?.title && <span className={clsx("text-sm", `color-${sources[id].color} bg-base op-80 bg-op-50! px-1 rounded`)}>{sources[id].title}</span>}
             </span>
-            <span className="text-xs">正在刷新</span>
+            <span className="text-xs">拖拽中</span>
           </span>
         </div>
-        <div className="flex gap-2 op-80">
+        <div className={clsx("flex gap-2 text-lg", `color-${sources[id].color}`)}>
           <button
             type="button"
             className={clsx("i-ph:dots-six-vertical-duotone", "cursor-grabbing")}
           />
         </div>
       </div>
-      <div className="h-full p-2 overflow-x-auto bg-base bg-op-70! rounded-2xl" />
+      <div className={`h-full p-2 overflow-x-auto bg-base bg-op-50! rounded-2xl sprinkle-${sources[id].color}`} />
     </div>
   )
 }
@@ -129,6 +129,8 @@ function NewsCard({ id, inView, handleListeners }: NewsCardProps) {
     }))
   }, [setRefetchSource, id])
 
+  const isFreshFetching = useMemo(() => query.isFetching && !query.isPlaceholderData, [query])
+
   return (
     <>
       <div className={clsx("flex justify-between mx-2 mt-0 mb-2 items-center")}>
@@ -169,12 +171,18 @@ function NewsCard({ id, inView, handleListeners }: NewsCardProps) {
       </div>
 
       <OverlayScrollbar
-        className={clsx("h-full p-2 overflow-x-auto bg-base bg-op-70! rounded-2xl transition-filter duration-500", query.isFetching && "blur-3px")}
+        className={clsx([
+          "h-full p-2 overflow-x-auto rounded-2xl bg-base bg-op-70!",
+          isFreshFetching && `animate-pulse`,
+          `sprinkle-${sources[id].color}`,
+        ])}
         options={{
           overflow: { x: "hidden" },
         }}
       >
-        {sources[id].type === "hottest" ? <NewsList query={query} /> : <NewsListTimeLine query={query} />}
+        <div className={clsx("duration-500 transition-opacity", isFreshFetching && "op-20")}>
+          {sources[id].type === "hottest" ? <NewsList query={query} /> : <NewsListTimeLine query={query} />}
+        </div>
       </OverlayScrollbar>
     </>
   )
diff --git a/src/components/section/index.tsx b/src/components/section/index.tsx
index 0f9c6d9..51eb1be 100644
--- a/src/components/section/index.tsx
+++ b/src/components/section/index.tsx
@@ -17,8 +17,8 @@ export function Section({ id }: { id: SectionID }) {
     <>
       <div className="w-full flex justify-center">
         <span className={clsx([
-          "flex gap-2 mb-6 py-3 px-6 rounded-2xl bg-primary bg-op-10 dark:bg-op-5",
-          "md:(z-100)",
+          "flex gap-2 mb-4 py-3 px-6 rounded-2xl bg-primary/1 shadow shadow-red/20 hover:shadow-red/50 transition-shadow duration-500",
+          "md:(z-100 mb-6)",
         ])}
         >
           {sectionIds.map(section => (
@@ -27,8 +27,8 @@ export function Section({ id }: { id: SectionID }) {
               to="/s/$section"
               params={{ section }}
               className={clsx(
-                "op-90",
-                id === section && "color-primary font-bold op-100!",
+                "text-sm",
+                id === section ? "color-primary font-bold" : "op-70 dark:op-90",
               )}
             >
               {metadata[section].name}
diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx
index 6cf9a35..3f442b1 100644
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -6,11 +6,9 @@ import "virtual:uno.css"
 import type { QueryClient } from "@tanstack/react-query"
 import { Author, Homepage } from "@shared/consts"
 import clsx from "clsx"
-import { useEffect } from "react"
 import { Header } from "~/components/header"
 import { useOnReload } from "~/hooks/useOnReload"
 import { OverlayScrollbar } from "~/components/common/overlay-scrollbar"
-import { useSticky } from "~/hooks/useSticky"
 
 export const Route = createRootRouteWithContext<{
   queryClient: QueryClient
@@ -28,23 +26,28 @@ function NotFoundComponent() {
 
 function RootComponent() {
   useOnReload()
-  const { ref, isSticky } = useSticky()
-  useEffect(() => {
-    console.log(isSticky)
-  }, [isSticky])
   return (
     <>
-      <div className="absolute top-0 z-[-2] h-screen w-screen bg"></div>
-      <OverlayScrollbar className="h-full overflow-x-auto relative">
-        <header
-          ref={ref}
-          className={
-            clsx("flex justify-between items-center py-4 px-8 md:(py-6 px-20)", "sticky top-0 z-100 backdrop-blur-md")
-          }
+      <OverlayScrollbar className={clsx([
+        "h-full overflow-x-auto relative px-4",
+        "md:(px-10)",
+        "lg:(px-24)",
+      ])}
+      >
+        <header className={clsx([
+          "flex justify-between items-center py-4 px-5",
+          "lg:(py-6)",
+          "sticky top-0 z-100 backdrop-blur-md",
+        ])}
         >
           <Header />
         </header>
-        <main className="min-h-[calc(100vh-12rem)] px-4 md:(px-16 mt--16 min-h-[calc(100vh-8rem)] )">
+        <main className={clsx([
+          "min-h-[calc(100vh-170px)] transition-margin",
+          "md:(min-h-[calc(100vh-105px)] mt--16)",
+          "lg:(min-h-[calc(100vh-120px)] mt--17)",
+        ])}
+        >
           <Outlet />
         </main>
         <footer className="py-6 flex flex-col items-center justify-center text-sm text-neutral-500">
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 557a4b8..38561d9 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -15,7 +15,7 @@ html.dark {
 }
 
 body {
-  --at-apply: color-base bg-base;
+  --at-apply: color-base bg-base sprinkle-red;
   -moz-user-select: none;
   -webkit-user-select: none;
   user-select: none;
diff --git a/uno.config.ts b/uno.config.ts
index 0af8544..f3062e0 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -1,5 +1,7 @@
 import { defineConfig, presetIcons, presetUno, transformerDirectives, transformerVariantGroup } from "unocss"
-import { colors } from "./shared/colors"
+import { hex2rgba } from "@unocss/rule-utils"
+import { colors } from "unocss/preset-mini"
+import { sources } from "./shared/sources"
 
 export default defineConfig({
   mergeSelectors: false,
@@ -10,24 +12,33 @@ export default defineConfig({
       scale: 1.2,
     }),
   ],
-  rules: [],
+  rules: [
+    [/^sprinkle-(.+)$/, ([_, d]) => {
+      if (d in colors) {
+        // @ts-expect-error >_<
+        const hex: any = colors[d]?.[400]
+        if (hex) {
+          return {
+            "background-image": `radial-gradient(ellipse 80% 80% at 50% -30%,
+         rgba(${hex2rgba(hex)?.join(", ")}, 0.3),
+        rgba(255, 255, 255, 0));`,
+          }
+        }
+      }
+    }],
+  ],
   shortcuts: {
     "color-base": "color-neutral-800 dark:color-neutral-300",
     "bg-base": "bg-white dark:bg-dark-600",
-    "shadow-base": "shadow-[0px_2px_3px_-1px_rgba(0,0,0,0.1),0px_1px_0px_0px_rgba(25,28,33,0.02),0px_0px_0px_1px_rgba(25,28,33,0.08)] dark:shadow-[0px_2px_3px_-1px_rgba(0,0,0,0.1),0px_1px_0px_0px_rgba(25,28,33,0.02),0px_0px_0px_1px_rgba(25,28,33,0.08)]",
-
-    "bg-hover": "bg-primary-400/5",
 
     "color-active": "color-primary-600 dark:color-primary-400",
     "border-active": "border-primary-600/25 dark:border-primary-400/25",
     "bg-active": "bg-primary-400/10",
 
     "btn-pure": "op50 hover:op75",
-    "btn-action": "border border-base rounded flex gap-2 items-center px2 py1 op75 hover:op100 hover:bg-hover",
-    "btn-action-active": "color-active border-active! bg-active op100!",
   },
   safelist: [
-    ...["bg", "color", "border"].map(t => colors.map(c => `${t}-${c}`)).flat(1),
+    ...["bg", "color", "border", "sprinkle", "shadow"].map(t => Object.values(sources).map(c => `${t}-${c.color}`)).flat(1),
   ],
   extendTheme: (theme) => {
     // @ts-expect-error >_<