From 720c3b4a437e6ca546b25376041fd7246976ecca Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Tue, 10 Oct 2023 23:17:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Github=20=E5=92=8C=20Gitlab=20=E7=B3=BB?=
 =?UTF-8?q?=E5=88=97=E5=B9=B3=E5=8F=B0=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=AE=BE=E7=BD=AE=E4=BD=9C=E8=80=85=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/base/github/commonGithubConfig.ts     |  7 ++++++
 .../vuepress/vuepressYamlConverterAdaptor.ts  |  4 +--
 .../singleplatform/base/CommonBlogSetting.vue | 15 ++++++++---
 .../base/impl/CommonGithubSetting.vue         | 10 +++++---
 .../singleplatform/github/VuepressSetting.vue | 25 ++++++++++++++++++-
 .../gitlab/GitlabvuepressSetting.vue          | 23 ++++++++++++++++-
 src/locales/en_US.ts                          |  2 ++
 src/locales/zh_CN.ts                          |  2 ++
 8 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/src/adaptors/api/base/github/commonGithubConfig.ts b/src/adaptors/api/base/github/commonGithubConfig.ts
index df5afcdf..ca6ffd35 100644
--- a/src/adaptors/api/base/github/commonGithubConfig.ts
+++ b/src/adaptors/api/base/github/commonGithubConfig.ts
@@ -25,6 +25,7 @@
 
 import { PasswordType } from "zhi-blog-api"
 import { CommonBlogConfig } from "~/src/adaptors/api/base/commonBlogConfig.ts"
+import { StrUtil } from "zhi-common"
 
 /**
  * CommonGithubConfig 类用于存储 GitHub 相关配置信息
@@ -60,6 +61,11 @@ class CommonGithubConfig extends CommonBlogConfig {
    */
   public email: string
 
+  /**
+   * 作者主页
+   */
+  public site: string
+
   /**
    * Markdown文件名规则（占位符：[yyyy] [MM] [dd] [slug] [filename] ）
    */
