From 6ab51ffe00c7389954ae8c6f7f4c9a9535edbe80 Mon Sep 17 00:00:00 2001 From: expdsn <18111002318@163.com> Date: Thu, 23 Jan 2025 16:46:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=92=8C=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=86=E7=95=8C=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/_lib/data/link.ts | 53 +++++++++++++++ app/_lib/data/linkType.ts | 40 ++++++++++++ app/_lib/data/sider.tsx | 0 app/{_lib/data/search.ts => _ui/HotApps.tsx} | 0 app/_ui/LinkListBox.tsx | 58 ++++++++++++++-- app/_ui/Search.tsx | 6 +- app/_ui/SiderNav.tsx | 4 +- app/admin/(default)/dashboard/LinkTable.tsx | 69 +++++++++++++------- app/admin/(default)/dashboard/page.tsx | 18 +++-- app/api/link/[id]/route.ts | 8 +++ app/api/link/route.ts | 28 ++++---- app/api/linkType/[id]/route.ts | 25 +++---- app/api/linkType/route.ts | 45 +++++-------- app/api/uploadKey/route.ts | 10 +++ app/page.tsx | 22 +++---- package.json | 1 + pnpm-lock.yaml | 3 + 17 files changed, 286 insertions(+), 104 deletions(-) create mode 100644 app/_lib/data/link.ts create mode 100644 app/_lib/data/linkType.ts delete mode 100644 app/_lib/data/sider.tsx rename app/{_lib/data/search.ts => _ui/HotApps.tsx} (100%) diff --git a/app/_lib/data/link.ts b/app/_lib/data/link.ts new file mode 100644 index 0000000..912a26c --- /dev/null +++ b/app/_lib/data/link.ts @@ -0,0 +1,53 @@ +"use server"; + +import { getCollection } from "../mongodb"; +import { ReactNode } from "react"; + +export type Link = { + name: string; + link?: string; + description: string; + _id: string; + type: string; + priority: number; + logoLink: string; + isHot?: boolean; + addTime: number; + +} +export async function getLinkList({ page = 1, pageSize = 9999, typeId }: { + page?: number; + pageSize?: number; + typeId?: string; +}) { + const collection = await getCollection('link'); + const startIndex = (page - 1) * pageSize; + // 构建查询条件对象 + const query = { + type: typeId + } as any; + if (!typeId) { + // 如果 typeId 不存在，将其删除 + delete query.type + } + const pipeline = [ + // 根据构建好的查询条件筛选文档 + { $match: query }, + { $sort: { priority: 1 } }, + { $skip: startIndex }, + { $limit: pageSize }, + { + $addFields: { + _id: { $toString: "$_id" } + } + } + ]; + const cursor = collection.aggregate(pipeline); + const list = await cursor.toArray(); + // 获取符合查询条件的文档总数 + const total = await collection.countDocuments(query); + return { + total, + list + } +} \ No newline at end of file diff --git a/app/_lib/data/linkType.ts b/app/_lib/data/linkType.ts new file mode 100644 index 0000000..b44f44b --- /dev/null +++ b/app/_lib/data/linkType.ts @@ -0,0 +1,40 @@ +"use server"; + +import { getCollection } from "../mongodb"; +import { ReactNode } from "react"; +export type LinkType = { + label: string; + icon?: string; + iconElement?: ReactNode; + _id: string; + href?: string; + priority: number; + location?: string; + +} +export async function getLinkTypeList({ page = 1, pageSize = 9999 }: { + page?: number; + pageSize?: number; +}) { + const collection = await getCollection('link-type'); + const startIndex = (page - 1) * pageSize; + const pipeline = [ + { $sort: { priority: 1 } }, + { $skip: startIndex }, + { $limit: pageSize }, + { + $addFields: { + _id: { $toString: "$_id" } + } + } + ]; + const cursor = collection.aggregate(pipeline); + const list = await cursor.toArray(); + + // 计算总数量 + const total = (await collection.find({}).toArray()).length + return { + total, + list + } +} \ No newline at end of file diff --git a/app/_lib/data/sider.tsx b/app/_lib/data/sider.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/app/_lib/data/search.ts b/app/_ui/HotApps.tsx similarity index 100% rename from app/_lib/data/search.ts rename to app/_ui/HotApps.tsx diff --git a/app/_ui/LinkListBox.tsx b/app/_ui/LinkListBox.tsx index 40a4319..6e16b9f 100644 --- a/app/_ui/LinkListBox.tsx +++ b/app/_ui/LinkListBox.tsx @@ -1,14 +1,64 @@ "use client"; import Link from "next/link"; -import { Link as _Link } from "../api/link/route"; -import { LinkType } from "../api/linkType/route"; +import { LinkType } from "../_lib/data/linkType"; +import { Link as _Link } from "../_lib/data/link"; +import { useMemo } from "react"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faClock, faFire, faTimeline, faTimesCircle, faTimesRectangle, faVolumeTimes } from "@fortawesome/free-solid-svg-icons"; -export default function LinkListBox({ linkTypeList, linkList }: { linkTypeList: LinkType[]; linkList: _Link[] }) { +export default function LinkListBox({ linkTypeList, linkList, showHot, showRecent }: { linkTypeList: LinkType[]; linkList: _Link[]; showHot: boolean; showRecent: boolean }) { + const hotList = useMemo(() => linkList.filter((val, index) => val.isHot && index < 12), []) + const recentList = useMemo(() => linkList.map(val => val).sort((a, b) => b.addTime - a.addTime).filter((_, idx) => idx < 12), []) return
+ { + showHot &&
+
+ + 热门网站 +
+
+ { + hotList.map(val => ( + + +
+ {val.name} + {val.description} +
+ + )) + } +
+
+ } + { + showRecent &&
+
+ + 最新收录 + +
+
+ { + recentList.map(val => ( + + +
+ {val.name} + {val.description} +
+ + )) + } +
+
+ } { linkTypeList.map(item => (
-
+
{item.label} diff --git a/app/_ui/Search.tsx b/app/_ui/Search.tsx index 323c0e0..bb0e812 100644 --- a/app/_ui/Search.tsx +++ b/app/_ui/Search.tsx @@ -82,12 +82,12 @@ export default function Search() { } }, [activeSearchKey]) return ( -
+
-
+
{ SearchTypeList.map(item => ( @@ -116,7 +116,7 @@ export default function Search() { )) }
- +
diff --git a/app/_ui/SiderNav.tsx b/app/_ui/SiderNav.tsx index 533cc23..ed49543 100644 --- a/app/_ui/SiderNav.tsx +++ b/app/_ui/SiderNav.tsx @@ -4,9 +4,9 @@ import { LinkTypeItem } from "../_lib/types"; import Logo from "./Logo"; import clsx from "clsx"; import { usePathname } from "next/navigation"; -import { LinkType } from "../api/linkType/route"; import { useAtom } from "jotai"; import { linkTypeAtom } from "../_lib/atom"; +import { LinkType } from "../_lib/data/linkType"; export default function SiderNav({ linkList }: { linkList: LinkType[] }) { const pathname = usePathname() @@ -14,7 +14,7 @@ export default function SiderNav({ linkList }: { linkList: LinkType[] }) { const [selectType, setSelectType] = useAtom(linkTypeAtom) return (
-
+
); diff --git a/package.json b/package.json index f046e7b..9ce3de6 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "antd": "^5.23.2", "bcrypt": "^5.1.1", "clsx": "^2.1.1", + "dayjs": "^1.11.13", "icons": "link:@awesome.me/kit-KIT_CODE/icons", "jose": "^5.9.6", "jotai": "^2.11.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index edfc72f..a6434e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,9 @@ importers: clsx: specifier: ^2.1.1 version: 2.1.1 + dayjs: + specifier: ^1.11.13 + version: 1.11.13 icons: specifier: link:@awesome.me/kit-KIT_CODE/icons version: link:@awesome.me/kit-KIT_CODE/icons