From 42d517f0a11e0a220dc55377312c700872fde3e4 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Wed, 1 Nov 2023 22:25:06 +0800
Subject: [PATCH] bugfix

---
 .env.production.local                         |  4 ++--
 .../media-scan/[articleId]/layout.tsx         | 19 +++++++++++++++
 .../media-scan/[articleId]/page.tsx           | 24 +++++++++++++++++++
 .../media-scan/pages/[pageIndex]/layout.tsx   | 20 ++++++++++++++++
 .../media-scan/pages/[pageIndex]/page.tsx     | 18 ++++++++++++++
 app/components/ArticleBlock.tsx               |  2 +-
 app/components/LatestNews.tsx                 | 15 ++++++------
 next.config.js                                |  5 ++++
 8 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 app/(articles)/media-scan/[articleId]/layout.tsx
 create mode 100644 app/(articles)/media-scan/[articleId]/page.tsx
 create mode 100644 app/(articles)/media-scan/pages/[pageIndex]/layout.tsx
 create mode 100644 app/(articles)/media-scan/pages/[pageIndex]/page.tsx

diff --git a/.env.production.local b/.env.production.local
index d9f669d..71cea7c 100644
--- a/.env.production.local
+++ b/.env.production.local
@@ -1,2 +1,2 @@
-NEXT_PUBLIC_ADMIN_BASE_URL=/admin-api
-NEXT_PUBLIC_FRONT_BASE_URL=/front-api
+NEXT_PUBLIC_ADMIN_BASE_URL=http://101.34.131.16:8082/api
+NEXT_PUBLIC_FRONT_BASE_URL=http://101.34.131.16:8084/api
diff --git a/app/(articles)/media-scan/[articleId]/layout.tsx b/app/(articles)/media-scan/[articleId]/layout.tsx
new file mode 100644
index 0000000..cb6b744
--- /dev/null
+++ b/app/(articles)/media-scan/[articleId]/layout.tsx
@@ -0,0 +1,19 @@
+import { ReactNode } from "react";
+import ArticleLayout from "@/app/components/ArticleLayout";
+
+const Layout = ({
+  children,
+}: {
+  children: ReactNode;
+  params: {
+    articleId: string;
+  };
+}) => {
+  return (
+    <ArticleLayout leftNavTitle={"媒体扫描"} navigations={[]}>
+      {children}
+    </ArticleLayout>
+  );
+};
+
+export default Layout;
diff --git a/app/(articles)/media-scan/[articleId]/page.tsx b/app/(articles)/media-scan/[articleId]/page.tsx
new file mode 100644
index 0000000..9329b6e
--- /dev/null
+++ b/app/(articles)/media-scan/[articleId]/page.tsx
@@ -0,0 +1,24 @@
+import { articleDetail } from "@/app/api/articles";
+import ArticleRender from "@/app/components/ArticleRender";
+import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb";
+
+export default async function Article({
+  params,
+}: {
+  params: {
+    articleId: string;
+  };
+}) {
+  const data = await articleDetail({ id: params.articleId });
+  return (
+    <ArticleWithBreadcrumb
+      breadcrumb={[
+        { title: "首页", href: "/" },
+        { title: "媒体扫描", href: "/media-scan/pages/1" },
+        { title: data.title, href: `/media-scan/${data.id}` },
+      ]}
+    >
+      <ArticleRender article={data} />
+    </ArticleWithBreadcrumb>
+  );
+}
diff --git a/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx b/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx
new file mode 100644
index 0000000..cd8b1fe
--- /dev/null
+++ b/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx
@@ -0,0 +1,20 @@
+import { ReactNode } from "react";
+import ArticleLayout from "@/app/components/ArticleLayout";
+import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb";
+import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb";
+
+const breadcrumb: BreadcrumbItem[] = [
+  { title: "首页", href: "/" },
+  { title: "媒体扫描", href: "/media-scan/pages/1" },
+];
+const Layout = ({ children }: { children: ReactNode }) => {
+  return (
+    <ArticleLayout navigations={[]} leftNavTitle={"媒体扫描"}>
+      <ArticleWithBreadcrumb breadcrumb={breadcrumb}>
+        {children}
+      </ArticleWithBreadcrumb>
+    </ArticleLayout>
+  );
+};
+
+export default Layout;
diff --git a/app/(articles)/media-scan/pages/[pageIndex]/page.tsx b/app/(articles)/media-scan/pages/[pageIndex]/page.tsx
new file mode 100644
index 0000000..fc75584
--- /dev/null
+++ b/app/(articles)/media-scan/pages/[pageIndex]/page.tsx
@@ -0,0 +1,18 @@
+import ArticleList from "@/app/components/ArticleList";
+
+const Page = ({
+  params,
+}: {
+  params: {
+    pageIndex: string;
+  };
+}) => {
+  const { pageIndex } = params;
+  return (
+    <>
+      <ArticleList title={"媒体扫描"} cid={"8"} pageNo={parseInt(pageIndex)} />
+    </>
+  );
+};
+
+export default Page;
diff --git a/app/components/ArticleBlock.tsx b/app/components/ArticleBlock.tsx
index 211c8a9..7f9d989 100644
--- a/app/components/ArticleBlock.tsx
+++ b/app/components/ArticleBlock.tsx
@@ -50,7 +50,7 @@ const ArticleBlock = async ({
       </div>
       <div className={`${styles.articlesList} bg-[#e1f1fd] flex-1`}>
         <ul>
-          {data.lists.map((article) => (
+          {data.lists?.map((article) => (
             <li className={"h-8"} key={article.id}>
               <Link
                 className={
diff --git a/app/components/LatestNews.tsx b/app/components/LatestNews.tsx
index 6447bc1..682a697 100644
--- a/app/components/LatestNews.tsx
+++ b/app/components/LatestNews.tsx
@@ -10,7 +10,7 @@ const LatestNews = async () => {
     pageSize: 1,
     sort: "new",
   });
-  if (!lists.length) {
+  if (!lists?.length) {
     return <></>;
   }
   const { id } = lists[0];
@@ -18,22 +18,21 @@ const LatestNews = async () => {
     id: `${id}`,
   });
 
-  // const text = window.document.createElement("div");
-  // text.innerHTML = article.content;
   const content = htmlToText(article.content, {
-    // baseElements:{
-    //   selectors:['p']
-    // }
     selectors: [{ selector: "img", format: "skip" }],
   });
-  // const content = text.innerText;
+
   return (
     <div className={"h-[180px] bg-white p-2 flex"}>
       <Link
         href={`general-news/${lists[0].id}`}
         className={"article-cover w-[207px]"}
       >
-        <Image src={article.image} alt={""} />
+        <img
+          className={"w-full h-full object-cover"}
+          src={`${process.env.NEXT_PUBLIC_ADMIN_BASE_URL}/uploads/${article.image}`}
+          alt={""}
+        />
       </Link>
       <div className={"w-0 flex-1 ml-1 relative"}>
         <Link
diff --git a/next.config.js b/next.config.js
index 28d65b3..3e24ebf 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,5 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+    eslint: {
+        // Warning: This allows production builds to successfully complete even if
+        // your project has ESLint errors.
+        // ignoreDuringBuilds: true,
+    },
 }
 
 module.exports = nextConfig