From 749d825bfe135142658e72a328bc149781c2cad9 Mon Sep 17 00:00:00 2001 From: Tristan Yang Date: Tue, 12 Aug 2025 14:16:40 +0800 Subject: [PATCH] chore: updates --- src/components/Version.tsx | 1 - src/routes/callback/GithubCallback.tsx | 10 ++--- src/routes/setting/navs.tsx | 61 +++++++++++++------------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/components/Version.tsx b/src/components/Version.tsx index 3a2fd467..35c94c60 100644 --- a/src/components/Version.tsx +++ b/src/components/Version.tsx @@ -36,7 +36,6 @@ const Version: FC = () => {
  • diff --git a/src/routes/callback/GithubCallback.tsx b/src/routes/callback/GithubCallback.tsx index d035c95c..a8fb173c 100644 --- a/src/routes/callback/GithubCallback.tsx +++ b/src/routes/callback/GithubCallback.tsx @@ -15,22 +15,22 @@ type Props = { const GithubCallback: FC = ({ code, from = "webapp" }) => { const { t } = useTranslation("auth"); const { t: ct } = useTranslation(); - //拿本地存的magic token + //拿本地存的 magic token const magic_token = localStorage.getItem(KEY_LOCAL_MAGIC_TOKEN); const [login, { isLoading, isSuccess, error }] = useLoginMutation(); useEffect(() => { - if (code) { + if (code && !isLoading) { login({ magic_token, code, - type: "github" + type: "github", }); } - }, [code]); + }, [code, isLoading]); useEffect(() => { if (isSuccess) { toast.success(ct("tip.login")); - // 通知widget + // 通知 widget if (from == "widget") { localStorage.setItem("widget", `${new Date().getTime()}`); } diff --git a/src/routes/setting/navs.tsx b/src/routes/setting/navs.tsx index 8e815371..2dd3a893 100644 --- a/src/routes/setting/navs.tsx +++ b/src/routes/setting/navs.tsx @@ -20,7 +20,7 @@ import { shallowEqual } from "react-redux"; const dataManagementNav = { name: "data_management", component: , - admin: true + admin: true, }; const navs = [ { @@ -28,18 +28,18 @@ const navs = [ items: [ { name: "overview", - component: + component: , }, { name: "my_account", - component: + component: , }, { name: "members", component: , - admin: true - } - ] + admin: true, + }, + ], }, { name: "config", @@ -47,52 +47,53 @@ const navs = [ { name: "bot", component: , - admin: true + admin: true, }, { name: "firebase", - component: + component: , }, { name: "agora", - component: + component: , }, { name: "smtp", - component: + component: , }, { name: "login_method", - component: + component: , }, { name: "third_app", - component: + component: , }, { name: "widget", - component: + component: , }, { name: "license", - component: - } + component: , + }, ], - admin: true + admin: true, }, { name: "about", items: [ { name: "api_doc", - component: + component: , + admin: true, }, { name: "version", - component: - } - ] - } + component: , + }, + ], + }, ]; const useNavs = () => { @@ -112,7 +113,7 @@ const useNavs = () => { items: items.filter((item) => { return !item.admin; }), - ...rest + ...rest, }; }); if ( @@ -134,10 +135,10 @@ const useNavs = () => { name, // @ts-ignore title: t(`nav.${name}`), - ...rest + ...rest, }; }), - ...rest + ...rest, }; }); return transformedNavs.filter((nav) => { @@ -145,12 +146,12 @@ const useNavs = () => { return true; } else { // about 特殊处理下 - if (nav.name == "about") { - // 有付费,但是普通用户,则不显示about - return !upgraded; - } else { - return !nav.admin; - } + // if (nav.name == "about") { + // // 有付费,但是普通用户,则不显示 about + // return !upgraded; + // } else { + return !nav.admin; + // } } }); };