Merge branch 'master' of https://github.com/0xJacky/nginx-ui

0xJacky · Apr 17, 2023 · a43b99f · a43b99f
2 parents ca45d4e + ed142f3
commit a43b99f
Show file tree

Hide file tree

Showing 251 changed files with 10,753 additions and 2,830 deletions.
diff --git a/app.example.ini b/app.example.ini
@@ -20,3 +20,10 @@ Model =
 BaseUrl =
 Proxy =
 Token =
+
+[git]
+Url =
+AuthMethod =
+Username =
+Password =
+PrivateKeyFile =
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
@@ -1,5 +1,7 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 import '@vue/runtime-core'
 
@@ -20,6 +22,7 @@ declare module '@vue/runtime-core' {
     AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
     ADivider: typeof import('ant-design-vue/es')['Divider']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
+    ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AEmpty: typeof import('ant-design-vue/es')['Empty']
     AForm: typeof import('ant-design-vue/es')['Form']
     AFormItem: typeof import('ant-design-vue/es')['FormItem']

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,7 @@
 {
     "name": "nginx-ui-frontend-next",
     "private": true,
-    "version": "1.7.9",
+    "version": "1.8.0",
     "type": "commonjs",
     "scripts": {
         "dev": "vite",
@@ -12,13 +12,14 @@
     },
     "dependencies": {
         "@ant-design/icons-vue": "^6.1.0",
+        "@formkit/auto-animate": "^1.0.0-beta.6",
         "@types/lodash": "^4.14.188",
         "@types/marked": "^4.0.8",
         "@types/nprogress": "^0.2.0",
         "@types/sortablejs": "^1.15.0",
-        "ant-design-vue": "^3.2.15",
+        "ant-design-vue": "^3.2.17",
         "apexcharts": "^3.36.3",
-        "axios": "^1.2.2",
+        "axios": "^1.3.5",
         "dayjs": "^1.11.7",
         "highlight.js": "^11.7.0",
         "marked": "^4.2.5",
@@ -32,22 +33,22 @@
         "vue-router": "4",
         "vue3-ace-editor": "^2.2.2",
         "vue3-apexcharts": "^1.4.1",
-        "vue3-gettext": "^2.3.4",
+        "vue3-gettext": "^2.5.0-alpha.1",
         "vuedraggable": "^4.1.0",
         "xterm": "^5.1.0",
         "xterm-addon-attach": "^0.8.0",
         "xterm-addon-fit": "^0.7.0"
     },
     "devDependencies": {
-        "@vitejs/plugin-vue": "^4.0.0",
-        "@vitejs/plugin-vue-jsx": "^3.0.0",
+        "@vitejs/plugin-vue": "^4.1.0",
+        "@vitejs/plugin-vue-jsx": "^3.0.1",
         "@zougt/vite-plugin-theme-preprocessor": "^1.4.8",
         "less": "^4.1.3",
-        "typescript": "^4.9.4",
-        "unplugin-vue-components": "^0.22.12",
-        "vite": "^4.1.4",
+        "typescript": "^5.0.4",
+        "unplugin-vue-components": "^0.24.1",
+        "vite": "^4.2.1",
         "vite-plugin-html": "^3.2.0",
         "vite-svg-loader": "^4.0.0",
-        "vue-tsc": "^1.0.24"
+        "vue-tsc": "^1.2.0"
     }
 }
diff --git a/frontend/src/api/auto_cert.ts b/frontend/src/api/auto_cert.ts
@@ -0,0 +1,13 @@
+import http from '@/lib/http'
+
+const auto_cert = {
+    get_dns_providers() {
+        return http.get('/auto_cert/dns/providers')
+    },
+
+    get_dns_provider(code: string) {
+        return http.get('/auto_cert/dns/provider/' + code)
+    }
+}
+
+export default auto_cert
diff --git a/frontend/src/api/dns_credential.ts b/frontend/src/api/dns_credential.ts
@@ -0,0 +1,5 @@
+import Curd from '@/api/curd'
+
+const dns_credential = new Curd('/dns_credential')
+
+export default dns_credential
diff --git a/frontend/src/api/domain.ts b/frontend/src/api/domain.ts
@@ -25,6 +25,10 @@ class Domain extends Curd {
     duplicate(name: string, data: any) {
         return http.post(this.baseUrl + '/' + name + '/duplicate', data)
     }
+
+    advance_mode(name: string, data: any) {
+        return http.post(this.baseUrl + '/' + name + '/advance', data)
+    }
 }
 
 const domain = new Domain('/domain')

diff --git a/frontend/src/api/template.ts b/frontend/src/api/template.ts
@@ -18,6 +18,10 @@ class Template extends Curd {
         return http.get('template/block/' + name)
     }
 
+    build_block(name: string, data: any) {
+        return http.post('template/block/' + name, data)
+    }
+
 }
 
 const template = new Template('/template')

