diff --git a/frontend/lerna.json b/frontend/lerna.json index 5c359f7be44249e8305c587266b2e32bd650ceac..2e7a2482ee5247328012c96b10c5807af6ea6fc7 100644 --- a/frontend/lerna.json +++ b/frontend/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "2.0.0-beta.33", + "version": "2.0.0-beta.35", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/frontend/package.json b/frontend/package.json index 8c9b13268e7e094811349b1befc91268f29f3d16..6af826bb0125e65d5c72ec96d70a2ad2a5474076 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -4,7 +4,7 @@ "workspaces": [ "packages/*" ], - "version": "2.0.0-beta.33", + "version": "2.0.0-beta.35", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", diff --git a/frontend/packages/app/package.json b/frontend/packages/app/package.json index be613d12dc656b25ce71dcb5ec18277d7a9b9143..e0c1b515706f75522eee017d6b646be44d86554f 100644 --- a/frontend/packages/app/package.json +++ b/frontend/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/app", - "version": "2.0.0-beta.33", + "version": "2.0.0-beta.35", "private": true, "description": "A platform to visualize the deep learning process and result.", "keywords": [ @@ -21,7 +21,7 @@ "repository": { "type": "git", "url": "https://github.com/PaddlePaddle/VisualDL.git", - "directory": "frontend/app" + "directory": "frontend/packages/app" }, "scripts": { "dev": "electron index.js", @@ -29,7 +29,7 @@ "test": "echo \"Error: no test specified\" && exit 0" }, "dependencies": { - "@visualdl/server": "2.0.0-beta.33", + "@visualdl/server": "2.0.0-beta.35", "pm2": "4.4.0" }, "devDependencies": { diff --git a/frontend/packages/cli/package.json b/frontend/packages/cli/package.json index 4ef8d7213a76b1bc242b18be64c06dd67d8c427c..7b595dc2d8a3e3721b20aabe9d6f441a7dafdb70 100644 --- a/frontend/packages/cli/package.json +++ b/frontend/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@visualdl/cli", - "version": "2.0.0-beta.33", + "version": "2.0.0-beta.35", "description": "A platform to visualize the deep learning process and result.", "keywords": [ "visualdl", @@ -20,7 +20,7 @@ "repository": { "type": "git", "url": "https://github.com/PaddlePaddle/VisualDL.git", - "directory": "frontend/cli" + "directory": "frontend/packages/cli" }, "scripts": { "dev": "cross-env NODE_ENV=development ts-node index.ts", @@ -34,7 +34,7 @@ "dist" ], "dependencies": { - "@visualdl/server": "2.0.0-beta.33", + "@visualdl/server": "2.0.0-beta.35", "open": "7.0.3", "ora": "4.0.4", "pm2": "4.4.0", diff --git a/frontend/packages/core/components/Button.tsx b/frontend/packages/core/components/Button.tsx index a844e900048eaed93a8cbafb75b24ee2ad2286c0..a25f50a8773ce0fefe8d09938cef3747b7e4f049 100644 --- a/frontend/packages/core/components/Button.tsx +++ b/frontend/packages/core/components/Button.tsx @@ -39,14 +39,13 @@ const colors = { }; const Wrapper = styled.a<{type?: keyof typeof colors; rounded?: boolean; disabled?: boolean}>` - cursor: pointer; height: ${height}; line-height: ${height}; border-radius: ${props => (props.rounded ? half(height) : borderRadius)}; ${props => (props.type ? '' : sameBorder({color: borderColor}))} background-color: ${props => (props.type ? colors[props.type].default : 'transparent')}; color: ${props => (props.disabled ? textLighterColor : props.type ? textInvertColor : textColor)}; - cursor: ${props => (props.disabled ? 'not-allowed' : 'cursor')}; + cursor: ${props => (props.disabled ? 'not-allowed' : 'pointer')}; display: inline-block; vertical-align: top; text-align: center; diff --git a/frontend/packages/core/components/Icon.tsx b/frontend/packages/core/components/Icon.tsx index fda7de1dfdea92ab2eb8b26437b05fd0e7639575..8f3fff15db91211a4a1ebadabcd44a0a976320ed 100644 --- a/frontend/packages/core/components/Icon.tsx +++ b/frontend/packages/core/components/Icon.tsx @@ -7,7 +7,7 @@ type IconProps = { }; const Icon: FunctionComponent = ({type, className}) => { - return ; + return ; }; export default Icon; diff --git a/frontend/packages/core/components/Navbar.tsx b/frontend/packages/core/components/Navbar.tsx index db628e5bca313d5f7e5f16d5fba67e41af4c8133..587173ffd8e61f3f79bbfec1a8acaac0367b64fe 100644 --- a/frontend/packages/core/components/Navbar.tsx +++ b/frontend/packages/core/components/Navbar.tsx @@ -1,5 +1,5 @@ import {Link, config, i18n, useTranslation} from '~/utils/i18n'; -import React, {FunctionComponent} from 'react'; +import React, {FunctionComponent, useMemo} from 'react'; import { border, navbarBackgroundColor, @@ -12,6 +12,7 @@ import { } from '~/utils/style'; import Icon from '~/components/Icon'; +import {InitConfig} from '@visualdl/i18n'; import Language from '~/components/Language'; import ee from '~/utils/event'; import intersection from 'lodash/intersection'; @@ -99,13 +100,23 @@ const changeLanguage = () => { }; const Navbar: FunctionComponent = () => { - const {t} = useTranslation('common'); + const {t, i18n} = useTranslation('common'); const {pathname} = useRouter(); + const indexUrl = useMemo(() => { + // TODO: fix type + const subpath = (i18n.options as InitConfig).localeSubpaths?.[i18n.language]; + let path = process.env.PUBLIC_PATH ?? ''; + if (subpath) { + path += `/${subpath}`; + } + return `${path}/index`; + }, [i18n.options, i18n.language]); + return (