Skip to content

Commit

Permalink
[v1.3 RC] Enhanced domain add, optimized dashboard.
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xJacky
0xJacky authored May 8, 2022
2 parents c8282da + da31777 commit b3cf13a
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 226 deletions.
39 changes: 20 additions & 19 deletions README-zh_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ Nginx 网络管理界面，由 [0xJacky](https://jackyu.cn/) 与 [Hintay](https
- 在线编辑 Nginx 配置文件，编辑器支持 Nginx 配置语法高亮
- 使用 Go 和 Vue 开发，发行版本为单个可执行的二进制文件
- 前端支持暗夜模式
- 保存配置文件后自动测试配置文件并重载 Nginx

### 国际化

Expand Down Expand Up @@ -195,51 +196,51 @@ go build -o nginx-ui -v main.go
**安装或升级**

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

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

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

### 更多用法

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

## Nginx 反向代理配置示例

```nginx
server {
listen 80;
listen [::]:80;
listen 80;
listen [::]:80;
server_name <your_server_name>;
server_name <your_server_name>;
rewrite ^(.*)$ https://$host$1 permanent;
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name <your_server_name>;
server_name <your_server_name>;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
}
}
```
Expand Down
33 changes: 17 additions & 16 deletions README-zh_TW.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Nginx 網路管理介面，由 [0xJacky](https://jackyu.cn/) 與 [Hintay](https
- 線上編輯 Nginx 配置檔案，編輯器支援 Nginx 配置語法高亮
- 使用 Go 和 Vue 開發，發行版本為單個可執行的二進位制檔案
- 前端支援暗夜模式
- 保存配置文件後自動測試配置文件並重載 Nginx

### 國際化

Expand Down Expand Up @@ -215,31 +216,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst

```nginx
server {
listen 80;
listen [::]:80;
listen 80;
listen [::]:80;
server_name <your_server_name>;
server_name <your_server_name>;
rewrite ^(.*)$ https://$host$1 permanent;
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name <your_server_name>;
server_name <your_server_name>;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
}
}
```
Expand Down
33 changes: 17 additions & 16 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ URL：[https://nginxui.jackyu.cn](https://nginxui.jackyu.cn)
- Online editing websites configuration files, the editor support highlight nginx configuration syntax.
- Written in Go and Vue, distribution is a single executable binary.
- Frontend support Dark Mode
- Automatically test configuration file and reload nginx after saving configuration.

### Internationalization

Expand Down Expand Up @@ -214,31 +215,31 @@ bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/master/inst

```nginx
server {
listen 80;
listen [::]:80;
listen 80;
listen [::]:80;
server_name <your_server_name>;
server_name <your_server_name>;
rewrite ^(.*)$ https://$host$1 permanent;
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name <your_server_name>;
server_name <your_server_name>;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
ssl_certificate /path/to/ssl_cert;
ssl_certificate_key /path/to/ssl_cert_key;
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection upgrade;
proxy_pass http://127.0.0.1:9000/;
}
}
```
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/components/Chart/RadialBarChart.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ export default {
series: this.series,
chart: {
type: 'radialBar',
offsetY: 0
offsetY: -30
},
plotOptions: {
radialBar: {
startAngle: -135,
endAngle: 135,
dataLabels: {
name: {
fontSize: '15px',
fontSize: '14px',
color: this.colors,
offsetY: 56
offsetY: 36
},
value: {
offsetY: 60,
offsetY: 50,
fontSize: '14px',
color: undefined,
formatter: () => {return ''}
Expand Down Expand Up @@ -82,16 +82,16 @@ export default {
.container {
position: relative;
margin: 0 auto;
height: 172px;
height: 112px!important;
.text {
position: absolute;
top: calc(50% - 3px);
top: calc(50% - 5px);
width: 100%;
text-align: center;
}
.bottom_text {
position: absolute;
top: calc(152px);
top: calc(106px);
font-weight: 600;
width: 100%;
text-align: center;
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/lazy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ import {
Tabs,
Tooltip,
Transfer,
Upload
Upload,
Tag
} from 'ant-design-vue'

Vue.use(ConfigProvider)
Expand Down Expand Up @@ -97,6 +98,7 @@ Vue.use(Result)
Vue.use(pageHeader)
Vue.use(Switch)
Vue.use(Space)
Vue.use(Tag)

Vue.prototype.$confirm = Modal.confirm
Vue.prototype.$message = message
Expand Down
Loading

0 comments on commit b3cf13a

Please sign in to comment.