From 1ee5700aa01229b3d5956e2dbed38074e205287c Mon Sep 17 00:00:00 2001
From: 0xJacky <me@jackyu.cn>
Date: Fri, 5 May 2023 13:06:43 +0800
Subject: [PATCH] feat: add ca_dir settings in webui

---
 .../src/views/preference/BasicSettings.vue    |  3 +
 frontend/src/views/preference/GitSettings.vue | 24 -------
 frontend/src/views/preference/Preference.vue  |  3 -
 frontend/src/views/preference/typedef.ts      |  3 +-
 server/api/settings.go                        | 65 ++++++++++---------
 5 files changed, 38 insertions(+), 60 deletions(-)
 delete mode 100644 frontend/src/views/preference/GitSettings.vue

diff --git a/frontend/src/views/preference/BasicSettings.vue b/frontend/src/views/preference/BasicSettings.vue
index 4839015b..0cfe344a 100644
--- a/frontend/src/views/preference/BasicSettings.vue
+++ b/frontend/src/views/preference/BasicSettings.vue
@@ -42,6 +42,9 @@ const theme = inject('theme')
             <a-input v-model:value="data.server.github_proxy"
                      :placeholder="$gettext('Chinese user: https://ghproxy.com/')"/>
         </a-form-item>
+        <a-form-item :label="$gettext('CADir')">
+            <a-input v-model:value="data.server.ca_dir"/>
+        </a-form-item>
     </a-form>
 </template>
 
diff --git a/frontend/src/views/preference/GitSettings.vue b/frontend/src/views/preference/GitSettings.vue
deleted file mode 100644
index 5e3bdad2..00000000
--- a/frontend/src/views/preference/GitSettings.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script setup lang="ts">
-import {useGettext} from 'vue3-gettext'
-import {inject} from 'vue'
-import {IData} from '@/views/preference/typedef'
-
-const {$gettext} = useGettext()
-
-const data: IData = inject('data')!
-</script>
-
-<template>
-    <a-form layout="vertical">
-        <a-form-item :label="$gettext('Repo url')">
-            <a-input v-model:value="data.git.url"/>
-        </a-form-item>
-        <a-form-item :label="$gettext('Username')">
-            <a-input v-model:value="data.git.username"/>
-        </a-form-item>
-    </a-form>
-</template>
-
-<style lang="less" scoped>
-
-</style>
diff --git a/frontend/src/views/preference/Preference.vue b/frontend/src/views/preference/Preference.vue
index dac98d42..87251386 100644
--- a/frontend/src/views/preference/Preference.vue
+++ b/frontend/src/views/preference/Preference.vue
@@ -82,9 +82,6 @@ const activeKey = ref('1')
                 <a-tab-pane :tab="$gettext('OpenAI')" key="3">
                     <open-a-i-settings/>
                 </a-tab-pane>
-                <a-tab-pane :tab="$gettext('Git')" key="4">
-                    <git-settings/>
-                </a-tab-pane>
             </a-tabs>
         </div>
         <footer-tool-bar>
diff --git a/frontend/src/views/preference/typedef.ts b/frontend/src/views/preference/typedef.ts
index 3add651b..8fea3951 100644
--- a/frontend/src/views/preference/typedef.ts
+++ b/frontend/src/views/preference/typedef.ts
@@ -6,7 +6,8 @@ export interface IData {
         start_cmd: string
         http_challenge_port: string
         github_proxy: string,
-        email: string
+        email: string,
+        ca_dir: string
     },
     nginx_log: {
         access_log_path: string
diff --git a/server/api/settings.go b/server/api/settings.go
index d1d2b966..f5901e05 100644
--- a/server/api/settings.go
+++ b/server/api/settings.go
@@ -1,48 +1,49 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/server/settings"
-	"github.com/gin-gonic/gin"
-	"net/http"
+    "github.com/0xJacky/Nginx-UI/server/settings"
+    "github.com/gin-gonic/gin"
+    "net/http"
 )
 
 func GetSettings(c *gin.Context) {
-	c.JSON(http.StatusOK, gin.H{
-		"server":    settings.ServerSettings,
-		"nginx_log": settings.NginxLogSettings,
-		"openai":    settings.OpenAISettings,
-		"git":       settings.GitSettings,
-	})
+    c.JSON(http.StatusOK, gin.H{
+        "server":    settings.ServerSettings,
+        "nginx_log": settings.NginxLogSettings,
+        "openai":    settings.OpenAISettings,
+        "git":       settings.GitSettings,
+    })
 }
 
 func SaveSettings(c *gin.Context) {
-	var json struct {
-		Server   settings.Server   `json:"server"`
-		NginxLog settings.NginxLog `json:"nginx_log"`
-		Openai   settings.OpenAI   `json:"openai"`
-	}
+    var json struct {
+        Server   settings.Server   `json:"server"`
+        NginxLog settings.NginxLog `json:"nginx_log"`
+        Openai   settings.OpenAI   `json:"openai"`
+    }
 
-	if !BindAndValid(c, &json) {
-		return
-	}
+    if !BindAndValid(c, &json) {
+        return
+    }
 
-	settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
-	settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
-	settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
+    settings.Conf.Section("server").Key("Email").SetValue(json.Server.Email)
+    settings.Conf.Section("server").Key("HTTPChallengePort").SetValue(json.Server.HTTPChallengePort)
+    settings.Conf.Section("server").Key("GithubProxy").SetValue(json.Server.GithubProxy)
+    settings.Conf.Section("server").Key("CADir").SetValue(json.Server.CADir)
 
-	settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
-	settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
+    settings.Conf.Section("nginx_log").Key("AccessLogPath").SetValue(json.NginxLog.AccessLogPath)
+    settings.Conf.Section("nginx_log").Key("ErrorLogPath").SetValue(json.NginxLog.ErrorLogPath)
 
-	settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
-	settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
-	settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
-	settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
+    settings.Conf.Section("openai").Key("Model").SetValue(json.Openai.Model)
+    settings.Conf.Section("openai").Key("BaseUrl").SetValue(json.Openai.BaseUrl)
+    settings.Conf.Section("openai").Key("Proxy").SetValue(json.Openai.Proxy)
+    settings.Conf.Section("openai").Key("Token").SetValue(json.Openai.Token)
 
-	err := settings.Save()
-	if err != nil {
-		ErrHandler(c, err)
-		return
-	}
+    err := settings.Save()
+    if err != nil {
+        ErrHandler(c, err)
+        return
+    }
 
-	GetSettings(c)
+    GetSettings(c)
 }