save

app/(main)/article/[id]/page.tsx

@@ -4,18 +4,19 @@ import { faArrowRight } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import Image from "next/image"
 import Link from "next/link"
-
+const PICTURE_PREFIX = 'https://newuitab.oss-cn-hangzhou.aliyuncs.com/ai_upload/downloads/'
 export default async function Page({ params }: { params: Promise<{ id: string }> }) {
     const id = (await params).id
     const article = await getArticle(id)
+
     if (!article) return <></>
     return <div className="w-full h-full  min-h-[100vh] flex justify-center ">
-        <div className="w-full max-w-[800px] px-4 h-full  pb-[50px] pt-[100px]  ">
+        <div className="w-full max-w-[1000px] px-4 h-full  pb-[50px] pt-[30px] bg-white/50 shadow rounded-lg  ">
             <div className="w-full h-full ">
                 <div className="flex gap-x-5">
-                    <div className="p-4  rounded-lg">
+                    <div className="p-4 mb-10  rounded-lg bg-white/60 shadow">
-                        <Image src={article?.cover} width={200} height={200} className=" rounded-lg shadow object-cover w-[200px] h-[200px]" alt="">
+                        <img src={PICTURE_PREFIX + article?.cover} width={200} height={200} className=" rounded-lg shadow object-cover w-[200px] h-[200px]" alt="">
-                        </Image>
+                        </img>
                     </div>
                     <div className="flex flex-col gap-y-3 py-5">
                         <h1 className="text-2xl">{article.title}</h1>

app/(main)/page.tsx

@@ -2,14 +2,14 @@ import SiderNav from "../_ui/SiderNav";
 import Search from "../_ui/Search";
 import LinkListBox from "../_ui/LinkListBox";
 import { getLinkTypeList } from "../_lib/data/linkType";
-import { getLinkListAll } from "../_lib/data/link";
+import { getLinkList, getLinkListAll } from "../_lib/data/link";
 import Footer from "../_ui/footer";
 
 export default async function Page() {
 
   const { list: linkTypeList } = await getLinkTypeList({})
 
-  const linkList = await getLinkListAll()
+  const { list: linkList } = await getLinkList({ page: 1, pageSize: 9999 })
 
   return (
     <div className="flex min-h-full w-full font-[family-name:var(--font-geist-sans)] relative">

app/_lib/data/article.ts

@@ -40,8 +40,8 @@ export async function getArticleList({ page = 1, pageSize = 9999 }: {
     }
 }
 export async function getArticle(id: string) {
-    const collection = await getCollection('article');
+    const collection = await getCollection('link-article');
-    return collection.findOne({ _id: new ObjectId(id) }).then(res => res ? {
+    return collection.findOne({ _id: id as any }).then(res => res ? {
         ...res,
         _id: res._id.toString()
     } as ArticleType : null)

app/_lib/data/link.ts

@@ -22,25 +22,16 @@ export async function getLinkListAll() {
     const list = await linkCollection.aggregate<Link>([
         {
             '$addFields': {
-                'cleanedLink': {
+                '_id': {
-                    '$substrBytes': [
+                    '$toString': "$_id"
-                        {
-                            '$arrayElemAt': [
-                                {
-                                    '$split': [
-                                        '$link', '?'
-                                    ]
-                                }, 0
-                            ]
-                        }, 0, 1000
-                    ]
                 }
             }
-        }, {
+        },
+        {
             '$lookup': {
-                'from': 'article',
+                'from': 'link-article',
-                'localField': 'link',
+                'localField': '_id',
-                'foreignField': 'link',
+                'foreignField': '_id',
                 'as': 'article'
             }
         }, {
@@ -52,9 +43,6 @@ export async function getLinkListAll() {
                             '$article._id', 0
                         ]
                     }
-                },
-                '_id': {
-                    '$toString': "$_id"
                 }
 
             }
@@ -64,6 +52,7 @@ export async function getLinkListAll() {
             }
         }
     ]).toArray();
+    console.log(list);
     
     return list;
 }
@@ -84,7 +73,6 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: {
         // 如果 typeId 不存在，将其删除
         delete query.type
     }
-    console.log(startIndex, pageSize, typeId);
 
     const pipeline = [
         // 根据构建好的查询条件筛选文档
@@ -98,7 +86,6 @@ export async function getLinkList({ page = 1, pageSize = 9999, typeId }: {
             }
         }
     ];
-    console.dir(pipeline);
     const cursor = collection.aggregate<Link>(pipeline);
 
     const list = await cursor.toArray();

app/globals.css

@@ -16,6 +16,9 @@
 }
 @layer components {
   #markdown-view-preview {
+    h4 {
+      font: 1em sans-serif;
+    }
     p {
       font-size: var(--background);
       color: var(--color-gray-700);

next.config.ts

@@ -25,6 +25,7 @@ const nextConfig: NextConfig = {
       },
     ],
   },
+  
 };
 
 export default nextConfig;