From ce02257b0c25bd11a244a910de42615bf3a4f5f2 Mon Sep 17 00:00:00 2001 From: Harlan Sun <1249413181@qq.com> Date: Tue, 19 Sep 2023 09:58:38 +0800 Subject: [PATCH 1/7] fix: ui/ux --- .../icons/general/LinearCalendar.dark.svg | 4 + ...rCalendar.svg => LinearCalendar.light.svg} | 0 packages/icons/icon-generated-as-jsx.js | 7 +- packages/icons/icon-generated-as-url.js | 3 +- .../SiteAdaptor/components/CountDownTimer.tsx | 1 + .../src/SiteAdaptor/components/DatePicker.tsx | 2 +- .../src/SiteAdaptor/components/Footer.tsx | 6 +- pnpm-lock.yaml | 166 +++++++++++------- 8 files changed, 120 insertions(+), 69 deletions(-) create mode 100644 packages/icons/general/LinearCalendar.dark.svg rename packages/icons/general/{LinearCalendar.svg => LinearCalendar.light.svg} (100%) diff --git a/packages/icons/general/LinearCalendar.dark.svg b/packages/icons/general/LinearCalendar.dark.svg new file mode 100644 index 000000000000..b4fec0e7ebcd --- /dev/null +++ b/packages/icons/general/LinearCalendar.dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/icons/general/LinearCalendar.svg b/packages/icons/general/LinearCalendar.light.svg similarity index 100% rename from packages/icons/general/LinearCalendar.svg rename to packages/icons/general/LinearCalendar.light.svg diff --git a/packages/icons/icon-generated-as-jsx.js b/packages/icons/icon-generated-as-jsx.js index 0897586acba6..398439ad75bb 100644 --- a/packages/icons/icon-generated-as-jsx.js +++ b/packages/icons/icon-generated-as-jsx.js @@ -2082,7 +2082,12 @@ export const LeftArrow = /*#__PURE__*/ __createIcon('LeftArrow', [ ]) export const LinearCalendar = /*#__PURE__*/ __createIcon('LinearCalendar', [ { - u: () => new URL('./general/LinearCalendar.svg', import.meta.url), + c: ['dark'], + u: () => new URL('./general/LinearCalendar.dark.svg', import.meta.url), + }, + { + c: ['light'], + u: () => new URL('./general/LinearCalendar.light.svg', import.meta.url), }, ]) export const Link = /*#__PURE__*/ __createIcon('Link', [ diff --git a/packages/icons/icon-generated-as-url.js b/packages/icons/icon-generated-as-url.js index c3636d9154d3..d61b85558b18 100644 --- a/packages/icons/icon-generated-as-url.js +++ b/packages/icons/icon-generated-as-url.js @@ -212,7 +212,8 @@ export function japan_url() { return new URL("./general/Japan.svg", import.meta. export function jpy_url() { return new URL("./general/JPY.svg", import.meta.url) } export function key_square_url() { return new URL("./general/KeySquare.svg", import.meta.url) } export function left_arrow_url() { return new URL("./general/LeftArrow.svg", import.meta.url) } -export function linear_calendar_url() { return new URL("./general/LinearCalendar.svg", import.meta.url) } +export function linear_calendar_dark_url() { return new URL("./general/LinearCalendar.dark.svg", import.meta.url) } +export function linear_calendar_light_url() { return new URL("./general/LinearCalendar.light.svg", import.meta.url) } export function link_url() { return new URL("./general/Link.svg", import.meta.url) } export function link_out_url() { return new URL("./general/LinkOut.svg", import.meta.url) } export function loader_url() { return new URL("./general/Loader.svg", import.meta.url) } diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/CountDownTimer.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/CountDownTimer.tsx index aea2946051e1..ce3e7351c4bc 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/CountDownTimer.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/CountDownTimer.tsx @@ -9,6 +9,7 @@ const useStyles = makeStyles()((theme) => ({ fontWeight: 400, lineHeight: '16px', background: theme.palette.maskColor.bg, + color: theme.palette.maskColor.main, borderRadius: '4px', display: 'flex', alignItems: 'center', diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/DatePicker.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/DatePicker.tsx index 0aa664842f46..5de393384ac2 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/DatePicker.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/DatePicker.tsx @@ -11,7 +11,7 @@ import { Box } from '@mui/system' const useStyles = makeStyles<{ open: boolean }>()((theme, { open }) => ({ container: { - background: theme.palette.maskColor.white, + background: theme.palette.mode === 'dark' ? '#18232E' : theme.palette.maskColor.white, boxShadow: '0px 4px 30px 0px rgba(0, 0, 0, 0.10)', borderRadius: '16px', display: open ? 'flex' : 'none', diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx index 381e369cf346..b2c1a1a6f331 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx @@ -9,7 +9,7 @@ import { useOpenApplicationSettings } from '@masknet/shared' const useStyles = makeStyles()((theme) => ({ container: { display: 'flex', - background: 'rgba(255, 255, 255, 0.80)', + background: theme.palette.mode === 'dark' ? 'rgba(0, 0, 0, 0.80)' : 'rgba(255, 255, 255, 0.80)', backdropFilter: 'blur(10px)', borderRadius: '0 0 12px 12px', position: 'absolute', @@ -31,7 +31,7 @@ const useStyles = makeStyles()((theme) => ({ }, poweredBy: { color: theme.palette.maskColor.second, - fontSize: 14, + fontSize: '14px', fontWeight: 700, lineHeight: '18px', alignItems: 'center', @@ -40,7 +40,7 @@ const useStyles = makeStyles()((theme) => ({ display: 'flex', gap: '8px', color: theme.palette.maskColor.main, - fontSize: '16px', + fontSize: '14px', fontWeight: 700, lineHeight: '20px', alignItems: 'center', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e5b849823a8..3881c30004f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11091,7 +11091,7 @@ packages: resolution: {integrity: sha512-bSoJEKCENtmJrJDECHUe9PiqztIUACuSskyqw9ypqE7Dz3WxL3e8puFsWBkUsz+WOCjXh4B4Xljn88Ucxxv5HA==} engines: {node: '>=12.0.0'} peerDependencies: - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: @@ -11125,7 +11125,7 @@ packages: engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: '@mui/material': @@ -11148,7 +11148,7 @@ packages: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 '@mui/material': ^5.0.0 - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: @@ -11187,7 +11187,7 @@ packages: peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: @@ -11225,7 +11225,7 @@ packages: resolution: {integrity: sha512-I/W0QyTLRdEx6py3lKAquKO/rNF/7j+nIOM/xCyI9kU0fcotVTcTY08mKMsS6vrzdWpi6pAkD0wP0KwWy5R5VA==} engines: {node: '>=12.0.0'} peerDependencies: - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: '@types/react': @@ -11270,7 +11270,7 @@ packages: peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@types/react': 18.2.21 + '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 peerDependenciesMeta: '@emotion/react': @@ -11299,7 +11299,7 @@ packages: /@mui/types@7.2.0(@types/react@18.2.21): resolution: {integrity: sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA==} peerDependencies: - '@types/react': 18.2.21 + '@types/react': '*' peerDependenciesMeta: '@types/react': optional: true @@ -11642,7 +11642,7 @@ packages: resolution: {integrity: sha512-yNYzYN6N2wrcoOcxfNgBP7GLVoewfV7vsg4muVLAJdIBQWnXx+t7d/MEp0n3BYhcxH4MEjm6IZ6jDVzFa3zkJw==} engines: {node: '>= 12'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>= 5' dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) dev: true @@ -12114,7 +12114,7 @@ packages: react-refresh: '>=0.10.0 <1.0.0' sockjs-client: ^1.4.0 type-fest: '>=0.17.0 <4.0.0' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=4.43.0 <6.0.0' webpack-dev-server: 3.x || 4.x webpack-hot-middleware: 2.x webpack-plugin-serve: 0.x || 1.x @@ -12142,7 +12142,7 @@ packages: react-refresh: 0.11.0 schema-utils: 3.3.0 source-map: 0.7.4 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) dev: true /@pmmmwh/react-refresh-webpack-plugin@0.5.11(react-refresh@0.14.0)(webpack-dev-server@4.15.1)(webpack@5.88.0): @@ -12153,7 +12153,7 @@ packages: react-refresh: '>=0.10.0 <1.0.0' sockjs-client: ^1.4.0 type-fest: '>=0.17.0 <5.0.0' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=4.43.0 <6.0.0' webpack-dev-server: 3.x || 4.x webpack-hot-middleware: 2.x webpack-plugin-serve: 0.x || 1.x @@ -13139,7 +13139,7 @@ packages: react-dom: 0.0.0-experimental-0a360642d-20230711(react@0.0.0-experimental-0a360642d-20230711) regenerator-runtime: 0.13.11 ts-dedent: 2.2.0 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) transitivePeerDependencies: - '@storybook/mdx2-csf' - eslint @@ -13571,7 +13571,7 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 typescript: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '*' peerDependenciesMeta: react: optional: true @@ -13612,7 +13612,7 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 typescript: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '*' peerDependenciesMeta: react: optional: true @@ -13819,7 +13819,7 @@ packages: react: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || 0.0.0-experimental-0a360642d-20230711 typescript: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '*' peerDependenciesMeta: '@storybook/builder-webpack5': optional: true @@ -13839,7 +13839,7 @@ packages: react: 0.0.0-experimental-0a360642d-20230711 react-dom: 0.0.0-experimental-0a360642d-20230711(react@0.0.0-experimental-0a360642d-20230711) typescript: 5.3.0-dev.20230830 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) transitivePeerDependencies: - '@storybook/mdx2-csf' - bluebird @@ -14163,7 +14163,7 @@ packages: ts-dedent: 2.2.0 typescript: 5.3.0-dev.20230830 util-deprecate: 1.0.2 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) transitivePeerDependencies: - '@storybook/mdx2-csf' - '@swc/core' @@ -14256,7 +14256,7 @@ packages: ts-dedent: 2.2.0 typescript: 5.3.0-dev.20230830 util-deprecate: 1.0.2 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) transitivePeerDependencies: - '@storybook/mdx2-csf' - '@swc/core' @@ -16429,7 +16429,7 @@ packages: resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==} engines: {node: '>=14.15.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: 5.x.x webpack-cli: 5.x.x dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) @@ -16440,7 +16440,7 @@ packages: resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==} engines: {node: '>=14.15.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: 5.x.x webpack-cli: 5.x.x dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) @@ -16451,7 +16451,7 @@ packages: resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==} engines: {node: '>=14.15.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: 5.x.x webpack-cli: 5.x.x webpack-dev-server: '*' peerDependenciesMeta: @@ -17423,7 +17423,7 @@ packages: engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=2' peerDependenciesMeta: '@babel/core': optional: true @@ -17441,7 +17441,7 @@ packages: engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=2' peerDependenciesMeta: '@babel/core': optional: true @@ -17459,7 +17459,7 @@ packages: engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=2' peerDependenciesMeta: '@babel/core': optional: true @@ -17477,7 +17477,7 @@ packages: engines: {node: '>= 14.15.0'} peerDependencies: '@babel/core': ^7.12.0 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=5' peerDependenciesMeta: '@babel/core': optional: true @@ -17485,7 +17485,7 @@ packages: '@babel/core': 7.22.11 find-cache-dir: 4.0.0 schema-utils: 4.0.0 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) dev: true /babel-plugin-add-react-displayname@0.0.5: @@ -19401,7 +19401,7 @@ packages: resolution: {integrity: sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==} engines: {node: '>= 14.15.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.1.0 dependencies: fast-glob: 3.2.12 glob-parent: 6.0.2 @@ -19470,7 +19470,7 @@ packages: resolution: {integrity: sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw==} engines: {node: '>=v14.21.3'} peerDependencies: - '@types/node': 20.5.7 + '@types/node': '*' cosmiconfig: '>=7' ts-node: '>=10' typescript: '>=4 || 5' @@ -19892,7 +19892,7 @@ packages: resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==} engines: {node: '>= 8.9.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: camelcase: 5.3.1 cssesc: 3.0.0 @@ -19914,7 +19914,7 @@ packages: resolution: {integrity: sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==} engines: {node: '>= 10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.27.0 || ^5.0.0 dependencies: icss-utils: 5.1.0(postcss@8.4.29) loader-utils: 2.0.4 @@ -19933,7 +19933,7 @@ packages: resolution: {integrity: sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==} engines: {node: '>= 12.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.0.0 dependencies: icss-utils: 5.1.0(postcss@8.4.29) postcss: 8.4.29 @@ -20711,7 +20711,7 @@ packages: resolution: {integrity: sha512-pJ/NGZTQxK1VDoyy8fLm0UV3ugOanostztLKUmzqYnUIKqyUm2ZkIpon6No0gWlpOSMoSpBWTnzrx1cdsbpuyw==} engines: {node: '>=16.14.2', npm: '>=8.5.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.20.0 dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) dev: true @@ -22567,7 +22567,7 @@ packages: resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} engines: {node: '>= 10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 @@ -22843,7 +22843,7 @@ packages: eslint: '>= 6' typescript: '>= 2.7 || 5' vue-template-compiler: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>= 4' peerDependenciesMeta: eslint: optional: true @@ -22873,7 +22873,7 @@ packages: eslint: '>= 6' typescript: '>= 2.7 || 5' vue-template-compiler: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>= 4' peerDependenciesMeta: eslint: optional: true @@ -22907,7 +22907,7 @@ packages: eslint: '>= 6' typescript: '>= 2.7 || 5' vue-template-compiler: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>= 4' peerDependenciesMeta: eslint: optional: true @@ -24282,7 +24282,7 @@ packages: resolution: {integrity: sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==} engines: {node: '>=6.9'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: '@types/html-minifier-terser': 5.1.2 '@types/tapable': 1.0.8 @@ -24300,7 +24300,7 @@ packages: resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} engines: {node: '>=10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.20.0 dependencies: '@types/html-minifier-terser': 6.0.0 html-minifier-terser: 6.0.2 @@ -25865,7 +25865,7 @@ packages: resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: - '@types/node': 20.5.7 + '@types/node': '*' ts-node: '>=9.0.0' peerDependenciesMeta: '@types/node': @@ -29869,7 +29869,7 @@ packages: engines: {node: '>= 10.13.0'} peerDependencies: postcss: ^7.0.0 || ^8.0.1 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: cosmiconfig: 7.1.0 klona: 2.0.5 @@ -30737,7 +30737,7 @@ packages: resolution: {integrity: sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==} engines: {node: '>= 10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 @@ -30786,7 +30786,7 @@ packages: resolution: {integrity: sha512-/8OKrPRDTAGDnOkumGvDWixfrNPrRWhEMGLZnJr1NiJtRwdvNRGqGA2J/SeSvWerawqSPxNyXK+EfERCir6mMw==} peerDependencies: typescript: '>= 4.x || 5' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>= 4' peerDependenciesMeta: typescript: optional: true @@ -30799,7 +30799,7 @@ packages: react-docgen-typescript: 2.2.2(typescript@5.3.0-dev.20230830) tslib: 2.6.2 typescript: 5.3.0-dev.20230830 - webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) + webpack: 5.88.0(@swc/core@1.3.81) webpack-sources: 2.3.1 transitivePeerDependencies: - supports-color @@ -30984,7 +30984,7 @@ packages: /react-markdown@8.0.7(@types/react@18.2.21)(react@0.0.0-experimental-0a360642d-20230711): resolution: {integrity: sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==} peerDependencies: - '@types/react': 18.2.21 + '@types/react': '>=16' react: '>=16 || 0.0.0-experimental-0a360642d-20230711' peerDependenciesMeta: react: @@ -32708,7 +32708,7 @@ packages: resolution: {integrity: sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==} engines: {node: '>= 14.15.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.72.1 dependencies: abab: 2.0.6 iconv-lite: 0.6.3 @@ -33341,7 +33341,7 @@ packages: resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==} engines: {node: '>= 8.9.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: loader-utils: 2.0.4 schema-utils: 2.7.1 @@ -33352,7 +33352,7 @@ packages: resolution: {integrity: sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==} engines: {node: '>= 10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 @@ -33363,7 +33363,7 @@ packages: resolution: {integrity: sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==} engines: {node: '>= 12.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.0.0 dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) dev: true @@ -33502,7 +33502,7 @@ packages: resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==} peerDependencies: '@swc/core': ^1.2.147 - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: '>=2' dependencies: '@swc/core': 1.3.81 webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) @@ -33650,7 +33650,7 @@ packages: resolution: {integrity: sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==} engines: {node: '>= 10.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: cacache: 15.3.0 find-cache-dir: 3.3.2 @@ -33673,7 +33673,7 @@ packages: '@swc/core': '*' esbuild: '*' uglify-js: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.1.0 peerDependenciesMeta: '@swc/core': optional: true @@ -34127,7 +34127,7 @@ packages: peerDependencies: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' - '@types/node': 20.5.7 + '@types/node': '*' typescript: '>=2.7 || 5' peerDependenciesMeta: '@swc/core': @@ -34163,7 +34163,7 @@ packages: peerDependencies: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' - '@types/node': 20.5.7 + '@types/node': '*' typescript: '>=2.7 || 5' peerDependenciesMeta: '@swc/core': @@ -34886,7 +34886,7 @@ packages: engines: {node: '>= 10.13.0'} peerDependencies: file-loader: '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 peerDependenciesMeta: file-loader: optional: true @@ -35227,7 +35227,7 @@ packages: engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: - '@types/node': 20.5.7 + '@types/node': '>= 14' less: '*' lightningcss: ^1.21.0 sass: '*' @@ -35807,7 +35807,7 @@ packages: hasBin: true peerDependencies: '@webpack-cli/generators': '*' - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: 5.x.x webpack-bundle-analyzer: '*' webpack-dev-server: '*' peerDependenciesMeta: @@ -35839,7 +35839,7 @@ packages: resolution: {integrity: sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==} engines: {node: '>= 6'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: memory-fs: 0.4.1 mime: 2.6.0 @@ -35853,7 +35853,7 @@ packages: resolution: {integrity: sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==} engines: {node: '>= v10.23.3'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: colorette: 1.4.0 mem: 8.1.1 @@ -35868,7 +35868,7 @@ packages: resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.0.0 || ^5.0.0 dependencies: colorette: 2.0.19 memfs: 3.4.10 @@ -35883,7 +35883,7 @@ packages: engines: {node: '>= 12.13.0'} hasBin: true peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^4.37.0 || ^5.0.0 webpack-cli: '*' peerDependenciesMeta: webpack: @@ -35987,7 +35987,7 @@ packages: resolution: {integrity: sha512-ip7ljKtjRmXKjuLZLo8jzcQjV3nuVPI1U+AUcx6PGJXC/+7apt20wbSVfOKnXDhHhijzP44qe/1qSgR8C+HgZg==} engines: {node: '>=14.17.6'} peerDependencies: - webpack: Jack-Works/webpack#528c91e564d5756e21c9c462b607d913452af770 + webpack: ^5.0.0 dependencies: webpack: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4) dev: true @@ -36044,6 +36044,46 @@ packages: - supports-color dev: true + /webpack@5.88.0(@swc/core@1.3.81): + resolution: {integrity: sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 1.0.1 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) + browserslist: 4.21.10 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.3.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(@swc/core@1.3.81)(webpack@5.88.0) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + dev: true + /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -36710,7 +36750,7 @@ packages: dev: false github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770(@swc/core@1.3.81)(webpack-cli@5.1.4): - resolution: {tarball: https://codeload.github.com/Jack-Works/webpack/tar.gz/528c91e564d5756e21c9c462b607d913452af770} + resolution: {commit: 528c91e564d5756e21c9c462b607d913452af770, repo: git+ssh://git@github.com/Jack-Works/webpack.git, type: git} id: github.com/Jack-Works/webpack/528c91e564d5756e21c9c462b607d913452af770 name: webpack version: 5.88.0 @@ -36754,7 +36794,7 @@ packages: dev: true github.com/locize/html-parse-stringify2/d463109433b2c49c74a081044f54b2a6a1ccad7c: - resolution: {tarball: https://codeload.github.com/locize/html-parse-stringify2/tar.gz/d463109433b2c49c74a081044f54b2a6a1ccad7c} + resolution: {commit: d463109433b2c49c74a081044f54b2a6a1ccad7c, repo: git+ssh://git@github.com/locize/html-parse-stringify2.git, type: git} name: html-parse-stringify2 version: 2.0.1 dependencies: From 5583d05f044900a8ad099e02e4f2ac70afa1fce9 Mon Sep 17 00:00:00 2001 From: Harlan Sun <1249413181@qq.com> Date: Tue, 19 Sep 2023 14:48:05 +0800 Subject: [PATCH 2/7] fix: mf-5291 event tab --- .../src/SiteAdaptor/components/EventList.tsx | 18 ++++++++++-------- .../src/SiteAdaptor/components/Footer.tsx | 6 ++++-- .../src/SiteAdaptor/components/NFTList.tsx | 12 +++++++++--- .../src/SiteAdaptor/components/NewsList.tsx | 9 +++++++-- .../plugins/Calendar/src/locales/en-US.json | 2 +- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx index 838a566023b4..279b40469ee3 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/EventList.tsx @@ -11,7 +11,7 @@ const useStyles = makeStyles()((theme) => ({ flexDirection: 'column', height: '506px', width: '100%', - overflowY: 'auto', + overflow: 'overlay', position: 'relative', gap: '10px', }, @@ -32,10 +32,6 @@ const useStyles = makeStyles()((theme) => ({ padding: '8px 12px', flexDirection: 'column', gap: '8px', - fontWeight: 700, - lineHeight: '16px', - fontSize: '12px', - cursor: 'pointer', }, eventHeader: { display: 'flex', @@ -48,6 +44,12 @@ const useStyles = makeStyles()((theme) => ({ alignItems: 'center', color: theme.palette.maskColor.main, }, + projectName: { + color: theme.palette.maskColor.main, + fontSize: '12px', + fontWeight: 700, + lineHeight: '16px', + }, logo: { width: '24px', height: '24px', @@ -57,7 +59,7 @@ const useStyles = makeStyles()((theme) => ({ fontSize: '14px', fontWeight: 400, lineHeight: '18px', - color: theme.palette.maskColor.main, + color: theme.palette.mode === 'dark' ? theme.palette.maskColor.main : theme.palette.maskColor.second, }, poster: { borderRadius: '8px', @@ -74,7 +76,7 @@ interface EventListProps { } export const formatDate = (date: string) => { - const dateFormat = 'MMM dd, yyyy HH:mm:ss' + const dateFormat = 'MMM dd, yyyy HH:mm' return format(new Date(date), dateFormat) } @@ -99,7 +101,7 @@ export function EventList({ list, isLoading, empty }: EventListProps) {
logo - {v.project.name} + {v.project.name}
{v.event_title} diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx index b2c1a1a6f331..5e12f00b8a4d 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/Footer.tsx @@ -39,8 +39,10 @@ const useStyles = makeStyles()((theme) => ({ calender: { display: 'flex', gap: '8px', + }, + calendarText: { color: theme.palette.maskColor.main, - fontSize: '14px', + fontSize: '16px', fontWeight: 700, lineHeight: '20px', alignItems: 'center', @@ -87,7 +89,7 @@ export function Footer({ provider }: FooterProps) {
- {t.title()} + {t.title()}
{t.powered_by()} diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/NFTList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/NFTList.tsx index 315582bc62f7..da3ae57be5eb 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/NFTList.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/NFTList.tsx @@ -2,9 +2,9 @@ import React from 'react' import { EmptyStatus, LoadingStatus } from '@masknet/shared' import { useI18N } from '../../locales/i18n_generated.js' import { CountdownTimer } from './CountDownTimer.js' -import { formatDate } from './EventList.js' import { makeStyles } from '@masknet/theme' import { Typography } from '@mui/material' +import { formatDate } from './EventList.js' const useStyles = makeStyles()((theme) => ({ container: { @@ -12,7 +12,7 @@ const useStyles = makeStyles()((theme) => ({ flexDirection: 'column', height: '506px', width: '100%', - overflowY: 'auto', + overflow: 'overlay', position: 'relative', gap: '10px', }, @@ -49,6 +49,12 @@ const useStyles = makeStyles()((theme) => ({ alignItems: 'center', color: theme.palette.maskColor.main, }, + projectName: { + color: theme.palette.maskColor.main, + fontSize: '12px', + fontWeight: 700, + lineHeight: '16px', + }, logo: { width: '24px', height: '24px', @@ -101,7 +107,7 @@ export function NFTList({ list, isLoading, empty }: NFTListProps) {
logo - {v.project.name} + {v.project.name}
{v.event_title} diff --git a/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx b/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx index d87669bf06a3..4d58108623db 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/components/NewsList.tsx @@ -10,7 +10,7 @@ const useStyles = makeStyles()((theme) => ({ flexDirection: 'column', height: '506px', width: '100%', - overflowY: 'auto', + overflow: 'overlay', position: 'relative', gap: '10px', }, @@ -46,7 +46,12 @@ const useStyles = makeStyles()((theme) => ({ display: 'flex', gap: 8, alignItems: 'center', + }, + projectName: { color: theme.palette.maskColor.main, + fontSize: '12px', + fontWeight: 700, + lineHeight: '16px', }, logo: { width: '24px', @@ -106,7 +111,7 @@ export function NewsList({ list, isLoading, empty }: NewsListProps) {
logo - {v.project.name} + {v.project.name}
{v.event_type}
diff --git a/packages/plugins/Calendar/src/locales/en-US.json b/packages/plugins/Calendar/src/locales/en-US.json index ec7662e6c4b1..f71356f512ef 100644 --- a/packages/plugins/Calendar/src/locales/en-US.json +++ b/packages/plugins/Calendar/src/locales/en-US.json @@ -8,6 +8,6 @@ "loading": "Loading", "powered_by": "Powered By", "news": "News", - "event": "Event", + "event": "Events", "nfts": "NFTs" } From 482e702e8919b3949643fd0ad48e61b2ec2b34c5 Mon Sep 17 00:00:00 2001 From: Harlan Sun <1249413181@qq.com> Date: Tue, 19 Sep 2023 17:45:07 +0800 Subject: [PATCH 3/7] fix: mf-5282 --- packages/plugins/Calendar/src/hooks/useEventList.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/plugins/Calendar/src/hooks/useEventList.tsx b/packages/plugins/Calendar/src/hooks/useEventList.tsx index 15155027a79e..e1bb4099aa53 100644 --- a/packages/plugins/Calendar/src/hooks/useEventList.tsx +++ b/packages/plugins/Calendar/src/hooks/useEventList.tsx @@ -1,8 +1,10 @@ import { useQuery } from '@tanstack/react-query' import { Calendar } from '@masknet/web3-providers' +import startOfMonth from 'date-fns/startOfMonth' export function useNewsList() { - const date = Math.floor(Date.now() / 1000) + const start = startOfMonth(new Date()) + const date = start.getTime() / 1000 const { data, isLoading } = useQuery( ['newsList', Math.floor(date / 1000)], async () => await Calendar.getNewsList(date), @@ -18,7 +20,8 @@ export function useNewsList() { } export function useEventList() { - const date = Math.floor(Date.now() / 1000) + const start = startOfMonth(new Date()) + const date = start.getTime() / 1000 const { data, isLoading } = useQuery( ['eventList', Math.floor(date / 1000)], async () => await Calendar.getEventList(date), @@ -34,7 +37,8 @@ export function useEventList() { } export function useNFTList() { - const date = Math.floor(Date.now() / 1000) + const start = startOfMonth(new Date()) + const date = start.getTime() / 1000 const { data, isLoading } = useQuery( ['nftList', Math.floor(date / 1000)], async () => await Calendar.getNFTList(date), From 5d880ea8e502da7713cf7032f6c3ed1eb830c732 Mon Sep 17 00:00:00 2001 From: Harlan Sun <1249413181@qq.com> Date: Tue, 19 Sep 2023 22:04:39 +0800 Subject: [PATCH 4/7] fix: mf-5283 --- .../src/SiteAdaptor/CalendarContent.tsx | 21 ++-- .../src/SiteAdaptor/components/DatePicker.tsx | 12 +-- .../src/SiteAdaptor/components/EventList.tsx | 58 +++++++---- .../src/SiteAdaptor/components/NFTList.tsx | 95 ++++++++++++------- .../src/SiteAdaptor/components/NewsList.tsx | 61 ++++++++---- .../Calendar/src/hooks/useEventList.tsx | 31 +++--- .../plugins/Calendar/src/locales/en-US.json | 2 +- packages/web3-providers/src/Calendar/index.ts | 16 ++-- 8 files changed, 190 insertions(+), 106 deletions(-) diff --git a/packages/plugins/Calendar/src/SiteAdaptor/CalendarContent.tsx b/packages/plugins/Calendar/src/SiteAdaptor/CalendarContent.tsx index b56818bcc355..2ce8c57f0d34 100644 --- a/packages/plugins/Calendar/src/SiteAdaptor/CalendarContent.tsx +++ b/packages/plugins/Calendar/src/SiteAdaptor/CalendarContent.tsx @@ -7,8 +7,8 @@ import { Tab } from '@mui/material' import { TabContext, TabPanel } from '@mui/lab' import { DatePickerTab } from './components/DatePickerTab.js' import { useEventList, useNFTList, useNewsList } from '../hooks/useEventList.js' -import { EventList } from './components/EventList.js' import { NewsList } from './components/NewsList.js' +import { EventList } from './components/EventList.js' import { NFTList } from './components/NFTList.js' import { Footer } from './components/Footer.js' import { safeUnreachable } from '@masknet/kit' @@ -46,9 +46,9 @@ export function CalendarContent() { const [selectedDate, setSelectedDate] = useState(new Date()) const [open, setOpen] = useState(false) const t = useI18N() - const { data: eventList, isLoading: eventLoading } = useEventList() - const { data: newsList, isLoading: newsLoading } = useNewsList() - const { data: nftList, isLoading: nftLoading } = useNFTList() + const { data: eventList, isLoading: eventLoading } = useEventList(selectedDate) + const { data: newsList, isLoading: newsLoading } = useNewsList(selectedDate) + const { data: nftList, isLoading: nftLoading } = useNFTList(selectedDate) const list = useMemo(() => { switch (currentTab) { case 'news': @@ -89,20 +89,27 @@ export function CalendarContent() { /> - +