From e0cc13094f90120d858b9946e5823a9702203ce9 Mon Sep 17 00:00:00 2001 From: "Apple\\Apple" Date: Sat, 7 Jun 2025 22:50:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=97feat(ui):=20Enhance=20About=20p?= =?UTF-8?q?age=20with=20interactive=20project=20links=20and=20improve=20ex?= =?UTF-8?q?ternal=20link=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Changes:** - Replace React Router `Link` components with native `` tags for external links in About and Footer components - Add clickable links for "NewAPI", "QuantumNous", and "One API v0.5.4" in the About page - Link "NewAPI" to the main project repository (https://github.com/QuantumNous/new-api) - Link "QuantumNous" to the organization page (https://github.com/QuantumNous) - Link "One API v0.5.4" to the specific release page (https://github.com/songquanpeng/one-api/releases/tag/v0.5.4) - Apply consistent styling with primary color theme and hover effects across all links - Add proper security attributes (`rel="noopener noreferrer"`) to all external links **i18n Updates:** - Refactor i18n translation keys to support the new link structure - Split the original copyright string into smaller, reusable translation keys - Add new translation keys: `"© {{currentYear}}"` and `"| 基于"` - Maintain backward compatibility for existing translations **Benefits:** - Improved user experience with direct access to relevant project resources - Better SEO and link accessibility - Consistent visual styling across all external links - Enhanced security for external link navigation - Proper separation of concerns between internal routing and external navigation --- web/src/components/layout/Footer.js | 14 ++++---- web/src/i18n/locales/en.json | 8 +++-- web/src/pages/About/index.js | 53 ++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/web/src/components/layout/Footer.js b/web/src/components/layout/Footer.js index d53ae2ed..b776c216 100644 --- a/web/src/components/layout/Footer.js +++ b/web/src/components/layout/Footer.js @@ -81,14 +81,12 @@ const FooterBar = () => { © {currentYear} {systemName}. {t('版权所有')} - {isDemoSiteMode && ( -
- {t('设计与开发由')} - Douyin FE - & - QuantumNous -
- )} +
+ {t('设计与开发由')} + New API + & + One API +
), [logo, systemName, t, currentYear, isDemoSiteMode]); diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index 29469d14..d9df1088 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -1404,8 +1404,12 @@ "演示站点": "Demo Site", "页面未找到，请检查您的浏览器地址是否正确": "Page not found, please check if your browser address is correct", "New API项目仓库地址：": "New API project repository address: ", - "NewAPI © {{currentYear}} QuantumNous | 基于 One API v0.5.4 © 2023 JustSong。": "NewAPI © {{currentYear}} QuantumNous | Based on One API v0.5.4 © 2023 JustSong.", - "本项目根据MIT许可证授权，需在遵守Apache-2.0协议的前提下使用。": "This project is licensed under the MIT License and must be used in compliance with the Apache-2.0 License.", + "© {{currentYear}}": "© {{currentYear}}", + "| 基于": " | Based on ", + "© 2023 JustSong。": "© 2023 JustSong.", + "本项目根据": "This project is licensed under the ", + "授权，需在遵守": " and must be used in compliance with the ", + "的前提下使用。": ".", "管理员暂时未设置任何关于内容": "The administrator has not set any custom About content yet", "早上好": "Good morning", "中午好": "Good afternoon", diff --git a/web/src/pages/About/index.js b/web/src/pages/About/index.js index 42ac09e0..78de9185 100644 --- a/web/src/pages/About/index.js +++ b/web/src/pages/About/index.js @@ -3,7 +3,6 @@ import { API, showError } from '../../helpers'; import { marked } from 'marked'; import { Empty } from '@douyinfe/semi-ui'; import { IllustrationConstruction, IllustrationConstructionDark } from '@douyinfe/semi-illustrations'; -import { Link } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; const About = () => { @@ -42,14 +41,58 @@ const About = () => {

{t('可在设置页面设置关于内容，支持 HTML & Markdown')}

{t('New API项目仓库地址：')} - + https://github.com/QuantumNous/new-api - +

- {t('NewAPI © {{currentYear}} QuantumNous | 基于 One API v0.5.4 © 2023 JustSong。', { currentYear })} + + NewAPI + {t('© {{currentYear}}', { currentYear })} + QuantumNous + {t('| 基于')} + One API v0.5.4 + {t('© 2023 JustSong。')}

- {t('本项目根据MIT许可证授权，需在遵守Apache-2.0协议的前提下使用。')} + {t('本项目根据')} + + MIT许可证 + + {t('授权，需在遵守')} + + Apache-2.0协议 + + {t('的前提下使用。')}

); From 387721e9078b9cc38c219fdd427965f58475bd23 Mon Sep 17 00:00:00 2001 From: "Apple\\Apple" Date: Sat, 7 Jun 2025 22:55:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=97feat(ui):=20Enhance=20About=20p?= =?UTF-8?q?age=20with=20interactive=20project=20links=20and=20improve=20ex?= =?UTF-8?q?ternal=20link=20handling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/i18n/locales/en.json | 3 ++- web/src/pages/About/index.js | 13 ++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index d9df1088..82625b67 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -1406,7 +1406,8 @@ "New API项目仓库地址：": "New API project repository address: ", "© {{currentYear}}": "© {{currentYear}}", "| 基于": " | Based on ", - "© 2023 JustSong。": "© 2023 JustSong.", + "MIT许可证": "MIT License", + "Apache-2.0协议": "Apache-2.0 License", "本项目根据": "This project is licensed under the ", "授权，需在遵守": " and must be used in compliance with the ", "的前提下使用。": ".", diff --git a/web/src/pages/About/index.js b/web/src/pages/About/index.js index 78de9185..78a77163 100644 --- a/web/src/pages/About/index.js +++ b/web/src/pages/About/index.js @@ -71,7 +71,14 @@ const About = () => { className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" > One API v0.5.4 - {t('© 2023 JustSong。')} + © 2023 + JustSong +

{t('本项目根据')} @@ -81,7 +88,7 @@ const About = () => { rel="noopener noreferrer" className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" > - MIT许可证 + {t('MIT许可证')} {t('授权，需在遵守')} { rel="noopener noreferrer" className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" > - Apache-2.0协议 + {t('Apache-2.0协议')} {t('的前提下使用。')}

From 33014e93992b406c74a900c161dd121fadff512e Mon Sep 17 00:00:00 2001 From: "Apple\\Apple" Date: Sat, 7 Jun 2025 23:15:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=97feat(ui):=20Standardize=20link?= =?UTF-8?q?=20colors=20and=20update=20documentation=20URL=20in=20EditChann?= =?UTF-8?q?el=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Changes:** - Unify link color styling across EditChannel.js by replacing `text-blue-500` with consistent primary color scheme - Apply `!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors` to all template fill and documentation links - Update documentation URL from Calcium-Ion repository to QuantumNous repository - Add smooth hover transitions and consistent visual feedback for all clickable links **Affected Elements:** - Model mapping template fill link - Deployment region template fill link - Channel settings template fill link - Channel settings documentation link - Status code mapping template fill link **Benefits:** - Consistent visual design language across the entire application - Improved user experience with unified link styling - Better accessibility with clear hover states and transitions - Correct documentation references pointing to the current project repository **Technical Details:** - Maintains existing functionality while improving visual consistency - Links now match the color scheme used in About page and Footer components - Smooth color transitions enhance user interaction feedback --- web/src/components/layout/Footer.js | 28 ++++++++++++++-------------- web/src/pages/About/index.js | 14 +++++++------- web/src/pages/Channel/EditChannel.js | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/web/src/components/layout/Footer.js b/web/src/components/layout/Footer.js index b776c216..4f44c1dc 100644 --- a/web/src/components/layout/Footer.js +++ b/web/src/components/layout/Footer.js @@ -40,36 +40,36 @@ const FooterBar = () => {

{t('关于我们')}

- {t('关于项目')} - {t('联系我们')} - {t('功能特性')} + {t('关于项目')} + {t('联系我们')} + {t('功能特性')}

{t('文档')}

- {t('快速开始')} - {t('安装指南')} - {t('API 文档')} + {t('快速开始')} + {t('安装指南')} + {t('API 文档')}

{t('相关项目')}

- One API - Midjourney-Proxy - chatnio - neko-api-key-tool + One API + Midjourney-Proxy + chatnio + neko-api-key-tool

{t('基于New API的项目')}

- new-api-horizon - {/* VoAPI */} + new-api-horizon + {/* VoAPI */}
@@ -83,9 +83,9 @@ const FooterBar = () => {
{t('设计与开发由')} - New API + New API & - One API + One API
diff --git a/web/src/pages/About/index.js b/web/src/pages/About/index.js index 78a77163..3259449e 100644 --- a/web/src/pages/About/index.js +++ b/web/src/pages/About/index.js @@ -45,7 +45,7 @@ const About = () => { href='https://github.com/QuantumNous/new-api' target="_blank" rel="noopener noreferrer" - className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" + className="!text-semi-color-primary" > https://github.com/QuantumNous/new-api @@ -54,28 +54,28 @@ const About = () => { href="https://github.com/QuantumNous/new-api" target="_blank" rel="noopener noreferrer" - className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" + className="!text-semi-color-primary" > NewAPI {t('© {{currentYear}}', { currentYear })} QuantumNous {t('| 基于')} One API v0.5.4 © 2023 JustSong @@ -86,7 +86,7 @@ const About = () => { href="https://github.com/songquanpeng/one-api/blob/v0.5.4/LICENSE" target="_blank" rel="noopener noreferrer" - className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" + className="!text-semi-color-primary" > {t('MIT许可证')} @@ -95,7 +95,7 @@ const About = () => { href="https://github.com/QuantumNous/new-api/blob/main/LICENSE" target="_blank" rel="noopener noreferrer" - className="!text-semi-color-primary hover:!text-semi-color-primary-hover transition-colors" + className="!text-semi-color-primary" > {t('Apache-2.0协议')} diff --git a/web/src/pages/Channel/EditChannel.js b/web/src/pages/Channel/EditChannel.js index feed8beb..04dc284b 100644 --- a/web/src/pages/Channel/EditChannel.js +++ b/web/src/pages/Channel/EditChannel.js @@ -846,7 +846,7 @@ const EditChannel = (props) => { className="!rounded-lg font-mono" /> handleInputChange('model_mapping', JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2))} > {t('填入模板')} @@ -940,7 +940,7 @@ const EditChannel = (props) => { className="!rounded-lg font-mono" /> handleInputChange('other', JSON.stringify(REGION_EXAMPLE, null, 2))} > {t('填入模板')} @@ -1062,7 +1062,7 @@ const EditChannel = (props) => { />
{ handleInputChange( 'setting', @@ -1073,10 +1073,10 @@ const EditChannel = (props) => { {t('填入模板')} { window.open( - 'https://github.com/Calcium-Ion/new-api/blob/main/docs/channel/other_setting.md', + 'https://github.com/QuantumNous/new-api/blob/main/docs/channel/other_setting.md', ); }} > @@ -1146,7 +1146,7 @@ const EditChannel = (props) => { className="!rounded-lg font-mono" /> { handleInputChange( 'status_code_mapping', From 6e7249cf0655c8c869e2c240ca47a1ff26c6f5f4 Mon Sep 17 00:00:00 2001 From: "Apple\\Apple" Date: Sat, 7 Jun 2025 23:22:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8feat(ui):=20Improve=20Chat=20pa?= =?UTF-8?q?ge=20UI=20and=20add=20i18n=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace Banner with full-screen Spin component for better loading UX - Add English translation for "正在跳转..." ("Redirecting...") - Integrate i18next translation hook in Chat page component - Remove unused useEffect import for cleaner code The Chat page now shows a centered full-screen loading spinner instead of a banner when redirecting, providing a more consistent and professional user experience. The loading text is now properly internationalized and will display "Redirecting..." in English and "正在跳转..." in Chinese. --- web/src/i18n/locales/en.json | 1 + web/src/pages/Chat/index.js | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json index 82625b67..a3a05acd 100644 --- a/web/src/i18n/locales/en.json +++ b/web/src/i18n/locales/en.json @@ -1536,6 +1536,7 @@ "关闭公告": "Close Notice", "搜索条件": "Search Conditions", "加载中...": "Loading...", + "正在跳转...": "Redirecting...", "暂无公告": "No Notice", "操练场": "Playground", "欢迎使用，请完成以下设置以开始使用系统": "Welcome to use, please complete the following settings to start using the system", diff --git a/web/src/pages/Chat/index.js b/web/src/pages/Chat/index.js index bd4e19a1..22c5c1e2 100644 --- a/web/src/pages/Chat/index.js +++ b/web/src/pages/Chat/index.js @@ -1,9 +1,11 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import { useTokenKeys } from '../../hooks/useTokenKeys'; -import { Banner, Layout } from '@douyinfe/semi-ui'; +import { Spin } from '@douyinfe/semi-ui'; import { useParams } from 'react-router-dom'; +import { useTranslation } from 'react-i18next'; const ChatPage = () => { + const { t } = useTranslation(); const { id } = useParams(); const { keys, serverAddress, isLoading } = useTokenKeys(id); @@ -40,12 +42,17 @@ const ChatPage = () => { allow='camera;microphone' /> ) : ( -
- - - - - +
+
+ + + {t('正在跳转...')} + +
); }; From 7e9bd35ac77cb9fa54af7bbf014d9b07f3621c6c Mon Sep 17 00:00:00 2001 From: "Apple\\Apple" Date: Sun, 8 Jun 2025 00:07:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(auth):=20repl?= =?UTF-8?q?ace=20custom=20loading=20UI=20with=20shared=20Loading=20compone?= =?UTF-8?q?nt=20and=20add=20i18n=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace inline loading UI in OAuth2Callback with shared Loading component - Add internationalization support using useTranslation hook - Translate all hardcoded Chinese strings to support multiple languages - Remove unused processing state variable - Maintain consistent loading experience across the application - Support dynamic text content for retry attempts with parameter interpolation --- web/src/components/auth/OAuth2Callback.js | 33 +++++++++-------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/web/src/components/auth/OAuth2Callback.js b/web/src/components/auth/OAuth2Callback.js index 83f9db46..6d0bbe70 100644 --- a/web/src/components/auth/OAuth2Callback.js +++ b/web/src/components/auth/OAuth2Callback.js @@ -1,15 +1,16 @@ import React, { useContext, useEffect, useState } from 'react'; -import { Spin, Typography, Space } from '@douyinfe/semi-ui'; import { useNavigate, useSearchParams } from 'react-router-dom'; +import { useTranslation } from 'react-i18next'; import { API, showError, showSuccess, updateAPI, setUserData } from '../../helpers'; import { UserContext } from '../../context/User'; +import Loading from '../common/Loading'; const OAuth2Callback = (props) => { + const { t } = useTranslation(); const [searchParams, setSearchParams] = useSearchParams(); const [userState, userDispatch] = useContext(UserContext); - const [prompt, setPrompt] = useState('处理中...'); - const [processing, setProcessing] = useState(true); + const [prompt, setPrompt] = useState(t('处理中...')); let navigate = useNavigate(); @@ -20,25 +21,25 @@ const OAuth2Callback = (props) => { const { success, message, data } = res.data; if (success) { if (message === 'bind') { - showSuccess('绑定成功！'); - navigate('/setting'); + showSuccess(t('绑定成功！')); + navigate('/console/setting'); } else { userDispatch({ type: 'login', payload: data }); localStorage.setItem('user', JSON.stringify(data)); setUserData(data); updateAPI(); - showSuccess('登录成功！'); - navigate('/token'); + showSuccess(t('登录成功！')); + navigate('/console/token'); } } else { showError(message); if (count === 0) { - setPrompt(`操作失败，重定向至登录界面中...`); - navigate('/setting'); // in case this is failed to bind GitHub + setPrompt(t('操作失败，重定向至登录界面中...')); + navigate('/console/setting'); // in case this is failed to bind GitHub return; } count++; - setPrompt(`出现错误，第 ${count} 次重试中...`); + setPrompt(t('出现错误，第 ${count} 次重试中...', { count })); await new Promise((resolve) => setTimeout(resolve, count * 2000)); await sendCode(code, state, count); } @@ -50,17 +51,7 @@ const OAuth2Callback = (props) => { sendCode(code, state, 0).then(); }, []); - return ( -
- - -
- {prompt} -
- - -
- ); + return ; }; export default OAuth2Callback;