Skip to content

Commit 5178d1e

Browse files
committed
Refactored issue certificate
1 parent 267f0ed commit 5178d1e

File tree

13 files changed

+452
-179
lines changed

13 files changed

+452
-179
lines changed

frontend/components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ declare module '@vue/runtime-core' {
3232
AModal: typeof import('ant-design-vue/es')['Modal']
3333
APagination: typeof import('ant-design-vue/es')['Pagination']
3434
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
35+
AProgress: typeof import('ant-design-vue/es')['Progress']
3536
AreaChart: typeof import('./src/components/Chart/AreaChart.vue')['default']
3637
AResult: typeof import('ant-design-vue/es')['Result']
3738
ARow: typeof import('ant-design-vue/es')['Row']

frontend/src/dark.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
.directive-editor-extra {
44
background-color: rgba(0, 0, 0, 0.84) !important;
55
}
6+
7+
.issue-cert-log-container {
8+
background-color: rgba(0, 0, 0, 0.84) !important;
9+
}

frontend/src/language/constants.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,15 @@ export const msg = [
77
$gettext('Prohibit changing root password in demo'),
88
$gettext('Prohibit deleting the default user'),
99
$gettext('Failed to get certificate information'),
10+
11+
$gettext('Generating private key for registering account'),
12+
$gettext('Preparing lego configurations'),
13+
$gettext('Creating client facilitates communication with the CA server'),
14+
$gettext('Using HTTP01 challenge provider'),
15+
$gettext('Registering user'),
16+
$gettext('Obtaining certificate'),
17+
$gettext('Writing certificate to disk'),
18+
$gettext('Writing certificate private key to disk'),
19+
$gettext('Reloading nginx'),
20+
$gettext('Finished')
1021
]

frontend/src/language/en/app.po

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ msgstr "Auto-renewal disabled for %{name}"
6060
msgid "Auto-renewal enabled for %{name}"
6161
msgstr "Auto-renewal enabled for %{name}"
6262

63-
#: src/views/domain/DomainEdit.vue:166
63+
#: src/views/domain/DomainEdit.vue:178
6464
msgid "Back"
6565
msgstr "Back"
6666

@@ -86,22 +86,22 @@ msgstr "Build with"
8686
msgid "Cancel"
8787
msgstr "Cancel"
8888

89-
#: src/views/domain/cert/CertInfo.vue:40
89+
#: src/views/domain/cert/CertInfo.vue:24
9090
msgid "Certificate has expired"
9191
msgstr "Certificate has expired"
9292

93-
#: src/views/domain/cert/CertInfo.vue:44
93+
#: src/views/domain/cert/CertInfo.vue:28
9494
msgid "Certificate is valid"
9595
msgstr "Certificate is valid"
9696

97-
#: src/views/domain/cert/CertInfo.vue:30
97+
#: src/views/domain/cert/CertInfo.vue:14
9898
msgid "Certificate Status"
9999
msgstr "Certificate Status"
100100

101101
#: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:29
102102
#: src/views/domain/ngx_conf/LocationEditor.vue:21
103103
#: src/views/domain/ngx_conf/LocationEditor.vue:7
104-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:154
104+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:155
105105
msgid "Comments"
106106
msgstr "Comments"
107107

@@ -138,6 +138,10 @@ msgstr "Create Another"
138138
msgid "Created at"
139139
msgstr "Created at"
140140

141+
#: src/language/constants.ts:13
142+
msgid "Creating client facilitates communication with the CA server"
143+
msgstr ""
144+
141145
#: src/routes/index.ts:26
142146
msgid "Dashboard"
143147
msgstr "Dashboard"
@@ -180,7 +184,7 @@ msgstr "Disable auto-renewal failed for %{name}"
180184
msgid "Disabled"
181185
msgstr "Disabled"
182186

183-
#: src/views/domain/DomainEdit.vue:101 src/views/domain/DomainList.vue:64
187+
#: src/views/domain/DomainEdit.vue:112 src/views/domain/DomainList.vue:64
184188
msgid "Disabled successfully"
185189
msgstr "Disabled successfully"
186190

@@ -226,7 +230,7 @@ msgstr "Enable TLS"
226230
msgid "Enabled"
227231
msgstr "Enabled"
228232

229-
#: src/views/domain/DomainAdd.vue:46 src/views/domain/DomainEdit.vue:92
233+
#: src/views/domain/DomainAdd.vue:46 src/views/domain/DomainEdit.vue:103
230234
#: src/views/domain/DomainList.vue:54
231235
msgid "Enabled successfully"
232236
msgstr "Enabled successfully"
@@ -235,15 +239,15 @@ msgstr "Enabled successfully"
235239
msgid "Encrypt website with Let's Encrypt"
236240
msgstr "Encrypt website with Let's Encrypt"
237241

238-
#: src/views/domain/cert/CertInfo.vue:33
242+
#: src/views/domain/cert/CertInfo.vue:17
239243
msgid "Expiration Date: %{date}"
240244
msgstr "Expiration Date: %{date}"
241245

242-
#: src/views/domain/DomainEdit.vue:104 src/views/domain/DomainList.vue:68
246+
#: src/views/domain/DomainEdit.vue:115 src/views/domain/DomainList.vue:68
243247
msgid "Failed to disable %{msg}"
244248
msgstr "Failed to disable %{msg}"
245249

246-
#: src/views/domain/DomainEdit.vue:95 src/views/domain/DomainList.vue:58
250+
#: src/views/domain/DomainEdit.vue:106 src/views/domain/DomainList.vue:58
247251
msgid "Failed to enable %{msg}"
248252
msgstr "Failed to enable %{msg}"
249253

@@ -255,10 +259,14 @@ msgstr ""
255259
msgid "File Not Found"
256260
msgstr "File Not Found"
257261

258-
#: src/views/domain/DomainAdd.vue:7
262+
#: src/language/constants.ts:20 src/views/domain/DomainAdd.vue:7
259263
msgid "Finished"
260264
msgstr "Finished"
261265

266+
#: src/language/constants.ts:11
267+
msgid "Generating private key for registering account"
268+
msgstr ""
269+
262270
#: src/views/domain/cert/IssueCert.vue:85
263271
msgid "Getting the certificate, please wait..."
264272
msgstr "Getting the certificate, please wait..."
@@ -276,7 +284,7 @@ msgstr "Install"
276284
msgid "Install successfully"
277285
msgstr "Enabled successfully"
278286

279-
#: src/views/domain/cert/CertInfo.vue:31
287+
#: src/views/domain/cert/CertInfo.vue:15
280288
msgid "Intermediate Certification Authorities: %{issuer}"
281289
msgstr "Intermediate Certification Authorities: %{issuer}"
282290

@@ -384,7 +392,7 @@ msgstr "No"
384392
msgid "Not Found"
385393
msgstr "Not Found"
386394

387-
#: src/views/domain/cert/CertInfo.vue:35
395+
#: src/views/domain/cert/CertInfo.vue:19
388396
msgid "Not Valid Before: %{date}"
389397
msgstr "Not Valid Before: %{date}"
390398

@@ -396,6 +404,10 @@ msgstr ""
396404
"Note: The server_name in the current configuration must be the domain name "
397405
"you need to get the certificate."
398406

407+
#: src/language/constants.ts:16
408+
msgid "Obtaining certificate"
409+
msgstr ""
410+
399411
#: src/components/StdDataDisplay/StdCurd.vue:27
400412
#: src/components/StdDataDisplay/StdTable.vue:40
401413
#: src/views/domain/DomainList.vue:26
@@ -435,6 +447,11 @@ msgstr "Please input your password!"
435447
msgid "Please input your username!"
436448
msgstr "Please input your username!"
437449

450+
#: src/language/constants.ts:12
451+
#, fuzzy
452+
msgid "Preparing lego configurations"
453+
msgstr "Configurations"
454+
438455
#: src/language/constants.ts:7
439456
msgid "Prohibit changing root password in demo"
440457
msgstr ""
@@ -455,11 +472,19 @@ msgstr "Reads"
455472
msgid "Receive"
456473
msgstr "Receive"
457474

475+
#: src/language/constants.ts:15
476+
msgid "Registering user"
477+
msgstr ""
478+
479+
#: src/language/constants.ts:19
480+
msgid "Reloading nginx"
481+
msgstr ""
482+
458483
#: src/components/StdDataDisplay/StdTable.vue:187
459484
msgid "Reset"
460485
msgstr ""
461486

462-
#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:169
487+
#: src/views/config/ConfigEdit.vue:52 src/views/domain/DomainEdit.vue:181
463488
msgid "Save"
464489
msgstr "Save"
465490

@@ -479,7 +504,7 @@ msgid "Save Successfully"
479504
msgstr "Saved successfully"
480505

481506
#: src/views/config/ConfigEdit.vue:34 src/views/domain/DomainAdd.vue:43
482-
#: src/views/domain/DomainEdit.vue:80
507+
#: src/views/domain/DomainEdit.vue:91
483508
msgid "Saved successfully"
484509
msgstr "Saved successfully"
485510

@@ -488,10 +513,9 @@ msgid "Send"
488513
msgstr "Send"
489514

490515
#: src/components/StdDataDisplay/StdTable.vue:112
491-
#: src/components/StdDataDisplay/StdTable.vue:94
492-
#: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:44
493-
#: src/views/domain/DomainEdit.vue:56 src/views/domain/DomainEdit.vue:65
494-
#: src/views/domain/DomainEdit.vue:83 src/views/domain/DomainList.vue:78
516+
#: src/views/config/ConfigEdit.vue:22 src/views/domain/DomainEdit.vue:56
517+
#: src/views/domain/DomainEdit.vue:68 src/views/domain/DomainEdit.vue:77
518+
#: src/views/domain/DomainEdit.vue:94 src/views/domain/DomainList.vue:78
495519
#: src/views/other/Install.vue:71
496520
msgid "Server error"
497521
msgstr "Server error"
@@ -529,7 +553,7 @@ msgstr "Status"
529553
msgid "Storage"
530554
msgstr "Storage"
531555

532-
#: src/views/domain/cert/CertInfo.vue:32
556+
#: src/views/domain/cert/CertInfo.vue:16
533557
msgid "Subject Name: %{name}"
534558
msgstr "Subject Name: %{name}"
535559

@@ -579,6 +603,10 @@ msgstr "Username"
579603
msgid "Username (*)"
580604
msgstr "Username (*)"
581605

606+
#: src/language/constants.ts:14
607+
msgid "Using HTTP01 challenge provider"
608+
msgstr ""
609+
582610
#: src/views/domain/cert/IssueCert.vue:12 src/views/domain/DomainAdd.vue:24
583611
msgid "Warning"
584612
msgstr "Warning"
@@ -588,6 +616,14 @@ msgstr "Warning"
588616
msgid "Writes"
589617
msgstr "Writes"
590618

619+
#: src/language/constants.ts:18
620+
msgid "Writing certificate private key to disk"
621+
msgstr ""
622+
623+
#: src/language/constants.ts:17
624+
msgid "Writing certificate to disk"
625+
msgstr ""
626+
591627
#: src/views/domain/ngx_conf/directive/DirectiveEditor.vue:16
592628
msgid "Yes"
593629
msgstr "Yes"

0 commit comments

Comments
 (0)