Skip to content

Commit b2854d4

Browse files
0xJacky0xJacky
committed
feat(wip): collapsible panel for NgxConfigEditor
1 parent 4307472 commit b2854d4

File tree

22 files changed

+536
-344
lines changed

22 files changed

+536
-344
lines changed

‎app/gettext.config.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// eslint-disable-next-line @typescript-eslint/no-var-requires
22
const i18n = require('./i18n.json')
33

4-
module.export = {
4+
module.exports = {
55
input: {
66
include: ['**/*.js', '**/*.ts', '**/*.vue', '**/*.jsx', '**/*.tsx'],
77
},

‎app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"vue-router": "^4.2.5",
3535
"vue3-ace-editor": "2.2.4",
3636
"vue3-apexcharts": "^1.4.4",
37-
"vue3-gettext": "^3.0.0-beta.2",
37+
"vue3-gettext": "3.0.0-beta.2",
3838
"vuedraggable": "^4.1.0",
3939
"xterm": "^5.3.0",
4040
"xterm-addon-attach": "^0.9.0",

‎app/pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/language/LINGUAS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
en
1+
en zh_CN zh_TW fr_FR es ru_RU vi_VN

‎app/src/language/en/app.po

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ msgstr "Action"
2727
#: src/components/StdDesign/StdDataDisplay/StdCurd.vue:115
2828
#: src/components/StdDesign/StdDataDisplay/StdCurd.vue:141
2929
#: src/views/domain/ngx_conf/config_template/ConfigTemplate.vue:119
30-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:305
30+
#: src/views/domain/ngx_conf/NgxServer.vue:163
31+
#: src/views/domain/ngx_conf/NgxUpstream.vue:96
3132
msgid "Add"
3233
msgstr ""
3334

3435
#: src/views/domain/ngx_conf/directive/DirectiveAdd.vue:98
3536
msgid "Add Directive Below"
3637
msgstr "Add Directive Below"
3738

38-
#: src/views/domain/ngx_conf/LocationEditor.vue:117
39-
#: src/views/domain/ngx_conf/LocationEditor.vue:144
39+
#: src/views/domain/ngx_conf/LocationEditor.vue:115
40+
#: src/views/domain/ngx_conf/LocationEditor.vue:142
4041
msgid "Add Location"
4142
msgstr "Add Location"
4243

@@ -90,7 +91,7 @@ msgstr "Are you sure you want to remove this directive?"
9091
msgid "Are you sure you want to remove this directive?"
9192
msgstr "Are you sure you want to remove this directive?"
9293

93-
#: src/views/domain/ngx_conf/LocationEditor.vue:74
94+
#: src/views/domain/ngx_conf/LocationEditor.vue:72
9495
#, fuzzy
9596
msgid "Are you sure you want to remove this location?"
9697
msgstr "Are you sure you want to remove this directive?"
@@ -140,7 +141,7 @@ msgid "Base information"
140141
msgstr "Base information"
141142

142143
#: src/views/config/ConfigEdit.vue:117
143-
#: src/views/domain/components/RightSettings.vue:73
144+
#: src/views/domain/components/RightSettings.vue:76
144145
#: src/views/preference/Preference.vue:90
145146
#, fuzzy
146147
msgid "Basic"
@@ -171,8 +172,9 @@ msgstr ""
171172
#: src/views/domain/cert/components/ObtainCert.vue:137
172173
#: src/views/domain/components/Deploy.vue:24
173174
#: src/views/domain/components/RightSettings.vue:52
174-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:213
175-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:48
175+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:49
176+
#: src/views/domain/ngx_conf/NgxServer.vue:84
177+
#: src/views/domain/ngx_conf/NgxUpstream.vue:28
176178
msgid "Cancel"
177179
msgstr "Cancel"
178180

@@ -242,9 +244,9 @@ msgid "Cleared successfully"
242244
msgstr "Disabled successfully"
243245

244246
#: src/views/domain/ngx_conf/directive/DirectiveEditorItem.vue:97
245-
#: src/views/domain/ngx_conf/LocationEditor.vue:121
246-
#: src/views/domain/ngx_conf/LocationEditor.vue:90
247-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:281
247+
#: src/views/domain/ngx_conf/LocationEditor.vue:119
248+
#: src/views/domain/ngx_conf/LocationEditor.vue:88
249+
#: src/views/domain/ngx_conf/NgxServer.vue:139
248250
msgid "Comments"
249251
msgstr "Comments"
250252

@@ -274,8 +276,8 @@ msgid "Connected"
274276
msgstr ""
275277

276278
#: src/views/domain/ngx_conf/directive/DirectiveEditorItem.vue:102
277-
#: src/views/domain/ngx_conf/LocationEditor.vue:102
278-
#: src/views/domain/ngx_conf/LocationEditor.vue:130
279+
#: src/views/domain/ngx_conf/LocationEditor.vue:100
280+
#: src/views/domain/ngx_conf/LocationEditor.vue:128
279281
msgid "Content"
280282
msgstr "Content"
281283

@@ -316,7 +318,7 @@ msgid "Current Version"
316318
msgstr ""
317319

318320
#: src/views/domain/ngx_conf/config_template/ConfigTemplate.vue:126
319-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:238
321+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:185
320322
msgid "Custom"
321323
msgstr ""
322324

@@ -330,7 +332,8 @@ msgstr "Database (Optional, default: database)"
330332

331333
#: src/components/StdDesign/StdDataDisplay/StdTable.vue:360
332334
#: src/views/domain/DomainList.vue:156
333-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:256
335+
#: src/views/domain/ngx_conf/NgxServer.vue:114
336+
#: src/views/domain/ngx_conf/NgxUpstream.vue:77
334337
msgid "Delete"
335338
msgstr ""
336339

@@ -344,7 +347,7 @@ msgid "Deleted successfully"
344347
msgstr "Disabled successfully"
345348

346349
#: src/views/domain/components/Deploy.vue:109
347-
#: src/views/domain/components/RightSettings.vue:91
350+
#: src/views/domain/components/RightSettings.vue:94
348351
msgid "Deploy"
349352
msgstr ""
350353

@@ -444,16 +447,21 @@ msgstr "Are you sure you want to remove this directive?"
444447
msgid "Do you want to enable this site?"
445448
msgstr "Are you sure you want to remove this directive?"
446449

447-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:41
450+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:42
448451
#, fuzzy
449452
msgid "Do you want to enable TLS?"
450453
msgstr "Are you sure you want to remove this directive?"
451454

452-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:209
455+
#: src/views/domain/ngx_conf/NgxServer.vue:80
453456
#, fuzzy
454457
msgid "Do you want to remove this server?"
455458
msgstr "Are you sure you want to remove this directive?"
456459

460+
#: src/views/domain/ngx_conf/NgxUpstream.vue:24
461+
#, fuzzy
462+
msgid "Do you want to remove this upstream?"
463+
msgstr "Are you sure you want to remove this directive?"
464+
457465
#: src/views/certificate/WildcardCertificate.vue:69
458466
msgid "Domain"
459467
msgstr ""
@@ -519,6 +527,7 @@ msgstr "Edit Site"
519527
msgid "Email (*)"
520528
msgstr "Email (*)"
521529

530+
#: src/views/domain/components/Deploy.vue:89
522531
#: src/views/domain/DomainList.vue:133
523532
#, fuzzy
524533
msgid "Enable"
@@ -545,13 +554,12 @@ msgstr "Enable failed"
545554
msgid "Enable successfully"
546555
msgstr "Enabled successfully"
547556

548-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:233
557+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:174
549558
msgid "Enable TLS"
550559
msgstr "Enable TLS"
551560

552561
#: src/views/domain/cert/ChangeCert.vue:44
553-
#: src/views/domain/components/Deploy.vue:89
554-
#: src/views/domain/components/RightSettings.vue:75
562+
#: src/views/domain/components/RightSettings.vue:78
555563
#: src/views/domain/DomainEdit.vue:184 src/views/domain/DomainList.vue:32
556564
msgid "Enabled"
557565
msgstr "Enabled"
@@ -749,10 +757,6 @@ msgstr "Enabled successfully"
749757
msgid "Intermediate Certification Authorities: %{issuer}"
750758
msgstr "Intermediate Certification Authorities: %{issuer}"
751759

752-
#: src/views/certificate/WildcardCertificate.vue:84
753-
msgid "Issue"
754-
msgstr ""
755-
756760
#: src/views/certificate/Certificate.vue:137
757761
#, fuzzy
758762
msgid "Issue wildcard certificate"
@@ -810,11 +814,11 @@ msgstr "Load Averages:"
810814
msgid "Local"
811815
msgstr "Location"
812816

813-
#: src/views/domain/ngx_conf/LocationEditor.vue:65
817+
#: src/views/domain/ngx_conf/LocationEditor.vue:63
814818
msgid "Location"
815819
msgstr "Location"
816820

817-
#: src/views/domain/ngx_conf/LocationEditor.vue:48
821+
#: src/views/domain/ngx_conf/LocationEditor.vue:47
818822
msgid "Locations"
819823
msgstr "Locations"
820824

@@ -894,9 +898,11 @@ msgstr "Single Directive"
894898
#: src/views/certificate/CertificateEditor.vue:145
895899
#: src/views/certificate/DNSCredential.vue:13 src/views/config/config.ts:9
896900
#: src/views/domain/cert/ChangeCert.vue:21
897-
#: src/views/domain/components/RightSettings.vue:81
901+
#: src/views/domain/components/RightSettings.vue:84
898902
#: src/views/domain/components/SiteDuplicate.vue:135
899-
#: src/views/domain/DomainList.vue:16 src/views/environment/Environment.vue:15
903+
#: src/views/domain/DomainList.vue:16
904+
#: src/views/domain/ngx_conf/NgxUpstream.vue:108
905+
#: src/views/environment/Environment.vue:15
900906
msgid "Name"
901907
msgstr "Name"
902908

@@ -920,6 +926,7 @@ msgstr "Network Total Send"
920926
msgid "New version released"
921927
msgstr ""
922928

929+
#: src/views/certificate/WildcardCertificate.vue:84
923930
#: src/views/domain/cert/components/ObtainCert.vue:203
924931
#: src/views/domain/DomainAdd.vue:145
925932
msgid "Next"
@@ -965,7 +972,7 @@ msgstr "Saved successfully"
965972
#: src/components/StdDesign/StdDataDisplay/StdTable.vue:351
966973
#: src/views/domain/DomainList.vue:145
967974
#: src/views/domain/ngx_conf/directive/DirectiveEditorItem.vue:81
968-
#: src/views/domain/ngx_conf/LocationEditor.vue:76
975+
#: src/views/domain/ngx_conf/LocationEditor.vue:74
969976
#: src/views/notification/Notification.vue:71
970977
msgid "No"
971978
msgstr "No"
@@ -1026,8 +1033,9 @@ msgstr ""
10261033
#: src/views/domain/components/Deploy.vue:23
10271034
#: src/views/domain/components/RightSettings.vue:51
10281035
#: src/views/domain/DomainList.vue:146
1029-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:212
1030-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:47
1036+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:48
1037+
#: src/views/domain/ngx_conf/NgxServer.vue:83
1038+
#: src/views/domain/ngx_conf/NgxUpstream.vue:27
10311039
#: src/views/notification/Notification.vue:72
10321040
msgid "OK"
10331041
msgstr ""
@@ -1077,8 +1085,8 @@ msgid "Password (*)"
10771085
msgstr "Password (*)"
10781086

10791087
#: src/views/config/ConfigEdit.vue:120
1080-
#: src/views/domain/ngx_conf/LocationEditor.vue:124
1081-
#: src/views/domain/ngx_conf/LocationEditor.vue:96
1088+
#: src/views/domain/ngx_conf/LocationEditor.vue:122
1089+
#: src/views/domain/ngx_conf/LocationEditor.vue:94
10821090
msgid "Path"
10831091
msgstr "Path"
10841092

@@ -1203,6 +1211,15 @@ msgstr ""
12031211
msgid "Removed successfully"
12041212
msgstr "Saved successfully"
12051213

1214+
#: src/views/domain/ngx_conf/NgxUpstream.vue:74
1215+
#, fuzzy
1216+
msgid "Rename"
1217+
msgstr "Username"
1218+
1219+
#: src/views/domain/ngx_conf/NgxUpstream.vue:103
1220+
msgid "Rename Upstream"
1221+
msgstr ""
1222+
12061223
#: src/views/certificate/RenewCert.vue:43
12071224
#: src/views/certificate/RenewCert.vue:47
12081225
#, fuzzy
@@ -1473,7 +1490,7 @@ msgstr ""
14731490
msgid "Title"
14741491
msgstr ""
14751492

1476-
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:42
1493+
#: src/views/domain/ngx_conf/NgxConfigEditor.vue:43
14771494
msgid ""
14781495
"To make sure the certification auto-renewal can work normally, we need to "
14791496
"add a location which can proxy the request from authority to backend, and we "
@@ -1488,7 +1505,7 @@ msgstr ""
14881505

14891506
#: src/views/certificate/DNSCredential.vue:26 src/views/config/config.ts:29
14901507
#: src/views/config/ConfigEdit.vue:123
1491-
#: src/views/domain/components/RightSettings.vue:84
1508+
#: src/views/domain/components/RightSettings.vue:87
14921509
#: src/views/domain/DomainList.vue:44 src/views/environment/Environment.vue:98
14931510
#: src/views/user/User.vue:40
14941511
msgid "Updated at"
@@ -1579,7 +1596,7 @@ msgid "Writing certificate to disk"
15791596
msgstr ""
15801597

15811598
#: src/views/domain/ngx_conf/directive/DirectiveEditorItem.vue:80
1582-
#: src/views/domain/ngx_conf/LocationEditor.vue:75
1599+
#: src/views/domain/ngx_conf/LocationEditor.vue:73
15831600
msgid "Yes"
15841601
msgstr "Yes"
15851602

@@ -1591,6 +1608,10 @@ msgstr ""
15911608
msgid "You can check Nginx UI upgrade at this page."
15921609
msgstr ""
15931610

1611+
#, fuzzy
1612+
#~ msgid "Server"
1613+
#~ msgstr "Server Info"
1614+
15941615
#, fuzzy
15951616
#~ msgid "Leave blank will not change anything."
15961617
#~ msgstr "Leave blank for no change"

0 commit comments

Comments
 (0)