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}
+