diff --git a/frontend/src/api/domain.js b/frontend/src/api/domain.js index 7cf95641..b1266cf0 100644 --- a/frontend/src/api/domain.js +++ b/frontend/src/api/domain.js @@ -27,8 +27,8 @@ const domain = { return http.post(base_url + '/' + name + '/disable') }, - get_template(name) { - return http.get('template/' + name) + get_template() { + return http.get('template') }, cert_info(domain) { diff --git a/frontend/src/api/index.js b/frontend/src/api/index.js index 66aa9948..54f3bdc9 100644 --- a/frontend/src/api/index.js +++ b/frontend/src/api/index.js @@ -5,6 +5,7 @@ import user from './user' import install from './install' import analytic from './analytic' import settings from './settings' +import ngx from './ngx' export default { domain, @@ -13,5 +14,6 @@ export default { user, install, analytic, - settings + settings, + ngx } diff --git a/frontend/src/api/ngx.js b/frontend/src/api/ngx.js new file mode 100644 index 00000000..eeacf95a --- /dev/null +++ b/frontend/src/api/ngx.js @@ -0,0 +1,13 @@ +import http from '@/lib/http' + +const ngx = { + build_config(ngxConfig) { + return http.post('/ngx/build_config', ngxConfig) + }, + + tokenize_config(content) { + return http.post('/ngx/tokenize_config', {content}) + } +} + +export default ngx diff --git a/frontend/src/components/StdDataDisplay/StdTable.vue b/frontend/src/components/StdDataDisplay/StdTable.vue index dfafd029..b970a1cf 100644 --- a/frontend/src/components/StdDataDisplay/StdTable.vue +++ b/frontend/src/components/StdDataDisplay/StdTable.vue @@ -72,7 +72,7 @@ :okText="ok_text" :title="restore_title_text" @confirm="restore(record[rowKey])"> - {{restore_action_text}} + {{ restore_action_text }} - {{destroy_action_text}} + {{ destroy_action_text }} @@ -93,6 +93,7 @@ import StdPagination from './StdPagination' import moment from 'moment' import StdDataEntry from '@/components/StdDataEntry/StdDataEntry' +import $gettext, {$interpolate} from '@/lib/translate/gettext' export default { name: 'StdTable', @@ -230,10 +231,10 @@ export default { destroy(id) { this.api.destroy(id).then(() => { this.get_list() - this.$message.success('删除 ID: ' + id + ' 成功') + this.$message.success($interpolate($gettext('Delete ID: %{id}'), {id: id})) }).catch(e => { console.log(e) - this.$message.error(e?.message ?? '系统错误') + this.$message.error(e?.message ?? $gettext('Server error')) }) }, get_list(page_num = null) { diff --git a/frontend/src/components/VueItextarea/VueItextarea.vue b/frontend/src/components/VueItextarea/VueItextarea.vue index 5e2b1655..39dfa179 100644 --- a/frontend/src/components/VueItextarea/VueItextarea.vue +++ b/frontend/src/components/VueItextarea/VueItextarea.vue @@ -1,5 +1,5 @@ diff --git a/frontend/src/views/domain/cert/Cert.vue b/frontend/src/views/domain/cert/Cert.vue new file mode 100644 index 00000000..294b0943 --- /dev/null +++ b/frontend/src/views/domain/cert/Cert.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/frontend/src/views/domain/CertInfo.vue b/frontend/src/views/domain/cert/CertInfo.vue similarity index 91% rename from frontend/src/views/domain/CertInfo.vue rename to frontend/src/views/domain/cert/CertInfo.vue index 5a289055..dd452ee1 100644 --- a/frontend/src/views/domain/CertInfo.vue +++ b/frontend/src/views/domain/cert/CertInfo.vue @@ -1,6 +1,6 @@