From c2c3147b78853a67122bd72cba48d29e2d2044e8 Mon Sep 17 00:00:00 2001 From: Jacky Date: Sat, 19 Oct 2024 10:57:44 +0800 Subject: [PATCH] feat(site-editor): added alert if nginx is not running #425 --- .../components/NginxControl/NginxControl.vue | 23 +++++++++++-------- app/src/pinia/moudule/global.ts | 12 ++++++++++ app/src/routes/index.ts | 12 +++++----- .../views/certificate/CertificateEditor.vue | 4 ++-- app/src/views/certificate/RenewCert.vue | 2 +- .../views/certificate/WildcardCertificate.vue | 4 ++-- .../DomainAdd.vue => site/SiteAdd.vue} | 8 +++---- .../DomainEdit.vue => site/SiteEdit.vue} | 8 +++---- .../DomainList.vue => site/SiteList.vue} | 4 ++-- app/src/views/{domain => site}/cert/Cert.vue | 6 ++--- .../views/{domain => site}/cert/CertInfo.vue | 0 .../views/{domain => site}/cert/IssueCert.vue | 2 +- .../cert/components/AutoCertStepOne.vue | 2 +- .../cert/components/ChangeCert/ChangeCert.vue | 0 .../cert/components/DNSChallenge.vue | 0 .../cert/components/ObtainCert.vue | 4 ++-- .../cert/components/ObtainCertLive.vue | 0 .../{domain => site}/components/Deploy.vue | 0 .../components/RightSettings.vue | 2 +- .../components/SiteDuplicate.vue | 0 .../ngx_conf/LocationEditor.vue | 0 .../{domain => site}/ngx_conf/LogEntry.vue | 0 .../views/site/ngx_conf/NginxStatusAlert.vue | 21 +++++++++++++++++ .../ngx_conf/NgxConfigEditor.vue | 8 +++++-- .../{domain => site}/ngx_conf/NgxServer.vue | 10 ++++---- .../{domain => site}/ngx_conf/NgxUpstream.vue | 2 +- .../config_template/ConfigTemplate.vue | 6 ++--- .../ngx_conf/config_template/TemplateForm.vue | 2 +- .../config_template/TemplateFormItem.vue | 0 .../ngx_conf/directive/DirectiveAdd.vue | 0 .../ngx_conf/directive/DirectiveEditor.vue | 2 +- .../directive/DirectiveEditorItem.vue | 0 .../views/{domain => site}/ngx_conf/index.ts | 0 app/src/views/stream/StreamEdit.vue | 2 +- app/src/views/{pty => terminal}/Terminal.vue | 0 35 files changed, 93 insertions(+), 53 deletions(-) create mode 100644 app/src/pinia/moudule/global.ts rename app/src/views/{domain/DomainAdd.vue => site/SiteAdd.vue} (93%) rename app/src/views/{domain/DomainEdit.vue => site/SiteEdit.vue} (96%) rename app/src/views/{domain/DomainList.vue => site/SiteList.vue} (97%) rename app/src/views/{domain => site}/cert/Cert.vue (88%) rename app/src/views/{domain => site}/cert/CertInfo.vue (100%) rename app/src/views/{domain => site}/cert/IssueCert.vue (95%) rename app/src/views/{domain => site}/cert/components/AutoCertStepOne.vue (98%) rename app/src/views/{domain => site}/cert/components/ChangeCert/ChangeCert.vue (100%) rename app/src/views/{domain => site}/cert/components/DNSChallenge.vue (100%) rename app/src/views/{domain => site}/cert/components/ObtainCert.vue (97%) rename app/src/views/{domain => site}/cert/components/ObtainCertLive.vue (100%) rename app/src/views/{domain => site}/components/Deploy.vue (100%) rename app/src/views/{domain => site}/components/RightSettings.vue (98%) rename app/src/views/{domain => site}/components/SiteDuplicate.vue (100%) rename app/src/views/{domain => site}/ngx_conf/LocationEditor.vue (100%) rename app/src/views/{domain => site}/ngx_conf/LogEntry.vue (100%) create mode 100644 app/src/views/site/ngx_conf/NginxStatusAlert.vue rename app/src/views/{domain => site}/ngx_conf/NgxConfigEditor.vue (96%) rename app/src/views/{domain => site}/ngx_conf/NgxServer.vue (92%) rename app/src/views/{domain => site}/ngx_conf/NgxUpstream.vue (98%) rename app/src/views/{domain => site}/ngx_conf/config_template/ConfigTemplate.vue (93%) rename app/src/views/{domain => site}/ngx_conf/config_template/TemplateForm.vue (80%) rename app/src/views/{domain => site}/ngx_conf/config_template/TemplateFormItem.vue (100%) rename app/src/views/{domain => site}/ngx_conf/directive/DirectiveAdd.vue (100%) rename app/src/views/{domain => site}/ngx_conf/directive/DirectiveEditor.vue (92%) rename app/src/views/{domain => site}/ngx_conf/directive/DirectiveEditorItem.vue (100%) rename app/src/views/{domain => site}/ngx_conf/index.ts (100%) rename app/src/views/{pty => terminal}/Terminal.vue (100%) diff --git a/app/src/components/NginxControl/NginxControl.vue b/app/src/components/NginxControl/NginxControl.vue index 9166ff0f..15355b34 100644 --- a/app/src/components/NginxControl/NginxControl.vue +++ b/app/src/components/NginxControl/NginxControl.vue @@ -4,9 +4,12 @@ import { ReloadOutlined } from '@ant-design/icons-vue' import ngx from '@/api/ngx' import { logLevel } from '@/views/config/constants' import { NginxStatus } from '@/constants' +import { useGlobalStore } from '@/pinia/moudule/global' -const status = ref(0) -async function get_status() { +const global = useGlobalStore() +const { nginxStatus: status } = storeToRefs(global) + +async function getStatus() { const r = await ngx.status() if (r?.running === true) status.value = NginxStatus.Running @@ -16,7 +19,7 @@ async function get_status() { return r } -function reload_nginx() { +function reloadNginx() { status.value = NginxStatus.Reloading ngx.reload().then(r => { if (r.level < logLevel.Warn) @@ -27,14 +30,14 @@ function reload_nginx() { message.error(r.message) }).catch(e => { message.error(`${$gettext('Server error')} ${e?.message}`) - }).finally(() => get_status()) + }).finally(() => getStatus()) } -async function restart_nginx() { +async function restartNginx() { status.value = NginxStatus.Restarting await ngx.restart() - get_status().then(r => { + getStatus().then(r => { if (r.level < logLevel.Warn) message.success($gettext('Nginx restarted successfully')) else if (r.level === logLevel.Warn) @@ -50,7 +53,7 @@ const visible = ref(false) watch(visible, v => { if (v) - get_status() + getStatus() }) @@ -58,7 +61,7 @@ watch(visible, v => {