Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/styles/globals.css

.github/workflows/main.yml

@@ -0,0 +1,23 @@
+name: Sync to Remote Repository
+
+on:
+  push:
+    branches:
+      - main # 或者你的默认分支名称
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source repository
+        uses: actions/checkout@v2
+
+      - name: Push to remote repository
+        uses: ad-m/github-push-action@master # 把 `main` 改成 `master` 或具体的版本号
+        with:
+          github_token: ${{ secrets.GIT_TOKEN }}
+          github_url: ${{ secrets.GIT_REPO_URL}}
+          repository: yonote # 你的远程仓库URL
+          branch: main
+          force: true # 使用 "true" 强制推送（当你想要你的变化覆盖远程仓库时）
+          tags: true # 也推送tags

src/app/_components/common/Navbar.tsx

@@ -0,0 +1,42 @@
+"use client";
+'use strict';
+import React from 'react';
+import Link from 'next/link';
+
+const Navbar = () => {
+    const [currentNaver, setCurrentNaver] = React.useState<number>(1);
+    const Page1 = () => {
+        const [c, setC] = React.useState<undefined>(undefined);
+        return (
+            <div>
+                1
+            </div>)
+    };
+    const Page2 = () => {
+        const [c, setC] = React.useState<undefined>(undefined);
+        return (
+            <div>
+                2
+            </div>)
+    };
+    return (
+        <nav className='flex justify-center'>
+            <div className='flex flex-row justify-center w-61.25 h-13 text-center text-2.5 bg-[#FFF] border-rd-13 shadow-[0px_1px_4px_2px_rgba(0,0,0,0.05)] overflow-hidden'>
+                <Link href="find" className='flex-1 text-[#b5b5b5] font-500 mt-1 '>
+                    <img src={"/images/nav/find.svg"} alt={"find"} className='m-auto w-6 h-6'></img>
+                    <div className='lh-5.5'>发现</div>
+                </Link>
+                <Link href="subscribe" className='flex-1 text-[#b5b5b5] font-500 mt-1'>
+                    <img src={"/images/nav/book.svg"} alt={"subscribe"} className='m-auto w-6 h-6'></img>
+                    <div className='lh-5.5'>订阅</div>
+                </Link>
+                <Link href="user" className='flex-1 text-[#b5b5b5] font-500 mt-1 '>
+                    <img src={"/images/nav/user.svg"} alt={"use"} className='m-auto w-6 h-6'></img>
+                    <div className='lh-5.5'>我的</div>
+                </Link>
+            </div>
+        </nav>
+    );
+};
+
+export default Navbar;

src/app/_components/dialog/dialog.tsx

@@ -0,0 +1,33 @@
+import React from 'react'; // 引入 React
+
+// 定义 GeneralModal 组件，接收 isOpen 和 children 作为 props
+const GeneralModal = ({ isOpen, onClick, children }: { isOpen: boolean, onClick: () => void | null, children: React.ReactNode }) => {
+    // 如果 isOpen 是 false，则不显示模态框，直接返回 null
+    if (!isOpen) {
+        return null;
+    }
+
+    // 定义 modalClass 函数，返回模态框的样式类名字符串
+    const modalClass = (): string => {
+        // 返回样式类名字符串
+        return "w-80 h-80";
+    }
+
+    // 渲染模态框
+    return (
+        <div className="fixed top-0 left-0 w-full h-full flex justify-center items-center bg-white z-101">
+            {/* 模态框 */}
+            <div className={"rounded-3px border border-gray-300 shadow-md relative " + modalClass()}>
+                {/* 返回按钮 */}
+
+                {/* 模态框的内容 */}
+                {children}
+                <div className='w-15 shrink-0 b-1 border-black flex mt-100% ml-80% border-rd-10 justify-center'>
+                    <button onClick={onClick}  className='text-4'>返回</button>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default GeneralModal; // 导出 GeneralModal 组件