From 492958702a3cca1cb8c3334700ae26310ee9dcf8 Mon Sep 17 00:00:00 2001 From: "xiaoqi.cxq" Date: Tue, 26 Jul 2022 17:14:49 +0800 Subject: [PATCH] =?UTF-8?q?gitea=E6=94=AF=E6=8C=81http?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/menus/PublishMenu.vue | 4 +-- src/components/menus/SyncMenu.vue | 4 +-- src/components/menus/WorkspacesMenu.vue | 4 +-- .../modals/AccountManagementModal.vue | 4 +-- src/components/modals/ImageModal.vue | 4 +-- .../modals/providers/CustomAccountModal.vue | 2 +- .../modals/providers/GiteaAccountModal.vue | 12 +++++++-- .../modals/providers/SmmsAccountModal.vue | 2 +- src/data/welcomeFile.md | 25 ------------------- .../providers/giteaWorkspaceProvider.js | 4 +-- src/services/providers/helpers/giteaHelper.js | 13 ++++++++-- static/landing/index.html | 2 +- 12 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/components/menus/PublishMenu.vue b/src/components/menus/PublishMenu.vue index b17ca1f7..48a4167a 100644 --- a/src/components/menus/PublishMenu.vue +++ b/src/components/menus/PublishMenu.vue @@ -264,8 +264,8 @@ export default { }, async addGiteaAccount() { try { - const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'giteaAccount' }); - await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret); + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount' }); + await giteaHelper.addAccount(applicationInfo); } catch (e) { /* cancel */ } }, async addGoogleDriveAccount() { diff --git a/src/components/menus/SyncMenu.vue b/src/components/menus/SyncMenu.vue index da4fb1c7..2cef7982 100644 --- a/src/components/menus/SyncMenu.vue +++ b/src/components/menus/SyncMenu.vue @@ -240,8 +240,8 @@ export default { }, async addGiteaAccount() { try { - const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'giteaAccount' }); - await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret); + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount' }); + await giteaHelper.addAccount(applicationInfo); } catch (e) { /* cancel */ } }, async addGoogleDriveAccount() { diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue index c8ef2328..693acd04 100644 --- a/src/components/menus/WorkspacesMenu.vue +++ b/src/components/menus/WorkspacesMenu.vue @@ -95,8 +95,8 @@ export default { }, async addGiteaWorkspace() { try { - const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'giteaAccount' }); - const token = await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret); + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount' }); + const token = await giteaHelper.addAccount(applicationInfo); store.dispatch('modal/open', { type: 'giteaWorkspace', token, diff --git a/src/components/modals/AccountManagementModal.vue b/src/components/modals/AccountManagementModal.vue index feafd212..68464a0a 100644 --- a/src/components/modals/AccountManagementModal.vue +++ b/src/components/modals/AccountManagementModal.vue @@ -254,8 +254,8 @@ export default { }, async addGiteaAccount() { try { - const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'giteaAccount' }); - await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret); + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount' }); + await giteaHelper.addAccount(applicationInfo); } catch (e) { /* cancel */ } }, async addGoogleDriveAccount() { diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue index 4c3beac0..0c3bfb5b 100644 --- a/src/components/modals/ImageModal.vue +++ b/src/components/modals/ImageModal.vue @@ -233,8 +233,8 @@ export default modalTemplate({ }, async addGiteaImgStorage() { try { - const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'giteaAccount' }); - const token = await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret); + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount' }); + const token = await giteaHelper.addAccount(applicationInfo); const imgStorageInfo = await store.dispatch('modal/open', { type: 'giteaImgStorage', token, diff --git a/src/components/modals/providers/CustomAccountModal.vue b/src/components/modals/providers/CustomAccountModal.vue index 497a78e4..e1d1e7c1 100644 --- a/src/components/modals/providers/CustomAccountModal.vue +++ b/src/components/modals/providers/CustomAccountModal.vue @@ -4,7 +4,7 @@
-

将您的自定义图床账号链接到StackEdit。

+

将您的自定义图床账号链接到StackEdit中文版。

diff --git a/src/components/modals/providers/GiteaAccountModal.vue b/src/components/modals/providers/GiteaAccountModal.vue index 6a824a73..1610504a 100644 --- a/src/components/modals/providers/GiteaAccountModal.vue +++ b/src/components/modals/providers/GiteaAccountModal.vue @@ -38,13 +38,21 @@ import constants from '../../../data/constants'; export default modalTemplate({ data: () => ({ - redirectUrl: constants.oauth2RedirectUri, }), computedLocalSettings: { serverUrl: 'giteaServerUrl', applicationId: 'giteaApplicationId', applicationSecret: 'giteaApplicationSecret', }, + computed: { + redirectUrl() { + let url = constants.oauth2RedirectUri; + if (this.serverUrl && this.serverUrl.indexOf('http://') === 0) { + url = url.replace('https://', 'http://'); + } + return url; + }, + }, methods: { resolve() { const serverUrl = this.config.forceServerUrl || this.serverUrl; @@ -58,7 +66,7 @@ export default modalTemplate({ this.setError('applicationSecret'); } if (serverUrl && this.applicationId) { - const parsedUrl = serverUrl.match(/^(https:\/\/[^/]+)/); + const parsedUrl = serverUrl.match(/^(http[s]?:\/\/[^/]+)/); if (!parsedUrl) { this.setError('serverUrl'); } else { diff --git a/src/components/modals/providers/SmmsAccountModal.vue b/src/components/modals/providers/SmmsAccountModal.vue index d013b2e3..71b136fc 100644 --- a/src/components/modals/providers/SmmsAccountModal.vue +++ b/src/components/modals/providers/SmmsAccountModal.vue @@ -4,7 +4,7 @@
-

将您的SM.MS账号链接到StackEdit。

+

将您的SM.MS账号链接到StackEdit中文版。

diff --git a/src/data/welcomeFile.md b/src/data/welcomeFile.md index 24fea572..36962743 100644 --- a/src/data/welcomeFile.md +++ b/src/data/welcomeFile.md @@ -83,31 +83,6 @@ StackEdit中文版 将您的文件存储在您的浏览器中，这意味着您 由于一个文件可以与多个位置同步，您可以通过单击**同步**子菜单中的**文件同步**列出和管理同步位置。这允许您列出和删除链接到您的文件的同步位置。 - -# 发布 - -在 StackEdit中文版 中发布使您可以轻松地在线发布文件。对文件感到满意后，您可以将其发布到不同的托管平台，例如 **Blogger**、**Gitee**、**Gist**、**GitHub**、**WordPress** 和 **Zendesk**。使用 [Handlebars 模板](http://handlebarsjs.com/)，您可以完全控制导出的内容。 - -> 在开始发布之前，您必须在**发布**子菜单中链接一个账号。 - -## 发布文件 - -您可以通过打开 **发布** 子菜单并单击 **发布到** 来发布您的文件。对于某些位置，您可以选择以下格式： - -- Markdown：在可以解释的网站上发布 Markdown 文本（例如**GitHub**）， -- HTML：通过 Handlebars 模板发布转换为 HTML 的文件（例如在博客上）。 - -## 更新发布 - -发布后，StackEdit中文版 会将您的文件链接到该发布，这使您可以轻松地重新发布它。一旦您修改了文件并想要更新您的发布，请单击导航栏中的**立即发布**按钮。 - -> **注意：** 如果您的文件尚未发布，则 **立即发布** 按钮将被禁用。 - -## 管理文件发布 - -由于一个文件可以发布到多个位置，您可以通过单击**发布**子菜单中的**文件发布**来列出和管理发布位置。这允许您列出和删除链接到您的文件的发布位置。 - - # Markdown扩展 StackEdit中文版 通过添加额外的 **Markdown扩展** 扩展了标准 Markdown 语法，为您提供了一些不错的功能。 diff --git a/src/services/providers/giteaWorkspaceProvider.js b/src/services/providers/giteaWorkspaceProvider.js index 9f1d56b8..17d2448b 100644 --- a/src/services/providers/giteaWorkspaceProvider.js +++ b/src/services/providers/giteaWorkspaceProvider.js @@ -75,11 +75,11 @@ export default new Provider({ const sub = workspace ? workspace.sub : utils.queryParams.sub; let token = store.getters['data/giteaTokensBySub'][sub]; if (!token) { - const { applicationId, applicationSecret } = await store.dispatch('modal/open', { + const applicationInfo = await store.dispatch('modal/open', { type: 'giteaAccount', forceServerUrl: serverUrl, }); - token = await giteaHelper.addAccount(serverUrl, applicationId, applicationSecret, sub); + token = await giteaHelper.addAccount(applicationInfo, sub); } if (!workspace) { diff --git a/src/services/providers/helpers/giteaHelper.js b/src/services/providers/helpers/giteaHelper.js index 279d21d8..4e74f1b2 100644 --- a/src/services/providers/helpers/giteaHelper.js +++ b/src/services/providers/helpers/giteaHelper.js @@ -173,8 +173,17 @@ export default { return this.startOauth2(serverUrl, applicationId, applicationSecret, sub); } }, - async addAccount(serverUrl, applicationId, applicationSecret, sub = null) { - const token = await this.startOauth2(serverUrl, applicationId, applicationSecret, sub); + async addAccount({ + serverUrl, + applicationId, + applicationSecret, + }, sub = null) { + const token = await this.startOauth2( + serverUrl, + applicationId, + applicationSecret, + sub, + ); badgeSvc.addBadge('addGiteaAccount'); return token; }, diff --git a/static/landing/index.html b/static/landing/index.html index 03c3e669..8dfb71fc 100644 --- a/static/landing/index.html +++ b/static/landing/index.html @@ -9,7 +9,7 @@ + content="支持直接将码云（Gitee）、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片，并且可以直接在页面编辑同步和管理的Markdown编辑器。">