@@ -111,6 +117,7 @@ class CommonGithubConfig extends CommonBlogConfig {
     this.defaultMsg = "auto published by siyuan-plugin-publisher"
     this.author = "terwer"
     this.email = "youweics@163.com"
+    this.site = StrUtil.pathJoin(this.home, "/" + this.username)
     this.mdFilenameRule = "[filename].md"
     this.useMdFilename = false
     this.usePathCategory = false
diff --git a/src/adaptors/api/vuepress/vuepressYamlConverterAdaptor.ts b/src/adaptors/api/vuepress/vuepressYamlConverterAdaptor.ts
index d89194a4..52f502f7 100644
--- a/src/adaptors/api/vuepress/vuepressYamlConverterAdaptor.ts
+++ b/src/adaptors/api/vuepress/vuepressYamlConverterAdaptor.ts
@@ -81,9 +81,9 @@ class VuepressYamlConverterAdaptor extends YamlConvertAdaptor {
     }
 
     // author
-    let githubUrl = "https://github.com/terwer"
     const githubCfg = cfg as CommonGithubConfig
-    if (githubCfg.home) {
+    let githubUrl = githubCfg.site
+    if (StrUtil.isEmptyString(githubCfg.site)) {
       githubUrl = StrUtil.pathJoin(githubCfg.home, "/" + githubCfg.username)
     }
     yamlFormatObj.yamlObj.author = {
diff --git a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue
index 7447c39d..d0c8fe82 100644
--- a/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue
+++ b/src/components/set/publish/singleplatform/base/CommonBlogSetting.vue
@@ -60,12 +60,17 @@ const props = defineProps({
 })
 
 // emits
-const emit = defineEmits(["onHomeChange"])
+const emit = defineEmits(["onHomeChange", "onApiUrlChange", "onUsernameChange"])
 const handleHomeChange = (value: string | number): void => {
   if (emit) {
     emit("onHomeChange", value, formData.cfg)
   }
 }
+const handleUsernameChange = (value: string | number): void => {
+  if (emit) {
+    emit("onUsernameChange", value, formData.cfg)
+  }
+}
 
 // datas
 const isLoading = ref(false)
@@ -293,7 +298,11 @@ onMounted(async () => {
     </el-form-item>
     <!-- 登录名 -->
     <el-form-item :label="t('setting.common.username')" v-if="props.cfg.usernameEnabled">
-      <el-input v-model="formData.cfg.username" :placeholder="props.cfg?.placeholder.usernamePlaceholder" />
+      <el-input
+        v-model="formData.cfg.username"
+        :placeholder="props.cfg?.placeholder.usernamePlaceholder"
+        @input="handleUsernameChange"
+      />
     </el-form-item>
     <!-- 密码 -->
     <el-form-item
@@ -424,4 +433,4 @@ onMounted(async () => {
 .inline-tip
   margin 0
   padding-left 0
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
index 8f99b9cf..4b7c8ab1 100644
--- a/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
+++ b/src/components/set/publish/singleplatform/base/impl/CommonGithubSetting.vue
@@ -80,9 +80,6 @@ const syncDefaultPath = (cfg: any) => {
       <el-form-item :label="t('setting.blog.yamlLinkEnabled')">
         <el-switch v-model="(main.cfg as any).yamlLinkEnabled" />
       </el-form-item>
-      <el-form-item>
-        <a href="javascript:;" @click="toggleAdvance">{{ formData.advanceBtnText }}</a>
-      </el-form-item>
       <!-- Github分支名 -->
       <el-form-item :label="t('setting.blog.type.github.default.branch')">
         <el-input
@@ -98,6 +95,9 @@ const syncDefaultPath = (cfg: any) => {
           :placeholder="t('setting.blog.type.github.default.path.tip')"
         />
       </el-form-item>
+      <el-form-item>
+        <a href="javascript:;" @click="toggleAdvance">{{ formData.advanceBtnText }}</a>
+      </el-form-item>
       <div v-if="formData.showAdvancedConfig">
         <!-- 提交信息 -->
         <el-form-item :label="t('setting.blog.type.github.msg')">
@@ -111,6 +111,10 @@ const syncDefaultPath = (cfg: any) => {
         <el-form-item :label="t('setting.blog.type.github.email')">
           <el-input v-model="(main.cfg as any).email" :placeholder="t('setting.blog.type.github.email.tip')" />
         </el-form-item>
+        <!-- 作者主页 -->
+        <el-form-item :label="t('setting.blog.type.github.site')">
+          <el-input v-model="(main.cfg as any).site" :placeholder="t('setting.blog.type.github.site.tip')" />
+        </el-form-item>
         <!-- 文件规则 -->
         <el-form-item :label="t('setting.blog.mdFilenameRule')">
           <el-input
diff --git a/src/components/set/publish/singleplatform/github/VuepressSetting.vue b/src/components/set/publish/singleplatform/github/VuepressSetting.vue
index fa8891dc..9a3a49c1 100644
--- a/src/components/set/publish/singleplatform/github/VuepressSetting.vue
+++ b/src/components/set/publish/singleplatform/github/VuepressSetting.vue
@@ -28,6 +28,7 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { useVuepressApi } from "~/src/adaptors/api/vuepress/useVuepressApi.ts"
 import { VuepressConfig } from "~/src/adaptors/api/vuepress/vuepressConfig.ts"
 import { VuepressPlaceholder } from "~/src/adaptors/api/vuepress/vuepressPlaceholder.ts"
+import { StrUtil } from "zhi-common"
 
 const props = defineProps({
   apiType: {
@@ -46,10 +47,32 @@ vuepressPlaceholder.passwordPlaceholder = t("setting.blog.type.github.token.tip"
 vuepressPlaceholder.apiUrlPlaceholder = t("setting.blog.github.apiurl.tip")
 vuepressPlaceholder.previewUrlPlaceholder = t("setting.blog.previewUrl.tip")
 vuepressCfg.placeholder = vuepressPlaceholder
+
+// 处理事件的方法
+const onHomeChange = (value: string, cfg: VuepressConfig) => {
+  if (StrUtil.isEmptyString(cfg.home) || StrUtil.isEmptyString(cfg.username)) {
+    cfg.site = ""
+  } else {
+    cfg.site = StrUtil.pathJoin(cfg.home, "/" + cfg.username)
+  }
+}
+const onUsernameChange = (value: string, cfg: VuepressConfig) => {
+  // sync site
+  if (StrUtil.isEmptyString(cfg.home) || StrUtil.isEmptyString(cfg.username)) {
+    cfg.site = ""
+  } else {
+    cfg.site = StrUtil.pathJoin(cfg.home, "/" + cfg.username)
+  }
+}
 </script>
 
 <template>
-  <common-github-setting :api-type="props.apiType" :cfg="vuepressCfg">
+  <common-github-setting
+    :api-type="props.apiType"
+    :cfg="vuepressCfg"
+    @onHomeChange="onHomeChange"
+    @onUsernameChange="onUsernameChange"
+  >
     <template #header="header"> </template>
     <template #main="main"> </template>
     <template #footer="footer"> </template>
diff --git a/src/components/set/publish/singleplatform/gitlab/GitlabvuepressSetting.vue b/src/components/set/publish/singleplatform/gitlab/GitlabvuepressSetting.vue
index 25d020e5..0ad05456 100644
--- a/src/components/set/publish/singleplatform/gitlab/GitlabvuepressSetting.vue
+++ b/src/components/set/publish/singleplatform/gitlab/GitlabvuepressSetting.vue
@@ -50,17 +50,38 @@ vuepressCfg.placeholder = vuepressPlaceholder
 
 // 处理事件的方法
 const onHomeChange = (value: string, cfg: GitlabvuepressConfig) => {
+  // sync api
   if (StrUtil.isEmptyString(cfg.home)) {
     cfg.apiUrl = ""
   } else {
     cfg.apiUrl = cfg.home
     cfg.tokenSettingUrl = `${cfg.home}/-/profile/personal_access_tokens`
   }
+
+  // sync site
+  if (StrUtil.isEmptyString(cfg.home) || StrUtil.isEmptyString(cfg.username)) {
+    cfg.site = ""
+  } else {
+    cfg.site = StrUtil.pathJoin(cfg.home, "/" + cfg.username)
+  }
+}
+const onUsernameChange = (value: string, cfg: GitlabvuepressConfig) => {
+  // sync site
+  if (StrUtil.isEmptyString(cfg.home) || StrUtil.isEmptyString(cfg.username)) {
+    cfg.site = ""
+  } else {
+    cfg.site = StrUtil.pathJoin(cfg.home, "/" + cfg.username)
+  }
 }
 </script>
 
 <template>
-  <common-github-setting :api-type="props.apiType" :cfg="vuepressCfg" @onHomeChange="onHomeChange">
+  <common-github-setting
+    :api-type="props.apiType"
+    :cfg="vuepressCfg"
+    @onHomeChange="onHomeChange"
+    @onUsernameChange="onUsernameChange"
+  >
     <template #header="header"> </template>
     <template #main="main"> </template>
     <template #footer="footer"> </template>
diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts
index 36b189cf..edd41a39 100644
--- a/src/locales/en_US.ts
+++ b/src/locales/en_US.ts
@@ -147,6 +147,8 @@ export default {
   "setting.blog.type.github.author.tip": "Author, eg:terwer",
   "setting.blog.type.github.email": "Email",
   "setting.blog.type.github.email.tip": "Email",
+  "setting.blog.type.github.site": "Author's Page",
+  "setting.blog.type.github.site.tip": "Author's page, defaults to: [GitHub URL]/[Username] if left empty. Please do not change the key, translate the value to English.",
   "setting.blog.url": "Blog addr",
   "setting.blog.github.url.tip": "Github homepage address",
   "setting.blog.github.apiurl.tip": "Github's REST API address, typically: https://api.github.com",
diff --git a/src/locales/zh_CN.ts b/src/locales/zh_CN.ts
index 9df5f10f..0921a9b7 100644
--- a/src/locales/zh_CN.ts
+++ b/src/locales/zh_CN.ts
@@ -149,6 +149,8 @@ export default {
   "setting.blog.type.github.author.tip": "作者，例如：terwer",
   "setting.blog.type.github.email": "邮箱",
   "setting.blog.type.github.email.tip": "邮箱",
+  "setting.blog.type.github.site": "作者主页",
+  "setting.blog.type.github.site.tip": "作者主页，如果为空默认为：[GitHub地址]/[用户名]",
   "setting.blog.url": "博客网址",
   "setting.blog.github.url.tip": "Github首页地址",
   "setting.blog.username": "账号",