From f5a2a634a1fa720099aec07b36fb0aa97fffa482 Mon Sep 17 00:00:00 2001 From: 0xJacky Date: Thu, 5 Jan 2023 13:46:42 +0800 Subject: [PATCH] feat: config templates #53, #34, #33 --- .air.toml | 2 +- frontend/components.d.ts | 2 + frontend/src/api/template.ts | 25 +++ .../components/SetLanguage/SetLanguage.vue | 1 - frontend/src/layouts/BaseLayout.vue | 2 +- frontend/src/views/domain/DomainAdd.vue | 5 +- frontend/src/views/domain/cert/IssueCert.vue | 1 + .../views/domain/ngx_conf/ConfigTemplate.vue | 106 +++++++++++++ .../views/domain/ngx_conf/LocationEditor.vue | 6 +- .../views/domain/ngx_conf/NgxConfigEditor.vue | 9 +- .../ngx_conf/directive/DirectiveEditor.vue | 10 +- .../directive/DirectiveEditorItem.vue | 5 +- server/api/template.go | 96 ++++-------- server/pkg/nginx/parse.go | 13 +- server/router/routers.go | 2 + server/service/template.go | 145 ++++++++++++++++++ template/block/codeigniter.conf | 12 +- template/block/enable-php-8.conf | 13 ++ template/block/laravel.conf | 12 +- template/block/reverse_proxy.conf | 15 ++ template/block/reverse_proxy_ws.conf | 26 ++++ 21 files changed, 416 insertions(+), 92 deletions(-) create mode 100644 frontend/src/api/template.ts create mode 100644 frontend/src/views/domain/ngx_conf/ConfigTemplate.vue create mode 100644 server/service/template.go create mode 100644 template/block/enable-php-8.conf create mode 100644 template/block/reverse_proxy.conf create mode 100644 template/block/reverse_proxy_ws.conf diff --git a/.air.toml b/.air.toml index a9855a6..0d1e703 100644 --- a/.air.toml +++ b/.air.toml @@ -13,7 +13,7 @@ bin = "tmp/main" # Customize binary. full_bin = "APP_ENV=dev APP_USER=air ./tmp/main" # Watch these filename extensions. -include_ext = ["go", "tpl", "tmpl", "html"] +include_ext = ["go", "tpl", "tmpl", "html", "conf"] # Ignore these filename extensions or directories. exclude_dir = ["assets", "tmp", "vendor", "frontend/node_modules", "upload"] # Watch these directories if you specified. diff --git a/frontend/components.d.ts b/frontend/components.d.ts index d7ff438..842c10c 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -28,6 +28,8 @@ declare module '@vue/runtime-core' { ALayoutFooter: typeof import('ant-design-vue/es')['LayoutFooter'] ALayoutHeader: typeof import('ant-design-vue/es')['LayoutHeader'] ALayoutSider: typeof import('ant-design-vue/es')['LayoutSider'] + AList: typeof import('ant-design-vue/es')['List'] + AListItem: typeof import('ant-design-vue/es')['ListItem'] AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] diff --git a/frontend/src/api/template.ts b/frontend/src/api/template.ts new file mode 100644 index 0000000..d15057a --- /dev/null +++ b/frontend/src/api/template.ts @@ -0,0 +1,25 @@ +import Curd from '@/api/curd' +import http from '@/lib/http' + +class Template extends Curd { + get_config_list() { + return http.get('template/configs') + } + + get_block_list() { + return http.get('template/blocks') + } + + get_config(name: string) { + return http.get('template/config/' + name) + } + + get_block(name: string) { + return http.get('template/block/' + name) + } + +} + +const template = new Template('/template') + +export default template diff --git a/frontend/src/components/SetLanguage/SetLanguage.vue b/frontend/src/components/SetLanguage/SetLanguage.vue index 5b20f35..1d889d8 100644 --- a/frontend/src/components/SetLanguage/SetLanguage.vue +++ b/frontend/src/components/SetLanguage/SetLanguage.vue @@ -1,7 +1,6 @@ - +