diff --git a/frontend/src/components/Chart/AreaChart.vue b/frontend/src/components/Chart/AreaChart.vue
@@ -22,11 +22,11 @@ let chartOptions = {
             enabled: false
         },
         animations: {
-            enabled: false,
+            enabled: false
         },
         toolbar: {
             show: false
-        },
+        }
     },
     colors: ['#ff6385', '#36a3eb'],
     fill: {
@@ -41,7 +41,7 @@ let chartOptions = {
     },
     stroke: {
         curve: 'smooth',
-        width: 0,
+        width: 0
     },
     xaxis: {
         type: 'datetime',
@@ -75,7 +75,7 @@ let chartOptions = {
         },
         onItemHover: {
             highlightDataSeries: false
-        },
+        }
     }
 }
 
@@ -114,7 +114,7 @@ const callback = () => {
                 },
                 onItemHover: {
                     highlightDataSeries: false
-                },
+                }
             }
         }
     }

diff --git a/frontend/src/components/ChatGPT/ChatGPT.vue b/frontend/src/components/ChatGPT/ChatGPT.vue
@@ -7,11 +7,10 @@ import {urlJoin} from '@/lib/helper'
 import {marked} from 'marked'
 import hljs from 'highlight.js'
 import 'highlight.js/styles/vs2015.css'
-import {SendOutlined} from '@ant-design/icons-vue'
-import Template from '@/views/template/Template.vue'
+import Icon, {SendOutlined} from '@ant-design/icons-vue'
+
 import openai from '@/api/openai'
 import ChatGPT_logo from '@/assets/svg/ChatGPT_logo.svg'
-import Icon from '@ant-design/icons-vue'
 
 const {$gettext} = useGettext()
 
@@ -260,6 +259,11 @@ const show = computed(() => messages?.value?.length > 1)
 .chatgpt {
     position: sticky;
     top: 78px;
+
+    :deep(.ant-card-body) {
+        max-height: 100vh;
+        overflow-y: scroll;
+    }
 }
 
 .chat-start {

diff --git a/frontend/src/components/FooterToolbar/FooterToolBar.vue b/frontend/src/components/FooterToolbar/FooterToolBar.vue
@@ -28,7 +28,7 @@ export default {
 <style lang="less" scoped>
 .dark {
     .ant-pro-footer-toolbar {
-        background: rgba(24, 24, 24, 0.62);
+        background: rgba(24, 24, 24, 1);
         border-top: unset;
     }
 }

diff --git a/frontend/src/components/NginxControl/NginxControl.vue b/frontend/src/components/NginxControl/NginxControl.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import gettext from '@/gettext'
-
-const {$gettext} = gettext
 import ngx from '@/api/ngx'
 import logLevel from '@/views/config/constants'
 import {message} from 'ant-design-vue'
 import {ReloadOutlined} from '@ant-design/icons-vue'
-import Template from '@/views/template/Template.vue'
+
 import {ref, watch} from 'vue'
 
+const {$gettext} = gettext
+
 function get_status() {
     ngx.status().then(r => {
         if (r?.running === true) {

diff --git a/frontend/src/components/StdDataDisplay/StdBatchEdit.vue b/frontend/src/components/StdDataDisplay/StdBatchEdit.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts">
 import {reactive, ref} from 'vue'
 import gettext from '@/gettext'
-
-const {$gettext} = gettext
-
 import StdDataEntry from '@/components/StdDataEntry'
 import {message} from 'ant-design-vue'
 
+const {$gettext} = gettext
+
 const emit = defineEmits(['onSave'])
 
 const props = defineProps(['api', 'beforeSave'])
@@ -49,23 +48,23 @@ async function ok() {
 
 <template>
     <a-modal
-            class="std-curd-edit-modal"
-            :mask="false"
-            :title="$gettext('Batch Modify')"
-            v-model:visible="visible"
-            :cancel-text="$gettext('Cancel')"
-            :ok-text="$gettext('OK')"
-            @ok="ok"
-            :confirm-loading="loading"
-            :width="600"
-            destroyOnClose
+        class="std-curd-edit-modal"
+        :mask="false"
+        :title="$gettext('Batch Modify')"
+        v-model:visible="visible"
+        :cancel-text="$gettext('Cancel')"
+        :ok-text="$gettext('OK')"
+        @ok="ok"
+        :confirm-loading="loading"
+        :width="600"
+        destroyOnClose
     >
 
         <std-data-entry
-                ref="std_data_entry"
-                :data-list="batchColumns"
-                v-model:data-source="data"
-                :error="error"
+            ref="std_data_entry"
+            :data-list="batchColumns"
+            :data-source="data"
+            :error="error"
         />
 
         <slot name="extra"/>
@@ -74,4 +73,4 @@ async function ok() {
 
 <style scoped>
 
-</style>
+</style>
diff --git a/frontend/src/components/StdDataDisplay/StdCurd.vue b/frontend/src/components/StdDataDisplay/StdCurd.vue
@@ -4,7 +4,7 @@ import StdTable from './StdTable.vue'
 
 import StdDataEntry from '@/components/StdDataEntry'
 
-import {reactive, ref} from 'vue'
+import {provide, reactive, ref} from 'vue'
 import {message} from 'ant-design-vue'
 
 const {$gettext} = gettext
@@ -62,6 +62,7 @@ const props = defineProps({
 const visible = ref(false)
 const update = ref(0)
 const data: any = reactive({id: null})
+provide('data', data)
 const error: any = reactive({})
 const selected = ref([])
 
@@ -146,12 +147,12 @@ const selectedRowKeys = ref([])
             </template>
 
             <std-table
-                    ref="table"
-                    v-model:selected-row-keys="selectedRowKeys"
-                    v-bind="props"
-                    @clickEdit="edit"
-                    @selected="onSelect"
-                    :key="update"
+                ref="table"
+                v-model:selected-row-keys="selectedRowKeys"
+                v-bind="props"
+                @clickEdit="edit"
+                @selected="onSelect"
+                :key="update"
             >
                 <template v-slot:actions="slotProps">
                     <slot name="actions" :actions="slotProps.record"/>
@@ -160,26 +161,26 @@ const selectedRowKeys = ref([])
         </a-card>
 
         <a-modal
-                class="std-curd-edit-modal"
-                :mask="false"
-                :title="edit_text?edit_text:(data.id ? $gettext('Modify') : $gettext('Add'))"
-                :visible="visible"
-                :cancel-text="$gettext('Cancel')"
-                :ok-text="$gettext('OK')"
-                @cancel="cancel"
-                @ok="ok"
-                :width="modalWidth"
-                destroyOnClose
+            class="std-curd-edit-modal"
+            :mask="false"
+            :title="edit_text?edit_text:(data.id ? $gettext('Modify') : $gettext('Add'))"
+            :visible="visible"
+            :cancel-text="$gettext('Cancel')"
+            :ok-text="$gettext('OK')"
+            @cancel="cancel"
+            @ok="ok"
+            :width="modalWidth"
+            destroyOnClose
         >
             <div class="before-edit" v-if="$slots.beforeEdit">
                 <slot name="beforeEdit" :data="data"/>
             </div>
 
             <std-data-entry
-                    ref="std_data_entry"
-                    :data-list="editableColumns()"
-                    v-model:data-source="data"
-                    :error="error"
+                ref="std_data_entry"
+                :data-list="editableColumns()"
+                :data-source="data"
+                :error="error"
             />
 
             <slot name="edit" :data="data"/>

diff --git a/frontend/src/components/StdDataDisplay/StdPagination.vue b/frontend/src/components/StdDataDisplay/StdPagination.vue
@@ -24,11 +24,11 @@ const pageSize = computed({
 <template>
     <div class="pagination-container" v-if="pagination.total>pagination.per_page">
         <a-pagination
-                :current="pagination.current_page"
-                v-model:pageSize="pageSize"
-                :size="size"
-                :total="pagination.total"
-                @change="change"
+            :current="pagination.current_page"
+            v-model:pageSize="pageSize"
+            :size="size"
+            :total="pagination.total"
+            @change="change"
         />
     </div>
 </template>

diff --git a/frontend/src/components/StdDataDisplay/StdTable.vue b/frontend/src/components/StdDataDisplay/StdTable.vue
@@ -474,7 +474,7 @@ function initSortable() {
         <std-data-entry
             v-if="!disable_search && searchColumns.length"
             :data-list="searchColumns"
-            v-model:data-source="params"
+            :data-source="params"
             layout="inline"
         >
             <template #action>