fix file select

Merge pull request #16 from gexin1/main
fix: 首页展示问题和授权管理弹窗无法滚动
2024-09-11 07:35:19 +08:00 · 2024-09-11 06:37:38 +08:00 · 2024-09-10 22:56:54 +08:00 · 2024-09-10 21:02:31 +08:00
20 changed files with 890 additions and 98 deletions
--- a/go.mod
+++ b/go.mod
@@ -91,6 +91,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/nrdcg/namesilo v0.2.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -205,6 +205,7 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -290,6 +291,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nrdcg/namesilo v0.2.1 h1:kLjCjsufdW/IlC+iSfAqj0iQGgKjlbUUeDJio5Y6eMg=
+github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4rRpRiyw=
 github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
 github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
--- a/internal/applicant/applicant.go
+++ b/internal/applicant/applicant.go
@@ -19,6 +19,7 @@ const (
 	configTypeTencent    = "tencent"
 	configTypeAliyun     = "aliyun"
 	configTypeCloudflare = "cloudflare"
+	configTypeNamesilo   = "namesilo"
 )

 type Certificate struct {
@@ -70,6 +71,8 @@ func Get(record *models.Record) (Applicant, error) {
 		return NewAliyun(option), nil
 	case configTypeCloudflare:
 		return NewCloudflare(option), nil
+	case configTypeNamesilo:
+		return NewNamesilo(option), nil
 	default:
 		return nil, errors.New("unknown config type")
 	}
--- a/internal/applicant/namesilo.go
+++ b/internal/applicant/namesilo.go
@@ -0,0 +1,34 @@
+package applicant
+
+import (
+	"certimate/internal/domain"
+	"encoding/json"
+	"os"
+
+	namesiloProvider "github.com/go-acme/lego/v4/providers/dns/namesilo"
+)
+
+type namesilo struct {
+	option *ApplyOption
+}
+
+func NewNamesilo(option *ApplyOption) Applicant {
+	return &namesilo{
+		option: option,
+	}
+}
+
+func (a *namesilo) Apply() (*Certificate, error) {
+
+	access := &domain.NameSiloAccess{}
+	json.Unmarshal([]byte(a.option.Access), access)
+
+	os.Setenv("NAMESILO_API_KEY", access.ApiKey)
+
+	dnsProvider, err := namesiloProvider.NewDNSProvider()
+	if err != nil {
+		return nil, err
+	}
+
+	return apply(a.option, dnsProvider)
+}
--- a/internal/domain/access.go
+++ b/internal/domain/access.go
@@ -18,3 +18,7 @@ type QiniuAccess struct {
 	AccessKey string `json:"accessKey"`
 	SecretKey string `json:"secretKey"`
 }
+
+type NameSiloAccess struct {
+	ApiKey string `json:"apiKey"`
+}
--- a/migrations/1725973273_collections_snapshot.go
+++ b/migrations/1725973273_collections_snapshot.go
@@ -0,0 +1,508 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	m "github.com/pocketbase/pocketbase/migrations"
+	"github.com/pocketbase/pocketbase/models"
+)
+
+func init() {
+	m.Register(func(db dbx.Builder) error {
+		jsonData := `[
+			{
+				"id": "_pb_users_auth_",
+				"created": "2024-07-29 09:44:56.398Z",
+				"updated": "2024-09-07 07:42:28.389Z",
+				"name": "users",
+				"type": "auth",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "users_name",
+						"name": "name",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "users_avatar",
+						"name": "avatar",
+						"type": "file",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"mimeTypes": [
+								"image/jpeg",
+								"image/png",
+								"image/svg+xml",
+								"image/gif",
+								"image/webp"
+							],
+							"thumbs": null,
+							"maxSelect": 1,
+							"maxSize": 5242880,
+							"protected": false
+						}
+					}
+				],
+				"indexes": [],
+				"listRule": "id = @request.auth.id",
+				"viewRule": "id = @request.auth.id",
+				"createRule": "",
+				"updateRule": "id = @request.auth.id",
+				"deleteRule": "id = @request.auth.id",
+				"options": {
+					"allowEmailAuth": true,
+					"allowOAuth2Auth": true,
+					"allowUsernameAuth": true,
+					"exceptEmailDomains": null,
+					"manageRule": null,
+					"minPasswordLength": 8,
+					"onlyEmailDomains": null,
+					"onlyVerified": false,
+					"requireEmail": false
+				}
+			},
+			{
+				"id": "z3p974ainxjqlvs",
+				"created": "2024-07-29 10:02:48.334Z",
+				"updated": "2024-09-07 07:42:28.389Z",
+				"name": "domains",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "iuaerpl2",
+						"name": "domain",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "v98eebqq",
+						"name": "crontab",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "alc8e9ow",
+						"name": "access",
+						"type": "relation",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"collectionId": "4yzbv8urny5ja1e",
+							"cascadeDelete": false,
+							"minSelect": null,
+							"maxSelect": 1,
+							"displayFields": null
+						}
+					},
+					{
+						"system": false,
+						"id": "topsc9bj",
+						"name": "certUrl",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "vixgq072",
+						"name": "certStableUrl",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "g3a3sza5",
+						"name": "privateKey",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "gr6iouny",
+						"name": "certificate",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "tk6vnrmn",
+						"name": "issuerCertificate",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "sjo6ibse",
+						"name": "csr",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "x03n1bkj",
+						"name": "expiredAt",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "srybpixz",
+						"name": "targetType",
+						"type": "select",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSelect": 1,
+							"values": [
+								"aliyun-oss",
+								"aliyun-cdn",
+								"ssh",
+								"webhook",
+								"tencent-cdn",
+								"qiniu-cdn"
+							]
+						}
+					},
+					{
+						"system": false,
+						"id": "xy7yk0mb",
+						"name": "targetAccess",
+						"type": "relation",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"collectionId": "4yzbv8urny5ja1e",
+							"cascadeDelete": false,
+							"minSelect": null,
+							"maxSelect": 1,
+							"displayFields": null
+						}
+					},
+					{
+						"system": false,
+						"id": "6jqeyggw",
+						"name": "enabled",
+						"type": "bool",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {}
+					},
+					{
+						"system": false,
+						"id": "hdsjcchf",
+						"name": "deployed",
+						"type": "bool",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {}
+					},
+					{
+						"system": false,
+						"id": "aiya3rev",
+						"name": "rightnow",
+						"type": "bool",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {}
+					},
+					{
+						"system": false,
+						"id": "ixznmhzc",
+						"name": "lastDeployedAt",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "ghtlkn5j",
+						"name": "lastDeployment",
+						"type": "relation",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"collectionId": "0a1o4e6sstp694f",
+							"cascadeDelete": false,
+							"minSelect": null,
+							"maxSelect": 1,
+							"displayFields": null
+						}
+					}
+				],
+				"indexes": [
+					"CREATE UNIQUE INDEX ` + "`" + `idx_4ABO6EQ` + "`" + ` ON ` + "`" + `domains` + "`" + ` (` + "`" + `domain` + "`" + `)"
+				],
+				"listRule": null,
+				"viewRule": null,
+				"createRule": null,
+				"updateRule": null,
+				"deleteRule": null,
+				"options": {}
+			},
+			{
+				"id": "4yzbv8urny5ja1e",
+				"created": "2024-07-29 10:04:39.685Z",
+				"updated": "2024-09-10 12:51:41.405Z",
+				"name": "access",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "geeur58v",
+						"name": "name",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "iql7jpwx",
+						"name": "config",
+						"type": "json",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSize": 2000000
+						}
+					},
+					{
+						"system": false,
+						"id": "hwy7m03o",
+						"name": "configType",
+						"type": "select",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSelect": 1,
+							"values": [
+								"aliyun",
+								"tencent",
+								"ssh",
+								"webhook",
+								"cloudflare",
+								"qiniu",
+								"namesilo"
+							]
+						}
+					},
+					{
+						"system": false,
+						"id": "lr33hiwg",
+						"name": "deleted",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					}
+				],
+				"indexes": [
+					"CREATE UNIQUE INDEX ` + "`" + `idx_wkoST0j` + "`" + ` ON ` + "`" + `access` + "`" + ` (` + "`" + `name` + "`" + `)"
+				],
+				"listRule": null,
+				"viewRule": null,
+				"createRule": null,
+				"updateRule": null,
+				"deleteRule": null,
+				"options": {}
+			},
+			{
+				"id": "0a1o4e6sstp694f",
+				"created": "2024-07-30 06:30:27.801Z",
+				"updated": "2024-09-07 07:42:28.390Z",
+				"name": "deployments",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "farvlzk7",
+						"name": "domain",
+						"type": "relation",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"collectionId": "z3p974ainxjqlvs",
+							"cascadeDelete": false,
+							"minSelect": null,
+							"maxSelect": 1,
+							"displayFields": null
+						}
+					},
+					{
+						"system": false,
+						"id": "jx5f69i3",
+						"name": "log",
+						"type": "json",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSize": 2000000
+						}
+					},
+					{
+						"system": false,
+						"id": "qbxdtg9q",
+						"name": "phase",
+						"type": "select",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSelect": 1,
+							"values": [
+								"check",
+								"apply",
+								"deploy"
+							]
+						}
+					},
+					{
+						"system": false,
+						"id": "rglrp1hz",
+						"name": "phaseSuccess",
+						"type": "bool",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {}
+					},
+					{
+						"system": false,
+						"id": "lt1g1blu",
+						"name": "deployedAt",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					}
+				],
+				"indexes": [],
+				"listRule": null,
+				"viewRule": null,
+				"createRule": null,
+				"updateRule": null,
+				"deleteRule": null,
+				"options": {}
+			}
+		]`
+
+		collections := []*models.Collection{}
+		if err := json.Unmarshal([]byte(jsonData), &collections); err != nil {
+			return err
+		}
+
+		return daos.New(db).ImportCollections(collections, true, nil)
+	}, func(db dbx.Builder) error {
+		return nil
+	})
+}
--- a/ui/dist/assets/index-Cg0yCJnh.css
+++ b/ui/dist/assets/index-Cg0yCJnh.css
--- a/ui/dist/assets/index-D8T6Buyh.js
+++ b/ui/dist/assets/index-D8T6Buyh.js
--- a/ui/dist/assets/index-Kh_0Jotc.css
+++ b/ui/dist/assets/index-Kh_0Jotc.css
--- a/ui/dist/imgs/providers/namesilo.svg
+++ b/ui/dist/imgs/providers/namesilo.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+   <circle cx="512" cy="512" r="512" style="fill:#031b4e" />
+   <path
+      d="M668 415.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v85c0 17.1 69.9 30.7 156 30.7s156-13.6 156-30.7v-85zM512 556.4c86.1 0 156-13.6 156-30.2v85.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v-85.5c0 16.6 69.9 30.2 156 30.2zm156 80.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v85.5c0 16.6 69.9 30.2 156 30.2s156-13.6 156-30.2v-85.5zm0-296.9L512 239.4 356 340v55.4c0 14.1 69.9 25.2 156 25.2s156-11.1 156-25.2V340z"
+      style="fill:#fff" />
+</svg>
--- a/ui/dist/index.html
+++ b/ui/dist/index.html
@@ -5,8 +5,8 @@
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Certimate - Your Trusted SSL Automation Partner</title>
-    <script type="module" crossorigin src="/assets/index-BGMLTQZA.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Kh_0Jotc.css">
+    <script type="module" crossorigin src="/assets/index-D8T6Buyh.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Cg0yCJnh.css">
  </head>
  <body class="bg-background">
    <div id="root"></div>
