Skip to content

Commit

Permalink
feat: 统一整合各平台配置-Hexo
Browse files Browse the repository at this point in the history
  • Loading branch information
terwer committed Aug 6, 2023
1 parent e4b8a61 commit 4a5d091
Show file tree
Hide file tree
Showing 33 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/adaptors/api/cnblogs/useCnblogsApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { CnblogsApiAdaptor } from "~/src/adaptors/api/cnblogs/cnblogsApiAdaptor.
import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import {JsonUtil, ObjectUtil, StrUtil} from "zhi-common"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"

/**
* 使用Cnblogs API的自定义hook
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

import { CommonGithubPlaceholder } from "~/src/adaptors/api/base/github/config/CommonGithubPlaceholder.ts"
import { CommonGithubPlaceholder } from "~/src/adaptors/api/base/github/CommonGithubPlaceholder.ts"

class HexoPlaceHolder extends CommonGithubPlaceholder {}

Expand Down
6 changes: 3 additions & 3 deletions src/adaptors/api/hexo/useHexoApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { HexoConfig } from "~/src/adaptors/api/hexo/config/hexoConfig.ts"
import { HexoApiAdaptor } from "~/src/adaptors/api/hexo/adaptor/hexoApiAdaptor.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { HexoConfig } from "~/src/adaptors/api/hexo/hexoConfig.ts"
import { HexoApiAdaptor } from "~/src/adaptors/api/hexo/hexoApiAdaptor.ts"

const useHexoApi = async (key: string, newCfg?: HexoConfig) => {
// 创建应用日志记录器
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/api/metaweblog/useMetaweblogApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { MetaweblogApiAdaptor } from "~/src/adaptors/api/metaweblog/adaptor/metaweblogApiAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/api/notion/useNotionApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Utils } from "~/src/utils/utils.ts"
import { NotionConfig } from "~/src/adaptors/api/notion/config/notionConfig.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { NotionApiAdaptor } from "~/src/adaptors/api/notion/adaptor/notionApiAdaptor.ts"

const useNotionApi = async (key: string, newCfg?: NotionConfig) => {
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/api/typecho/useTypechoApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Utils } from "~/src/utils/utils.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { TypechoConfig } from "~/src/adaptors/api/typecho/config/typechoConfig.ts"
import {JsonUtil, ObjectUtil, StrUtil} from "zhi-common"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { TypechoApiAdaptor } from "~/src/adaptors/api/typecho/adaptor/typechoApiAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/api/wordpress/useWordpressApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import {JsonUtil, ObjectUtil, StrUtil} from "zhi-common"
import { WordpressConfig } from "~/src/adaptors/api/wordpress/config/wordpressConfig.ts"
import { WordpressApiAdaptor } from "~/src/adaptors/api/wordpress/adaptor/wordpressApiAdaptor.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"

/**
* 使用Wordpress API的自定义hook
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/api/yuque/useYuqueApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Utils } from "~/src/utils/utils.ts"
import { YuqueConfig } from "~/src/adaptors/api/yuque/config/yuqueConfig.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import {JsonUtil, ObjectUtil, StrUtil} from "zhi-common"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { YuqueApiAdaptor } from "~/src/adaptors/api/yuque/adaptor/yuqueApiAdaptor.ts"

const useYuqueApi = async (key: string, newCfg?: YuqueConfig) => {
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

import { BlogAdaptor, WebAdaptor } from "zhi-blog-api"
import { getSubPlatformTypeByKey, SubPlatformType } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getSubPlatformTypeByKey, SubPlatformType } from "~/src/platform/dynamicConfig.ts"
import { useCnblogsApi } from "~/src/adaptors/api/cnblogs/useCnblogsApi.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useWordpressApi } from "~/src/adaptors/api/wordpress/useWordpressApi.ts"
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/web/csdn/useCsdnWeb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { CsdnWebAdaptor } from "~/src/adaptors/web/csdn/adaptor/csdnWebAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/web/jianshu/useJianshuWeb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { JianshuWebAdaptor } from "~/src/adaptors/web/jianshu/adaptor/jianshuWebAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/web/juejin/useJuejinWeb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { JuejinWebAdaptor } from "~/src/adaptors/web/juejin/adaptor/juejinWebAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/web/wechat/useWechatWeb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { WechatWebAdaptor } from "~/src/adaptors/web/wechat/adaptor/wechatWebAdaptor.ts"

/**
Expand Down
2 changes: 1 addition & 1 deletion src/adaptors/web/zhihu/useZhihuWeb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { AppInstance } from "~/src/appInstance.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { Utils } from "~/src/utils/utils.ts"
import { getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getDynPostidKey } from "~/src/platform/dynamicConfig.ts"

/**
* 用于获取ZhihuWeb的API的自定义Hook
Expand Down
2 changes: 1 addition & 1 deletion src/components/publish/SinglePublishDoPublish.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { MethodEnum } from "~/src/models/methodEnum.ts"
import { Post } from "zhi-blog-api"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { DynamicConfig } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig } from "~/src/platform/dynamicConfig.ts"
import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
import { ElMessage, ElMessageBox } from "element-plus"
import { Delete } from "@element-plus/icons-vue"
Expand Down
2 changes: 1 addition & 1 deletion src/components/publish/SinglePublishSelectPlatform.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { onMounted, reactive } from "vue"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { useRouter } from "vue-router"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { HtmlUtil, JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
Expand Down
2 changes: 1 addition & 1 deletion src/components/publish/form/PublishPlatform.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script setup lang="ts">
import { onMounted, reactive } from "vue"
import { JsonUtil, StrUtil } from "zhi-common"
import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig, DynamicJsonCfg, getDynPostidKey } from "~/src/platform/dynamicConfig.ts"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { svgIcons } from "../../../utils/svgIcons.ts"
Expand Down
2 changes: 1 addition & 1 deletion src/components/set/PublishSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
PlatformType,
replacePlatformByKey,
setDynamicJsonCfg,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
import { useRouter } from "vue-router"
import { usePlatformDefine } from "~/src/composables/usePlatformDefine.ts"
Expand Down
2 changes: 1 addition & 1 deletion src/components/set/publish/PlatformAddForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
PlatformType,
setDynamicJsonCfg,
SubPlatformType,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { useRoute, useRouter } from "vue-router"
Expand Down
2 changes: 1 addition & 1 deletion src/components/set/publish/PlatformQuickAdd.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
-->

<script setup lang="ts">
import { DynamicConfig, PlatformType } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig, PlatformType } from "~/src/platform/dynamicConfig.ts"
import { useRoute, useRouter } from "vue-router"
import BackPage from "~/src/components/common/BackPage.vue"
import { reactive } from "vue"
Expand Down
2 changes: 1 addition & 1 deletion src/components/set/publish/PlatformUpdateForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
PlatformType,
replacePlatformByKey,
setDynamicJsonCfg,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { JsonUtil } from "zhi-common"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"
import { SypConfig } from "~/syp.config.ts"
Expand Down
2 changes: 1 addition & 1 deletion src/components/set/publish/singleplatform/SettingEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import BackPage from "~/src/components/common/BackPage.vue"
import { reactive } from "vue"
import { useRoute } from "vue-router"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { getSubPlatformTypeByKey, SubPlatformType } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { getSubPlatformTypeByKey, SubPlatformType } from "~/src/platform/dynamicConfig.ts"
import CnblogsSetting from "~/src/components/set/publish/singleplatform/metaweblog/CnblogsSetting.vue"
import WordpressSetting from "~/src/components/set/publish/singleplatform/metaweblog/WordpressSetting.vue"
import TypechoSetting from "~/src/components/set/publish/singleplatform/metaweblog/TypechoSetting.vue"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
DynamicJsonCfg,
getDynCfgByKey,
setDynamicJsonCfg,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { SypConfig } from "~/syp.config.ts"
import { CommonblogConfig } from "~/src/adaptors/api/base/CommonblogConfig.ts"
import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<script setup lang="ts">
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { useHexoApi } from "~/src/adaptors/api/hexo/useHexoApi.ts"
import { HexoConfig } from "~/src/adaptors/api/hexo/config/hexoConfig.ts"
import { HexoPlaceHolder } from "~/src/adaptors/api/hexo/config/hexoPlaceHolder.ts"
import { HexoConfig } from "~/src/adaptors/api/hexo/hexoConfig.ts"
import { HexoPlaceHolder } from "~/src/adaptors/api/hexo/hexoPlaceHolder.ts"
const props = defineProps({
apiType: {
Expand Down
2 changes: 1 addition & 1 deletion src/composables/usePlatformDefine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

import { DynamicConfig, PlatformType } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig, PlatformType } from "~/src/platform/dynamicConfig.ts"
import { useVueI18n } from "~/src/composables/useVueI18n.ts"
import { pre } from "~/src/utils/import/pre.ts"

Expand Down
2 changes: 1 addition & 1 deletion src/composables/usePublish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { useSettingStore } from "~/src/stores/useSettingStore.ts"
import { useSiyuanApi } from "~/src/composables/useSiyuanApi.ts"
import { pre } from "~/src/utils/import/pre.ts"
import { MethodEnum } from "~/src/models/methodEnum.ts"
import { DynamicConfig, DynamicJsonCfg, getDynCfgByKey } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig, DynamicJsonCfg, getDynCfgByKey } from "~/src/platform/dynamicConfig.ts"
import { DYNAMIC_CONFIG_KEY } from "~/src/utils/constants.ts"

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
getSubPlatformTypeByKey,
PlatformType,
SubPlatformType,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { describe, it, expect } from "vitest"

describe("test dynamicConfig", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* questions.
*/

import { YamlConvertAdaptor } from "~/src/components/set/publish/platform/yamlConvertAdaptor.ts"
import { YamlConvertAdaptor } from "~/src/platform/yamlConvertAdaptor.ts"
import idUtil from "~/src/utils/idUtil.ts"
import { StrUtil } from "zhi-common"

Expand Down
2 changes: 1 addition & 1 deletion src/utils/import/pre.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
DynamicConfig,
PlatformType,
SubPlatformType,
} from "~/src/components/set/publish/platform/dynamicConfig.ts"
} from "~/src/platform/dynamicConfig.ts"
import { svgIcons } from "~/src/utils/svgIcons.ts"

export const pre = {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/widgetUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { useSiyuanDevice } from "~/src/composables/useSiyuanDevice.ts"
import { StrUtil } from "zhi-common"
import { BrowserUtil, SiyuanDevice } from "zhi-device"
import { createAppLogger } from "~/src/utils/appLogger.ts"
import { DynamicConfig } from "~/src/components/set/publish/platform/dynamicConfig.ts"
import { DynamicConfig } from "~/src/platform/dynamicConfig.ts"

const logger = createAppLogger("widget-utils")

Expand Down

0 comments on commit 4a5d091

Please sign in to comment.