diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 9e32ff771..c235bbfd3 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -31,6 +31,7 @@ "moment-timezone": "^0.5.33", "node-sass": "^4.14.1", "pl-table": "^2.5.8", + "qrcodejs2": "0.0.2", "quill": "^1.3.7", "v-selectpage": "^2.1.4", "vue": "^2.5.2", diff --git a/nezha-fronted/src/assets/css/font/iconfont.css b/nezha-fronted/src/assets/css/font/iconfont.css index 7452388a6..0f58266e9 100644 --- a/nezha-fronted/src/assets/css/font/iconfont.css +++ b/nezha-fronted/src/assets/css/font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('iconfont.woff2?t=1628215874870') format('woff2'), - url('iconfont.woff?t=1628215874870') format('woff'), - url('iconfont.ttf?t=1628215874870') format('truetype'); + src: url('iconfont.woff2?t=1628678895024') format('woff2'), + url('iconfont.woff?t=1628678895024') format('woff'), + url('iconfont.ttf?t=1628678895024') format('truetype'); } .nz-icon { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-yanzhengma:before { + content: "\e736"; +} + .nz-icon-about-full:before { content: "\e735"; } diff --git a/nezha-fronted/src/assets/css/font/iconfont.ttf b/nezha-fronted/src/assets/css/font/iconfont.ttf index 25fcd1dbd..04609c56c 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.ttf and b/nezha-fronted/src/assets/css/font/iconfont.ttf differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff b/nezha-fronted/src/assets/css/font/iconfont.woff index ebb7ae068..1d4e1ff78 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff and b/nezha-fronted/src/assets/css/font/iconfont.woff differ diff --git a/nezha-fronted/src/assets/css/font/iconfont.woff2 b/nezha-fronted/src/assets/css/font/iconfont.woff2 index 28323cec8..8c10b8347 100644 Binary files a/nezha-fronted/src/assets/css/font/iconfont.woff2 and b/nezha-fronted/src/assets/css/font/iconfont.woff2 differ diff --git a/nezha-fronted/src/assets/css/nzIcon.css b/nezha-fronted/src/assets/css/nzIcon.css index b6e3869e4..bc317d187 100644 --- a/nezha-fronted/src/assets/css/nzIcon.css +++ b/nezha-fronted/src/assets/css/nzIcon.css @@ -1,8 +1,8 @@ @font-face { font-family: "nz-icon"; /* Project id 2030432 */ - src: url('./font/iconfont.woff2?t=1628215874870') format('woff2'), - url('./font/iconfont.woff?t=1628215874870') format('woff'), - url('./font/iconfont.ttf?t=1628215874870') format('truetype'); + src: url('./font/iconfont.woff2?t=1628678895024') format('woff2'), + url('./font/iconfont.woff?t=1628678895024') format('woff'), + url('./font/iconfont.ttf?t=1628678895024') format('truetype'); } .nz-icon { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.nz-icon-yanzhengma:before { + content: "\e736"; +} + .nz-icon-about-full:before { content: "\e735"; } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 29b308485..be4175997 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -147,7 +147,7 @@ const cn = { silenceAlert: '告警静默', quickSilent: '快速静默', configEndpoint: '配置', - generate: '生产' + generate: '生产', }, setup: { step0: '欢迎', @@ -229,7 +229,13 @@ const cn = { login: { username: '登录名', pin: '密码', - login: '登录' + login: '登录', + verify: '验证', + verifyDialogTitle: 'Two Factor Authentication Set Up', + verifyTitle: 'Two-Factor Authentication', + verifyContent: 'Enter the code from the two -factor app on your mobile device. If you\' ve lost your device, you may enter one of your recovery codes.', + verifyPlaceholder: '验证码', + bindFail: '绑定失败' }, dashboard: { title: '仪表盘', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 7e3ed0c3c..e77bdb00d 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -152,7 +152,8 @@ const en = { silenceAlert: 'silence alert', quickSilent: 'Quick silent', configEndpoint: 'Config', - generate: 'Generate' + generate: 'Generate', + }, pageSize: '/page', setup: { @@ -236,7 +237,13 @@ const en = { username: 'Username', pin: 'Password', login: 'Login', - upload: 'Upload license' + upload: 'Upload license', + verify: 'Verify code', + verifyDialogTitle: 'Two Factor Authentication Set Up', + verifyTitle: 'Two-Factor Authentication', + verifyContent: 'Enter the code from the two -factor app on your mobile device. If you\' ve lost your device, you may enter one of your recovery codes.', + verifyPlaceholder: 'verify code', + bindFail: 'Binding failure' }, dashboard: { title: 'Dashboard', diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index 3439f5a68..bc30a00cd 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -1,55 +1,125 @@