Skip to content

Commit 60919ae

Browse files
committed
Enhanced domain add
1 parent 0fe9bf5 commit 60919ae

File tree

22 files changed

+4064
-3658
lines changed

22 files changed

+4064
-3658
lines changed

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-ui-frontend",
3-
"version": "1.2.2",
3+
"version": "1.3.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

frontend/src/components/StdDataEntry/StdDataEntry.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115

116116
<p v-if="!dataSource[d.dataIndex] && d.empty_description" v-html="d.empty_description"/>
117117
</a-form-item>
118-
<a-form-item>
118+
<a-form-item v-if="$slots.supplement||$slots.action">
119119
<slot name="supplement"/>
120120
<slot name="action"/>
121121
</a-form-item>

frontend/src/locale/en/LC_MESSAGES/app.po

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,27 @@ msgstr ""
2323
msgid "Action"
2424
msgstr ""
2525

26-
#: src/router/index.js:47 src/views/domain/DomainAdd.vue:18
26+
#: src/router/index.js:47 src/views/domain/DomainAdd.vue:27
2727
msgid "Add Site"
2828
msgstr ""
2929

30-
#: src/views/domain/DomainAdd.vue:2
31-
msgid ""
32-
"Add site here first, then you can configure TLS on the domain edit page."
33-
msgstr ""
34-
35-
#: src/views/domain/DomainEdit.vue:194
30+
#: src/views/domain/DomainAdd.vue:86 src/views/domain/DomainEdit.vue:172
3631
msgid "Auto-renewal disabled for %{name}"
3732
msgstr ""
3833

39-
#: src/views/domain/DomainEdit.vue:188
34+
#: src/views/domain/DomainAdd.vue:80 src/views/domain/DomainEdit.vue:166
4035
msgid "Auto-renewal enabled for %{name}"
4136
msgstr ""
4237

38+
#: src/views/domain/DomainAdd.vue:37
39+
msgid "Base information"
40+
msgstr ""
41+
4342
#: src/views/other/About.vue:11
4443
msgid "Build with"
4544
msgstr ""
4645

47-
#: src/views/config/ConfigEdit.vue:5 src/views/domain/DomainEdit.vue:23
46+
#: src/views/config/ConfigEdit.vue:5 src/views/domain/DomainEdit.vue:24
4847
msgid "Cancel"
4948
msgstr ""
5049

@@ -76,6 +75,10 @@ msgstr ""
7675
msgid "Configurations"
7776
msgstr ""
7877

78+
#: src/views/domain/DomainAdd.vue:40
79+
msgid "Configure SSL"
80+
msgstr ""
81+
7982
#: src/views/dashboard/DashBoard.vue:207
8083
msgid "CPU Status"
8184
msgstr ""
@@ -84,6 +87,10 @@ msgstr ""
8487
msgid "CPU:"
8588
msgstr ""
8689

90+
#: src/views/domain/DomainAdd.vue:31 src/views/domain/DomainAdd.vue:5
91+
msgid "Create Another"
92+
msgstr ""
93+
8794
#: src/views/user/User.vue:23
8895
msgid "Created at"
8996
msgstr ""
@@ -104,7 +111,7 @@ msgstr ""
104111
msgid "Development Mode"
105112
msgstr ""
106113

107-
#: src/views/domain/DomainEdit.vue:196
114+
#: src/views/domain/DomainAdd.vue:88 src/views/domain/DomainEdit.vue:174
108115
msgid "Disable auto-renewal failed for %{name}"
109116
msgstr ""
110117

@@ -121,10 +128,14 @@ msgstr ""
121128
msgid "Disk IO"
122129
msgstr ""
123130

124-
#: src/views/domain/DomainEdit.vue:133
131+
#: src/views/domain/DomainEdit.vue:134
125132
msgid "Do you want to change the template to support the TLS?"
126133
msgstr ""
127134

135+
#: src/views/domain/DomainAdd.vue:111
136+
msgid "Domain Config Created Successfully"
137+
msgstr ""
138+
128139
#: src/views/domain/DomainEdit.vue:42
129140
msgid "Edit %{n}"
130141
msgstr ""
@@ -145,11 +156,11 @@ msgstr ""
145156
msgid "Email (*)"
146157
msgstr ""
147158

148-
#: src/views/domain/DomainEdit.vue:190
159+
#: src/views/domain/DomainAdd.vue:82 src/views/domain/DomainEdit.vue:168
149160
msgid "Enable auto-renewal failed for %{name}"
150161
msgstr ""
151162

152-
#: src/views/domain/DomainAdd.vue:33
163+
#: src/views/domain/DomainAdd.vue:39
153164
msgid "Enable failed"
154165
msgstr ""
155166

