diff --git a/src/renderer/src/pages/Sign/SignIn.tsx b/src/renderer/src/pages/Sign/SignIn.tsx index be500bd..cef1eba 100644 --- a/src/renderer/src/pages/Sign/SignIn.tsx +++ b/src/renderer/src/pages/Sign/SignIn.tsx @@ -78,11 +78,7 @@ const SignIn = () => { setTimeout(() => { void getUserInfo().then((user) => { refreshRouter() - if (searchParams.has('redirect')) { - navigate(searchParams.get('redirect') ?? '/') - } else { - navigate('/') - } + navigate(searchParams.get('redirect') ?? '/repository') notification.success({ message: '欢迎回来', @@ -262,7 +258,7 @@ const SignIn = () => { navigate('/') }} > - 返回首页 + 返回主页 { diff --git a/src/renderer/src/pages/Sign/Verify.tsx b/src/renderer/src/pages/Sign/Verify.tsx index 006b72d..06280c7 100644 --- a/src/renderer/src/pages/Sign/Verify.tsx +++ b/src/renderer/src/pages/Sign/Verify.tsx @@ -81,7 +81,7 @@ const Verify = () => { break case PERMISSION_NO_VERIFICATION_REQUIRED: void message.warning('账户已验证') - navigate('/') + navigate('/repository') break default: void message.error('出错了,请稍后重试') @@ -128,11 +128,7 @@ const Verify = () => { setTimeout(() => { void requestUserInfo().then(() => { refreshRouter() - if (searchParams.has('redirect')) { - navigate(searchParams.get('redirect') ?? '/') - } else { - navigate('/') - } + navigate(searchParams.get('redirect') ?? '/repository') }) }, 1500) break diff --git a/src/renderer/src/pages/System/Tools/Code.tsx b/src/renderer/src/pages/System/Tools/Code.tsx index a02e109..49f63f0 100644 --- a/src/renderer/src/pages/System/Tools/Code.tsx +++ b/src/renderer/src/pages/System/Tools/Code.tsx @@ -62,7 +62,7 @@ const Code = () => { case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: diff --git a/src/renderer/src/pages/System/Tools/Execute.tsx b/src/renderer/src/pages/System/Tools/Execute.tsx index fe5dbb2..85a73bc 100644 --- a/src/renderer/src/pages/System/Tools/Execute.tsx +++ b/src/renderer/src/pages/System/Tools/Execute.tsx @@ -51,7 +51,7 @@ const Execute = () => { case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') setTimeout(() => { - navigate('/') + navigate('/system/tools') }, 3000) break default: diff --git a/src/renderer/src/pages/Tools/Edit.tsx b/src/renderer/src/pages/Tools/Edit.tsx index 8b5504f..bbc478f 100644 --- a/src/renderer/src/pages/Tools/Edit.tsx +++ b/src/renderer/src/pages/Tools/Edit.tsx @@ -118,13 +118,13 @@ const Edit = () => { case TOOL_UNDER_REVIEW: void message.error('保存失败:工具审核中') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break case TOOL_HAS_BEEN_PUBLISHED: void message.error('保存失败:工具已发布') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: @@ -184,13 +184,13 @@ const Edit = () => { case TOOL_UNDER_REVIEW: void message.error('保存失败:工具审核中') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break case TOOL_HAS_BEEN_PUBLISHED: void message.error('保存失败:工具已发布') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: @@ -245,20 +245,20 @@ const Edit = () => { case 'PROCESSING': void message.warning('工具审核中,请勿修改') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: void message.warning('请先创建新版本后编辑工具') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) } break case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: @@ -322,7 +322,7 @@ const Edit = () => { useEffect(() => { if (!['WEB', 'DESKTOP', 'ANDROID'].includes(searchParams.get('platform')!)) { - navigate('/') + navigate('/repository') return } getTool() diff --git a/src/renderer/src/pages/Tools/Source.tsx b/src/renderer/src/pages/Tools/Source.tsx index e5da384..d808c86 100644 --- a/src/renderer/src/pages/Tools/Source.tsx +++ b/src/renderer/src/pages/Tools/Source.tsx @@ -49,7 +49,7 @@ const Source = () => { case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: @@ -65,7 +65,7 @@ const Source = () => { useEffect(() => { if (username === '!' && !getLoginStatus()) { setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) return } @@ -78,7 +78,7 @@ const Source = () => { return } if (!['WEB', 'DESKTOP', 'ANDROID'].includes(searchParams.get('platform')!)) { - navigate('/') + navigate('/repository') return } getTool() diff --git a/src/renderer/src/pages/Tools/View.tsx b/src/renderer/src/pages/Tools/View.tsx index 375ddef..9b60593 100644 --- a/src/renderer/src/pages/Tools/View.tsx +++ b/src/renderer/src/pages/Tools/View.tsx @@ -72,7 +72,7 @@ const View = () => { case DATABASE_NO_RECORD_FOUND: void message.error('未找到指定工具') setTimeout(() => { - navigate('/') + navigate('/repository') }, 3000) break default: @@ -101,7 +101,7 @@ const View = () => { return } if (!['WEB', 'DESKTOP', 'ANDROID'].includes(searchParams.get('platform')!)) { - navigate('/') + navigate('/repository') return } getTool() diff --git a/src/renderer/src/pages/ToolsFramework.tsx b/src/renderer/src/pages/ToolsFramework.tsx index 7a36100..13bd59c 100644 --- a/src/renderer/src/pages/ToolsFramework.tsx +++ b/src/renderer/src/pages/ToolsFramework.tsx @@ -13,13 +13,13 @@ const ToolsFramework = () => { @@ -29,8 +29,8 @@ const ToolsFramework = () => { {tools.map((tool) => { return tool.menu && - tool.id !== 'tools' && - tool.id !== 'tools-store' ? ( + tool.id !== 'tools-store' && + tool.id !== 'tools-repository' ? ( import('@/pages/Tools')), - name: '主页', - icon: lazy(() => import('~icons/oxygen/home')), - menu: true, - auth: false - }, { path: 'store', absolutePath: '/store', @@ -19,6 +9,21 @@ export const tools: RouteJsonObject[] = [ icon: lazy(() => import('~icons/oxygen/store')), menu: true }, + { + path: 'repository', + absolutePath: '/repository', + id: 'tools-repository', + component: lazy(() => import('@/pages/Tools')), + name: '个人仓库', + titlePostfix: ' - 仓库', + icon: lazy(() => import('~icons/oxygen/home')), + menu: true + }, + { + path: '', + absolutePath: '/', + element: + }, { path: 'store/:username', absolutePath: '/store', @@ -34,7 +39,6 @@ export const tools: RouteJsonObject[] = [ name: '创建工具', titlePostfix: ' - 创建新工具', icon: lazy(() => import('~icons/oxygen/newProject')), - menu: false, auth: true }, {