From a8b1ad286d4e11116c4f26ff9ea070d6adfee179 Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:27:50 +0800 Subject: [PATCH] update --- .env.production.local | 6 +- .../academic-events/[articleId]/layout.tsx | 2 +- .../academic-events/[articleId]/page.tsx | 6 +- .../pages/[pageIndex]/layout.tsx | 6 +- .../pages/[pageIndex]/page.tsx | 2 +- .../announcements/[articleId]/layout.tsx | 2 +- .../announcements/[articleId]/page.tsx | 6 +- .../pages/[pageIndex]/layout.tsx | 6 +- .../announcements/pages/[pageIndex]/page.tsx | 2 +- .../branch-life-sketch/[articleId]/layout.tsx | 2 +- .../branch-life-sketch/[articleId]/page.tsx | 6 +- .../pages/[pageIndex]/layout.tsx | 6 +- .../pages/[pageIndex]/page.tsx | 2 +- .../general-news/[articleId]/layout.tsx | 2 +- .../general-news/[articleId]/page.tsx | 6 +- .../general-news/pages/[pageIndex]/layout.tsx | 6 +- .../general-news/pages/[pageIndex]/page.tsx | 2 +- .../media-scan/[articleId]/layout.tsx | 2 +- .../media-scan/[articleId]/page.tsx | 6 +- .../media-scan/pages/[pageIndex]/layout.tsx | 6 +- .../media-scan/pages/[pageIndex]/page.tsx | 2 +- .../recruitment/[articleId]/layout.tsx | 2 +- .../recruitment/[articleId]/page.tsx | 6 +- .../recruitment/pages/[pageIndex]/layout.tsx | 6 +- .../recruitment/pages/[pageIndex]/page.tsx | 2 +- .../research-progress/[articleId]/layout.tsx | 2 +- .../research-progress/[articleId]/page.tsx | 6 +- .../pages/[pageIndex]/layout.tsx | 6 +- .../pages/[pageIndex]/page.tsx | 2 +- .../[articleId]/layout.tsx | 2 +- .../[articleId]/page.tsx | 6 +- .../pages/[pageIndex]/layout.tsx | 6 +- .../pages/[pageIndex]/page.tsx | 2 +- .../government-policy/layout.tsx | 4 +- .../government-policy/page.tsx | 2 +- .../industry-docking/layout.tsx | 4 +- .../industry-docking/page.tsx | 2 +- .../intellectual-property-services/layout.tsx | 4 +- .../intellectual-property-services/page.tsx | 2 +- .../intelligence-services/layout.tsx | 4 +- .../intelligence-services/page.tsx | 2 +- .../investment-and-financing/layout.tsx | 4 +- .../investment-and-financing/page.tsx | 2 +- .../achievements-transformation/layout.tsx | 2 +- .../layout.tsx | 4 +- .../page.tsx | 2 +- .../technology-assessment/layout.tsx | 4 +- .../technology-assessment/page.tsx | 2 +- app/(introduce)/contact-us/layout.tsx | 4 +- .../func-dep/asset-finance/layout.tsx | 2 +- .../func-dep/asset-finance/page.tsx | 2 +- .../func-dep/general-office/layout.tsx | 2 +- .../func-dep/general-office/page.tsx | 2 +- .../func-dep/industry/layout.tsx | 2 +- .../func-dep/industry/page.tsx | 2 +- .../func-dep/personnel/layout.tsx | 2 +- .../func-dep/personnel/page.tsx | 2 +- .../func-dep/technology/layout.tsx | 2 +- .../func-dep/technology/page.tsx | 2 +- .../(functional-departments)/layout.tsx | 2 +- .../(generally)/architecture/layout.tsx | 2 +- .../(generally)/architecture/page.tsx | 4 +- .../(generally)/dean-speech/layout.tsx | 2 +- .../(generally)/dean-speech/page.tsx | 2 +- .../(generally)/joint-laboratory/layout.tsx | 2 +- .../(generally)/joint-laboratory/page.tsx | 2 +- .../(generally)/joint-venture/layout.tsx | 2 +- .../(generally)/joint-venture/page.tsx | 2 +- .../organization/(generally)/layout.tsx | 2 +- .../(generally)/overview/layout.tsx | 2 +- .../(generally)/overview/page.tsx | 2 +- .../(generally)/research-platform/layout.tsx | 2 +- .../(generally)/research-platform/page.tsx | 2 +- .../organization/(generally)/stidc/layout.tsx | 2 +- .../organization/(generally)/stidc/page.tsx | 2 +- .../talents/academician/layout.tsx | 2 +- app/(introduce)/talents/academician/page.tsx | 4 +- app/(introduce)/talents/layout.tsx | 2 +- app/(introduce)/talents/overview/layout.tsx | 2 +- app/(introduce)/talents/overview/page.tsx | 2 +- app/(introduce)/talents/researcher/layout.tsx | 2 +- app/(introduce)/talents/researcher/page.tsx | 4 +- .../talents/vice-researcher/layout.tsx | 2 +- .../talents/vice-researcher/page.tsx | 4 +- app/{assets => _assets}/backtop.png | Bin app/{assets => _assets}/banner.jpg | Bin app/{assets => _assets}/circle.png | Bin app/{assets => _assets}/footer.jpg | Bin app/{assets => _assets}/left-banner.jpg | Bin app/{assets => _assets}/page.module.css | 0 app/{assets => _assets}/pin.png | Bin app/{assets => _assets}/trumpet-icon.png | Bin .../AnhuiSwiper.tsx | 66 ++++--- .../ArticleBlock.tsx | 8 +- .../ArticleHeading.tsx | 0 .../ArticleLayout.tsx | 2 +- .../ArticleList.module.scss | 0 .../ArticleList.tsx | 4 +- app/_components/ArticleRender.tsx | 46 +++++ .../ArticleWithBreadcrumb.tsx | 2 +- app/{components => _components}/BackToTop.tsx | 2 +- app/_components/BranchLifeSketch.tsx | 115 +++++++++++ .../Breadcrumb.tsx | 0 .../FriendLinks.module.scss | 0 .../FriendLinks.tsx | 2 +- .../LatestNews.tsx | 4 +- .../LeftNav.module.scss | 0 app/{components => _components}/LeftNav.tsx | 2 +- app/{components => _components}/MainNav.tsx | 0 .../Pagination.tsx | 0 app/_lib/request.ts | 25 +++ app/{api => _services}/articles.ts | 6 +- app/{types => _types}/album.ts | 0 app/{types => _types}/article.ts | 0 app/{types => _types}/base.ts | 0 app/components/ArticleRender.tsx | 34 ---- app/components/BranchLifeSketch.tsx | 91 --------- app/layout.tsx | 8 +- app/lib/request.ts | 12 -- app/page.tsx | 16 +- next.config.js | 22 ++- package.json | 8 +- pnpm-lock.yaml | 184 +++++++++--------- 123 files changed, 491 insertions(+), 428 deletions(-) rename app/{assets => _assets}/backtop.png (100%) rename app/{assets => _assets}/banner.jpg (100%) rename app/{assets => _assets}/circle.png (100%) rename app/{assets => _assets}/footer.jpg (100%) rename app/{assets => _assets}/left-banner.jpg (100%) rename app/{assets => _assets}/page.module.css (100%) rename app/{assets => _assets}/pin.png (100%) rename app/{assets => _assets}/trumpet-icon.png (100%) rename app/{components => _components}/AnhuiSwiper.tsx (66%) rename app/{components => _components}/ArticleBlock.tsx (89%) rename app/{components => _components}/ArticleHeading.tsx (100%) rename app/{components => _components}/ArticleLayout.tsx (90%) rename app/{components => _components}/ArticleList.module.scss (100%) rename app/{components => _components}/ArticleList.tsx (90%) create mode 100644 app/_components/ArticleRender.tsx rename app/{components => _components}/ArticleWithBreadcrumb.tsx (84%) rename app/{components => _components}/BackToTop.tsx (93%) create mode 100644 app/_components/BranchLifeSketch.tsx rename app/{components => _components}/Breadcrumb.tsx (100%) rename app/{components => _components}/FriendLinks.module.scss (100%) rename app/{components => _components}/FriendLinks.tsx (97%) rename app/{components => _components}/LatestNews.tsx (89%) rename app/{components => _components}/LeftNav.module.scss (100%) rename app/{components => _components}/LeftNav.tsx (96%) rename app/{components => _components}/MainNav.tsx (100%) rename app/{components => _components}/Pagination.tsx (100%) create mode 100644 app/_lib/request.ts rename app/{api => _services}/articles.ts (78%) rename app/{types => _types}/album.ts (100%) rename app/{types => _types}/article.ts (100%) rename app/{types => _types}/base.ts (100%) delete mode 100644 app/components/ArticleRender.tsx delete mode 100644 app/components/BranchLifeSketch.tsx delete mode 100644 app/lib/request.ts diff --git a/.env.production.local b/.env.production.local index 71cea7c..9e19c49 100644 --- a/.env.production.local +++ b/.env.production.local @@ -1,2 +1,4 @@ -NEXT_PUBLIC_ADMIN_BASE_URL=http://101.34.131.16:8082/api -NEXT_PUBLIC_FRONT_BASE_URL=http://101.34.131.16:8084/api +NEXT_PUBLIC_ADMIN_BASE_URL=http://localhost:8082/api +NEXT_PUBLIC_FRONT_BASE_URL=http://localhost:8084/api +NEXT_PUBLIC_CLIENT_BASE_URL=/api +NEXT_PUBLIC_CLIENT_ADMIN_BASE_URL=/admin-api diff --git a/app/(articles)/academic-exchange/academic-events/[articleId]/layout.tsx b/app/(articles)/academic-exchange/academic-events/[articleId]/layout.tsx index c53bc9a..3e620ac 100644 --- a/app/(articles)/academic-exchange/academic-events/[articleId]/layout.tsx +++ b/app/(articles)/academic-exchange/academic-events/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/academic-exchange/academic-events/[articleId]/page.tsx b/app/(articles)/academic-exchange/academic-events/[articleId]/page.tsx index 256f544..d4e6aa5 100644 --- a/app/(articles)/academic-exchange/academic-events/[articleId]/page.tsx +++ b/app/(articles)/academic-exchange/academic-events/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; -import ArticleRender from "@/app/components/ArticleRender"; -import { articleDetail } from "@/app/api/articles"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; +import ArticleRender from "@/app/_components/ArticleRender"; +import { articleDetail } from "@/app/_services/articles"; const Page = async ({ params, diff --git a/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/layout.tsx b/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/layout.tsx index 6bccbd2..2d60b51 100644 --- a/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { navigations } from "@/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/config"; const breadcrumb: BreadcrumbItem[] = [ diff --git a/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/page.tsx b/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/page.tsx index 75c2d64..70e710b 100644 --- a/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/page.tsx +++ b/app/(articles)/academic-exchange/academic-events/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/announcements/[articleId]/layout.tsx b/app/(articles)/announcements/[articleId]/layout.tsx index c53bc9a..3e620ac 100644 --- a/app/(articles)/announcements/[articleId]/layout.tsx +++ b/app/(articles)/announcements/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/announcements/[articleId]/page.tsx b/app/(articles)/announcements/[articleId]/page.tsx index e5bf816..b319efc 100644 --- a/app/(articles)/announcements/[articleId]/page.tsx +++ b/app/(articles)/announcements/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Article({ params, diff --git a/app/(articles)/announcements/pages/[pageIndex]/layout.tsx b/app/(articles)/announcements/pages/[pageIndex]/layout.tsx index 659c3c0..c1eb4aa 100644 --- a/app/(articles)/announcements/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/announcements/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/announcements/pages/[pageIndex]/page.tsx b/app/(articles)/announcements/pages/[pageIndex]/page.tsx index b73c803..7783cea 100644 --- a/app/(articles)/announcements/pages/[pageIndex]/page.tsx +++ b/app/(articles)/announcements/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = async ({ params, diff --git a/app/(articles)/branch-life-sketch/[articleId]/layout.tsx b/app/(articles)/branch-life-sketch/[articleId]/layout.tsx index b63a93b..e409d2e 100644 --- a/app/(articles)/branch-life-sketch/[articleId]/layout.tsx +++ b/app/(articles)/branch-life-sketch/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/branch-life-sketch/[articleId]/page.tsx b/app/(articles)/branch-life-sketch/[articleId]/page.tsx index 4ad4e29..17e8c20 100644 --- a/app/(articles)/branch-life-sketch/[articleId]/page.tsx +++ b/app/(articles)/branch-life-sketch/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Article({ params, diff --git a/app/(articles)/branch-life-sketch/pages/[pageIndex]/layout.tsx b/app/(articles)/branch-life-sketch/pages/[pageIndex]/layout.tsx index 30da134..0434df5 100644 --- a/app/(articles)/branch-life-sketch/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/branch-life-sketch/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/branch-life-sketch/pages/[pageIndex]/page.tsx b/app/(articles)/branch-life-sketch/pages/[pageIndex]/page.tsx index 38aea84..270528c 100644 --- a/app/(articles)/branch-life-sketch/pages/[pageIndex]/page.tsx +++ b/app/(articles)/branch-life-sketch/pages/[pageIndex]/page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/general-news/[articleId]/layout.tsx b/app/(articles)/general-news/[articleId]/layout.tsx index c53bc9a..3e620ac 100644 --- a/app/(articles)/general-news/[articleId]/layout.tsx +++ b/app/(articles)/general-news/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/general-news/[articleId]/page.tsx b/app/(articles)/general-news/[articleId]/page.tsx index 2c2bf36..6816ef2 100644 --- a/app/(articles)/general-news/[articleId]/page.tsx +++ b/app/(articles)/general-news/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Article({ params, diff --git a/app/(articles)/general-news/pages/[pageIndex]/layout.tsx b/app/(articles)/general-news/pages/[pageIndex]/layout.tsx index 6776561..1e5d430 100644 --- a/app/(articles)/general-news/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/general-news/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/general-news/pages/[pageIndex]/page.tsx b/app/(articles)/general-news/pages/[pageIndex]/page.tsx index 393dc74..c4f5217 100644 --- a/app/(articles)/general-news/pages/[pageIndex]/page.tsx +++ b/app/(articles)/general-news/pages/[pageIndex]/page.tsx @@ -1,5 +1,5 @@ import React from "react"; -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/media-scan/[articleId]/layout.tsx b/app/(articles)/media-scan/[articleId]/layout.tsx index cb6b744..6af237e 100644 --- a/app/(articles)/media-scan/[articleId]/layout.tsx +++ b/app/(articles)/media-scan/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/media-scan/[articleId]/page.tsx b/app/(articles)/media-scan/[articleId]/page.tsx index 9329b6e..c5e17ed 100644 --- a/app/(articles)/media-scan/[articleId]/page.tsx +++ b/app/(articles)/media-scan/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Article({ params, diff --git a/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx b/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx index cd8b1fe..b736cb3 100644 --- a/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/media-scan/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import Breadcrumb, { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/media-scan/pages/[pageIndex]/page.tsx b/app/(articles)/media-scan/pages/[pageIndex]/page.tsx index fc75584..340543b 100644 --- a/app/(articles)/media-scan/pages/[pageIndex]/page.tsx +++ b/app/(articles)/media-scan/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/recruitment/[articleId]/layout.tsx b/app/(articles)/recruitment/[articleId]/layout.tsx index 40aab04..5b7d7da 100644 --- a/app/(articles)/recruitment/[articleId]/layout.tsx +++ b/app/(articles)/recruitment/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/recruitment/[articleId]/page.tsx b/app/(articles)/recruitment/[articleId]/page.tsx index f1bbbbf..0b24286 100644 --- a/app/(articles)/recruitment/[articleId]/page.tsx +++ b/app/(articles)/recruitment/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Article({ params, diff --git a/app/(articles)/recruitment/pages/[pageIndex]/layout.tsx b/app/(articles)/recruitment/pages/[pageIndex]/layout.tsx index 5c4bea6..99bbbd9 100644 --- a/app/(articles)/recruitment/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/recruitment/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import Breadcrumb, { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/recruitment/pages/[pageIndex]/page.tsx b/app/(articles)/recruitment/pages/[pageIndex]/page.tsx index d9cdaf8..309eddb 100644 --- a/app/(articles)/recruitment/pages/[pageIndex]/page.tsx +++ b/app/(articles)/recruitment/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/research-progress/[articleId]/layout.tsx b/app/(articles)/research-progress/[articleId]/layout.tsx index c53bc9a..3e620ac 100644 --- a/app/(articles)/research-progress/[articleId]/layout.tsx +++ b/app/(articles)/research-progress/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/research-progress/[articleId]/page.tsx b/app/(articles)/research-progress/[articleId]/page.tsx index 52571fb..7aa8dfc 100644 --- a/app/(articles)/research-progress/[articleId]/page.tsx +++ b/app/(articles)/research-progress/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function ResearchProgress({ params, diff --git a/app/(articles)/research-progress/pages/[pageIndex]/layout.tsx b/app/(articles)/research-progress/pages/[pageIndex]/layout.tsx index 7b283c4..c891efd 100644 --- a/app/(articles)/research-progress/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/research-progress/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; -import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import Breadcrumb, { BreadcrumbItem } from "@/app/_components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/research-progress/pages/[pageIndex]/page.tsx b/app/(articles)/research-progress/pages/[pageIndex]/page.tsx index aa06f0a..7c67084 100644 --- a/app/(articles)/research-progress/pages/[pageIndex]/page.tsx +++ b/app/(articles)/research-progress/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(articles)/technological-achievements/[articleId]/layout.tsx b/app/(articles)/technological-achievements/[articleId]/layout.tsx index c53bc9a..3e620ac 100644 --- a/app/(articles)/technological-achievements/[articleId]/layout.tsx +++ b/app/(articles)/technological-achievements/[articleId]/layout.tsx @@ -1,5 +1,5 @@ import { ReactNode } from "react"; -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; const Layout = ({ children, diff --git a/app/(articles)/technological-achievements/[articleId]/page.tsx b/app/(articles)/technological-achievements/[articleId]/page.tsx index e164e4e..7c87b06 100644 --- a/app/(articles)/technological-achievements/[articleId]/page.tsx +++ b/app/(articles)/technological-achievements/[articleId]/page.tsx @@ -1,6 +1,6 @@ -import { articleDetail } from "@/app/api/articles"; -import ArticleRender from "@/app/components/ArticleRender"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import { articleDetail } from "@/app/_services/articles"; +import ArticleRender from "@/app/_components/ArticleRender"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; export default async function Page({ params, diff --git a/app/(articles)/technological-achievements/pages/[pageIndex]/layout.tsx b/app/(articles)/technological-achievements/pages/[pageIndex]/layout.tsx index f10ad01..a09e6b1 100644 --- a/app/(articles)/technological-achievements/pages/[pageIndex]/layout.tsx +++ b/app/(articles)/technological-achievements/pages/[pageIndex]/layout.tsx @@ -1,7 +1,7 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; -import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import ArticleLayout from "@/app/_components/ArticleLayout"; +import Breadcrumb, { BreadcrumbItem } from "@/app/_components/Breadcrumb"; import { ReactNode } from "react"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(articles)/technological-achievements/pages/[pageIndex]/page.tsx b/app/(articles)/technological-achievements/pages/[pageIndex]/page.tsx index af405c7..e7be524 100644 --- a/app/(articles)/technological-achievements/pages/[pageIndex]/page.tsx +++ b/app/(articles)/technological-achievements/pages/[pageIndex]/page.tsx @@ -1,4 +1,4 @@ -import ArticleList from "@/app/components/ArticleList"; +import ArticleList from "@/app/_components/ArticleList"; const Page = ({ params, diff --git a/app/(introduce)/achievements-transformation/government-policy/layout.tsx b/app/(introduce)/achievements-transformation/government-policy/layout.tsx index 0e4f39f..c1f089e 100644 --- a/app/(introduce)/achievements-transformation/government-policy/layout.tsx +++ b/app/(introduce)/achievements-transformation/government-policy/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/government-policy/page.tsx b/app/(introduce)/achievements-transformation/government-policy/page.tsx index f879103..fb6aac0 100644 --- a/app/(introduce)/achievements-transformation/government-policy/page.tsx +++ b/app/(introduce)/achievements-transformation/government-policy/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/industry-docking/layout.tsx b/app/(introduce)/achievements-transformation/industry-docking/layout.tsx index d7afb19..25e1e60 100644 --- a/app/(introduce)/achievements-transformation/industry-docking/layout.tsx +++ b/app/(introduce)/achievements-transformation/industry-docking/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/industry-docking/page.tsx b/app/(introduce)/achievements-transformation/industry-docking/page.tsx index 30670ed..52c0ba4 100644 --- a/app/(introduce)/achievements-transformation/industry-docking/page.tsx +++ b/app/(introduce)/achievements-transformation/industry-docking/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/intellectual-property-services/layout.tsx b/app/(introduce)/achievements-transformation/intellectual-property-services/layout.tsx index e2aa51e..458217d 100644 --- a/app/(introduce)/achievements-transformation/intellectual-property-services/layout.tsx +++ b/app/(introduce)/achievements-transformation/intellectual-property-services/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/intellectual-property-services/page.tsx b/app/(introduce)/achievements-transformation/intellectual-property-services/page.tsx index 47dd00d..0e8372f 100644 --- a/app/(introduce)/achievements-transformation/intellectual-property-services/page.tsx +++ b/app/(introduce)/achievements-transformation/intellectual-property-services/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/intelligence-services/layout.tsx b/app/(introduce)/achievements-transformation/intelligence-services/layout.tsx index b11a389..e8769a6 100644 --- a/app/(introduce)/achievements-transformation/intelligence-services/layout.tsx +++ b/app/(introduce)/achievements-transformation/intelligence-services/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/intelligence-services/page.tsx b/app/(introduce)/achievements-transformation/intelligence-services/page.tsx index 4419327..14a042a 100644 --- a/app/(introduce)/achievements-transformation/intelligence-services/page.tsx +++ b/app/(introduce)/achievements-transformation/intelligence-services/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/investment-and-financing/layout.tsx b/app/(introduce)/achievements-transformation/investment-and-financing/layout.tsx index f463b48..f0bdfe0 100644 --- a/app/(introduce)/achievements-transformation/investment-and-financing/layout.tsx +++ b/app/(introduce)/achievements-transformation/investment-and-financing/layout.tsx @@ -1,6 +1,6 @@ import React, { ReactNode } from "react"; -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/investment-and-financing/page.tsx b/app/(introduce)/achievements-transformation/investment-and-financing/page.tsx index 4c69218..4faeec0 100644 --- a/app/(introduce)/achievements-transformation/investment-and-financing/page.tsx +++ b/app/(introduce)/achievements-transformation/investment-and-financing/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/layout.tsx b/app/(introduce)/achievements-transformation/layout.tsx index 42c50c4..4e5e266 100644 --- a/app/(introduce)/achievements-transformation/layout.tsx +++ b/app/(introduce)/achievements-transformation/layout.tsx @@ -1,4 +1,4 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; import { ReactNode } from "react"; import { navigations } from "@/app/(introduce)/achievements-transformation/config"; diff --git a/app/(introduce)/achievements-transformation/scientific-research-project-declaration/layout.tsx b/app/(introduce)/achievements-transformation/scientific-research-project-declaration/layout.tsx index e1fcb47..6e98f69 100644 --- a/app/(introduce)/achievements-transformation/scientific-research-project-declaration/layout.tsx +++ b/app/(introduce)/achievements-transformation/scientific-research-project-declaration/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/scientific-research-project-declaration/page.tsx b/app/(introduce)/achievements-transformation/scientific-research-project-declaration/page.tsx index 44f8882..6637b1f 100644 --- a/app/(introduce)/achievements-transformation/scientific-research-project-declaration/page.tsx +++ b/app/(introduce)/achievements-transformation/scientific-research-project-declaration/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/achievements-transformation/technology-assessment/layout.tsx b/app/(introduce)/achievements-transformation/technology-assessment/layout.tsx index a32da9d..a36e0b7 100644 --- a/app/(introduce)/achievements-transformation/technology-assessment/layout.tsx +++ b/app/(introduce)/achievements-transformation/technology-assessment/layout.tsx @@ -1,6 +1,6 @@ -import ArticleWithBreadcrumb from "@/app/components/ArticleWithBreadcrumb"; +import ArticleWithBreadcrumb from "@/app/_components/ArticleWithBreadcrumb"; import { ReactNode } from "react"; -import { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const breadcrumb: BreadcrumbItem[] = [ { title: "首页", href: "/" }, diff --git a/app/(introduce)/achievements-transformation/technology-assessment/page.tsx b/app/(introduce)/achievements-transformation/technology-assessment/page.tsx index fd91450..3289960 100644 --- a/app/(introduce)/achievements-transformation/technology-assessment/page.tsx +++ b/app/(introduce)/achievements-transformation/technology-assessment/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/contact-us/layout.tsx b/app/(introduce)/contact-us/layout.tsx index 1da510b..da282ee 100644 --- a/app/(introduce)/contact-us/layout.tsx +++ b/app/(introduce)/contact-us/layout.tsx @@ -1,6 +1,6 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/layout.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/layout.tsx index d11b692..43b3aa6 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/page.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/page.tsx index 2bc866f..392c9dc 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/page.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/asset-finance/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/general-office/layout.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/general-office/layout.tsx index 50cd2a1..a5ed942 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/general-office/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/general-office/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/general-office/page.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/general-office/page.tsx index 4da0cd8..8e0e11f 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/general-office/page.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/general-office/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/industry/layout.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/industry/layout.tsx index a07ca5d..211428a 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/industry/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/industry/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/industry/page.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/industry/page.tsx index 68acb78..f98fccb 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/industry/page.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/industry/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/personnel/layout.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/personnel/layout.tsx index 2d0d650..136f46e 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/personnel/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/personnel/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/personnel/page.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/personnel/page.tsx index 14d20f1..1889284 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/personnel/page.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/personnel/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/technology/layout.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/technology/layout.tsx index 29d4d0a..898c570 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/technology/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/technology/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(functional-departments)/func-dep/technology/page.tsx b/app/(introduce)/organization/(functional-departments)/func-dep/technology/page.tsx index ff4ee90..e0e8afa 100644 --- a/app/(introduce)/organization/(functional-departments)/func-dep/technology/page.tsx +++ b/app/(introduce)/organization/(functional-departments)/func-dep/technology/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(functional-departments)/layout.tsx b/app/(introduce)/organization/(functional-departments)/layout.tsx index ece03b9..0b5bb72 100644 --- a/app/(introduce)/organization/(functional-departments)/layout.tsx +++ b/app/(introduce)/organization/(functional-departments)/layout.tsx @@ -1,4 +1,4 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; import { ReactNode } from "react"; const navigations = [ diff --git a/app/(introduce)/organization/(generally)/architecture/layout.tsx b/app/(introduce)/organization/(generally)/architecture/layout.tsx index 9f1e5d5..ed41528 100644 --- a/app/(introduce)/organization/(generally)/architecture/layout.tsx +++ b/app/(introduce)/organization/(generally)/architecture/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/architecture/page.tsx b/app/(introduce)/organization/(generally)/architecture/page.tsx index 5f7f466..fe4fe3d 100644 --- a/app/(introduce)/organization/(generally)/architecture/page.tsx +++ b/app/(introduce)/organization/(generally)/architecture/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( @@ -6,7 +6,7 @@ const Page = () => { ); diff --git a/app/(introduce)/organization/(generally)/dean-speech/layout.tsx b/app/(introduce)/organization/(generally)/dean-speech/layout.tsx index ce2a559..20e17a7 100644 --- a/app/(introduce)/organization/(generally)/dean-speech/layout.tsx +++ b/app/(introduce)/organization/(generally)/dean-speech/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/dean-speech/page.tsx b/app/(introduce)/organization/(generally)/dean-speech/page.tsx index 27fd3ba..01fd447 100644 --- a/app/(introduce)/organization/(generally)/dean-speech/page.tsx +++ b/app/(introduce)/organization/(generally)/dean-speech/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(generally)/joint-laboratory/layout.tsx b/app/(introduce)/organization/(generally)/joint-laboratory/layout.tsx index de8aaa5..0ccf2dd 100644 --- a/app/(introduce)/organization/(generally)/joint-laboratory/layout.tsx +++ b/app/(introduce)/organization/(generally)/joint-laboratory/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/joint-laboratory/page.tsx b/app/(introduce)/organization/(generally)/joint-laboratory/page.tsx index 0a904f5..2e05919 100644 --- a/app/(introduce)/organization/(generally)/joint-laboratory/page.tsx +++ b/app/(introduce)/organization/(generally)/joint-laboratory/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(generally)/joint-venture/layout.tsx b/app/(introduce)/organization/(generally)/joint-venture/layout.tsx index 0ea24cf..e673220 100644 --- a/app/(introduce)/organization/(generally)/joint-venture/layout.tsx +++ b/app/(introduce)/organization/(generally)/joint-venture/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/joint-venture/page.tsx b/app/(introduce)/organization/(generally)/joint-venture/page.tsx index a691a9e..656e08f 100644 --- a/app/(introduce)/organization/(generally)/joint-venture/page.tsx +++ b/app/(introduce)/organization/(generally)/joint-venture/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(generally)/layout.tsx b/app/(introduce)/organization/(generally)/layout.tsx index 45f7c13..fe49085 100644 --- a/app/(introduce)/organization/(generally)/layout.tsx +++ b/app/(introduce)/organization/(generally)/layout.tsx @@ -1,4 +1,4 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; import { ReactNode } from "react"; import { navigations } from "@/app/(introduce)/organization/(generally)/config"; diff --git a/app/(introduce)/organization/(generally)/overview/layout.tsx b/app/(introduce)/organization/(generally)/overview/layout.tsx index 7b1e436..8442755 100644 --- a/app/(introduce)/organization/(generally)/overview/layout.tsx +++ b/app/(introduce)/organization/(generally)/overview/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/overview/page.tsx b/app/(introduce)/organization/(generally)/overview/page.tsx index 88efe11..7c358e2 100644 --- a/app/(introduce)/organization/(generally)/overview/page.tsx +++ b/app/(introduce)/organization/(generally)/overview/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(generally)/research-platform/layout.tsx b/app/(introduce)/organization/(generally)/research-platform/layout.tsx index 05d8fa1..b6d2c23 100644 --- a/app/(introduce)/organization/(generally)/research-platform/layout.tsx +++ b/app/(introduce)/organization/(generally)/research-platform/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/research-platform/page.tsx b/app/(introduce)/organization/(generally)/research-platform/page.tsx index 4bc61d8..6a5f1dd 100644 --- a/app/(introduce)/organization/(generally)/research-platform/page.tsx +++ b/app/(introduce)/organization/(generally)/research-platform/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/organization/(generally)/stidc/layout.tsx b/app/(introduce)/organization/(generally)/stidc/layout.tsx index 22b668b..d801b23 100644 --- a/app/(introduce)/organization/(generally)/stidc/layout.tsx +++ b/app/(introduce)/organization/(generally)/stidc/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/organization/(generally)/stidc/page.tsx b/app/(introduce)/organization/(generally)/stidc/page.tsx index 93e02f3..3e2e1ba 100644 --- a/app/(introduce)/organization/(generally)/stidc/page.tsx +++ b/app/(introduce)/organization/(generally)/stidc/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/talents/academician/layout.tsx b/app/(introduce)/talents/academician/layout.tsx index 05d8fa1..b6d2c23 100644 --- a/app/(introduce)/talents/academician/layout.tsx +++ b/app/(introduce)/talents/academician/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/talents/academician/page.tsx b/app/(introduce)/talents/academician/page.tsx index b203efc..b0f63dc 100644 --- a/app/(introduce)/talents/academician/page.tsx +++ b/app/(introduce)/talents/academician/page.tsx @@ -1,5 +1,5 @@ import Image from "next/image"; -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( @@ -8,7 +8,7 @@ const Page = () => {

中科院院士

{"张景中"}

diff --git a/app/(introduce)/talents/layout.tsx b/app/(introduce)/talents/layout.tsx index adc0ddc..db375e6 100644 --- a/app/(introduce)/talents/layout.tsx +++ b/app/(introduce)/talents/layout.tsx @@ -1,4 +1,4 @@ -import ArticleLayout from "@/app/components/ArticleLayout"; +import ArticleLayout from "@/app/_components/ArticleLayout"; import { ReactNode } from "react"; import { navigations } from "@/app/(introduce)/talents/config"; diff --git a/app/(introduce)/talents/overview/layout.tsx b/app/(introduce)/talents/overview/layout.tsx index 05d8fa1..b6d2c23 100644 --- a/app/(introduce)/talents/overview/layout.tsx +++ b/app/(introduce)/talents/overview/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/talents/overview/page.tsx b/app/(introduce)/talents/overview/page.tsx index 9da33ae..c5a2527 100644 --- a/app/(introduce)/talents/overview/page.tsx +++ b/app/(introduce)/talents/overview/page.tsx @@ -1,4 +1,4 @@ -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const Page = () => { return ( diff --git a/app/(introduce)/talents/researcher/layout.tsx b/app/(introduce)/talents/researcher/layout.tsx index 05d8fa1..b6d2c23 100644 --- a/app/(introduce)/talents/researcher/layout.tsx +++ b/app/(introduce)/talents/researcher/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/talents/researcher/page.tsx b/app/(introduce)/talents/researcher/page.tsx index 5652aa0..ec582e5 100644 --- a/app/(introduce)/talents/researcher/page.tsx +++ b/app/(introduce)/talents/researcher/page.tsx @@ -1,6 +1,6 @@ import styles from "./page.module.scss"; import Link from "next/link"; -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const academicians = [ { @@ -59,7 +59,7 @@ const Page = () => { > {academician.name} diff --git a/app/(introduce)/talents/vice-researcher/layout.tsx b/app/(introduce)/talents/vice-researcher/layout.tsx index 05d8fa1..b6d2c23 100644 --- a/app/(introduce)/talents/vice-researcher/layout.tsx +++ b/app/(introduce)/talents/vice-researcher/layout.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb from "@/app/components/Breadcrumb"; +import Breadcrumb from "@/app/_components/Breadcrumb"; const breadcrumb = [ { href: "/", title: "首页" }, diff --git a/app/(introduce)/talents/vice-researcher/page.tsx b/app/(introduce)/talents/vice-researcher/page.tsx index c0ed400..a2584e7 100644 --- a/app/(introduce)/talents/vice-researcher/page.tsx +++ b/app/(introduce)/talents/vice-researcher/page.tsx @@ -1,5 +1,5 @@ import Link from "next/link"; -import ArticleHeading from "@/app/components/ArticleHeading"; +import ArticleHeading from "@/app/_components/ArticleHeading"; const academicians = [ { @@ -28,7 +28,7 @@ const Page = () => { > {academician.name} diff --git a/app/assets/backtop.png b/app/_assets/backtop.png similarity index 100% rename from app/assets/backtop.png rename to app/_assets/backtop.png diff --git a/app/assets/banner.jpg b/app/_assets/banner.jpg similarity index 100% rename from app/assets/banner.jpg rename to app/_assets/banner.jpg diff --git a/app/assets/circle.png b/app/_assets/circle.png similarity index 100% rename from app/assets/circle.png rename to app/_assets/circle.png diff --git a/app/assets/footer.jpg b/app/_assets/footer.jpg similarity index 100% rename from app/assets/footer.jpg rename to app/_assets/footer.jpg diff --git a/app/assets/left-banner.jpg b/app/_assets/left-banner.jpg similarity index 100% rename from app/assets/left-banner.jpg rename to app/_assets/left-banner.jpg diff --git a/app/assets/page.module.css b/app/_assets/page.module.css similarity index 100% rename from app/assets/page.module.css rename to app/_assets/page.module.css diff --git a/app/assets/pin.png b/app/_assets/pin.png similarity index 100% rename from app/assets/pin.png rename to app/_assets/pin.png diff --git a/app/assets/trumpet-icon.png b/app/_assets/trumpet-icon.png similarity index 100% rename from app/assets/trumpet-icon.png rename to app/_assets/trumpet-icon.png diff --git a/app/components/AnhuiSwiper.tsx b/app/_components/AnhuiSwiper.tsx similarity index 66% rename from app/components/AnhuiSwiper.tsx rename to app/_components/AnhuiSwiper.tsx index 521724c..116a5e9 100644 --- a/app/components/AnhuiSwiper.tsx +++ b/app/_components/AnhuiSwiper.tsx @@ -1,5 +1,5 @@ "use client"; -import React, { useEffect } from "react"; +import React, { useEffect, useRef } from "react"; import Swiper from "swiper"; import { Pagination, EffectCoverflow, Autoplay } from "swiper/modules"; @@ -10,12 +10,12 @@ import "swiper/css/pagination"; import "swiper/css/effect-coverflow"; import "swiper/css/autoplay"; -const albums = [ +const data = [ { id: 28, cid: 3, name: "ah9.jpeg", - path: "/uploads/image/20231101/99c2f8c3-aba8-4872-a9b9-dfbcf128c062.jpeg", + path: "api/uploads/image/20231101/99c2f8c3-aba8-4872-a9b9-dfbcf128c062.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/99c2f8c3-aba8-4872-a9b9-dfbcf128c062.jpeg", ext: "jpeg", size: "40KB", @@ -26,7 +26,7 @@ const albums = [ id: 27, cid: 3, name: "ah7.jpeg", - path: "/uploads/image/20231101/aba2a38f-ee62-4730-af7a-5b8933ed7497.jpeg", + path: "api/uploads/image/20231101/aba2a38f-ee62-4730-af7a-5b8933ed7497.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/aba2a38f-ee62-4730-af7a-5b8933ed7497.jpeg", ext: "jpeg", size: "4KB", @@ -37,8 +37,8 @@ const albums = [ id: 26, cid: 3, name: "ah8.jpeg", - path: "/uploads/image/20231101/63523f59-9b59-40d1-a654-c4678f8a1913.jpeg", - uri: `http://localhost:8082/api/uploads/image/20231101/63523f59-9b59-40d1-a654-c4678f8a1913.jpeg`, + path: "api/uploads/image/20231101/63523f59-9b59-40d1-a654-c4678f8a1913.jpeg", + uri: "http://localhost:8082/api/uploads/image/20231101/63523f59-9b59-40d1-a654-c4678f8a1913.jpeg", ext: "jpeg", size: "29KB", createTime: "2023-11-01 10:40:15", @@ -48,8 +48,8 @@ const albums = [ id: 25, cid: 3, name: "ah2.jpeg", - path: "/uploads/image/20231101/5bedf085-841a-48cc-bca2-9c9b2c751b48.jpeg", - uri: `http://localhost:8082/api/uploads/image/20231101/5bedf085-841a-48cc-bca2-9c9b2c751b48.jpeg`, + path: "api/uploads/image/20231101/5bedf085-841a-48cc-bca2-9c9b2c751b48.jpeg", + uri: "http://localhost:8082/api/uploads/image/20231101/5bedf085-841a-48cc-bca2-9c9b2c751b48.jpeg", ext: "jpeg", size: "26KB", createTime: "2023-11-01 10:40:15", @@ -59,7 +59,7 @@ const albums = [ id: 24, cid: 3, name: "ah5.jpeg", - path: "/uploads/image/20231101/2f19a501-89f7-4f78-9487-096a3799736d.jpeg", + path: "api/uploads/image/20231101/2f19a501-89f7-4f78-9487-096a3799736d.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/2f19a501-89f7-4f78-9487-096a3799736d.jpeg", ext: "jpeg", size: "22KB", @@ -70,7 +70,7 @@ const albums = [ id: 23, cid: 3, name: "ah6.jpeg", - path: "/uploads/image/20231101/70f4bea2-77a4-4595-a3a5-5c60711afae6.jpeg", + path: "api/uploads/image/20231101/70f4bea2-77a4-4595-a3a5-5c60711afae6.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/70f4bea2-77a4-4595-a3a5-5c60711afae6.jpeg", ext: "jpeg", size: "22KB", @@ -81,7 +81,7 @@ const albums = [ id: 22, cid: 3, name: "ah3.jpeg", - path: "/uploads/image/20231101/82309b4a-22e8-4b06-8e9d-d2b114ef3aad.jpeg", + path: "api/uploads/image/20231101/82309b4a-22e8-4b06-8e9d-d2b114ef3aad.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/82309b4a-22e8-4b06-8e9d-d2b114ef3aad.jpeg", ext: "jpeg", size: "14KB", @@ -92,7 +92,7 @@ const albums = [ id: 21, cid: 3, name: "ah1.jpeg", - path: "/uploads/image/20231101/5e3a02dc-2c7c-4671-9151-79315a53a3d2.jpeg", + path: "api/uploads/image/20231101/5e3a02dc-2c7c-4671-9151-79315a53a3d2.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/5e3a02dc-2c7c-4671-9151-79315a53a3d2.jpeg", ext: "jpeg", size: "9KB", @@ -103,7 +103,7 @@ const albums = [ id: 20, cid: 3, name: "ah4.jpeg", - path: "/uploads/image/20231101/106409ac-e454-47f2-a383-8ea572718b3d.jpeg", + path: "api/uploads/image/20231101/106409ac-e454-47f2-a383-8ea572718b3d.jpeg", uri: "http://localhost:8082/api/uploads/image/20231101/106409ac-e454-47f2-a383-8ea572718b3d.jpeg", ext: "jpeg", size: "31KB", @@ -111,28 +111,30 @@ const albums = [ updateTime: "2023-11-01 10:40:15", }, ]; - const AnhuiSwiper = () => { + const swiperRef = useRef(null); useEffect(() => { let swiper: Swiper | null = null; - swiper = new Swiper(".swiper", { - modules: [Pagination, EffectCoverflow, Autoplay], - autoplay: { - delay: 2000, - }, - loop: true, - slidesPerView: 3, - effect: "coverflow", - pagination: { - el: ".swiper-pagination", - dynamicBullets: true, - }, - }); + if (swiperRef.current && data) { + swiper = new Swiper(swiperRef.current, { + modules: [Pagination, EffectCoverflow, Autoplay], + autoplay: { + delay: 2000, + }, + loop: true, + slidesPerView: 3, + effect: "coverflow", + pagination: { + el: ".swiper-pagination", + dynamicBullets: true, + }, + }); + } return () => { swiper?.destroy(); swiper = null; }; - }, []); + }, [data]); return (
{ 安徽风采
-
+
- {albums.map((el) => ( + {data.map((el) => (
{""}
diff --git a/app/components/ArticleBlock.tsx b/app/_components/ArticleBlock.tsx similarity index 89% rename from app/components/ArticleBlock.tsx rename to app/_components/ArticleBlock.tsx index 2c53e9d..2acf271 100644 --- a/app/components/ArticleBlock.tsx +++ b/app/_components/ArticleBlock.tsx @@ -1,9 +1,9 @@ import Image from "next/image"; -import trumpetIcon from "@/app/assets/trumpet-icon.png"; -import styles from "@/app/assets/page.module.css"; +import trumpetIcon from "@/app/_assets/trumpet-icon.png"; +import styles from "@/app/_assets/page.module.css"; import Link from "next/link"; -import request from "@/app/lib/request"; -import { listArticles } from "@/app/api/articles"; +import request from "@/app/_lib/request"; +import { listArticles } from "@/app/_services/articles"; import dayjs from "dayjs"; interface ArticleLink { diff --git a/app/components/ArticleHeading.tsx b/app/_components/ArticleHeading.tsx similarity index 100% rename from app/components/ArticleHeading.tsx rename to app/_components/ArticleHeading.tsx diff --git a/app/components/ArticleLayout.tsx b/app/_components/ArticleLayout.tsx similarity index 90% rename from app/components/ArticleLayout.tsx rename to app/_components/ArticleLayout.tsx index 08cca90..fa1b43a 100644 --- a/app/components/ArticleLayout.tsx +++ b/app/_components/ArticleLayout.tsx @@ -1,4 +1,4 @@ -import LeftNav from "@/app/components/LeftNav"; +import LeftNav from "@/app/_components/LeftNav"; import { ReactNode } from "react"; const ArticleLayout = ({ diff --git a/app/components/ArticleList.module.scss b/app/_components/ArticleList.module.scss similarity index 100% rename from app/components/ArticleList.module.scss rename to app/_components/ArticleList.module.scss diff --git a/app/components/ArticleList.tsx b/app/_components/ArticleList.tsx similarity index 90% rename from app/components/ArticleList.tsx rename to app/_components/ArticleList.tsx index 48a8bd6..b47729a 100644 --- a/app/components/ArticleList.tsx +++ b/app/_components/ArticleList.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { listArticles } from "@/app/api/articles"; +import { listArticles } from "@/app/_services/articles"; import styles from "./ArticleList.module.scss"; import Link from "next/link"; -import Pagination from "@/app/components/Pagination"; +import Pagination from "@/app/_components/Pagination"; import dayjs from "dayjs"; const ArticleList = async ({ diff --git a/app/_components/ArticleRender.tsx b/app/_components/ArticleRender.tsx new file mode 100644 index 0000000..3f4c6ae --- /dev/null +++ b/app/_components/ArticleRender.tsx @@ -0,0 +1,46 @@ +import { ArticleDetail } from "@/app/_types/article"; +import Link from "next/link"; +import ArticleHeading from "@/app/_components/ArticleHeading"; + +const ArticleRender = ({ article }: { article: ArticleDetail }) => { + return ( +
+ +
+
+
+ 上一篇 + {article.prev ? ( + + {article.prev.title} + + ) : ( + + 没有了 + + )} +
+
+ 下一篇 + {article.next ? ( + + {article.next.title} + + ) : ( + + 没有了 + + )} +
+
+
+ ); +}; + +export default ArticleRender; diff --git a/app/components/ArticleWithBreadcrumb.tsx b/app/_components/ArticleWithBreadcrumb.tsx similarity index 84% rename from app/components/ArticleWithBreadcrumb.tsx rename to app/_components/ArticleWithBreadcrumb.tsx index 6072b54..1a838ee 100644 --- a/app/components/ArticleWithBreadcrumb.tsx +++ b/app/_components/ArticleWithBreadcrumb.tsx @@ -1,5 +1,5 @@ import React, { ReactNode } from "react"; -import Breadcrumb, { BreadcrumbItem } from "@/app/components/Breadcrumb"; +import Breadcrumb, { BreadcrumbItem } from "@/app/_components/Breadcrumb"; const ArticleWithBreadcrumb = ({ breadcrumb, diff --git a/app/components/BackToTop.tsx b/app/_components/BackToTop.tsx similarity index 93% rename from app/components/BackToTop.tsx rename to app/_components/BackToTop.tsx index 9f10963..3a23d90 100644 --- a/app/components/BackToTop.tsx +++ b/app/_components/BackToTop.tsx @@ -1,5 +1,5 @@ "use client"; -import backTop from "@/app/assets/backtop.png"; +import backTop from "@/app/_assets/backtop.png"; import Image from "next/image"; import { useScroll } from "ahooks"; diff --git a/app/_components/BranchLifeSketch.tsx b/app/_components/BranchLifeSketch.tsx new file mode 100644 index 0000000..c0bdccc --- /dev/null +++ b/app/_components/BranchLifeSketch.tsx @@ -0,0 +1,115 @@ +"use client"; +import styles from "@/app/_assets/page.module.css"; +import Image from "next/image"; +import trumpetIcon from "@/app/_assets/trumpet-icon.png"; +import { articleDetail, listArticles } from "@/app/_services/articles"; +import { htmlToText } from "html-to-text"; +import Link from "next/link"; +import { useEffect, useRef, useState } from "react"; +import { Article, ArticleDetail } from "@/app/_types/article"; +import useSWR from "swr"; +import { axiosClientInstance } from "@/app/_lib/request"; +import { BaseResponse, PageData } from "@/app/_types/base"; +import Swiper from "swiper"; +import { Pagination, Autoplay } from "swiper/modules"; + +// import Swiper and modules styles +import "swiper/css"; +import "swiper/css/pagination"; +import "swiper/css/autoplay"; + +const BranchLifeSketch = () => { + const { data } = useSWR("/article/list?cid=13", (key: string) => + axiosClientInstance.get>>(key), + ); + const swiperRef = useRef(null); + useEffect(() => { + let swiper: Swiper | null = null; + if (swiperRef.current && data) { + swiper = new Swiper(swiperRef.current, { + modules: [Pagination, Autoplay], + loop: true, + slidesPerView: 2, + direction: "vertical", + mousewheel: true, + autoplay: { + delay: 1500, + pauseOnMouseEnter: true, + }, + }); + } + return () => { + swiper?.destroy(); + swiper = null; + }; + }, [data]); + return ( + <> +
+ {"trumpet + 分院生活剪影 +
+
+
+
+ {data?.data.lists?.map((article) => { + return ( +
+ +
+ ); + })} +
+
+
+ + ); +}; + +const ArticleItem = ({ article }: { article: Article }) => { + const { data } = useSWR(`/pc/articleDetail?id=${article.id}`, (key) => + axiosClientInstance.get>(key), + ); + + return ( +
+ + {""} + + +
+ + {article.title} + + +
+ {data?.data.content && + htmlToText(data.data.content, { + selectors: [ + { + selector: "img", + format: "skip", + }, + ], + })} +
+
+
+ ); +}; + +export default BranchLifeSketch; diff --git a/app/components/Breadcrumb.tsx b/app/_components/Breadcrumb.tsx similarity index 100% rename from app/components/Breadcrumb.tsx rename to app/_components/Breadcrumb.tsx diff --git a/app/components/FriendLinks.module.scss b/app/_components/FriendLinks.module.scss similarity index 100% rename from app/components/FriendLinks.module.scss rename to app/_components/FriendLinks.module.scss diff --git a/app/components/FriendLinks.tsx b/app/_components/FriendLinks.tsx similarity index 97% rename from app/components/FriendLinks.tsx rename to app/_components/FriendLinks.tsx index df34c82..30af345 100644 --- a/app/components/FriendLinks.tsx +++ b/app/_components/FriendLinks.tsx @@ -1,6 +1,6 @@ import Image from "next/image"; import Link from "next/link"; -import pin from "@/app/assets/pin.png"; +import pin from "@/app/_assets/pin.png"; import styles from "./FriendLinks.module.scss"; const links = [ diff --git a/app/components/LatestNews.tsx b/app/_components/LatestNews.tsx similarity index 89% rename from app/components/LatestNews.tsx rename to app/_components/LatestNews.tsx index 000017b..60137f5 100644 --- a/app/components/LatestNews.tsx +++ b/app/_components/LatestNews.tsx @@ -1,4 +1,4 @@ -import { articleDetail, listArticles } from "@/app/api/articles"; +import { articleDetail, listArticles } from "@/app/_services/articles"; import Link from "next/link"; import Image from "next/image"; import { htmlToText } from "html-to-text"; @@ -30,7 +30,7 @@ const LatestNews = async () => { > {""} diff --git a/app/components/LeftNav.module.scss b/app/_components/LeftNav.module.scss similarity index 100% rename from app/components/LeftNav.module.scss rename to app/_components/LeftNav.module.scss diff --git a/app/components/LeftNav.tsx b/app/_components/LeftNav.tsx similarity index 96% rename from app/components/LeftNav.tsx rename to app/_components/LeftNav.tsx index 4a7fb6b..600114e 100644 --- a/app/components/LeftNav.tsx +++ b/app/_components/LeftNav.tsx @@ -1,7 +1,7 @@ "use client"; import Image from "next/image"; -import circle from "@/app/assets/circle.png"; +import circle from "@/app/_assets/circle.png"; import styles from "./LeftNav.module.scss"; import Link from "next/link"; import { usePathname } from "next/navigation"; diff --git a/app/components/MainNav.tsx b/app/_components/MainNav.tsx similarity index 100% rename from app/components/MainNav.tsx rename to app/_components/MainNav.tsx diff --git a/app/components/Pagination.tsx b/app/_components/Pagination.tsx similarity index 100% rename from app/components/Pagination.tsx rename to app/_components/Pagination.tsx diff --git a/app/_lib/request.ts b/app/_lib/request.ts new file mode 100644 index 0000000..c6e80d7 --- /dev/null +++ b/app/_lib/request.ts @@ -0,0 +1,25 @@ +import axios from "axios"; + +const axiosInstance = axios.create({ + baseURL: process.env.NEXT_PUBLIC_FRONT_BASE_URL, +}); +const axiosClientInstance = axios.create({ + baseURL: process.env.NEXT_PUBLIC_CLIENT_BASE_URL, +}); +const axiosClientAdminInstance = axios.create({ + baseURL: process.env.NEXT_PUBLIC_CLIENT_ADMIN_BASE_URL, +}); + +axiosInstance.interceptors.response.use((response) => { + return response.data; +}); + +axiosClientInstance.interceptors.response.use((response) => { + return response.data; +}); +axiosClientAdminInstance.interceptors.response.use((response) => { + return response.data; +}); + +export { axiosClientInstance, axiosClientAdminInstance }; +export default axiosInstance; diff --git a/app/api/articles.ts b/app/_services/articles.ts similarity index 78% rename from app/api/articles.ts rename to app/_services/articles.ts index d110e9e..0fa4aeb 100644 --- a/app/api/articles.ts +++ b/app/_services/articles.ts @@ -1,11 +1,11 @@ -import request from "@/app/lib/request"; -import { BaseResponse, PageData } from "@/app/types/base"; +import request from "@/app/_lib/request"; +import { BaseResponse, PageData } from "@/app/_types/base"; import { Article, ArticleDetail, ArticleDetailParams, ArticleListParams, -} from "@/app/types/article"; +} from "@/app/_types/article"; export const listArticles = (params: ArticleListParams) => request diff --git a/app/types/album.ts b/app/_types/album.ts similarity index 100% rename from app/types/album.ts rename to app/_types/album.ts diff --git a/app/types/article.ts b/app/_types/article.ts similarity index 100% rename from app/types/article.ts rename to app/_types/article.ts diff --git a/app/types/base.ts b/app/_types/base.ts similarity index 100% rename from app/types/base.ts rename to app/_types/base.ts diff --git a/app/components/ArticleRender.tsx b/app/components/ArticleRender.tsx deleted file mode 100644 index 666dc46..0000000 --- a/app/components/ArticleRender.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { ArticleDetail } from "@/app/types/article"; -import Link from "next/link"; -import ArticleHeading from "@/app/components/ArticleHeading"; - -const ArticleRender = ({ article }: { article: ArticleDetail }) => { - return ( -
- -
-
-
- 上一篇 - - {article.prev?.title ?? "没有了"} - -
-
- 下一篇 - - {article.next?.title ?? "没有了"} - -
-
-
- ); -}; - -export default ArticleRender; diff --git a/app/components/BranchLifeSketch.tsx b/app/components/BranchLifeSketch.tsx deleted file mode 100644 index ef48aaf..0000000 --- a/app/components/BranchLifeSketch.tsx +++ /dev/null @@ -1,91 +0,0 @@ -import styles from "@/app/assets/page.module.css"; -import Image from "next/image"; -import trumpetIcon from "@/app/assets/trumpet-icon.png"; -import { articleDetail, listArticles } from "@/app/api/articles"; -import { htmlToText } from "html-to-text"; -import Link from "next/link"; -import { useEffect, useState } from "react"; -import { Article } from "@/app/types/article"; - -// TODO: -// const [lists, setLists] = useState([]); -// useEffect(() => { -// listArticles({ cid: "13" }).then((res) => { -// setLists(() => res.lists); -// }); -// }, []); -const BranchLifeSketch = async () => { - const { lists } = await listArticles({ cid: "13" }); - return ( - <> -
- {"trumpet - 分院生活剪影 -
-
- {/*@ts-ignore*/} - - {lists?.map(async (article) => { - const articleInfo = await articleDetail({ - id: `${article.id}`, - }); - const articleText = htmlToText(articleInfo.content, { - selectors: [ - { - selector: "img", - format: "skip", - }, - ], - }); - return ( - // @ts-ignore - -
- - {article.title} - -
- - {article.title} - -
- {articleText} -
-
-
- {/*@ts-ignore*/} -
- ); - })} - {/*@ts-ignore*/} -
-
- - ); -}; - -export default BranchLifeSketch; diff --git a/app/layout.tsx b/app/layout.tsx index e9261a2..6bd6430 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,12 +1,12 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; import "./globals.css"; -import footer from "@/app/assets/footer.jpg"; +import footer from "@/app/_assets/footer.jpg"; import Image from "next/image"; -import banner from "@/app/assets/banner.jpg"; +import banner from "@/app/_assets/banner.jpg"; import { ReactNode } from "react"; -import MainNav from "@/app/components/MainNav"; -import BackToTop from "@/app/components/BackToTop"; +import MainNav from "@/app/_components/MainNav"; +import BackToTop from "@/app/_components/BackToTop"; const inter = Inter({ subsets: ["latin"] }); diff --git a/app/lib/request.ts b/app/lib/request.ts deleted file mode 100644 index a75bd1d..0000000 --- a/app/lib/request.ts +++ /dev/null @@ -1,12 +0,0 @@ -import axios from "axios"; - -const axiosInstance = axios.create({ - // baseURL: "http://localhost:8084/api", - baseURL: process.env.NEXT_PUBLIC_FRONT_BASE_URL, -}); - -axiosInstance.interceptors.response.use((response) => { - return response.data; -}); - -export default axiosInstance; diff --git a/app/page.tsx b/app/page.tsx index cd4fff4..2a20be9 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,11 +1,11 @@ import Image from "next/image"; -import leftBanner from "./assets/left-banner.jpg"; -import ArticleBlock from "@/app/components/ArticleBlock"; +import leftBanner from "@/app/_assets/left-banner.jpg"; +import ArticleBlock from "@/app/_components/ArticleBlock"; import { register } from "swiper/element/bundle"; -import AnhuiSwiper from "@/app/components/AnhuiSwiper"; -import LatestNews from "@/app/components/LatestNews"; -import FriendLinks from "@/app/components/FriendLinks"; -import BranchLifeSketch from "@/app/components/BranchLifeSketch"; +import AnhuiSwiper from "@/app/_components/AnhuiSwiper"; +import LatestNews from "@/app/_components/LatestNews"; +import FriendLinks from "@/app/_components/FriendLinks"; +import BranchLifeSketch from "@/app/_components/BranchLifeSketch"; export default async function Home() { return ( @@ -81,7 +81,9 @@ export default async function Home() { target="_blank" /> -
{/**/}
+
+ +
diff --git a/next.config.js b/next.config.js index 3e24ebf..2cec0c5 100644 --- a/next.config.js +++ b/next.config.js @@ -1,10 +1,16 @@ -/** @type {import('next').NextConfig} */ +/** @type {import("next").NextConfig} */ const nextConfig = { - eslint: { - // Warning: This allows production builds to successfully complete even if - // your project has ESLint errors. - // ignoreDuringBuilds: true, - }, -} + async rewrites() { + return [ + { + source: "/api/:path*", + destination: "http://localhost:8084/api/:path*" + }, { + source: "/admin-api/:path*", + destination: "http://localhost:8082/api/:path*" + }, + ]; + } +}; -module.exports = nextConfig +module.exports = nextConfig; diff --git a/package.json b/package.json index 67bfc2f..db39500 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev", + "dev": "next", "build": "next build", "start": "next start", "lint": "next lint", @@ -14,7 +14,7 @@ "axios": "^1.6.0", "dayjs": "^1.11.10", "html-to-text": "^9.0.5", - "next": "14.0.0", + "next": "14.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "swiper": "^11.0.3", @@ -23,10 +23,10 @@ "devDependencies": { "@types/html-to-text": "^9.0.3", "@types/node": "^20.8.10", - "@types/react": "^18.2.34", + "@types/react": "^18.2.35", "@types/react-dom": "^18.2.14", "autoprefixer": "^10.4.16", - "eslint": "^8.52.0", + "eslint": "^8.53.0", "eslint-config-next": "14.0.0", "postcss": "^8.4.31", "prettier": "^3.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f8407a..68f4dc5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ dependencies: specifier: ^9.0.5 version: 9.0.5 next: - specifier: 14.0.0 - version: 14.0.0(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5) + specifier: 14.0.1 + version: 14.0.1(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5) react: specifier: ^18.2.0 version: 18.2.0 @@ -41,8 +41,8 @@ devDependencies: specifier: ^20.8.10 version: 20.8.10 '@types/react': - specifier: ^18.2.34 - version: 18.2.34 + specifier: ^18.2.35 + version: 18.2.35 '@types/react-dom': specifier: ^18.2.14 version: 18.2.14 @@ -50,11 +50,11 @@ devDependencies: specifier: ^10.4.16 version: 10.4.16(postcss@8.4.31) eslint: - specifier: ^8.52.0 - version: 8.52.0 + specifier: ^8.53.0 + version: 8.53.0 eslint-config-next: specifier: 14.0.0 - version: 14.0.0(eslint@8.52.0)(typescript@5.2.2) + version: 14.0.0(eslint@8.53.0)(typescript@5.2.2) postcss: specifier: ^8.4.31 version: 8.4.31 @@ -92,13 +92,13 @@ packages: dependencies: regenerator-runtime: 0.14.0 - /@eslint-community/eslint-utils@4.4.0(eslint@8.52.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.53.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.52.0 + eslint: 8.53.0 eslint-visitor-keys: 3.4.3 dev: true @@ -107,8 +107,8 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.1.2: - resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} + /@eslint/eslintrc@2.1.3: + resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -124,8 +124,8 @@ packages: - supports-color dev: true - /@eslint/js@8.52.0: - resolution: {integrity: sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==} + /@eslint/js@8.53.0: + resolution: {integrity: sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -179,8 +179,8 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /@next/env@14.0.0: - resolution: {integrity: sha512-cIKhxkfVELB6hFjYsbtEeTus2mwrTC+JissfZYM0n+8Fv+g8ucUfOlm3VEDtwtwydZ0Nuauv3bl0qF82nnCAqA==} + /@next/env@14.0.1: + resolution: {integrity: sha512-Ms8ZswqY65/YfcjrlcIwMPD7Rg/dVjdLapMcSHG26W6O67EJDF435ShW4H4LXi1xKO1oRc97tLXUpx8jpLe86A==} dev: false /@next/eslint-plugin-next@14.0.0: @@ -189,8 +189,8 @@ packages: glob: 7.1.7 dev: true - /@next/swc-darwin-arm64@14.0.0: - resolution: {integrity: sha512-HQKi159jCz4SRsPesVCiNN6tPSAFUkOuSkpJsqYTIlbHLKr1mD6be/J0TvWV6fwJekj81bZV9V/Tgx3C2HO9lA==} + /@next/swc-darwin-arm64@14.0.1: + resolution: {integrity: sha512-JyxnGCS4qT67hdOKQ0CkgFTp+PXub5W1wsGvIq98TNbF3YEIN7iDekYhYsZzc8Ov0pWEsghQt+tANdidITCLaw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -198,8 +198,8 @@ packages: dev: false optional: true - /@next/swc-darwin-x64@14.0.0: - resolution: {integrity: sha512-4YyQLMSaCgX/kgC1jjF3s3xSoBnwHuDhnF6WA1DWNEYRsbOOPWjcYhv8TKhRe2ApdOam+VfQSffC4ZD+X4u1Cg==} + /@next/swc-darwin-x64@14.0.1: + resolution: {integrity: sha512-625Z7bb5AyIzswF9hvfZWa+HTwFZw+Jn3lOBNZB87lUS0iuCYDHqk3ujuHCkiyPtSC0xFBtYDLcrZ11mF/ap3w==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -207,8 +207,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu@14.0.0: - resolution: {integrity: sha512-io7fMkJ28Glj7SH8yvnlD6naIhRDnDxeE55CmpQkj3+uaA2Hko6WGY2pT5SzpQLTnGGnviK85cy8EJ2qsETj/g==} + /@next/swc-linux-arm64-gnu@14.0.1: + resolution: {integrity: sha512-iVpn3KG3DprFXzVHM09kvb//4CNNXBQ9NB/pTm8LO+vnnnaObnzFdS5KM+w1okwa32xH0g8EvZIhoB3fI3mS1g==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -217,8 +217,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl@14.0.0: - resolution: {integrity: sha512-nC2h0l1Jt8LEzyQeSs/BKpXAMe0mnHIMykYALWaeddTqCv5UEN8nGO3BG8JAqW/Y8iutqJsaMe2A9itS0d/r8w==} + /@next/swc-linux-arm64-musl@14.0.1: + resolution: {integrity: sha512-mVsGyMxTLWZXyD5sen6kGOTYVOO67lZjLApIj/JsTEEohDDt1im2nkspzfV5MvhfS7diDw6Rp/xvAQaWZTv1Ww==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -227,8 +227,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu@14.0.0: - resolution: {integrity: sha512-Wf+WjXibJQ7hHXOdNOmSMW5bxeJHVf46Pwb3eLSD2L76NrytQlif9NH7JpHuFlYKCQGfKfgSYYre5rIfmnSwQw==} + /@next/swc-linux-x64-gnu@14.0.1: + resolution: {integrity: sha512-wMqf90uDWN001NqCM/auRl3+qVVeKfjJdT9XW+RMIOf+rhUzadmYJu++tp2y+hUbb6GTRhT+VjQzcgg/QTD9NQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -237,8 +237,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl@14.0.0: - resolution: {integrity: sha512-WTZb2G7B+CTsdigcJVkRxfcAIQj7Lf0ipPNRJ3vlSadU8f0CFGv/ST+sJwF5eSwIe6dxKoX0DG6OljDBaad+rg==} + /@next/swc-linux-x64-musl@14.0.1: + resolution: {integrity: sha512-ol1X1e24w4j4QwdeNjfX0f+Nza25n+ymY0T2frTyalVczUmzkVD7QGgPTZMHfR1aLrO69hBs0G3QBYaj22J5GQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -247,8 +247,8 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc@14.0.0: - resolution: {integrity: sha512-7R8/x6oQODmNpnWVW00rlWX90sIlwluJwcvMT6GXNIBOvEf01t3fBg0AGURNKdTJg2xNuP7TyLchCL7Lh2DTiw==} + /@next/swc-win32-arm64-msvc@14.0.1: + resolution: {integrity: sha512-WEmTEeWs6yRUEnUlahTgvZteh5RJc4sEjCQIodJlZZ5/VJwVP8p2L7l6VhzQhT4h7KvLx/Ed4UViBdne6zpIsw==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -256,8 +256,8 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc@14.0.0: - resolution: {integrity: sha512-RLK1nELvhCnxaWPF07jGU4x3tjbyx2319q43loZELqF0+iJtKutZ+Lk8SVmf/KiJkYBc7Cragadz7hb3uQvz4g==} + /@next/swc-win32-ia32-msvc@14.0.1: + resolution: {integrity: sha512-oFpHphN4ygAgZUKjzga7SoH2VGbEJXZa/KL8bHCAwCjDWle6R1SpiGOdUdA8EJ9YsG1TYWpzY6FTbUA+iAJeww==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -265,8 +265,8 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc@14.0.0: - resolution: {integrity: sha512-g6hLf1SUko+hnnaywQQZzzb3BRecQsoKkF3o/C+F+dOA4w/noVAJngUVkfwF0+2/8FzNznM7ofM6TGZO9svn7w==} + /@next/swc-win32-x64-msvc@14.0.1: + resolution: {integrity: sha512-FFp3nOJ/5qSpeWT0BZQ+YE1pSMk4IMpkME/1DwKBwhg4mJLB9L+6EXuJi4JEwaJdl5iN+UUlmUD3IsR1kx5fAg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -337,11 +337,11 @@ packages: /@types/react-dom@18.2.14: resolution: {integrity: sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==} dependencies: - '@types/react': 18.2.34 + '@types/react': 18.2.35 dev: true - /@types/react@18.2.34: - resolution: {integrity: sha512-U6eW/alrRk37FU/MS2RYMjx0Va2JGIVXELTODaTIYgvWGCV4Y4TfTUzG8DdmpDNIT0Xpj/R7GfyHOJJrDttcvg==} + /@types/react@18.2.35: + resolution: {integrity: sha512-LG3xpFZ++rTndV+/XFyX5vUP7NI9yxyk+MQvBDq+CVs8I9DLSc3Ymwb1Vmw5YDoeNeHN4PDZa3HylMKJYT9PNQ==} dependencies: '@types/prop-types': 15.7.9 '@types/scheduler': 0.16.5 @@ -352,7 +352,7 @@ packages: resolution: {integrity: sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==} dev: true - /@typescript-eslint/parser@6.9.1(eslint@8.52.0)(typescript@5.2.2): + /@typescript-eslint/parser@6.9.1(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -367,7 +367,7 @@ packages: '@typescript-eslint/typescript-estree': 6.9.1(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.9.1 debug: 4.3.4 - eslint: 8.52.0 + eslint: 8.53.0 typescript: 5.2.2 transitivePeerDependencies: - supports-color @@ -601,7 +601,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.22.1 - caniuse-lite: 1.0.30001559 + caniuse-lite: 1.0.30001561 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -661,8 +661,8 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001559 - electron-to-chromium: 1.4.575 + caniuse-lite: 1.0.30001561 + electron-to-chromium: 1.4.576 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) dev: true @@ -692,8 +692,8 @@ packages: engines: {node: '>= 6'} dev: true - /caniuse-lite@1.0.30001559: - resolution: {integrity: sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==} + /caniuse-lite@1.0.30001561: + resolution: {integrity: sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==} /chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} @@ -891,8 +891,8 @@ packages: domhandler: 5.0.3 dev: false - /electron-to-chromium@1.4.575: - resolution: {integrity: sha512-kY2BGyvgAHiX899oF6xLXSIf99bAvvdPhDoJwG77nxCSyWYuRH6e9a9a3gpXBvCs6lj4dQZJkfnW2hdKWHEISg==} + /electron-to-chromium@1.4.576: + resolution: {integrity: sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA==} dev: true /emoji-regex@9.2.2: @@ -1010,7 +1010,7 @@ packages: engines: {node: '>=10'} dev: true - /eslint-config-next@14.0.0(eslint@8.52.0)(typescript@5.2.2): + /eslint-config-next@14.0.0(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-jtXeE+/pGQ3h9n11QyyuPN50kO13GO5XvjU5ZRq6W+XTpOMjyobWmK2s7aowy0FtzA49krJzYzEU9s1RMwoJ6g==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 @@ -1021,14 +1021,14 @@ packages: dependencies: '@next/eslint-plugin-next': 14.0.0 '@rushstack/eslint-patch': 1.5.1 - '@typescript-eslint/parser': 6.9.1(eslint@8.52.0)(typescript@5.2.2) - eslint: 8.52.0 + '@typescript-eslint/parser': 6.9.1(eslint@8.53.0)(typescript@5.2.2) + eslint: 8.53.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.52.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0) - eslint-plugin-jsx-a11y: 6.8.0(eslint@8.52.0) - eslint-plugin-react: 7.33.2(eslint@8.52.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.52.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.53.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0) + eslint-plugin-jsx-a11y: 6.8.0(eslint@8.53.0) + eslint-plugin-react: 7.33.2(eslint@8.53.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.53.0) typescript: 5.2.2 transitivePeerDependencies: - eslint-import-resolver-webpack @@ -1045,7 +1045,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.52.0): + /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.53.0): resolution: {integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -1054,9 +1054,9 @@ packages: dependencies: debug: 4.3.4 enhanced-resolve: 5.15.0 - eslint: 8.52.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0) + eslint: 8.53.0 + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0) fast-glob: 3.3.1 get-tsconfig: 4.7.2 is-core-module: 2.13.1 @@ -1068,7 +1068,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -1089,16 +1089,16 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.9.1(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.9.1(eslint@8.53.0)(typescript@5.2.2) debug: 3.2.7 - eslint: 8.52.0 + eslint: 8.53.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.52.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.0)(eslint@8.53.0) transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0): + /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0): resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} engines: {node: '>=4'} peerDependencies: @@ -1108,16 +1108,16 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.9.1(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.9.1(eslint@8.53.0)(typescript@5.2.2) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.52.0 + eslint: 8.53.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.52.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.9.1)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.53.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -1133,7 +1133,7 @@ packages: - supports-color dev: true - /eslint-plugin-jsx-a11y@6.8.0(eslint@8.52.0): + /eslint-plugin-jsx-a11y@6.8.0(eslint@8.53.0): resolution: {integrity: sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==} engines: {node: '>=4.0'} peerDependencies: @@ -1149,7 +1149,7 @@ packages: damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 es-iterator-helpers: 1.0.15 - eslint: 8.52.0 + eslint: 8.53.0 hasown: 2.0.0 jsx-ast-utils: 3.3.5 language-tags: 1.0.9 @@ -1158,16 +1158,16 @@ packages: object.fromentries: 2.0.7 dev: true - /eslint-plugin-react-hooks@4.6.0(eslint@8.52.0): + /eslint-plugin-react-hooks@4.6.0(eslint@8.53.0): resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: - eslint: 8.52.0 + eslint: 8.53.0 dev: true - /eslint-plugin-react@7.33.2(eslint@8.52.0): + /eslint-plugin-react@7.33.2(eslint@8.53.0): resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} engines: {node: '>=4'} peerDependencies: @@ -1178,7 +1178,7 @@ packages: array.prototype.tosorted: 1.1.2 doctrine: 2.1.0 es-iterator-helpers: 1.0.15 - eslint: 8.52.0 + eslint: 8.53.0 estraverse: 5.3.0 jsx-ast-utils: 3.3.5 minimatch: 3.1.2 @@ -1205,15 +1205,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.52.0: - resolution: {integrity: sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==} + /eslint@8.53.0: + resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.2 - '@eslint/js': 8.52.0 + '@eslint/eslintrc': 2.1.3 + '@eslint/js': 8.53.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -1962,8 +1962,8 @@ packages: thenify-all: 1.6.0 dev: true - /nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -1971,8 +1971,8 @@ packages: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true - /next@14.0.0(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5): - resolution: {integrity: sha512-J0jHKBJpB9zd4+c153sair0sz44mbaCHxggs8ryVXSFBuBqJ8XdE9/ozoV85xGh2VnSjahwntBZZgsihL9QznA==} + /next@14.0.1(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5): + resolution: {integrity: sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -1986,10 +1986,10 @@ packages: sass: optional: true dependencies: - '@next/env': 14.0.0 + '@next/env': 14.0.1 '@swc/helpers': 0.5.2 busboy: 1.6.0 - caniuse-lite: 1.0.30001559 + caniuse-lite: 1.0.30001561 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -1997,15 +1997,15 @@ packages: styled-jsx: 5.1.1(react@18.2.0) watchpack: 2.4.0 optionalDependencies: - '@next/swc-darwin-arm64': 14.0.0 - '@next/swc-darwin-x64': 14.0.0 - '@next/swc-linux-arm64-gnu': 14.0.0 - '@next/swc-linux-arm64-musl': 14.0.0 - '@next/swc-linux-x64-gnu': 14.0.0 - '@next/swc-linux-x64-musl': 14.0.0 - '@next/swc-win32-arm64-msvc': 14.0.0 - '@next/swc-win32-ia32-msvc': 14.0.0 - '@next/swc-win32-x64-msvc': 14.0.0 + '@next/swc-darwin-arm64': 14.0.1 + '@next/swc-darwin-x64': 14.0.1 + '@next/swc-linux-arm64-gnu': 14.0.1 + '@next/swc-linux-arm64-musl': 14.0.1 + '@next/swc-linux-x64-gnu': 14.0.1 + '@next/swc-linux-x64-musl': 14.0.1 + '@next/swc-win32-arm64-msvc': 14.0.1 + '@next/swc-win32-ia32-msvc': 14.0.1 + '@next/swc-win32-x64-msvc': 14.0.1 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -2252,7 +2252,7 @@ packages: resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.6 + nanoid: 3.3.7 picocolors: 1.0.0 source-map-js: 1.0.2