From 63feb39dee4ec3af7d5ed789da6b11f337783ced Mon Sep 17 00:00:00 2001 From: expdsn <18111002318@163.com> Date: Tue, 4 Mar 2025 16:13:41 +0800 Subject: [PATCH] clear --- .dockerignore | 40 +++++++++++++++++++ app/(main)/article/[id]/page.tsx | 4 -- app/(main)/detail/[id]/page.tsx | 11 +++-- app/(main)/page.tsx | 5 ++- app/(main)/search/page.tsx | 7 +++- app/_ui/LinkListBox.tsx | 2 +- app/admin/(default)/dashboard/LinkTable.tsx | 4 +- .../(default)/dashboard/article/page.tsx | 1 - app/admin/(default)/dashboard/page.tsx | 2 +- app/api/search/[id]/route.ts | 4 +- eslint.config.mjs | 27 ++++++------- 11 files changed, 75 insertions(+), 32 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..886d9e0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,40 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# env files (can opt-in for committing if needed) +.env.local +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/app/(main)/article/[id]/page.tsx b/app/(main)/article/[id]/page.tsx index ee47541..90b4d32 100644 --- a/app/(main)/article/[id]/page.tsx +++ b/app/(main)/article/[id]/page.tsx @@ -1,11 +1,7 @@ import { getArticle } from "@/app/_lib/data/article" -import MarkdownView from "@/app/_ui/MarkdownView" import { faArrowRight } from "@fortawesome/free-solid-svg-icons" import { FontAwesomeIcon } from "@fortawesome/react-fontawesome" -import Image from "next/image" -import { MDXRemote } from 'next-mdx-remote/rsc' import Link from "next/link" -import { mdxComponent } from "@/app/_lib/MdxComponent" import { CustomMDX } from "@/app/_ui/customComponent" const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/' export default async function Page({ params }: { params: Promise<{ id: string }> }) { diff --git a/app/(main)/detail/[id]/page.tsx b/app/(main)/detail/[id]/page.tsx index d8618e8..e0bbd9e 100644 --- a/app/(main)/detail/[id]/page.tsx +++ b/app/(main)/detail/[id]/page.tsx @@ -1,20 +1,23 @@ -import { getLinkList, getLinkListAll } from "@/app/_lib/data/link"; +import { getLinkList } from "@/app/_lib/data/link"; import { getLinkType } from "@/app/_lib/data/linkType"; import { LinkBlock } from "@/app/_ui/LinkListBox"; import Search from "@/app/_ui/Search"; -import { use } from "react"; +import { Suspense } from "react"; export default async function Page({ params }: { params: Promise<{ id: string }> }) { const id = (await params).id const linkType = await getLinkType(id) - const { list: linkList } = await getLinkList({ typeId: id }) + const { list: linkList } = await getLinkList({ filter: { type: id } }) return ( <> {/* */}
- + ...}> + + +

{linkType?.label}

{ diff --git a/app/(main)/page.tsx b/app/(main)/page.tsx index c7a847a..2abf00a 100644 --- a/app/(main)/page.tsx +++ b/app/(main)/page.tsx @@ -4,6 +4,7 @@ import LinkListBox from "../_ui/LinkListBox"; import { getLinkTypeList } from "../_lib/data/linkType"; import { getLinkList } from "../_lib/data/link"; import Footer from "../_ui/footer"; +import { Suspense } from "react"; export default async function Page() { @@ -16,7 +17,9 @@ export default async function Page() {
- + }> + +
diff --git a/app/(main)/search/page.tsx b/app/(main)/search/page.tsx index bbdfb28..01bfeec 100644 --- a/app/(main)/search/page.tsx +++ b/app/(main)/search/page.tsx @@ -1,9 +1,12 @@ import Search from "@/app/_ui/Search"; import ResultBox from "./ResultBox"; +import { Suspense } from "react"; export default function Page() { return
- - + ...
}> + + +
} \ No newline at end of file diff --git a/app/_ui/LinkListBox.tsx b/app/_ui/LinkListBox.tsx index f49f597..b9e05af 100644 --- a/app/_ui/LinkListBox.tsx +++ b/app/_ui/LinkListBox.tsx @@ -4,7 +4,7 @@ import { LinkType } from "../_lib/data/linkType"; import { Link as _Link } from "../_lib/data/link"; import { useEffect, useMemo, useState } from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faArrowRight, faClock, faFire, faRightFromBracket, faRightLong, faTimeline, faTimesCircle, faTimesRectangle, faVolumeTimes } from "@fortawesome/free-solid-svg-icons"; +import { faArrowRight, faClock, faFire} from "@fortawesome/free-solid-svg-icons"; import { useAtom } from "jotai"; import { linkTypeAtom } from "../_lib/atom"; import Image from "next/image"; diff --git a/app/admin/(default)/dashboard/LinkTable.tsx b/app/admin/(default)/dashboard/LinkTable.tsx index e205596..da40c70 100644 --- a/app/admin/(default)/dashboard/LinkTable.tsx +++ b/app/admin/(default)/dashboard/LinkTable.tsx @@ -33,7 +33,7 @@ export default function LinkTable(props: { id: string }) { ({ current, pageSize }) => { console.log(current, pageSize); - return getLinkList({ page: current, pageSize, typeId: props.id }) + return getLinkList({ page: current, pageSize, filter: { type: props.id } }) } @@ -196,7 +196,7 @@ export default function LinkTable(props: { id: string }) { value: item._id }))}> - + ( <> - + 1 ) }, diff --git a/app/api/search/[id]/route.ts b/app/api/search/[id]/route.ts index 707635e..439b198 100644 --- a/app/api/search/[id]/route.ts +++ b/app/api/search/[id]/route.ts @@ -11,9 +11,9 @@ export async function GET(req: NextRequest) { const pageSize = parseInt(req.nextUrl.searchParams.get('pageSize') || '10') || 10; const typeId = req.nextUrl.searchParams.get('typeId') || '' - const res = await getLinkList({ page, pageSize, typeId }) + const res = await getLinkList({ page, pageSize, filter: { type: typeId } }) return Response.json(res) - } catch { + } catch { return Response.error() } } diff --git a/eslint.config.mjs b/eslint.config.mjs index 71cd777..ae9eabd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,21 +1,20 @@ -import { dirname } from "path"; -import { fileURLToPath } from "url"; -import { FlatCompat } from "@eslint/eslintrc"; - -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); +import { FlatCompat } from '@eslint/eslintrc' const compat = new FlatCompat({ - baseDirectory: __dirname, -}); + // import.meta.dirname is available after Node.js v20.11.0 + baseDirectory: import.meta.dirname, +}) const eslintConfig = [ - ...compat.extends("next/core-web-vitals", "next/typescript"), - { + ...compat.config({ + extends: ['next'], rules: { + 'react/no-unescaped-entities': 'off', + '@next/next/no-page-custom-font': 'off', "@typescript-eslint/no-explicit-any": "off", // 禁用对显式 any 类型的检查 - }, - }, -]; -export default eslintConfig; + }, + }), +] + +export default eslintConfig \ No newline at end of file