Merge branch 'main' of https://github.com/MetaBubble207/yonote

MetaBubble207 · Apr 3, 2024 · f21fe4f · f21fe4f
2 parents 04d0b25 + b6da486
commit f21fe4f
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.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
diff --git a/public/images/nav/book.svg b/public/images/nav/book.svg
diff --git a/public/images/nav/book_active.svg b/public/images/nav/book_active.svg
diff --git a/public/images/nav/find.svg b/public/images/nav/find.svg
diff --git a/public/images/nav/find_active.svg b/public/images/nav/find_active.svg
diff --git a/public/images/nav/user.svg b/public/images/nav/user.svg
diff --git a/public/images/nav/user_active.svg b/public/images/nav/user_active.svg
diff --git a/src/app/_components/common/Navbar.jsx b/src/app/_components/common/Navbar.jsx
@@ -1,26 +1,24 @@
+"use client"
 import React from 'react';
 import Link from 'next/link';
 
 const Navbar = () => {
     return (
-        <nav>
-            <ul>
-                <li>
-                    <Link href="find">
-                        发现
-                    </Link>
-                </li>
-                <li>
-                    <Link href="subscribe">
-                        订阅
-                    </Link>
-                </li>
-                <li>
-                    <Link href="user">
-                        我的
-                    </Link>
-                </li>
-            </ul>
+        <nav className='flex justify-center'>
+            <div className='flex flex-row justify-center w-65% h-20.8 text-center text-4 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.2'>
+                    <img src={"/images/nav/find.svg"} alt={"find"} className='m-auto mb-1.2 w-9.6 h-9.6'></img>
+                    发现
+                </Link>
+                <Link href="subscribe" className='flex-1 text-[#b5b5b5] font-500 mt-1.2'>
+                    <img src={"/images/nav/book.svg"} alt={"subscribe"} className='m-auto mb-1.2 w-9.6 h-9.6'></img>
+                    订阅
+                </Link>
+                <Link href="user" className='flex-1 text-[#b5b5b5] font-500 mt-1.2'>
+                    <img src={"/images/nav/user.svg"} alt={"use"} className='m-auto mb-1.2 w-9.6 h-9.6'></img>
+                    我的
+                </Link>
+            </div>
         </nav>
     );
 };

diff --git a/src/app/user1/page.tsx b/src/app/user1/page.tsx
@@ -0,0 +1,66 @@
+import Image from "next/image";
+import React from "react";
+
+function User() {
+  return (
+    // 背景颜色
+    <div className="bg-gradient-to-rb from-custom-blue via-custom-teal to-custom-light-blue w-screen h-screen">
+      {/* 顶部 */}
+      {/* 用户信息 */}
+      <div className="pl-4 pt-9">
+        <div className="flex flex-row items-center">
+          {/* 用户头像 */}
+          <Image src="/images/user/avatar.svg" alt="avatar" width={83} height={83} className="my-4 ml-4" />
+          <div className="ml-3 flex-1">
+            <div className="flex align-center">
+              <h1 className="w-10 text-[#252525] text-4.5 font-500 lh-6">芋圆</h1>
+
+              {/* 图标 */}
+              <Image src="/images/user/Group.png" alt="group" width={20} height={20} className="ml-2 w-5 h-5 items-center" />
+            </div>
+            <div className="flex items-center">
+              {/* ID */}
+              <div className="logo flex w-3.5 h-3.5 items-center">
+                <Image src="/images/user/I_logo.svg" alt="group" width={7.44} height={7.44} className="w-1.4775 h-1.86 shrink-0 fill-#666" />
+                <Image src="/images/user/D_logo.svg" alt="group" width={7.44} height={7.44} className="w-1.4775 h-1.86 shrink-0 fill-#666" />
+              </div>
+              <span className="ml-1 w-18 text-[#999] font-Source Han Sans SC text-2.5 font-not-italic font-400 lh-6 items-center">1317wfa2</span>
+            </div>
+
+          </div>
+
+          {/* 编辑资料 */}
+          <div className="w-19.5 h-5 border-rd-4 bg-[#FFF] text-2.5 font-500 lh-6 rounded-xl flex  bg-white pl-2.5 items-center mr-4">
+            <Image src="/images/user/icon_edit.png" alt="icon" width={14} height={14} className="w-4 h-4 mr-1" />
+            <a href="#" className="w-10 text-[#252525] text-2.5 font-500 lh-6">编辑资料</a>
+          </div>
+        </div>
+      </div>
+
+
+      {/* 专栏、小课区域 */}
+      <div className="w-85.75 h-63.75 border-rd-2.5 bg-#FFF ml-4 pl-4 pt-4 mt-6 ">
+        {/* 导航区域 */}
+        <div className="flex">
+          <a href="#" className="w-7 h-14 mr-8 text-[#B5B5B5] font-source-han-sans-sc text-sm font-normal leading-6">专栏</a>
+          <a href="#" className="w-8 h-14 text-gray-900 font-source-han-sans-sc text-base font-medium leading-6 ">小课</a>
+        </div>
+
+        {/* 内容区域 */}
+        <div className="flex w- h-14">
+          <Image src="/images/user/cover.svg" alt="icon" width={14} height={14} className="w-15.5 h-19" />
+          <div>
+            <h2>「心智与阅读」</h2>
+            <p>情绪价值波动，上上签，愤怒，变化，偏执，创造</p>
+          </div>
+        </div>
+      </div>
+
+
+    </div>
+
+  );
+}
+
+
+export default User;