From 6b640381e80915177d2da9db071959827a3a0c3d Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Mon, 1 May 2023 13:39:23 +0800 Subject: [PATCH] fix: site add issues --- frontend/docs/.vitepress/config.ts | 2 +- frontend/docs/guide/about.md | 2 +- frontend/docs/zh_CN/guide/about.md | 2 +- frontend/src/views/domain/DomainAdd.vue | 14 ++-- frontend/src/views/domain/cert/IssueCert.vue | 2 +- .../cert/components/AutoCertStepOne.vue | 6 +- .../domain/cert/components/ObtainCert.vue | 23 ++++--- .../views/domain/ngx_conf/NgxConfigEditor.vue | 8 ++- .../nginx/sites-available/test.nginxui.com | 24 +++++++ .../nginx/sites-enabled/test.nginxui.com | 1 + .../nginx/ssl/test.nginxui.com/fullchain.cer | 64 +++++++++++++++++++ .../nginx/ssl/test.nginxui.com/private.key | 27 ++++++++ 12 files changed, 153 insertions(+), 22 deletions(-) create mode 100644 resources/development/nginx/sites-available/test.nginxui.com create mode 120000 resources/development/nginx/sites-enabled/test.nginxui.com create mode 100644 resources/development/nginx/ssl/test.nginxui.com/fullchain.cer create mode 100644 resources/development/nginx/ssl/test.nginxui.com/private.key diff --git a/frontend/docs/.vitepress/config.ts b/frontend/docs/.vitepress/config.ts index 57bae2f6..b7a80a03 100644 --- a/frontend/docs/.vitepress/config.ts +++ b/frontend/docs/.vitepress/config.ts @@ -29,7 +29,7 @@ export default defineConfig({ nav: [ {text: 'Home', link: '/'}, {text: 'Guide', link: '/guide/about'}, - {text: 'Demo', link: 'https://nginxui.jackyu.cn'} + {text: 'Demo', link: 'https://demo.nginxui.com'} ], sidebar: sidebar(), diff --git a/frontend/docs/guide/about.md b/frontend/docs/guide/about.md index cc3257c5..e0980388 100644 --- a/frontend/docs/guide/about.md +++ b/frontend/docs/guide/about.md @@ -38,7 +38,7 @@ managing your Nginx server. ## Demo -URL:[https://nginxui.jackyu.cn](https://nginxui.jackyu.cn) +URL:[https://demo.nginxui.com](https://demo.nginxui.com) - Username:admin - Password:admin diff --git a/frontend/docs/zh_CN/guide/about.md b/frontend/docs/zh_CN/guide/about.md index ce8a4071..41c88b01 100644 --- a/frontend/docs/zh_CN/guide/about.md +++ b/frontend/docs/zh_CN/guide/about.md @@ -36,7 +36,7 @@ Nginx UI 是一个全新的 Nginx 网络管理界面,旨在简化 Nginx 服务 ## 在线预览 -网址:[https://nginxui.jackyu.cn](https://nginxui.jackyu.cn) +网址:[https://demo.nginxui.com](https://demo.nginxui.com) - 用户名:admin - 密码:admin diff --git a/frontend/src/views/domain/DomainAdd.vue b/frontend/src/views/domain/DomainAdd.vue index 89fa3217..24d18571 100644 --- a/frontend/src/views/domain/DomainAdd.vue +++ b/frontend/src/views/domain/DomainAdd.vue @@ -5,7 +5,7 @@ import NgxConfigEditor from '@/views/domain/ngx_conf/NgxConfigEditor.vue' import {useGettext} from 'vue3-gettext' import domain from '@/api/domain' import ngx from '@/api/ngx' -import {computed, reactive, ref} from 'vue' +import {computed, provide, reactive, ref} from 'vue' import {message} from 'ant-design-vue' import {useRouter} from 'vue-router' @@ -38,13 +38,12 @@ function init() { } function save() { - ngx.build_config(ngx_config).then(r => { + return ngx.build_config(ngx_config).then(r => { domain.save(ngx_config.name, {name: ngx_config.name, content: r.content, overwrite: true}).then(() => { message.success($gettext('Saved successfully')) domain.enable(ngx_config.name).then(() => { message.success($gettext('Enabled successfully')) - current_step.value++ window.scroll({top: 0, left: 0, behavior: 'smooth'}) }).catch(r => { message.error(r.message ?? $gettext('Enable failed'), 5) @@ -79,6 +78,13 @@ const has_server_name = computed(() => { return false }) + +provide('save_site_config', save) + +async function next() { + await save() + current_step.value++ +}