From 58455e688ee00fa1ef1c217cffe03c2f2ee01d41 Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Mon, 3 Oct 2022 18:45:35 +0800 Subject: [PATCH] Improve WebAuthnCredentialTable and border radius --- web/src/App.less | 5 ++- web/src/WebauthnCredentialTable.js | 69 +++++++++++++++--------------- web/src/auth/LoginPage.js | 3 +- web/src/common/CaptchaPreview.js | 2 +- web/src/common/CountDownInput.js | 2 +- web/src/locales/zh/data.json | 2 +- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/web/src/App.less b/web/src/App.less index be0f46d7..d918ac35 100644 --- a/web/src/App.less +++ b/web/src/App.less @@ -28,7 +28,7 @@ color: #61dafb; } -#root{ +#root { height: 100%; } @@ -64,6 +64,7 @@ background-size: 25px, 25px; background-position: center; background-repeat: no-repeat; + border-radius: 5px; width: 45px; height: 65px; float: right; @@ -89,7 +90,7 @@ .loginBackground { height: 100%; - background: #ffffff no-repeat; + background: #fff no-repeat; background-size: 100% 100%; background-attachment: fixed; } diff --git a/web/src/WebauthnCredentialTable.js b/web/src/WebauthnCredentialTable.js index da34dba7..6591d34e 100644 --- a/web/src/WebauthnCredentialTable.js +++ b/web/src/WebauthnCredentialTable.js @@ -19,40 +19,6 @@ import * as UserWebauthnBackend from "./backend/UserWebauthnBackend"; import * as Setting from "./Setting"; class WebAuthnCredentialTable extends React.Component { - render() { - const columns = [ - { - title: i18next.t("user:WebAuthn credentials"), - dataIndex: "ID", - key: "ID", - }, - { - title: i18next.t("general:Action"), - key: "action", - render: (text, record, index) => { - return ( - - ); - }, - }, - ]; - - return ( - ( -
- {i18next.t("user:WebAuthn credentials")}     - -
- )} - /> - ); - } - deleteRow(table, i) { table = Setting.deleteRow(table, i); this.props.updateTable(table); @@ -71,6 +37,41 @@ class WebAuthnCredentialTable extends React.Component { Setting.showMessage("error", `Failed to connect to server: ${error}`); }); } + + render() { + const columns = [ + { + title: i18next.t("general:Name"), + dataIndex: "ID", + key: "ID", + }, + { + title: i18next.t("general:Action"), + key: "action", + width: "170px", + render: (text, record, index) => { + return ( + + ); + }, + }, + ]; + + return ( +
( +
+ {i18next.t("user:WebAuthn credentials")}     + +
+ )} + /> + ); + } } export default WebAuthnCredentialTable; diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index 862288d4..042c08f8 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -698,7 +698,7 @@ class LoginPage extends React.Component { return (
- +
@@ -718,7 +718,6 @@ class LoginPage extends React.Component { this.renderForm(application) }
-
diff --git a/web/src/common/CaptchaPreview.js b/web/src/common/CaptchaPreview.js index f0a6c03c..c6f78981 100644 --- a/web/src/common/CaptchaPreview.js +++ b/web/src/common/CaptchaPreview.js @@ -87,7 +87,7 @@ export const CaptchaPreview = ({ backgroundRepeat: "no-repeat", height: "80px", width: "200px", - borderRadius: "3px", + borderRadius: "5px", border: "1px solid #ccc", marginBottom: 10, }} diff --git a/web/src/common/CountDownInput.js b/web/src/common/CountDownInput.js index cf791527..bd557fad 100644 --- a/web/src/common/CountDownInput.js +++ b/web/src/common/CountDownInput.js @@ -101,7 +101,7 @@ export const CountDownInput = (props) => { backgroundRepeat: "no-repeat", height: "80px", width: "200px", - borderRadius: "3px", + borderRadius: "5px", border: "1px solid #ccc", marginBottom: 10, }} diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index 705a0be1..c81353f4 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -702,7 +702,7 @@ "Unlink": "解绑", "Upload (.xlsx)": "上传(.xlsx)", "Upload a photo": "上传头像", - "WebAuthn credentials": "WebAuthn credentials", + "WebAuthn credentials": "WebAuthn凭据", "input password": "输入密码" }, "webhook": {