diff --git a/.zuul.yaml b/.zuul.yaml index a440cbb7..f37e0090 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -564,6 +564,7 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ + - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ - skyline-console-devstack-e2etests-network: @@ -593,6 +594,7 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ + - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ - skyline-console-devstack-e2etests-other: @@ -615,6 +617,7 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ + - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ - skyline-console-devstack-e2etests-storage: @@ -645,6 +648,7 @@ - ^src/styles/.*$ - ^src/locales/.*$ - ^src/asset/.*$ + - ^src/layouts/.*$ # .zuul.yaml - ^.zuul.yaml$ gate: diff --git a/src/layouts/Auth/index.jsx b/src/layouts/Auth/index.jsx index e12c8486..9625f28f 100644 --- a/src/layouts/Auth/index.jsx +++ b/src/layouts/Auth/index.jsx @@ -22,15 +22,31 @@ import loginFullImage from 'asset/image/login-full.png'; import loginRightLogo from 'asset/image/loginRightLogo.png'; import styles from './index.less'; -@inject('rootStore') -@observer -class AuthLayout extends Component { +export class AuthLayout extends Component { constructor(props) { super(props); this.routes = props.route.routes; } + renderRight() { + return ( +
+ +
+ +
+ ); + } + render() { return (
@@ -47,22 +63,10 @@ class AuthLayout extends Component { {renderRoutes(this.routes)}
-
- -
- -
+ {this.renderRight()}
); } } -export default AuthLayout; +export default inject('rootStore')(observer(AuthLayout)); diff --git a/src/pages/auth/containers/Login/index.jsx b/src/pages/auth/containers/Login/index.jsx index 4272ec12..b1345cac 100644 --- a/src/pages/auth/containers/Login/index.jsx +++ b/src/pages/auth/containers/Login/index.jsx @@ -63,7 +63,7 @@ export class Login extends Component { product_name: { zh = t('Cloud Platform'), en = 'Cloud Platform' } = {}, } = this.info; const { isLocaleZh } = i18n; - return isLocaleZh ? zh : en; + return t('Welcome, {name}', { name: isLocaleZh ? zh : en }); } get domains() { @@ -280,9 +280,7 @@ export class Login extends Component { render() { return ( <> -

- {t('Welcome, {name}', { name: this.productName })} -

+

{this.productName}