chore: updates
This commit is contained in:
@@ -36,7 +36,6 @@ const Version: FC<Props> = () => {
|
|||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<Button disabled={syncing} onClick={handleSync}>
|
<Button disabled={syncing} onClick={handleSync}>
|
||||||
{" "}
|
|
||||||
{syncing ? <Ring size={18} color="#fff" /> : t("sync")}
|
{syncing ? <Ring size={18} color="#fff" /> : t("sync")}
|
||||||
</Button>
|
</Button>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -15,22 +15,22 @@ type Props = {
|
|||||||
const GithubCallback: FC<Props> = ({ code, from = "webapp" }) => {
|
const GithubCallback: FC<Props> = ({ code, from = "webapp" }) => {
|
||||||
const { t } = useTranslation("auth");
|
const { t } = useTranslation("auth");
|
||||||
const { t: ct } = useTranslation();
|
const { t: ct } = useTranslation();
|
||||||
//拿本地存的magic token
|
//拿本地存的 magic token
|
||||||
const magic_token = localStorage.getItem(KEY_LOCAL_MAGIC_TOKEN);
|
const magic_token = localStorage.getItem(KEY_LOCAL_MAGIC_TOKEN);
|
||||||
const [login, { isLoading, isSuccess, error }] = useLoginMutation();
|
const [login, { isLoading, isSuccess, error }] = useLoginMutation();
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (code) {
|
if (code && !isLoading) {
|
||||||
login({
|
login({
|
||||||
magic_token,
|
magic_token,
|
||||||
code,
|
code,
|
||||||
type: "github"
|
type: "github",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}, [code]);
|
}, [code, isLoading]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isSuccess) {
|
if (isSuccess) {
|
||||||
toast.success(ct("tip.login"));
|
toast.success(ct("tip.login"));
|
||||||
// 通知widget
|
// 通知 widget
|
||||||
if (from == "widget") {
|
if (from == "widget") {
|
||||||
localStorage.setItem("widget", `${new Date().getTime()}`);
|
localStorage.setItem("widget", `${new Date().getTime()}`);
|
||||||
}
|
}
|
||||||
|
|||||||
+31
-30
@@ -20,7 +20,7 @@ import { shallowEqual } from "react-redux";
|
|||||||
const dataManagementNav = {
|
const dataManagementNav = {
|
||||||
name: "data_management",
|
name: "data_management",
|
||||||
component: <DataManagement />,
|
component: <DataManagement />,
|
||||||
admin: true
|
admin: true,
|
||||||
};
|
};
|
||||||
const navs = [
|
const navs = [
|
||||||
{
|
{
|
||||||
@@ -28,18 +28,18 @@ const navs = [
|
|||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
name: "overview",
|
name: "overview",
|
||||||
component: <Overview />
|
component: <Overview />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "my_account",
|
name: "my_account",
|
||||||
component: <MyAccount />
|
component: <MyAccount />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "members",
|
name: "members",
|
||||||
component: <ManageMembers />,
|
component: <ManageMembers />,
|
||||||
admin: true
|
admin: true,
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "config",
|
name: "config",
|
||||||
@@ -47,52 +47,53 @@ const navs = [
|
|||||||
{
|
{
|
||||||
name: "bot",
|
name: "bot",
|
||||||
component: <BotConfig />,
|
component: <BotConfig />,
|
||||||
admin: true
|
admin: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "firebase",
|
name: "firebase",
|
||||||
component: <ConfigFirebase />
|
component: <ConfigFirebase />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "agora",
|
name: "agora",
|
||||||
component: <ConfigAgora />
|
component: <ConfigAgora />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "smtp",
|
name: "smtp",
|
||||||
component: <ConfigSMTP />
|
component: <ConfigSMTP />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "login_method",
|
name: "login_method",
|
||||||
component: <Logins />
|
component: <Logins />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "third_app",
|
name: "third_app",
|
||||||
component: <APIConfig />
|
component: <APIConfig />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "widget",
|
name: "widget",
|
||||||
component: <Widget />
|
component: <Widget />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "license",
|
name: "license",
|
||||||
component: <License />
|
component: <License />,
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
admin: true
|
admin: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "about",
|
name: "about",
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
name: "api_doc",
|
name: "api_doc",
|
||||||
component: <APIDocument />
|
component: <APIDocument />,
|
||||||
|
admin: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "version",
|
name: "version",
|
||||||
component: <Version />
|
component: <Version />,
|
||||||
}
|
},
|
||||||
]
|
],
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const useNavs = () => {
|
const useNavs = () => {
|
||||||
@@ -112,7 +113,7 @@ const useNavs = () => {
|
|||||||
items: items.filter((item) => {
|
items: items.filter((item) => {
|
||||||
return !item.admin;
|
return !item.admin;
|
||||||
}),
|
}),
|
||||||
...rest
|
...rest,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
if (
|
if (
|
||||||
@@ -134,10 +135,10 @@ const useNavs = () => {
|
|||||||
name,
|
name,
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
title: t(`nav.${name}`),
|
title: t(`nav.${name}`),
|
||||||
...rest
|
...rest,
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
...rest
|
...rest,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
return transformedNavs.filter((nav) => {
|
return transformedNavs.filter((nav) => {
|
||||||
@@ -145,12 +146,12 @@ const useNavs = () => {
|
|||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
// about 特殊处理下
|
// about 特殊处理下
|
||||||
if (nav.name == "about") {
|
// if (nav.name == "about") {
|
||||||
// 有付费,但是普通用户,则不显示about
|
// // 有付费,但是普通用户,则不显示 about
|
||||||
return !upgraded;
|
// return !upgraded;
|
||||||
} else {
|
// } else {
|
||||||
return !nav.admin;
|
return !nav.admin;
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user