From ed62c871567e9c5781f742932b0e0521833cded0 Mon Sep 17 00:00:00 2001 From: Yidadaa Date: Tue, 15 Aug 2023 22:50:42 +0800 Subject: [PATCH] feat: close #2638 hide auth page and use better unauth tips --- app/components/auth.tsx | 9 +++++++++ app/locales/cn.ts | 8 ++++++-- app/locales/en.ts | 8 ++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/components/auth.tsx b/app/components/auth.tsx index de0df454..1ca83dcd 100644 --- a/app/components/auth.tsx +++ b/app/components/auth.tsx @@ -7,6 +7,8 @@ import { useAccessStore } from "../store"; import Locale from "../locales"; import BotIcon from "../icons/bot.svg"; +import { useEffect } from "react"; +import { getClientConfig } from "../config/client"; export function AuthPage() { const navigate = useNavigate(); @@ -14,6 +16,13 @@ export function AuthPage() { const goHome = () => navigate(Path.Home); + useEffect(() => { + if (getClientConfig()?.isApp) { + navigate(Path.Settings); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + return (
diff --git a/app/locales/cn.ts b/app/locales/cn.ts index 3929e09e..19e804b3 100644 --- a/app/locales/cn.ts +++ b/app/locales/cn.ts @@ -1,10 +1,14 @@ +import { getClientConfig } from "../config/client"; import { SubmitKey } from "../store/config"; +const isApp = !!getClientConfig()?.isApp; + const cn = { WIP: "该功能仍在开发中……", Error: { - Unauthorized: - "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者在[设置](/#/settings)页填入你自己的 OpenAI API Key。", + Unauthorized: isApp + ? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。" + : "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者在[设置](/#/settings)页填入你自己的 OpenAI API Key。", }, Auth: { Title: "需要密码", diff --git a/app/locales/en.ts b/app/locales/en.ts index d37149c9..64cdc38b 100644 --- a/app/locales/en.ts +++ b/app/locales/en.ts @@ -1,12 +1,16 @@ +import { getClientConfig } from "../config/client"; import { SubmitKey } from "../store/config"; import { LocaleType } from "./index"; // if you are adding a new translation, please use PartialLocaleType instead of LocaleType + +const isApp = !!getClientConfig()?.isApp; const en: LocaleType = { WIP: "Coming Soon...", Error: { - Unauthorized: - "Unauthorized access, please enter access code in [auth](/#/auth) page.", + Unauthorized: isApp + ? "Invalid API Key, please check it in [Settings](/#/settings) page." + : "Unauthorized access, please enter access code in [auth](/#/auth) page, or enter your OpenAI API Key.", }, Auth: { Title: "Need Access Code",