--- a/ui/public/imgs/providers/namesilo.svg
+++ b/ui/public/imgs/providers/namesilo.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+   <circle cx="512" cy="512" r="512" style="fill:#031b4e" />
+   <path
+      d="M668 415.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v85c0 17.1 69.9 30.7 156 30.7s156-13.6 156-30.7v-85zM512 556.4c86.1 0 156-13.6 156-30.2v85.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v-85.5c0 16.6 69.9 30.2 156 30.2zm156 80.5c0 16.6-69.9 30.2-156 30.2s-156-13.6-156-30.2v85.5c0 16.6 69.9 30.2 156 30.2s156-13.6 156-30.2v-85.5zm0-296.9L512 239.4 356 340v55.4c0 14.1 69.9 25.2 156 25.2s156-11.1 156-25.2V340z"
+      style="fill:#fff" />
+</svg>
--- a/ui/src/components/certimate/AccessEdit.tsx
+++ b/ui/src/components/certimate/AccessEdit.tsx
@@ -5,6 +5,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "@/components/ui/dialog";
+import { ScrollArea } from "@/components/ui/scroll-area";

 import { useState } from "react";

@@ -29,6 +30,7 @@ import {
 } from "../ui/select";
 import AccessCloudflareForm from "./AccessCloudflareForm";
 import AccessQiniuForm from "./AccessQiniuForm";
