Skip to content

Commit da31777

Browse files
0xJacky0xJacky
committed
Optimized Dashboard
1 parent 13689f8 commit da31777

File tree

11 files changed

+147
-120
lines changed

11 files changed

+147
-120
lines changed

‎README-zh_CN.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -196,51 +196,51 @@ go build -o nginx-ui -v main.go
196196
**安装或升级**
197197

198198
```shell
199-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) install
199+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) install -r https://ghproxy.com/
200200
```
201201
一键安装脚本默认设置的监听端口为 `9000`，HTTP Challenge 端口默认为 `9180`，如果出现端口冲突请进入 `/usr/local/etc/nginx-ui/app.ini` 修改，并使用 `systemctl restart nginx-ui` 重启 Nginx UI 服务。
202202

203203
**卸载 Nginx UI 但保留配置和数据库文件**
204204

205205
```shell
206-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) remove
206+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) remove
207207
```
208208

209209
### 更多用法
210210

211211
````shell
212-
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) help
212+
bash <(curl -L -s https://ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/master/install.sh) help
213213
````
214214

215215
## Nginx 反向代理配置示例
216216

217217
```nginx
218218
server {
219-
listen 80;
220-
listen [::]:80;
219+
listen 80;
220+
listen [::]:80;
221221
222-
server_name <your_server_name>;
222+
server_name <your_server_name>;
223223
rewrite ^(.*)$ https://$host$1 permanent;
224224
}
225225
226226
server {
227-
listen 443 ssl http2;
228-
listen [::]:443 ssl http2;
227+
listen 443 ssl http2;
228+
listen [::]:443 ssl http2;
229229
230-
server_name <your_server_name>;
230+
server_name <your_server_name>;
231231
232-
ssl_certificate /path/to/ssl_cert;
233-
ssl_certificate_key /path/to/ssl_cert_key;
232+
ssl_certificate /path/to/ssl_cert;
233+
ssl_certificate_key /path/to/ssl_cert_key;
234234
235235
location / {
236-
proxy_set_header Host $host;
237-
proxy_set_header X-Real-IP $remote_addr;
238-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239-
proxy_set_header X-Forwarded-Proto $scheme;
240-
proxy_http_version 1.1;
241-
proxy_set_header Upgrade $http_upgrade;
242-
proxy_set_header Connection upgrade;
243-
proxy_pass http://127.0.0.1:9000/;
236+
proxy_set_header Host $host;
237+
proxy_set_header X-Real-IP $remote_addr;
238+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239+
proxy_set_header X-Forwarded-Proto $scheme;
240+
proxy_http_version 1.1;
241+
proxy_set_header Upgrade $http_upgrade;
242+
proxy_set_header Connection upgrade;
243+
proxy_pass http://127.0.0.1:9000/;
244244
}
245245
}
246246
```

‎README-zh_TW.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,31 +216,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst
216216

217217
```nginx
218218
server {
219-
listen 80;
220-
listen [::]:80;
219+
listen 80;
220+
listen [::]:80;
221221
222-
server_name <your_server_name>;
222+
server_name <your_server_name>;
223223
rewrite ^(.*)$ https://$host$1 permanent;
224224
}
225225
226226
server {
227-
listen 443 ssl http2;
228-
listen [::]:443 ssl http2;
227+
listen 443 ssl http2;
228+
listen [::]:443 ssl http2;
229229
230-
server_name <your_server_name>;
230+
server_name <your_server_name>;
231231
232-
ssl_certificate /path/to/ssl_cert;
233-
ssl_certificate_key /path/to/ssl_cert_key;
232+
ssl_certificate /path/to/ssl_cert;
233+
ssl_certificate_key /path/to/ssl_cert_key;
234234
235235
location / {
236-
proxy_set_header Host $host;
237-
proxy_set_header X-Real-IP $remote_addr;
238-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239-
proxy_set_header X-Forwarded-Proto $scheme;
240-
proxy_http_version 1.1;
241-
proxy_set_header Upgrade $http_upgrade;
242-
proxy_set_header Connection upgrade;
243-
proxy_pass http://127.0.0.1:9000/;
236+
proxy_set_header Host $host;
237+
proxy_set_header X-Real-IP $remote_addr;
238+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
239+
proxy_set_header X-Forwarded-Proto $scheme;
240+
proxy_http_version 1.1;
241+
proxy_set_header Upgrade $http_upgrade;
242+
proxy_set_header Connection upgrade;
243+
proxy_pass http://127.0.0.1:9000/;
244244
}
245245
}
246246
```

‎README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,31 +215,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst
215215

216216
```nginx
217217
server {
218-
listen 80;
219-
listen [::]:80;
218+
listen 80;
219+
listen [::]:80;
220220
221-
server_name <your_server_name>;
221+
server_name <your_server_name>;
222222
rewrite ^(.*)$ https://$host$1 permanent;
223223
}
224224
225225
server {
226-
listen 443 ssl http2;
227-
listen [::]:443 ssl http2;
226+
listen 443 ssl http2;
227+
listen [::]:443 ssl http2;
228228
229-
server_name <your_server_name>;
229+
server_name <your_server_name>;
230230
231-
ssl_certificate /path/to/ssl_cert;
232-
ssl_certificate_key /path/to/ssl_cert_key;
231+
ssl_certificate /path/to/ssl_cert;
232+
ssl_certificate_key /path/to/ssl_cert_key;
233233
234234
location / {
235-
proxy_set_header Host $host;
236-
proxy_set_header X-Real-IP $remote_addr;
237-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
238-
proxy_set_header X-Forwarded-Proto $scheme;
239-
proxy_http_version 1.1;
240-
proxy_set_header Upgrade $http_upgrade;
241-
proxy_set_header Connection upgrade;
242-
proxy_pass http://127.0.0.1:9000/;
235+
proxy_set_header Host $host;
236+
proxy_set_header X-Real-IP $remote_addr;
237+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
238+
proxy_set_header X-Forwarded-Proto $scheme;
239+
proxy_http_version 1.1;
240+
proxy_set_header Upgrade $http_upgrade;
241+
proxy_set_header Connection upgrade;
242+
proxy_pass http://127.0.0.1:9000/;
243243
}
244244
}
245245
```

‎frontend/src/components/Chart/RadialBarChart.vue‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ export default {
3535
series: this.series,
3636
chart: {
3737
type: 'radialBar',
38-
offsetY: 0
38+
offsetY: -30
3939
},
4040
plotOptions: {
4141
radialBar: {
4242
startAngle: -135,
4343
endAngle: 135,
4444
dataLabels: {
4545
name: {
46-
fontSize: '15px',
46+
fontSize: '14px',
4747
color: this.colors,
48-
offsetY: 56
48+
offsetY: 36
4949
},
5050
value: {
51-
offsetY: 60,
51+
offsetY: 50,
5252
fontSize: '14px',
5353
color: undefined,
5454
formatter: () => {return ''}
@@ -82,16 +82,16 @@ export default {
8282
.container {
8383
position: relative;
8484
margin: 0 auto;
85-
height: 172px;
85+
height: 112px!important;
8686
.text {
8787
position: absolute;
88-
top: calc(50% - 3px);
88+
top: calc(50% - 5px);
8989
width: 100%;
9090
text-align: center;
9191
}
9292
.bottom_text {
9393
position: absolute;
94-
top: calc(152px);
94+
top: calc(106px);
9595
font-weight: 600;
9696
width: 100%;
9797
text-align: center;

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

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ msgstr ""
8383
msgid "Configure SSL"
8484
msgstr ""
8585

86-
#: src/views/dashboard/DashBoard.vue:207
86+
#: src/views/dashboard/DashBoard.vue:211
8787
msgid "CPU Status"
8888
msgstr ""
8989

@@ -119,16 +119,16 @@ msgstr ""
119119
msgid "Disable auto-renewal failed for %{name}"
120120
msgstr ""
121121

122-
#: src/views/domain/DomainList.vue:7 src/views/domain/DomainList.vue:2
123-
#: src/views/domain/DomainList.vue:17
122+
#: src/views/domain/DomainEdit.vue:63 src/views/domain/DomainList.vue:7
123+
#: src/views/domain/DomainList.vue:2 src/views/domain/DomainList.vue:17
124124
msgid "Disabled"
125125
msgstr ""
126126

127127
#: src/views/domain/DomainEdit.vue:180 src/views/domain/DomainList.vue:55
128128
msgid "Disabled successfully"
129129
msgstr ""
130130

131-
#: src/views/dashboard/DashBoard.vue:285
131+
#: src/views/dashboard/DashBoard.vue:289
132132
msgid "Disk IO"
133133
msgstr ""
134134

@@ -140,15 +140,15 @@ msgstr ""
140140
msgid "Domain Config Created Successfully"
141141
msgstr ""
142142

143-
#: src/views/domain/DomainEdit.vue:49
143+
#: src/views/domain/DomainEdit.vue:47
144144
msgid "Edit %{n}"
145145
msgstr ""
146146

147147
#: src/router/index.js:69 src/views/config/ConfigEdit.vue:15
148148
msgid "Edit Configuration"
149149
msgstr ""
150150

151-
#: src/views/domain/DomainEdit.vue:136
151+
#: src/views/domain/DomainEdit.vue:134
152152
msgid "Edit Configuration File"
153153
msgstr ""
154154

@@ -172,8 +172,9 @@ msgstr ""
172172
msgid "Enable TLS"
173173
msgstr ""
174174

175-
#: src/views/domain/DomainEdit.vue:73 src/views/domain/DomainList.vue:8
176-
#: src/views/domain/DomainList.vue:3 src/views/domain/DomainList.vue:16
175+
#: src/views/domain/DomainEdit.vue:54 src/views/domain/DomainEdit.vue:71
176+
#: src/views/domain/DomainList.vue:8 src/views/domain/DomainList.vue:3
177+
#: src/views/domain/DomainList.vue:16
177178
msgid "Enabled"
178179
msgstr ""
179180

@@ -282,10 +283,14 @@ msgstr ""
282283
msgid "Manage Users"
283284
msgstr ""
284285

285-
#: src/views/dashboard/DashBoard.vue:103
286+
#: src/views/dashboard/DashBoard.vue:105
286287
msgid "Memory"
287288
msgstr ""
288289

290+
#: src/views/dashboard/DashBoard.vue:93
291+
msgid "Memory and Storage"
292+
msgstr ""
293+
289294
#: src/views/domain/DomainAdd.vue:28 src/views/domain/DomainAdd.vue:2
290295
msgid "Modify Config"
291296
msgstr ""
@@ -294,15 +299,19 @@ msgstr ""
294299
msgid "Name"
295300
msgstr ""
296301

297-
#: src/views/dashboard/DashBoard.vue:234
302+
#: src/views/dashboard/DashBoard.vue:238
298303
msgid "Network"
299304
msgstr ""
300305

301-
#: src/views/dashboard/DashBoard.vue:168
306+
#: src/views/dashboard/DashBoard.vue:163
307+
msgid "Network Statistics"
308+
msgstr ""
309+
310+
#: src/views/dashboard/DashBoard.vue:172
302311
msgid "Network Total Receive"
303312
msgstr ""
304313

305-
#: src/views/dashboard/DashBoard.vue:177
314+
#: src/views/dashboard/DashBoard.vue:181
306315
msgid "Network Total Send"
307316
msgstr ""
308317

@@ -360,11 +369,11 @@ msgstr ""
360369
msgid "Project Team"
361370
msgstr ""
362371

363-
#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:308
372+
#: src/views/dashboard/DashBoard.vue:61 src/views/dashboard/DashBoard.vue:312
364373
msgid "Reads"
365374
msgstr ""
366375

367-
#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:243
376+
#: src/views/dashboard/DashBoard.vue:51 src/views/dashboard/DashBoard.vue:247
368377
msgid "Receive"
369378
msgstr ""
370379

@@ -386,7 +395,7 @@ msgstr ""
386395
msgid "Saved successfully"
387396
msgstr ""
388397

389-
#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:257
398+
#: src/views/dashboard/DashBoard.vue:54 src/views/dashboard/DashBoard.vue:261
390399
msgid "Send"
391400
msgstr ""
392401

@@ -415,15 +424,15 @@ msgstr ""
415424
msgid "Status"
416425
msgstr ""
417426

418-
#: src/views/dashboard/DashBoard.vue:135
427+
#: src/views/dashboard/DashBoard.vue:137
419428
msgid "Storage"
420429
msgstr ""
421430

422431
#: src/views/domain/CertInfo.vue:4
423432
msgid "Subject Name: %{name}"
424433
msgstr ""
425434

426-
#: src/views/dashboard/DashBoard.vue:119
435+
#: src/views/dashboard/DashBoard.vue:121
427436
msgid "Swap"
428437
msgstr ""
429438

@@ -476,6 +485,6 @@ msgstr ""
476485
msgid "Username (*)"
477486
msgstr ""
478487

479-
#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:294
488+
#: src/views/dashboard/DashBoard.vue:58 src/views/dashboard/DashBoard.vue:298
480489
msgid "Writes"
481490
msgstr ""

‎frontend/src/locale/zh_CN/LC_MESSAGES/app.mo‎

99 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)