update

2023-11-02 17:24:34 +08:00
parent 593a8a0bc3
commit 2423f8c2e8
8 changed files with 86 additions and 9 deletions
--- a/app/assets/backtop.png
+++ b/app/assets/backtop.png
--- a/app/components/AnhuiSwiper.tsx
+++ b/app/components/AnhuiSwiper.tsx
@ -157,6 +157,7 @@ const AnhuiSwiper = () => {
            >
              <img
                src={`${process.env.NEXT_PUBLIC_ADMIN_BASE_URL}${el.path}`}
+                alt={""}
              />
              {/*@ts-ignore*/}
            </swiper-slide>
--- a/app/components/BackToTop.tsx
+++ b/app/components/BackToTop.tsx
@ -0,0 +1,19 @@
+"use client";
+import backTop from "@/app/assets/backtop.png";
+import Image from "next/image";
+// import { useScroll } from "ahooks";
+
+const BackToTop = () => {
+  // const position = useScroll();
+  return (
+    <div className={`fixed bottom-4 right-10 w-[50px] h-[50px]`}>
+      <Image
+        className={"w-full h-full cursor-pointer"}
+        src={backTop}
+        alt={""}
+      />
+    </div>
+  );
+};
+
+export default BackToTop;
--- a/app/components/BranchLifeSketch.tsx
+++ b/app/components/BranchLifeSketch.tsx
@ -1,15 +1,23 @@
-"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/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<Article[]>([]);
+// useEffect(() => {
+//     listArticles({ cid: "13" }).then((res) => {
+//         setLists(() => res.lists);
+//     });
+// }, []);
 const BranchLifeSketch = async () => {
  const { lists } = await listArticles({ cid: "13" });
  return (
-    <div>
+    <>
      <div
        className={`title-bar text-white flex items-center px-2 font-bold ${styles.articleBlockTitleBar} relative`}
      >
@ -76,7 +84,7 @@ const BranchLifeSketch = async () => {
          {/*@ts-ignore*/}
        </swiper-container>
      </div>
-    </div>
+    </>
  );
 };

--- 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 Link from "next/link";
 import footer from "@/app/assets/footer.jpg";
 import Image from "next/image";
 import banner from "@/app/assets/banner.jpg";
 import { ReactNode } from "react";
 import MainNav from "@/app/components/MainNav";
+import BackToTop from "@/app/components/BackToTop";

 const inter = Inter({ subsets: ["latin"] });

@ -25,6 +25,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
          {children}
          <Image src={footer} alt={"footer"} className={"mt-4"} />
        </main>
+        <BackToTop />
      </body>
    </html>
  );
--- a/app/page.tsx
+++ b/app/page.tsx
@ -81,9 +81,7 @@ export default async function Home() {
            target="_blank"
          />
        </map>
-        <div className={"mt-1"}>
-          <BranchLifeSketch />
-        </div>
+        <div className={"mt-1"}>{/*<BranchLifeSketch />*/}</div>
      </div>
      <div className={"main-content w-[540px]"}>
        <LatestNews />
--- a/package.json
+++ b/package.json
@ -10,6 +10,7 @@
    "format": "prettier --write \"app/**/*.{js,jsx,ts,tsx,json,md}\""
  },
  "dependencies": {
+    "ahooks": "^3.7.8",
    "axios": "^1.6.0",
    "dayjs": "^1.11.10",
    "html-to-text": "^9.0.5",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -5,6 +5,9 @@ settings:
  excludeLinksFromLockfile: false

 dependencies:
+  ahooks:
+    specifier: ^3.7.8
+    version: 3.7.8(react@18.2.0)
  axios:
    specifier: ^1.6.0
    version: 1.6.0
@ -82,7 +85,6 @@ packages:
    engines: {node: '>=6.9.0'}
    dependencies:
      regenerator-runtime: 0.14.0
-    dev: true

  /@eslint-community/eslint-utils@4.4.0(eslint@8.52.0):
    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
@ -308,6 +310,10 @@ packages:
    resolution: {integrity: sha512-ImzcLdHN3+zghCoZcA+vWd/t0GhM10S7lnvSq9YA6lbo4HGK10WIJ7n+NI7mbeVZeUtgrmK5fXM66kZcws1oHA==}
    dev: true

+  /@types/js-cookie@2.2.7:
+    resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==}
+    dev: false
+
  /@types/json5@0.0.29:
    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
    dev: true
@ -421,6 +427,29 @@ packages:
    hasBin: true
    dev: true

+  /ahooks-v3-count@1.0.0:
+    resolution: {integrity: sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ==}
+    dev: false
+
+  /ahooks@3.7.8(react@18.2.0):
+    resolution: {integrity: sha512-e/NMlQWoCjaUtncNFIZk3FG1ImSkV/JhScQSkTqnftakRwdfZWSw6zzoWSG9OMYqPNs2MguDYBUFFC6THelWXA==}
+    engines: {node: '>=8.0.0'}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      '@babel/runtime': 7.23.2
+      '@types/js-cookie': 2.2.7
+      ahooks-v3-count: 1.0.0
+      dayjs: 1.11.10
+      intersection-observer: 0.12.2
+      js-cookie: 2.2.1
+      lodash: 4.17.21
+      react: 18.2.0
+      resize-observer-polyfill: 1.5.1
+      screenfull: 5.2.0
+      tslib: 2.6.2
+    dev: false
+
  /ajv@6.12.6:
    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
    dependencies:
@ -1588,6 +1617,10 @@ packages:
      side-channel: 1.0.4
    dev: true

+  /intersection-observer@0.12.2:
+    resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==}
+    dev: false
+
  /is-array-buffer@3.0.2:
    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
    dependencies:
@ -1768,6 +1801,10 @@ packages:
    hasBin: true
    dev: true

+  /js-cookie@2.2.1:
+    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}
+    dev: false
+
  /js-tokens@4.0.0:
    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}

@ -1855,6 +1892,10 @@ packages:
    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
    dev: true

+  /lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+    dev: false
+
  /loose-envify@1.4.0:
    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
    hasBin: true
@ -2292,7 +2333,6 @@ packages:

  /regenerator-runtime@0.14.0:
    resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}
-    dev: true

  /regexp.prototype.flags@1.5.1:
    resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
@ -2303,6 +2343,10 @@ packages:
      set-function-name: 2.0.1
    dev: true

+  /resize-observer-polyfill@1.5.1:
+    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+    dev: false
+
  /resolve-from@4.0.0:
    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
    engines: {node: '>=4'}
@ -2381,6 +2425,11 @@ packages:
      loose-envify: 1.4.0
    dev: false

+  /screenfull@5.2.0:
+    resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
  /selderee@0.11.0:
    resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
    dependencies: