Merge pull request #97 from 0xJacky/v1.8-dev

v1.8

Author: 0xJacky

app.example.ini

@@ -20,3 +20,10 @@ Model =
 BaseUrl =
 Proxy =
 Token =
+
+[git]
+Url =
+AuthMethod =
+Username =
+Password =
+PrivateKeyFile =

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']

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",
@@ -27,26 +28,26 @@
         "pinia-plugin-persistedstate": "^3.0.2",
         "reconnecting-websocket": "^4.4.0",
         "vite-plugin-build-id": "^0.2.3",
-        "vue": "^3.2.45",
+        "vue": "^3.2.47",
         "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"
     }
 }

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

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

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')

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')

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
-                },
+                }
             }
         }
     }

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 {

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;
     }
 }