Skip to content

Commit b19ecdd

Browse files
committed
Refactored nginx configuration editor
1 parent f526cd0 commit b19ecdd

File tree

31 files changed

+1566
-1046
lines changed

31 files changed

+1566
-1046
lines changed

frontend/src/api/domain.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const domain = {
2727
return http.post(base_url + '/' + name + '/disable')
2828
},
2929

30-
get_template(name) {
31-
return http.get('template/' + name)
30+
get_template() {
31+
return http.get('template')
3232
},
3333

3434
cert_info(domain) {

frontend/src/api/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import user from './user'
55
import install from './install'
66
import analytic from './analytic'
77
import settings from './settings'
8+
import ngx from './ngx'
89

910
export default {
1011
domain,
@@ -13,5 +14,6 @@ export default {
1314
user,
1415
install,
1516
analytic,
16-
settings
17+
settings,
18+
ngx
1719
}

frontend/src/api/ngx.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import http from '@/lib/http'
2+
3+
const ngx = {
4+
build_config(ngxConfig) {
5+
return http.post('/ngx/build_config', ngxConfig)
6+
},
7+
8+
tokenize_config(content) {
9+
return http.post('/ngx/tokenize_config', {content})
10+
}
11+
}
12+
13+
export default ngx

frontend/src/components/StdDataDisplay/StdTable.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@
7272
:okText="ok_text"
7373
:title="restore_title_text"
7474
@confirm="restore(record[rowKey])">
75-
<a href="javascript:;">{{restore_action_text}}</a>
75+
<a href="javascript:;">{{ restore_action_text }}</a>
7676
</a-popconfirm>
7777
<a-popconfirm
7878
v-else
7979
:cancelText="cancel_text"
8080
:okText="ok_text"
8181
:title="destroy_title_text"
8282
@confirm="destroy(record[rowKey])">
83-
<a href="javascript:;">{{destroy_action_text}}</a>
83+
<a href="javascript:;">{{ destroy_action_text }}</a>
8484
</a-popconfirm>
8585
</template>
8686
</div>
@@ -93,6 +93,7 @@
9393
import StdPagination from './StdPagination'
9494
import moment from 'moment'
9595
import StdDataEntry from '@/components/StdDataEntry/StdDataEntry'
96+
import $gettext, {$interpolate} from '@/lib/translate/gettext'
9697
9798
export default {
9899
name: 'StdTable',
@@ -230,10 +231,10 @@ export default {
230231
destroy(id) {
231232
this.api.destroy(id).then(() => {
232233
this.get_list()
233-
this.$message.success('删除 ID: ' + id + ' 成功')
234+
this.$message.success($interpolate($gettext('Delete ID: %{id}'), {id: id}))
234235
}).catch(e => {
235236
console.log(e)
236-
this.$message.error(e?.message ?? '系统错误')
237+
this.$message.error(e?.message ?? $gettext('Server error'))
237238
})
238239
},
239240
get_list(page_num = null) {

frontend/src/components/VueItextarea/VueItextarea.vue

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<editor v-model="current_value" @init="editorInit" lang="nginx" theme="monokai" width="100%" height="1000"></editor>
2+
<editor v-model="current_value" @init="editorInit" lang="nginx" theme="monokai" width="100%" :height="defaultTextHeight"></editor>
33
</template>
44
<style lang="less">
55
.cm-s-monokai {
@@ -20,6 +20,10 @@ export default {
2020
},
2121
props: {
2222
value: {},
23+
defaultTextHeight: {
24+
type: Number,
25+
default: 1000
26+
}
2327
},
2428
model: {
2529
prop: 'value',
@@ -36,16 +40,6 @@ export default {
3640
data() {
3741
return {
3842
current_value: this.value ?? '',
39-
cmOptions: {
40-
tabSize: 4,
41-
mode: 'text/x-nginx-conf',
42-
theme: 'monokai',
43-
lineNumbers: true,
44-
line: true,
45-
highlightDifferences: true,
46-
defaultTextHeight: 1000,
47-
// more CodeMirror options...
48-
}
4943
}
5044
},
5145
methods: {

frontend/src/layouts/BaseLayout.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ export default {
5757
data() {
5858
return {
5959
collapsed: this.collapse(),
60-
zh_CN,
6160
clientWidth: document.body.clientWidth,
6261
}
6362
},

0 commit comments

Comments
 (0)