diff --git a/web/src/App.js b/web/src/App.js index 2be9e8d9..b4d75735 100644 --- a/web/src/App.js +++ b/web/src/App.js @@ -425,9 +425,47 @@ class App extends Component { renderContent() { if (!Setting.isMobile()) { - return ( -
- + return ( +
+ +
+ { + Setting.isMobile() ? null : ( + +
+ + ) + } + + { + this.renderMenu() + } +
+ { + this.renderAccount() + } + +
+
+
+ + + { + this.renderRouter() + } + + +
+
+ ) + } else { + return( +
{ Setting.isMobile() ? null : ( @@ -440,65 +478,26 @@ class App extends Component { // theme="dark" mode={(Setting.isMobile() && this.isStartPages()) ? "inline" : "horizontal"} selectedKeys={[`${this.state.selectedMenuKey}`]} - style={{ lineHeight: '64px'}} + style={{ lineHeight: '64px' }} > { this.renderMenu() } -
- { - this.renderAccount() - } - -
+
+ { + this.renderAccount() + } + +
- - - { - this.renderRouter() - } - - - -
- ) - } else { - return( -
-
{ - Setting.isMobile() ? null : ( - -
- - ) + this.renderRouter() } - - { - this.renderMenu() - } -
- { - this.renderAccount() - } - -
-
-
- { - this.renderRouter() - } -
- ) +
+ ) + } } -} - renderFooter() { // How to keep your footer where it belongs ? diff --git a/web/src/auth/ForgetPage.js b/web/src/auth/ForgetPage.js index 8a30fc3f..52a59da1 100644 --- a/web/src/auth/ForgetPage.js +++ b/web/src/auth/ForgetPage.js @@ -13,21 +13,16 @@ // limitations under the License. import React from "react"; -import { Button, Col, Divider, Form, Select, Input, Row, Steps } from "antd"; +import {Button, Col, Divider, Form, Select, Input, Row, Steps} from "antd"; import * as AuthBackend from "./AuthBackend"; import * as ApplicationBackend from "../backend/ApplicationBackend"; import * as Util from "./Util"; import * as Setting from "../Setting"; import i18next from "i18next"; -import { CountDownInput } from "../component/CountDownInput"; +import {CountDownInput} from "../component/CountDownInput"; import * as UserBackend from "../backend/UserBackend"; -import { - CheckCircleOutlined, - KeyOutlined, - LockOutlined, - SolutionOutlined, - UserOutlined, -} from "@ant-design/icons"; +import {CheckCircleOutlined, KeyOutlined, LockOutlined, SolutionOutlined, UserOutlined} from "@ant-design/icons"; +import CustomGithubCorner from "../CustomGithubCorner"; const { Step } = Steps; const { Option } = Select; @@ -474,7 +469,7 @@ class ForgetPage extends React.Component { } return ( - <> + {i18next.t("forget:Retrieve password")} @@ -512,7 +507,8 @@ class ForgetPage extends React.Component { - + + ); } } diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index 4c750c1c..7d6f1a23 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -34,6 +34,7 @@ import LinkedInLoginButton from "./LinkedInLoginButton"; import WeComLoginButton from "./WeComLoginButton"; import LarkLoginButton from "./LarkLoginButton"; import GitLabLoginButton from "./GitLabLoginButton"; +import CustomGithubCorner from "../CustomGithubCorner"; class LoginPage extends React.Component { constructor(props) { @@ -435,6 +436,7 @@ class LoginPage extends React.Component { { Setting.renderHelmet(application) } + { Setting.renderLogo(application) } diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js index d192e84b..f9097ae7 100644 --- a/web/src/auth/SignupPage.js +++ b/web/src/auth/SignupPage.js @@ -24,6 +24,7 @@ import * as ApplicationBackend from "../backend/ApplicationBackend"; import * as UserBackend from "../backend/UserBackend"; import {CountDownInput} from "../component/CountDownInput"; import SelectRegionBox from "../SelectRegionBox"; +import CustomGithubCorner from "../CustomGithubCorner"; const formItemLayout = { labelCol: { @@ -528,6 +529,7 @@ class SignupPage extends React.Component { return (
+