From 2423f8c2e8df192d5f884b2b52717427e2a52e2d Mon Sep 17 00:00:00 2001 From: quantulr <35954003+quantulr@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:24:34 +0800 Subject: [PATCH] update --- app/assets/backtop.png | Bin 0 -> 1096 bytes app/components/AnhuiSwiper.tsx | 1 + app/components/BackToTop.tsx | 19 ++++++++++ app/components/BranchLifeSketch.tsx | 14 ++++++-- app/layout.tsx | 3 +- app/page.tsx | 4 +-- package.json | 1 + pnpm-lock.yaml | 53 ++++++++++++++++++++++++++-- 8 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 app/assets/backtop.png create mode 100644 app/components/BackToTop.tsx diff --git a/app/assets/backtop.png b/app/assets/backtop.png new file mode 100644 index 0000000000000000000000000000000000000000..aa0ebe4ea731b7c7f11270d39110741a7c311c58 GIT binary patch literal 1096 zcmaJ=Uq}=|99~OGw8$dDglbxYGP?b9dY!v@>E7;LUbSN9krG7i?T+56yR+?%-6}m) z5ELX9QN0Ac)I$$t5=9Ua`4B}=P(j#35JWZLND& zmRFZk6tyzdqNK?l4p!MR^558WW{hm>aiSBqqi&qnTu4a<%0iH`v>up-nlX6v8EmAe zrJK!6C+<}Di#oCxEx<6oH^v7~K(3In|M2&TJWS zVf#>PMjz_a1%qzd4H|us2v`tnz_zZxv3y;K4~v{2@)0oq(Zri;bc<;vIq!>{Vss8;M`YQ2 zKF{Rq807Y_ydVfH7iPoZ5J7~zK^tp+$o6Uq3JUae*L1LnY!E1FSu}uSG>LRB1{!`e?3_6faLk|tOI%!;YP2kEAWfy7~ zxfz7|3sr2(A&k5na)2y@Z5^gi}gkfYL0slZi`K43u`7r4eEH&K)uOoHVQ&kA(SW6(&t$O5w&i)Qgy z;zjl5xkm9={iDx?D>6KRxiGclurT+~Cd2NMsa9_vijWsEo>HWY|L)5> zseFQ~JpJKgsPXdnrTm>M=@A&cu&yGpJ>y@j{JCj`apm}myDcrujqBRgy`LLKp4U!& z|1lZK4!^oqT2={~Pf#UG0^`NLm+8au{S&!!y`Z;i?Qqo-^Jebc2KQITQn~(2W zK6-LYnm!^PsHo}K`mIFSlAM0LyE>W-Rj#hO7k|L_o^`Tssy|FT9Xne3>Fw9*Re$L> jzd!%;^}(4llV8_#QK { > {""} {/*@ts-ignore*/} diff --git a/app/components/BackToTop.tsx b/app/components/BackToTop.tsx new file mode 100644 index 0000000..e1c934b --- /dev/null +++ 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 ( +
+ {""} +
+ ); +}; + +export default BackToTop; diff --git a/app/components/BranchLifeSketch.tsx b/app/components/BranchLifeSketch.tsx index de0fed0..6bb9f8e 100644 --- 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([]); +// useEffect(() => { +// listArticles({ cid: "13" }).then((res) => { +// setLists(() => res.lists); +// }); +// }, []); const BranchLifeSketch = async () => { const { lists } = await listArticles({ cid: "13" }); return ( -
+ <>
@@ -76,7 +84,7 @@ const BranchLifeSketch = async () => { {/*@ts-ignore*/}
-
+ ); }; diff --git a/app/layout.tsx b/app/layout.tsx index b4aa4c7..f6445be 100644 --- 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} {"footer"} + ); diff --git a/app/page.tsx b/app/page.tsx index b4240c7..2d1627a 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -81,9 +81,7 @@ export default async function Home() { target="_blank" /> -
- -
+
{/**/}
diff --git a/package.json b/package.json index d9bc420..d02030e 100644 --- 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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 198ad90..c8c5797 100644 --- 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: