From 2823d1fabf58359254d5865001fcf052b008fd82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=87=E9=98=B3?= Date: Thu, 29 Jan 2026 20:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=96=87=E7=AB=A0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E7=BB=84=E4=BB=B6=E5=92=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=9C=8B=E5=8F=8B=E5=9C=88=E9=A3=8E=E6=A0=BC=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=A2=9C=E8=89=B2=E5=92=8C=E9=98=B4=E5=BD=B1?= =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=8C=E6=8F=90=E5=8D=87=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/{ => (main)}/article/[id]/page.tsx | 0 .../Comment/components/List/index.scss | 0 .../Comment/components/List/index.tsx | 0 .../article/components/Comment/index.scss | 0 .../article/components/Comment/index.tsx | 0 .../article/components/Copyright/index.tsx | 0 .../article/components/MD/index.scss | 0 .../article/components/MD/index.tsx | 0 .../article/components/Nav/index.scss | 0 .../article/components/Nav/index.tsx | 0 .../article/components/Summary/index.scss | 0 .../article/components/Summary/index.tsx | 0 .../article/components/Tag/index.scss | 0 .../article/components/Tag/index.tsx | 0 .../article/components/UpAndDown/index.tsx | 0 src/app/{ => (main)}/cate/[id]/page.tsx | 0 .../data/components/Archiving/index.tsx | 0 .../components/Archiving/svg/archiving.svg | 0 .../Statis/components/CateStatis/index.tsx | 0 .../Statis/components/CateStatis/svg/cate.svg | 0 .../Statis/components/TagStatus/index.tsx | 0 .../Statis/components/TagStatus/svg/tag.svg | 0 .../data/components/Statis/index.tsx | 0 .../data/components/Statis/svg/article.svg | 0 .../data/components/Statis/svg/cate.svg | 0 .../data/components/Statis/svg/comment.svg | 0 .../data/components/Statis/svg/friend.svg | 0 .../data/components/Statis/svg/statis.svg | 0 src/app/{ => (main)}/data/page.tsx | 0 src/app/{ => (main)}/equipment/page.tsx | 0 src/app/{ => (main)}/fishpond/page.tsx | 0 src/app/{ => (main)}/footprint/page.scss | 0 src/app/{ => (main)}/footprint/page.tsx | 0 .../friend/components/ApplyForAdd/index.tsx | 0 .../friend/components/CopyableText/index.tsx | 0 src/app/{ => (main)}/friend/index.tsx | 0 src/app/{ => (main)}/friend/page.tsx | 0 src/app/(main)/layout.tsx | 12 ++ .../my/component/Calendar/index.scss | 0 .../my/component/Calendar/index.tsx | 0 .../my/component/Character/index.tsx | 0 .../{ => (main)}/my/component/Goals/index.tsx | 0 .../my/component/IconCloud/index.tsx | 0 .../my/component/InfoOne/index.tsx | 0 .../my/component/InfoTwo/index.scss | 0 .../my/component/InfoTwo/index.tsx | 0 .../{ => (main)}/my/component/Map/index.tsx | 0 .../my/component/Project/index.tsx | 0 .../my/component/Technology/index.tsx | 0 src/app/{ => (main)}/my/page.tsx | 0 src/app/{ => (main)}/page.tsx | 0 src/app/{ => (main)}/resume/page.tsx | 0 src/app/{ => (main)}/resume/resume.tsx | 0 src/app/{ => (main)}/tag/[id]/page.tsx | 0 .../tags/components/TagCloudBackground.tsx | 0 .../tags/components/TagItemCard.tsx | 0 .../tags/components/TagsPageClient.tsx | 0 .../tags/components/VirtualizedTagList.tsx | 0 src/app/{ => (main)}/tags/page.tsx | 0 src/app/{ => (main)}/wall/[cate]/page.tsx | 0 .../wall/components/AddWallInfo/index.tsx | 0 .../wall/components/WallMasonry/index.scss | 0 .../wall/components/WallMasonry/index.tsx | 0 src/app/layout.tsx | 22 +--- src/app/record/components/ImageList/index.tsx | 30 +++-- src/app/record/components/RecordCard.tsx | 41 +++---- src/app/record/page.tsx | 104 ++++++++++-------- src/components/Header/index.tsx | 4 +- tailwind.config.ts | 14 ++- 69 files changed, 129 insertions(+), 98 deletions(-) rename src/app/{ => (main)}/article/[id]/page.tsx (100%) rename src/app/{ => (main)}/article/components/Comment/components/List/index.scss (100%) rename src/app/{ => (main)}/article/components/Comment/components/List/index.tsx (100%) rename src/app/{ => (main)}/article/components/Comment/index.scss (100%) rename src/app/{ => (main)}/article/components/Comment/index.tsx (100%) rename src/app/{ => (main)}/article/components/Copyright/index.tsx (100%) rename src/app/{ => (main)}/article/components/MD/index.scss (100%) rename src/app/{ => (main)}/article/components/MD/index.tsx (100%) rename src/app/{ => (main)}/article/components/Nav/index.scss (100%) rename src/app/{ => (main)}/article/components/Nav/index.tsx (100%) rename src/app/{ => (main)}/article/components/Summary/index.scss (100%) rename src/app/{ => (main)}/article/components/Summary/index.tsx (100%) rename src/app/{ => (main)}/article/components/Tag/index.scss (100%) rename src/app/{ => (main)}/article/components/Tag/index.tsx (100%) rename src/app/{ => (main)}/article/components/UpAndDown/index.tsx (100%) rename src/app/{ => (main)}/cate/[id]/page.tsx (100%) rename src/app/{ => (main)}/data/components/Archiving/index.tsx (100%) rename src/app/{ => (main)}/data/components/Archiving/svg/archiving.svg (100%) rename src/app/{ => (main)}/data/components/Statis/components/CateStatis/index.tsx (100%) rename src/app/{ => (main)}/data/components/Statis/components/CateStatis/svg/cate.svg (100%) rename src/app/{ => (main)}/data/components/Statis/components/TagStatus/index.tsx (100%) rename src/app/{ => (main)}/data/components/Statis/components/TagStatus/svg/tag.svg (100%) rename src/app/{ => (main)}/data/components/Statis/index.tsx (100%) rename src/app/{ => (main)}/data/components/Statis/svg/article.svg (100%) rename src/app/{ => (main)}/data/components/Statis/svg/cate.svg (100%) rename src/app/{ => (main)}/data/components/Statis/svg/comment.svg (100%) rename src/app/{ => (main)}/data/components/Statis/svg/friend.svg (100%) rename src/app/{ => (main)}/data/components/Statis/svg/statis.svg (100%) rename src/app/{ => (main)}/data/page.tsx (100%) rename src/app/{ => (main)}/equipment/page.tsx (100%) rename src/app/{ => (main)}/fishpond/page.tsx (100%) rename src/app/{ => (main)}/footprint/page.scss (100%) rename src/app/{ => (main)}/footprint/page.tsx (100%) rename src/app/{ => (main)}/friend/components/ApplyForAdd/index.tsx (100%) rename src/app/{ => (main)}/friend/components/CopyableText/index.tsx (100%) rename src/app/{ => (main)}/friend/index.tsx (100%) rename src/app/{ => (main)}/friend/page.tsx (100%) create mode 100644 src/app/(main)/layout.tsx rename src/app/{ => (main)}/my/component/Calendar/index.scss (100%) rename src/app/{ => (main)}/my/component/Calendar/index.tsx (100%) rename src/app/{ => (main)}/my/component/Character/index.tsx (100%) rename src/app/{ => (main)}/my/component/Goals/index.tsx (100%) rename src/app/{ => (main)}/my/component/IconCloud/index.tsx (100%) rename src/app/{ => (main)}/my/component/InfoOne/index.tsx (100%) rename src/app/{ => (main)}/my/component/InfoTwo/index.scss (100%) rename src/app/{ => (main)}/my/component/InfoTwo/index.tsx (100%) rename src/app/{ => (main)}/my/component/Map/index.tsx (100%) rename src/app/{ => (main)}/my/component/Project/index.tsx (100%) rename src/app/{ => (main)}/my/component/Technology/index.tsx (100%) rename src/app/{ => (main)}/my/page.tsx (100%) rename src/app/{ => (main)}/page.tsx (100%) rename src/app/{ => (main)}/resume/page.tsx (100%) rename src/app/{ => (main)}/resume/resume.tsx (100%) rename src/app/{ => (main)}/tag/[id]/page.tsx (100%) rename src/app/{ => (main)}/tags/components/TagCloudBackground.tsx (100%) rename src/app/{ => (main)}/tags/components/TagItemCard.tsx (100%) rename src/app/{ => (main)}/tags/components/TagsPageClient.tsx (100%) rename src/app/{ => (main)}/tags/components/VirtualizedTagList.tsx (100%) rename src/app/{ => (main)}/tags/page.tsx (100%) rename src/app/{ => (main)}/wall/[cate]/page.tsx (100%) rename src/app/{ => (main)}/wall/components/AddWallInfo/index.tsx (100%) rename src/app/{ => (main)}/wall/components/WallMasonry/index.scss (100%) rename src/app/{ => (main)}/wall/components/WallMasonry/index.tsx (100%) diff --git a/src/app/article/[id]/page.tsx b/src/app/(main)/article/[id]/page.tsx similarity index 100% rename from src/app/article/[id]/page.tsx rename to src/app/(main)/article/[id]/page.tsx diff --git a/src/app/article/components/Comment/components/List/index.scss b/src/app/(main)/article/components/Comment/components/List/index.scss similarity index 100% rename from src/app/article/components/Comment/components/List/index.scss rename to src/app/(main)/article/components/Comment/components/List/index.scss diff --git a/src/app/article/components/Comment/components/List/index.tsx b/src/app/(main)/article/components/Comment/components/List/index.tsx similarity index 100% rename from src/app/article/components/Comment/components/List/index.tsx rename to src/app/(main)/article/components/Comment/components/List/index.tsx diff --git a/src/app/article/components/Comment/index.scss b/src/app/(main)/article/components/Comment/index.scss similarity index 100% rename from src/app/article/components/Comment/index.scss rename to src/app/(main)/article/components/Comment/index.scss diff --git a/src/app/article/components/Comment/index.tsx b/src/app/(main)/article/components/Comment/index.tsx similarity index 100% rename from src/app/article/components/Comment/index.tsx rename to src/app/(main)/article/components/Comment/index.tsx diff --git a/src/app/article/components/Copyright/index.tsx b/src/app/(main)/article/components/Copyright/index.tsx similarity index 100% rename from src/app/article/components/Copyright/index.tsx rename to src/app/(main)/article/components/Copyright/index.tsx diff --git a/src/app/article/components/MD/index.scss b/src/app/(main)/article/components/MD/index.scss similarity index 100% rename from src/app/article/components/MD/index.scss rename to src/app/(main)/article/components/MD/index.scss diff --git a/src/app/article/components/MD/index.tsx b/src/app/(main)/article/components/MD/index.tsx similarity index 100% rename from src/app/article/components/MD/index.tsx rename to src/app/(main)/article/components/MD/index.tsx diff --git a/src/app/article/components/Nav/index.scss b/src/app/(main)/article/components/Nav/index.scss similarity index 100% rename from src/app/article/components/Nav/index.scss rename to src/app/(main)/article/components/Nav/index.scss diff --git a/src/app/article/components/Nav/index.tsx b/src/app/(main)/article/components/Nav/index.tsx similarity index 100% rename from src/app/article/components/Nav/index.tsx rename to src/app/(main)/article/components/Nav/index.tsx diff --git a/src/app/article/components/Summary/index.scss b/src/app/(main)/article/components/Summary/index.scss similarity index 100% rename from src/app/article/components/Summary/index.scss rename to src/app/(main)/article/components/Summary/index.scss diff --git a/src/app/article/components/Summary/index.tsx b/src/app/(main)/article/components/Summary/index.tsx similarity index 100% rename from src/app/article/components/Summary/index.tsx rename to src/app/(main)/article/components/Summary/index.tsx diff --git a/src/app/article/components/Tag/index.scss b/src/app/(main)/article/components/Tag/index.scss similarity index 100% rename from src/app/article/components/Tag/index.scss rename to src/app/(main)/article/components/Tag/index.scss diff --git a/src/app/article/components/Tag/index.tsx b/src/app/(main)/article/components/Tag/index.tsx similarity index 100% rename from src/app/article/components/Tag/index.tsx rename to src/app/(main)/article/components/Tag/index.tsx diff --git a/src/app/article/components/UpAndDown/index.tsx b/src/app/(main)/article/components/UpAndDown/index.tsx similarity index 100% rename from src/app/article/components/UpAndDown/index.tsx rename to src/app/(main)/article/components/UpAndDown/index.tsx diff --git a/src/app/cate/[id]/page.tsx b/src/app/(main)/cate/[id]/page.tsx similarity index 100% rename from src/app/cate/[id]/page.tsx rename to src/app/(main)/cate/[id]/page.tsx diff --git a/src/app/data/components/Archiving/index.tsx b/src/app/(main)/data/components/Archiving/index.tsx similarity index 100% rename from src/app/data/components/Archiving/index.tsx rename to src/app/(main)/data/components/Archiving/index.tsx diff --git a/src/app/data/components/Archiving/svg/archiving.svg b/src/app/(main)/data/components/Archiving/svg/archiving.svg similarity index 100% rename from src/app/data/components/Archiving/svg/archiving.svg rename to src/app/(main)/data/components/Archiving/svg/archiving.svg diff --git a/src/app/data/components/Statis/components/CateStatis/index.tsx b/src/app/(main)/data/components/Statis/components/CateStatis/index.tsx similarity index 100% rename from src/app/data/components/Statis/components/CateStatis/index.tsx rename to src/app/(main)/data/components/Statis/components/CateStatis/index.tsx diff --git a/src/app/data/components/Statis/components/CateStatis/svg/cate.svg b/src/app/(main)/data/components/Statis/components/CateStatis/svg/cate.svg similarity index 100% rename from src/app/data/components/Statis/components/CateStatis/svg/cate.svg rename to src/app/(main)/data/components/Statis/components/CateStatis/svg/cate.svg diff --git a/src/app/data/components/Statis/components/TagStatus/index.tsx b/src/app/(main)/data/components/Statis/components/TagStatus/index.tsx similarity index 100% rename from src/app/data/components/Statis/components/TagStatus/index.tsx rename to src/app/(main)/data/components/Statis/components/TagStatus/index.tsx diff --git a/src/app/data/components/Statis/components/TagStatus/svg/tag.svg b/src/app/(main)/data/components/Statis/components/TagStatus/svg/tag.svg similarity index 100% rename from src/app/data/components/Statis/components/TagStatus/svg/tag.svg rename to src/app/(main)/data/components/Statis/components/TagStatus/svg/tag.svg diff --git a/src/app/data/components/Statis/index.tsx b/src/app/(main)/data/components/Statis/index.tsx similarity index 100% rename from src/app/data/components/Statis/index.tsx rename to src/app/(main)/data/components/Statis/index.tsx diff --git a/src/app/data/components/Statis/svg/article.svg b/src/app/(main)/data/components/Statis/svg/article.svg similarity index 100% rename from src/app/data/components/Statis/svg/article.svg rename to src/app/(main)/data/components/Statis/svg/article.svg diff --git a/src/app/data/components/Statis/svg/cate.svg b/src/app/(main)/data/components/Statis/svg/cate.svg similarity index 100% rename from src/app/data/components/Statis/svg/cate.svg rename to src/app/(main)/data/components/Statis/svg/cate.svg diff --git a/src/app/data/components/Statis/svg/comment.svg b/src/app/(main)/data/components/Statis/svg/comment.svg similarity index 100% rename from src/app/data/components/Statis/svg/comment.svg rename to src/app/(main)/data/components/Statis/svg/comment.svg diff --git a/src/app/data/components/Statis/svg/friend.svg b/src/app/(main)/data/components/Statis/svg/friend.svg similarity index 100% rename from src/app/data/components/Statis/svg/friend.svg rename to src/app/(main)/data/components/Statis/svg/friend.svg diff --git a/src/app/data/components/Statis/svg/statis.svg b/src/app/(main)/data/components/Statis/svg/statis.svg similarity index 100% rename from src/app/data/components/Statis/svg/statis.svg rename to src/app/(main)/data/components/Statis/svg/statis.svg diff --git a/src/app/data/page.tsx b/src/app/(main)/data/page.tsx similarity index 100% rename from src/app/data/page.tsx rename to src/app/(main)/data/page.tsx diff --git a/src/app/equipment/page.tsx b/src/app/(main)/equipment/page.tsx similarity index 100% rename from src/app/equipment/page.tsx rename to src/app/(main)/equipment/page.tsx diff --git a/src/app/fishpond/page.tsx b/src/app/(main)/fishpond/page.tsx similarity index 100% rename from src/app/fishpond/page.tsx rename to src/app/(main)/fishpond/page.tsx diff --git a/src/app/footprint/page.scss b/src/app/(main)/footprint/page.scss similarity index 100% rename from src/app/footprint/page.scss rename to src/app/(main)/footprint/page.scss diff --git a/src/app/footprint/page.tsx b/src/app/(main)/footprint/page.tsx similarity index 100% rename from src/app/footprint/page.tsx rename to src/app/(main)/footprint/page.tsx diff --git a/src/app/friend/components/ApplyForAdd/index.tsx b/src/app/(main)/friend/components/ApplyForAdd/index.tsx similarity index 100% rename from src/app/friend/components/ApplyForAdd/index.tsx rename to src/app/(main)/friend/components/ApplyForAdd/index.tsx diff --git a/src/app/friend/components/CopyableText/index.tsx b/src/app/(main)/friend/components/CopyableText/index.tsx similarity index 100% rename from src/app/friend/components/CopyableText/index.tsx rename to src/app/(main)/friend/components/CopyableText/index.tsx diff --git a/src/app/friend/index.tsx b/src/app/(main)/friend/index.tsx similarity index 100% rename from src/app/friend/index.tsx rename to src/app/(main)/friend/index.tsx diff --git a/src/app/friend/page.tsx b/src/app/(main)/friend/page.tsx similarity index 100% rename from src/app/friend/page.tsx rename to src/app/(main)/friend/page.tsx diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx new file mode 100644 index 0000000..2e75a55 --- /dev/null +++ b/src/app/(main)/layout.tsx @@ -0,0 +1,12 @@ +import Header from '@/components/Header'; +import Footer from '@/components/Footer'; + +export default function MainLayout({ children }: { children: React.ReactNode }) { + return ( + <> +
+
{children}
+