+import AccessNamesiloForm from "./AccessNamesiloForm";

 type TargetConfigEditProps = {
  op: "add" | "edit";
@@ -110,6 +112,16 @@ export function AccessEdit({
        />
      );
      break;
+    case "namesilo":
+      form = (
+        <AccessNamesiloForm
+          data={data}
+          onAfterReq={() => {
+            setOpen(false);
+          }}
+        />
+      );
+      break;
  }

  const getOptionCls = (val: string) => {
@@ -125,44 +137,46 @@ export function AccessEdit({
        <DialogHeader>
          <DialogTitle>{op == "add" ? "添加" : "编辑"}授权</DialogTitle>
        </DialogHeader>
-        <div className="container">
-          <Label>服务商</Label>
+        <ScrollArea className="max-h-[80vh]">
+          <div className="container py-3">
+            <Label>服务商</Label>

-          <Select
-            onValueChange={(val) => {
-              console.log(val);
-              setConfigType(val);
-            }}
-            defaultValue={configType}
-          >
-            <SelectTrigger className="mt-3">
-              <SelectValue placeholder="请选择服务商" />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectGroup>
-                <SelectLabel>服务商</SelectLabel>
-                {typeKeys.map((key) => (
-                  <SelectItem value={key} key={key}>
-                    <div
-                      className={cn(
-                        "flex items-center space-x-2 rounded cursor-pointer",
-                        getOptionCls(key)
-                      )}
-                    >
-                      <img
-                        src={accessTypeMap.get(key)?.[1]}
-                        className="h-6 w-6"
-                      />
-                      <div>{accessTypeMap.get(key)?.[0]}</div>
-                    </div>
-                  </SelectItem>
-                ))}
-              </SelectGroup>
-            </SelectContent>
-          </Select>
+            <Select
+              onValueChange={(val) => {
+                console.log(val);
+                setConfigType(val);
+              }}
+              defaultValue={configType}
+            >
+              <SelectTrigger className="mt-3">
+                <SelectValue placeholder="请选择服务商" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectGroup>
+                  <SelectLabel>服务商</SelectLabel>
+                  {typeKeys.map((key) => (
+                    <SelectItem value={key} key={key}>
+                      <div
+                        className={cn(
+                          "flex items-center space-x-2 rounded cursor-pointer",
+                          getOptionCls(key)
+                        )}
+                      >
+                        <img
+                          src={accessTypeMap.get(key)?.[1]}
+                          className="h-6 w-6"
+                        />
+                        <div>{accessTypeMap.get(key)?.[0]}</div>
+                      </div>
+                    </SelectItem>
+                  ))}
+                </SelectGroup>
+              </SelectContent>
+            </Select>

-          {form}
-        </div>
+            {form}
+          </div>
+        </ScrollArea>
      </DialogContent>
    </Dialog>
  );
--- a/ui/src/components/certimate/AccessNamesiloForm.tsx
+++ b/ui/src/components/certimate/AccessNamesiloForm.tsx
@@ -0,0 +1,173 @@
+import { Input } from "@/components/ui/input";
+import { useForm } from "react-hook-form";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+
+import z from "zod";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Button } from "@/components/ui/button";
+
+import { Access, accessFormType, NamesiloConfig } from "@/domain/access";
+import { save } from "@/repository/access";
+import { useConfig } from "@/providers/config";
+import { ClientResponseError } from "pocketbase";
+import { PbErrorData } from "@/domain/base";
+
+const AccessNamesiloForm = ({
+  data,
+  onAfterReq,
+}: {
+  data?: Access;
+  onAfterReq: () => void;
+}) => {
+  const { addAccess, updateAccess } = useConfig();
+  const formSchema = z.object({
+    id: z.string().optional(),
+    name: z.string().min(1).max(64),
+    configType: accessFormType,
+    apiKey: z.string().min(1).max(64),
+  });
+
+  let config: NamesiloConfig = {
+    apiKey: "",
+  };
+  if (data) config = data.config as NamesiloConfig;
+
+  const form = useForm<z.infer<typeof formSchema>>({
+    resolver: zodResolver(formSchema),
+    defaultValues: {
+      id: data?.id,
+      name: data?.name,
+      configType: "namesilo",
+      apiKey: config.apiKey,
+    },
+  });
+
+  const onSubmit = async (data: z.infer<typeof formSchema>) => {
+    console.log(data);
+    const req: Access = {
+      id: data.id as string,
+      name: data.name,
+      configType: data.configType,
+      config: {
+        apiKey: data.apiKey,
+      },
+    };
+
+    try {
+      const rs = await save(req);
+
+      onAfterReq();
+
+      req.id = rs.id;
+      req.created = rs.created;
+      req.updated = rs.updated;
+      if (data.id) {
+        updateAccess(req);
+        return;
+      }
+      addAccess(req);
+    } catch (e) {
+      const err = e as ClientResponseError;
+
+      Object.entries(err.response.data as PbErrorData).forEach(
+        ([key, value]) => {
+          form.setError(key as keyof z.infer<typeof formSchema>, {
+            type: "manual",
+            message: value.message,
+          });
+        }
+      );
+    }
+  };
+
+  return (
+    <>
+      <div className="max-w-[35em] mx-auto mt-10">
+        <Form {...form}>
+          <form
+            onSubmit={(e) => {
+              console.log(e);
+              e.stopPropagation();
+              form.handleSubmit(onSubmit)(e);
+            }}
+            className="space-y-8"
+          >
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>名称</FormLabel>
+                  <FormControl>
+                    <Input placeholder="请输入授权名称" {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="id"
+              render={({ field }) => (
+                <FormItem className="hidden">
+                  <FormLabel>配置类型</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="configType"
+              render={({ field }) => (
+                <FormItem className="hidden">
+                  <FormLabel>配置类型</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="apiKey"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>NAMESILO_API_KEY</FormLabel>
+                  <FormControl>
+                    <Input placeholder="请输入NAMESILO_API_KEY" {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <div className="flex justify-end">
+              <Button type="submit">保存</Button>
+            </div>
+          </form>
+        </Form>
+      </div>
+    </>
+  );
+};
+
+export default AccessNamesiloForm;
--- a/ui/src/components/certimate/AccessSSHForm.tsx
+++ b/ui/src/components/certimate/AccessSSHForm.tsx
@@ -18,6 +18,7 @@ import { save } from "@/repository/access";
 import { ClientResponseError } from "pocketbase";
 import { PbErrorData } from "@/domain/base";
 import { readFileContent } from "@/lib/file";
+import { useRef, useState } from "react";

 const AccessSSHForm = ({
  data,
@@ -27,6 +28,11 @@ const AccessSSHForm = ({
  onAfterReq: () => void;
 }) => {
  const { addAccess, updateAccess } = useConfig();
+
+  const fileInputRef = useRef<HTMLInputElement | null>(null);
+
+  const [fileName, setFileName] = useState("");
+
  const formSchema = z.object({
    id: z.string().optional(),
    name: z.string().min(1).max(64),
@@ -38,7 +44,7 @@ const AccessSSHForm = ({
    username: z.string().min(1).max(64),
    password: z.string().min(0).max(64),
    key: z.string().min(0).max(20480),
-    keyFile: z.string().optional(),
+    keyFile: z.any().optional(),
    command: z.string().min(1).max(2048),
    certPath: z.string().min(0).max(2048),
    keyPath: z.string().min(0).max(2048),
@@ -127,9 +133,16 @@ const AccessSSHForm = ({
  ) => {
    const file = event.target.files?.[0];
    if (!file) return;
-    const content = await readFileContent(file);
+    const savedFile = file;
+    setFileName(savedFile.name);
+    const content = await readFileContent(savedFile);
    form.setValue("key", content);
-    form.setValue("keyFile", "");
+  };
+
+  const handleSelectFileClick = () => {
+    console.log(fileInputRef.current);
+
+    fileInputRef.current?.click();
  };

  return (
@@ -279,12 +292,26 @@ const AccessSSHForm = ({
                <FormItem>
                  <FormLabel>Key（使用证书登录）</FormLabel>
                  <FormControl>
-                    <Input
-                      placeholder="请输入Key"
-                      {...field}
-                      type="file"
-                      onChange={handleFileChange}
-                    />
+                    <div>
+                      <Button
+                        type={"button"}
+                        variant={"secondary"}
+                        size={"sm"}
+                        className="w-48"
+                        onClick={handleSelectFileClick}
+                      >
+                        {fileName ? fileName : "请选择文件"}
+                      </Button>
+                      <Input
+                        placeholder="请输入Key"
+                        {...field}
+                        ref={fileInputRef}
+                        className="hidden"
+                        hidden
+                        type="file"
+                        onChange={handleFileChange}
+                      />
+                    </div>
                  </FormControl>

                  <FormMessage />
--- a/ui/src/domain/access.ts
+++ b/ui/src/domain/access.ts
@@ -4,6 +4,7 @@ export const accessTypeMap: Map<string, [string, string]> = new Map([
  ["tencent", ["腾讯云", "/imgs/providers/tencent.svg"]],
  ["aliyun", ["阿里云", "/imgs/providers/aliyun.svg"]],
  ["cloudflare", ["Cloudflare", "/imgs/providers/cloudflare.svg"]],
+  ["namesilo", ["Namesilo", "/imgs/providers/namesilo.svg"]],
  ["qiniu", ["七牛云", "/imgs/providers/qiniu.svg"]],
  ["ssh", ["SSH部署", "/imgs/providers/ssh.svg"]],
  ["webhook", ["Webhook", "/imgs/providers/webhook.svg"]],
@@ -17,6 +18,7 @@ export const accessFormType = z.union(
    z.literal("webhook"),
    z.literal("cloudflare"),
    z.literal("qiniu"),
+    z.literal("namesilo"),
  ],
  { message: "请选择云服务商" }
 );
@@ -31,7 +33,9 @@ export type Access = {
    | SSHConfig
    | WebhookConfig
    | CloudflareConfig
-    | QiniuConfig;
+    | QiniuConfig
+    | NamesiloConfig;
+
  deleted?: string;
  created?: string;
  updated?: string;
@@ -60,6 +64,10 @@ export type AliyunConfig = {
  accessKeySecret: string;
 };

+export type NamesiloConfig = {
+  apiKey: string;
+};
+
 export type SSHConfig = {
  host: string;
  port: string;
--- a/ui/src/pages/DashboardLayout.tsx
+++ b/ui/src/pages/DashboardLayout.tsx
@@ -227,7 +227,7 @@ export default function Dashboard() {
                    href="https://github.com/usual2970/certimate/releases"
                    target="_blank"
                  >
-                    Certimate v0.1.0
+                    Certimate v0.1.3
                  </a>
                </div>
              </div>
--- a/ui/src/pages/dashboard/Dashboard.tsx
+++ b/ui/src/pages/dashboard/Dashboard.tsx
@@ -58,8 +58,8 @@ const Dashboard = () => {
      <div className="flex justify-between items-center">
        <div className="text-muted-foreground">控制面板</div>
      </div>
-      <div className="flex mt-10 gap-5 flex-col md:flex-row">
-        <div className="w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
+      <div className="flex mt-10 gap-5 flex-col flex-wrap md:flex-row">
+        <div className="w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
          <div className="p-3">
            <SquareSigma size={48} strokeWidth={1} className="text-blue-400" />
          </div>
@@ -80,7 +80,7 @@ const Dashboard = () => {
          </div>
        </div>

-        <div className="w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
+        <div className="w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg border">
          <div className="p-3">
            <CalendarX2 size={48} strokeWidth={1} className="text-red-400" />
          </div>
@@ -101,7 +101,7 @@ const Dashboard = () => {
          </div>
        </div>

-        <div className="border w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg">
+        <div className="border w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg">
          <div className="p-3">
            <LoaderPinwheel
              size={48}
@@ -126,7 +126,7 @@ const Dashboard = () => {
          </div>
        </div>

-        <div className="border w-full md:w-[300px] flex items-center rounded-md p-3 shadow-lg">
+        <div className="border w-full md:w-[250px] 3xl:w-[300px] flex items-center rounded-md p-3 shadow-lg">
          <div className="p-3">
            <Ban size={48} strokeWidth={1} className="text-gray-400" />
          </div>
--- a/ui/src/pages/domains/Edit.tsx
+++ b/ui/src/pages/domains/Edit.tsx
@@ -131,7 +131,7 @@ const Edit = () => {
        title: "成功",
        description,
      });
-      navigate("/");
+      navigate("/domains");
    } catch (e) {
      const err = e as ClientResponseError;

--- a/ui/tailwind.config.js
+++ b/ui/tailwind.config.js
@@ -14,6 +14,7 @@ module.exports = {
      padding: "2rem",
      screens: {
        "2xl": "1400px",
+        '3xl': '1920px',
      },
    },
    extend: {
Author	SHA1	Message	Date
yoan	844347acf9	fix file select	2024-09-11 07:35:19 +08:00
usual2970	eeae9b4405	Merge pull request #16 from gexin1/main fix: 首页展示问题和授权管理弹窗无法滚动	2024-09-11 06:37:38 +08:00
river	feef94f873	fix: 1. 修复首页控制面板在md和2xl的时候会超出屏幕 2.修复授权管理-添加授权选择ssh 弹窗过长超出屏幕无法滚动	2024-09-10 22:56:54 +08:00
yoan	7ad8cdfe47	add namesilo provider	2024-09-10 21:02:31 +08:00