@@ -162,7 +173,7 @@ msgstr ""
162173
msgid "Enabled"
163174
msgstr ""
164175

165-
#: src/views/domain/DomainAdd.vue:27 src/views/domain/DomainList.vue:46
176+
#: src/views/domain/DomainAdd.vue:36 src/views/domain/DomainList.vue:46
166177
msgid "Enabled successfully"
167178
msgstr ""
168179

@@ -182,11 +193,16 @@ msgstr ""
182193
msgid "File Not Found"
183194
msgstr ""
184195

196+
#: src/views/domain/DomainAdd.vue:43
197+
msgid "Finished"
198+
msgstr ""
199+
200+
#: src/views/domain/DomainAdd.vue:13 src/views/domain/DomainAdd.vue:2
185201
#: src/views/domain/DomainEdit.vue:9 src/views/domain/DomainEdit.vue:3
186202
msgid "Getting Certificate from Let's Encrypt"
187203
msgstr ""
188204

189-
#: src/views/domain/DomainEdit.vue:156
205+
#: src/views/domain/methods.js:34
190206
msgid "Getting the certificate, please wait..."
191207
msgstr ""
192208

@@ -265,6 +281,10 @@ msgstr ""
265281
msgid "Memory"
266282
msgstr ""
267283

284+
#: src/views/domain/DomainAdd.vue:28 src/views/domain/DomainAdd.vue:2
285+
msgid "Modify Config"
286+
msgstr ""
287+
268288
#: src/views/config/Config.vue:5 src/views/domain/DomainList.vue:5
269289
msgid "Name"
270290
msgstr ""
@@ -281,6 +301,10 @@ msgstr ""
281301
msgid "Network Total Send"
282302
msgstr ""
283303

304+
#: src/views/domain/DomainAdd.vue:38
305+
msgid "Next"
306+
msgstr ""
307+
284308
#: src/router/index.js:105
285309
msgid "Not Found"
286310
msgstr ""
@@ -289,7 +313,7 @@ msgstr ""
289313
msgid "Not Valid Before: %{date}"
290314
msgstr ""
291315

292-
#: src/views/domain/DomainEdit.vue:155
316+
#: src/views/domain/methods.js:33
293317
msgid ""
294318
"Note: The server_name in the current configuration must be the domain name "
295319
"you need to get the certificate."
@@ -343,26 +367,25 @@ msgstr ""
343367
msgid "Root Directory (root)"
344368
msgstr ""
345369

346-
#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainAdd.vue:6
347-
#: src/views/domain/DomainEdit.vue:24
370+
#: src/views/config/ConfigEdit.vue:6 src/views/domain/DomainEdit.vue:27
348371
msgid "Save"
349372
msgstr ""
350373

351-
#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:38
352-
#: src/views/domain/DomainEdit.vue:151
374+
#: src/views/config/ConfigEdit.vue:47 src/views/domain/DomainAdd.vue:43
375+
#: src/views/domain/DomainAdd.vue:54 src/views/domain/DomainEdit.vue:152
353376
msgid "Save error %{msg}"
354377
msgstr ""
355378

356-
#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:24
357-
#: src/views/domain/DomainEdit.vue:145
379+
#: src/views/config/ConfigEdit.vue:44 src/views/domain/DomainAdd.vue:33
380+
#: src/views/domain/DomainAdd.vue:51 src/views/domain/DomainEdit.vue:146
358381
msgid "Saved successfully"
359382
msgstr ""
360383

361384
#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:257
362385
msgid "Send"
363386
msgstr ""
364387

365-
#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:71
388+
#: src/views/config/ConfigEdit.vue:35 src/views/domain/DomainEdit.vue:72
366389
#: src/views/other/Login.vue:35
367390
msgid "Server error"
368391
msgstr ""
@@ -379,6 +402,10 @@ msgstr ""
379402
msgid "Sites List"
380403
msgstr ""
381404

405+
#: src/views/domain/DomainAdd.vue:20 src/views/domain/DomainAdd.vue:9
406+
msgid "Skip"
407+
msgstr ""
408+
382409
#: src/views/domain/DomainList.vue:11
383410
msgid "Status"
384411
msgstr ""
@@ -418,11 +445,12 @@ msgid ""
418445
"changed after it has been created."
419446
msgstr ""
420447

448+
#: src/views/domain/DomainAdd.vue:15 src/views/domain/DomainAdd.vue:4
421449
#: src/views/domain/DomainEdit.vue:11 src/views/domain/DomainEdit.vue:5
422450
msgid "This feature is not available in demo."
423451
msgstr ""
424452

425-
#: src/views/domain/DomainEdit.vue:134
453+
#: src/views/domain/DomainEdit.vue:135
426454
msgid "This operation will lose the custom configuration."
427455
msgstr ""
428456

247 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)