diff --git a/Dockerfile b/Dockerfile index 1a701d00..f82c17d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:11.15.0 +FROM mafgwo/wkhtmltopdf-nodejs:11.15.0 RUN mkdir -p /opt/stackedit WORKDIR /opt/stackedit diff --git a/README.md b/README.md index 4e255340..99706d89 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ StackEdit的作者可能因为什么原因，已经很久不维护了，Github ### TODO: 关于后续的一些想法 - 支持**Gitea**、**Gogs**两个轻量级且适于自建的Git仓库（毕竟Gitlab对机器配置要求较高）。想支持这两个主要也是考虑到其实很多公司已经禁用了Github或Gitee仓库，在公司都没法连上自己的Git仓库。 - 汉化，毕竟大家最熟悉的还是母语，并且该编辑器功能页面也不多，汉化工作量并不会很大。 -- 替换主工作区为Gitee（原版本主工作区是Google Drive，国内只有fan墙才可以用） +- 替换主文档空间为Gitee（原版本主文档空间是Google Drive，国内只有fan墙才可以用） - 引入mdnice，右边预览增加mdnice预览选项，主要含选主题(含mdnice常用20多个主题)、支持自定义主题、复制到公众号、复制到知乎、复制到稀土掘金等基本功能，便于喜欢写公众号、博客的同学可以更好更快的排版。 - ... 另外，朋友们有好的想法也可以在Issue或者加我微信 qicoding 提给我。 @@ -26,13 +26,14 @@ StackEdit的作者可能因为什么原因，已经很久不维护了，Github **Gogs目前无法支持，因为API目前不支持直接把Markdown推上去，如果后续Gogs的API支持了再添加** **已汉化主要功能部分（2022-06-01）** +对应Docker版本：5.15.5, tag: v5.15.5 -**接下来修改主工作区为Gitee** - +**已完成修改主文档空间为Gitee（2022-06-04）** +对应Docker版本：5.15.6, tag: v5.15.6 ### 目前已部署地址 -https://edit.qicoder.com/ +https://stackedit.cn/ 该地址可以作为试用或长期使用，本人承诺绝对没采集任何人的Token等敏感信息，不需要担心私有仓库泄漏。 diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json index d13a5f37..d2051f69 100644 --- a/chrome-app/manifest.json +++ b/chrome-app/manifest.json @@ -1,6 +1,6 @@ { "name": "StackEdit中文版", - "description": "浏览器内 Markdown 编辑器", + "description": "支持Gitee仓库的浏览器内 Markdown 编辑器", "version": "1.0.13", "manifest_version": 2, "container" : "GOOGLE_DRIVE", @@ -15,10 +15,10 @@ }, "app": { "urls": [ - "https://edit.qicoder.com/" + "https://stackedit.cn/" ], "launch": { - "web_url": "https://edit.qicoder.com/app" + "web_url": "https://stackedit.cn/app" } }, "offline_enabled": true, diff --git a/index.html b/index.html index 0b2d6255..b0021f93 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ StackEdit中文版 - + diff --git a/package.json b/package.json index 80ddac9b..99e53d89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "5.15.2", + "version": "5.15.6", "description": "Free, open-source, full-featured Markdown editor", "author": "Benoit Schweblin", "license": "Apache-2.0", diff --git a/server/index.js b/server/index.js index 393f49e4..70071717 100644 --- a/server/index.js +++ b/server/index.js @@ -37,6 +37,8 @@ module.exports = (app) => { // Serve landing.html app.get('/', (req, res) => res.sendFile(resolvePath('static/landing/index.html'))); + // Serve privacy_policy.html + app.get('/privacy_policy.html', (req, res) => res.sendFile(resolvePath('static/landing/privacy_policy.html'))); // Serve sitemap.xml app.get('/sitemap.xml', (req, res) => res.sendFile(resolvePath('static/sitemap.xml'))); // Serve callback.html diff --git a/server/pandoc.js b/server/pandoc.js index 8ac0f3d3..cf93ac51 100644 --- a/server/pandoc.js +++ b/server/pandoc.js @@ -2,7 +2,6 @@ const { spawn } = require('child_process'); const fs = require('fs'); const tmp = require('tmp'); -const user = require('./user'); const conf = require('./conf'); const outputFormats = { @@ -42,108 +41,101 @@ exports.generate = (req, res) => { const outputFormat = Object.prototype.hasOwnProperty.call(outputFormats, req.query.format) ? req.query.format : 'pdf'; - user.checkSponsor(req.query.idToken) - .then((isSponsor) => { - if (!isSponsor) { - throw new Error('unauthorized'); - } - - return new Promise((resolve, reject) => { - tmp.file({ - postfix: `.${outputFormat}`, - }, (err, filePath, fd, cleanupCallback) => { - if (err) { - reject(err); - } else { - resolve({ - filePath, - cleanupCallback, - }); - } - }); - }); - }) - .then(({ filePath, cleanupCallback }) => new Promise((resolve, reject) => { - const options = readJson(req.query.options); - const metadata = readJson(req.query.metadata); - const params = []; - - params.push('--latex-engine=xelatex'); - params.push('--webtex=http://chart.apis.google.com/chart?cht=tx&chf=bg,s,FFFFFF00&chco=000000&chl='); - if (options.toc) { - params.push('--toc'); - } - options.tocDepth = parseInt(options.tocDepth, 10); - if (!Number.isNaN(options.tocDepth)) { - params.push('--toc-depth', options.tocDepth); - } - options.highlightStyle = highlightStyles.includes(options.highlightStyle) ? options.highlightStyle : 'kate'; - params.push('--highlight-style', options.highlightStyle); - Object.keys(metadata).forEach((key) => { - params.push('-M', `${key}=${metadata[key]}`); - }); - - let finished = false; - - function onError(error) { - finished = true; - cleanupCallback(); - reject(error); - } - - const format = outputFormat === 'pdf' ? 'latex' : outputFormat; - params.push('-f', 'json', '-t', format, '-o', filePath); - const pandoc = spawn(conf.values.pandocPath, params, { - stdio: [ - 'pipe', - 'ignore', - 'pipe', - ], - }); - let timeoutId = setTimeout(() => { - timeoutId = null; - pandoc.kill(); - }, 50000); - pandoc.on('error', onError); - pandoc.stdin.on('error', onError); - pandoc.stderr.on('data', (data) => { - pandocError += `${data}`; - }); - pandoc.on('close', (code) => { - if (!finished) { - clearTimeout(timeoutId); - if (!timeoutId) { - res.statusCode = 408; - cleanupCallback(); - reject(new Error('timeout')); - } else if (code) { - cleanupCallback(); - reject(); - } else { - res.set('Content-Type', outputFormats[outputFormat]); - const readStream = fs.createReadStream(filePath); - readStream.on('open', () => readStream.pipe(res)); - readStream.on('close', () => cleanupCallback()); - readStream.on('error', () => { - cleanupCallback(); - reject(); - }); - } - } - }); - req.pipe(pandoc.stdin); - })) - .catch((err) => { - const message = err && err.message; - if (message === 'unauthorized') { - res.statusCode = 401; - res.end('Unauthorized.'); - } else if (message === 'timeout') { - res.statusCode = 408; - res.end('Request timeout.'); + new Promise((resolve, reject) => { + tmp.file({ + postfix: `.${outputFormat}`, + }, (err, filePath, fd, cleanupCallback) => { + if (err) { + reject(err); } else { - res.statusCode = 400; - res.end(pandocError || 'Unknown error.'); + resolve({ + filePath, + cleanupCallback, + }); } }); + }).then(({ filePath, cleanupCallback }) => new Promise((resolve, reject) => { + const options = readJson(req.query.options); + const metadata = readJson(req.query.metadata); + const params = []; + + params.push('--pdf-engine=xelatex'); + params.push('--webtex=http://chart.apis.google.com/chart?cht=tx&chf=bg,s,FFFFFF00&chco=000000&chl='); + if (options.toc) { + params.push('--toc'); + } + options.tocDepth = parseInt(options.tocDepth, 10); + if (!Number.isNaN(options.tocDepth)) { + params.push('--toc-depth', options.tocDepth); + } + options.highlightStyle = highlightStyles.includes(options.highlightStyle) ? options.highlightStyle : 'kate'; + params.push('--highlight-style', options.highlightStyle); + Object.keys(metadata).forEach((key) => { + params.push('-M', `${key}=${metadata[key]}`); + }); + + let finished = false; + + function onError(error) { + finished = true; + cleanupCallback(); + reject(error); + } + + const format = outputFormat === 'pdf' ? 'latex' : outputFormat; + params.push('-f', 'json', '-t', format, '-o', filePath); + const pandoc = spawn(conf.values.pandocPath, params, { + stdio: [ + 'pipe', + 'ignore', + 'pipe', + ], + }); + let timeoutId = setTimeout(() => { + timeoutId = null; + pandoc.kill(); + }, 50000); + pandoc.on('error', onError); + pandoc.stdin.on('error', onError); + pandoc.stderr.on('data', (data) => { + pandocError += `${data}`; + }); + pandoc.on('close', (code) => { + if (!finished) { + clearTimeout(timeoutId); + if (!timeoutId) { + res.statusCode = 408; + cleanupCallback(); + reject(new Error('timeout')); + } else if (code) { + cleanupCallback(); + reject(); + } else { + res.set('Content-Type', outputFormats[outputFormat]); + const readStream = fs.createReadStream(filePath); + readStream.on('open', () => readStream.pipe(res)); + readStream.on('close', () => cleanupCallback()); + readStream.on('error', () => { + cleanupCallback(); + reject(); + }); + } + } + }); + req.pipe(pandoc.stdin); + })) + .catch((err) => { + console.error(err); + const message = err && err.message; + if (message === 'unauthorized') { + res.statusCode = 401; + res.end('Unauthorized.'); + } else if (message === 'timeout') { + res.statusCode = 408; + res.end('Request timeout.'); + } else { + res.statusCode = 400; + res.end(pandocError || 'Unknown error.'); + } + }); }; diff --git a/server/pdf.js b/server/pdf.js index 0fe4337a..f898b8a0 100644 --- a/server/pdf.js +++ b/server/pdf.js @@ -2,7 +2,6 @@ const { spawn } = require('child_process'); const fs = require('fs'); const tmp = require('tmp'); -const user = require('./user'); const conf = require('./conf'); /* eslint-disable no-var, prefer-arrow-callback, func-names */ @@ -51,135 +50,129 @@ const readJson = (str) => { exports.generate = (req, res) => { let wkhtmltopdfError = ''; - user.checkSponsor(req.query.idToken) - .then((isSponsor) => { - if (!isSponsor) { - throw new Error('unauthorized'); - } - return new Promise((resolve, reject) => { - tmp.file((err, filePath, fd, cleanupCallback) => { - if (err) { - reject(err); - } else { - resolve({ - filePath, - cleanupCallback, - }); - } - }); - }); - }) - .then(({ filePath, cleanupCallback }) => new Promise((resolve, reject) => { - let finished = false; - - function onError(err) { - finished = true; - cleanupCallback(); + new Promise((resolve, reject) => { + tmp.file((err, filePath, fd, cleanupCallback) => { + if (err) { reject(err); - } - const options = readJson(req.query.options); - const params = []; - - // Margins - const marginTop = parseInt(`${options.marginTop}`, 10); - params.push('-T', Number.isNaN(marginTop) ? 25 : marginTop); - const marginRight = parseInt(`${options.marginRight}`, 10); - params.push('-R', Number.isNaN(marginRight) ? 25 : marginRight); - const marginBottom = parseInt(`${options.marginBottom}`, 10); - params.push('-B', Number.isNaN(marginBottom) ? 25 : marginBottom); - const marginLeft = parseInt(`${options.marginLeft}`, 10); - params.push('-L', Number.isNaN(marginLeft) ? 25 : marginLeft); - - // Header - if (options.headerCenter) { - params.push('--header-center', `${options.headerCenter}`); - } - if (options.headerLeft) { - params.push('--header-left', `${options.headerLeft}`); - } - if (options.headerRight) { - params.push('--header-right', `${options.headerRight}`); - } - if (options.headerFontName) { - params.push('--header-font-name', `${options.headerFontName}`); - } - if (options.headerFontSize) { - params.push('--header-font-size', `${options.headerFontSize}`); - } - - // Footer - if (options.footerCenter) { - params.push('--footer-center', `${options.footerCenter}`); - } - if (options.footerLeft) { - params.push('--footer-left', `${options.footerLeft}`); - } - if (options.footerRight) { - params.push('--footer-right', `${options.footerRight}`); - } - if (options.footerFontName) { - params.push('--footer-font-name', `${options.footerFontName}`); - } - if (options.footerFontSize) { - params.push('--footer-font-size', `${options.footerFontSize}`); - } - - // Page size - params.push('--page-size', !authorizedPageSizes.includes(options.pageSize) ? 'A4' : options.pageSize); - - // Use a temp file as wkhtmltopdf can't access /dev/stdout on Amazon EC2 for some reason - params.push('--run-script', `${waitForJavaScript.toString()}waitForJavaScript()`); - params.push('--window-status', 'done'); - const wkhtmltopdf = spawn(conf.values.wkhtmltopdfPath, params.concat('-', filePath), { - stdio: [ - 'pipe', - 'ignore', - 'pipe', - ], - }); - let timeoutId = setTimeout(function () { - timeoutId = null; - wkhtmltopdf.kill(); - }, 50000); - wkhtmltopdf.on('error', onError); - wkhtmltopdf.stdin.on('error', onError); - wkhtmltopdf.stderr.on('data', (data) => { - wkhtmltopdfError += `${data}`; - }); - wkhtmltopdf.on('close', (code) => { - if (!finished) { - clearTimeout(timeoutId); - if (!timeoutId) { - cleanupCallback(); - reject(new Error('timeout')); - } else if (code) { - cleanupCallback(); - reject(); - } else { - res.set('Content-Type', 'application/pdf'); - const readStream = fs.createReadStream(filePath); - readStream.on('open', () => readStream.pipe(res)); - readStream.on('close', () => cleanupCallback()); - readStream.on('error', () => { - cleanupCallback(); - reject(); - }); - } - } - }); - req.pipe(wkhtmltopdf.stdin); - })) - .catch((err) => { - const message = err && err.message; - if (message === 'unauthorized') { - res.statusCode = 401; - res.end('Unauthorized.'); - } else if (message === 'timeout') { - res.statusCode = 408; - res.end('Request timeout.'); } else { - res.statusCode = 400; - res.end(wkhtmltopdfError || 'Unknown error.'); + resolve({ + filePath, + cleanupCallback, + }); } }); + }).then(({ filePath, cleanupCallback }) => new Promise((resolve, reject) => { + let finished = false; + + function onError(err) { + finished = true; + cleanupCallback(); + reject(err); + } + const options = readJson(req.query.options); + const params = []; + + // Margins + const marginTop = parseInt(`${options.marginTop}`, 10); + params.push('-T', Number.isNaN(marginTop) ? 25 : marginTop); + const marginRight = parseInt(`${options.marginRight}`, 10); + params.push('-R', Number.isNaN(marginRight) ? 25 : marginRight); + const marginBottom = parseInt(`${options.marginBottom}`, 10); + params.push('-B', Number.isNaN(marginBottom) ? 25 : marginBottom); + const marginLeft = parseInt(`${options.marginLeft}`, 10); + params.push('-L', Number.isNaN(marginLeft) ? 25 : marginLeft); + + // Header + if (options.headerCenter) { + params.push('--header-center', `${options.headerCenter}`); + } + if (options.headerLeft) { + params.push('--header-left', `${options.headerLeft}`); + } + if (options.headerRight) { + params.push('--header-right', `${options.headerRight}`); + } + if (options.headerFontName) { + params.push('--header-font-name', `${options.headerFontName}`); + } + if (options.headerFontSize) { + params.push('--header-font-size', `${options.headerFontSize}`); + } + + // Footer + if (options.footerCenter) { + params.push('--footer-center', `${options.footerCenter}`); + } + if (options.footerLeft) { + params.push('--footer-left', `${options.footerLeft}`); + } + if (options.footerRight) { + params.push('--footer-right', `${options.footerRight}`); + } + if (options.footerFontName) { + params.push('--footer-font-name', `${options.footerFontName}`); + } + if (options.footerFontSize) { + params.push('--footer-font-size', `${options.footerFontSize}`); + } + + // Page size + params.push('--page-size', !authorizedPageSizes.includes(options.pageSize) ? 'A4' : options.pageSize); + + // Use a temp file as wkhtmltopdf can't access /dev/stdout on Amazon EC2 for some reason + params.push('--run-script', `${waitForJavaScript.toString()}waitForJavaScript()`); + params.push('--window-status', 'done'); + const wkhtmltopdf = spawn(conf.values.wkhtmltopdfPath, params.concat('-', filePath), { + stdio: [ + 'pipe', + 'ignore', + 'pipe', + ], + }); + let timeoutId = setTimeout(function () { + timeoutId = null; + wkhtmltopdf.kill(); + }, 50000); + wkhtmltopdf.on('error', onError); + wkhtmltopdf.stdin.on('error', onError); + wkhtmltopdf.stderr.on('data', (data) => { + wkhtmltopdfError += `${data}`; + }); + wkhtmltopdf.on('close', (code) => { + if (!finished) { + clearTimeout(timeoutId); + if (!timeoutId) { + cleanupCallback(); + reject(new Error('timeout')); + } else if (code) { + cleanupCallback(); + reject(); + } else { + res.set('Content-Type', 'application/pdf'); + const readStream = fs.createReadStream(filePath); + readStream.on('open', () => readStream.pipe(res)); + readStream.on('close', () => cleanupCallback()); + readStream.on('error', () => { + cleanupCallback(); + reject(); + }); + } + } + }); + req.pipe(wkhtmltopdf.stdin); + })) + .catch((err) => { + console.error(err); + const message = err && err.message; + if (message === 'unauthorized') { + res.statusCode = 401; + res.end('Unauthorized.'); + } else if (message === 'timeout') { + res.statusCode = 408; + res.end('Request timeout.'); + } else { + res.statusCode = 400; + res.end(wkhtmltopdfError || 'Unknown error.'); + } + }); }; diff --git a/src/components/ButtonBar.vue b/src/components/ButtonBar.vue index 85564891..b4ca7e83 100644 --- a/src/components/ButtonBar.vue +++ b/src/components/ButtonBar.vue @@ -4,10 +4,10 @@ - - diff --git a/src/components/FindReplace.vue b/src/components/FindReplace.vue index 837aa3a8..760f9e71 100644 --- a/src/components/FindReplace.vue +++ b/src/components/FindReplace.vue @@ -1,6 +1,6 @@ diff --git a/src/components/menus/WorkspacesMenu.vue b/src/components/menus/WorkspacesMenu.vue index 54184b03..c8ef2328 100644 --- a/src/components/menus/WorkspacesMenu.vue +++ b/src/components/menus/WorkspacesMenu.vue @@ -2,8 +2,8 @@
-
{{workspaceCount}}
管理工作区
- 列出、重命名、删除工作区 +
{{workspaceCount}}
管理文档空间
+ 列出、重命名、删除文档空间
@@ -15,27 +15,27 @@
- 新增 GitHub 工作区 + 新增 GitHub 文档空间 - 新增 Gitee 工作区 + 新增 Gitee 文档空间 - 新增 GitLab 工作区 + 新增 GitLab 文档空间 - 新增 Gitea 工作区 + 新增 Gitea 文档空间 - 新增 Google Drive 工作区 + 新增 Google Drive 文档空间 - 新增 CouchDB 工作区 + 新增 CouchDB 文档空间
diff --git a/src/components/modals/AboutModal.vue b/src/components/modals/AboutModal.vue index 2bd3ad93..145430ef 100644 --- a/src/components/modals/AboutModal.vue +++ b/src/components/modals/AboutModal.vue @@ -9,7 +9,7 @@ Chrome 应用 — Chrome 扩展
- © 2013-2022 StackEdit中文版
v{{version}} + © 2022 StackEdit中文版
v{{version}}

常见问题解答

diff --git a/src/components/modals/AccountManagementModal.vue b/src/components/modals/AccountManagementModal.vue index 6c88c0d6..a175b996 100644 --- a/src/components/modals/AccountManagementModal.vue +++ b/src/components/modals/AccountManagementModal.vue @@ -1,11 +1,11 @@ diff --git a/src/components/modals/BadgeManagementModal.vue b/src/components/modals/BadgeManagementModal.vue index 86278842..12a4c50b 100644 --- a/src/components/modals/BadgeManagementModal.vue +++ b/src/components/modals/BadgeManagementModal.vue @@ -1,18 +1,18 @@ diff --git a/src/components/modals/FilePropertiesModal.vue b/src/components/modals/FilePropertiesModal.vue index dfc94ed7..ec46e781 100644 --- a/src/components/modals/FilePropertiesModal.vue +++ b/src/components/modals/FilePropertiesModal.vue @@ -1,17 +1,17 @@ diff --git a/src/components/modals/HtmlExportModal.vue b/src/components/modals/HtmlExportModal.vue index b845f8fc..a8e9b4ec 100644 --- a/src/components/modals/HtmlExportModal.vue +++ b/src/components/modals/HtmlExportModal.vue @@ -1,22 +1,22 @@ diff --git a/src/components/modals/ImageModal.vue b/src/components/modals/ImageModal.vue index b34803d3..d03338c1 100644 --- a/src/components/modals/ImageModal.vue +++ b/src/components/modals/ImageModal.vue @@ -1,23 +1,23 @@ diff --git a/src/components/modals/LinkModal.vue b/src/components/modals/LinkModal.vue index ef6db5f5..20b43974 100644 --- a/src/components/modals/LinkModal.vue +++ b/src/components/modals/LinkModal.vue @@ -1,14 +1,14 @@ diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue index 120225ba..84ea4d14 100644 --- a/src/components/modals/PandocExportModal.vue +++ b/src/components/modals/PandocExportModal.vue @@ -1,7 +1,7 @@ @@ -29,7 +29,6 @@ import FileSaver from 'file-saver'; import networkSvc from '../../services/networkSvc'; import editorSvc from '../../services/editorSvc'; -import googleHelper from '../../services/providers/helpers/googleHelper'; import modalTemplate from './common/modalTemplate'; import store from '../../store'; import badgeSvc from '../../services/badgeSvc'; @@ -45,15 +44,11 @@ export default modalTemplate({ const currentContent = store.getters['content/current']; const { selectedFormat } = this; store.dispatch('queue/enqueue', async () => { - const tokenToRefresh = store.getters['workspace/sponsorToken']; - const sponsorToken = tokenToRefresh && await googleHelper.refreshToken(tokenToRefresh); - try { const { body } = await networkSvc.request({ method: 'POST', url: 'pandocExport', params: { - idToken: sponsorToken && sponsorToken.idToken, format: selectedFormat, options: JSON.stringify(store.getters['data/computedSettings'].pandoc), metadata: JSON.stringify(currentContent.properties), @@ -65,12 +60,8 @@ export default modalTemplate({ FileSaver.saveAs(body, `${currentFile.name}.${selectedFormat}`); badgeSvc.addBadge('exportPandoc'); } catch (err) { - if (err.status === 401) { - store.dispatch('modal/open', 'sponsorOnly'); - } else { - console.error(err); // eslint-disable-line no-console - store.dispatch('notification/error', err); - } + console.error(err); // eslint-disable-line no-console + store.dispatch('notification/error', err); } }); }, diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue index 8ffd529f..971c01f1 100644 --- a/src/components/modals/PdfExportModal.vue +++ b/src/components/modals/PdfExportModal.vue @@ -1,21 +1,21 @@ @@ -24,7 +24,6 @@ import FileSaver from 'file-saver'; import exportSvc from '../../services/exportSvc'; import networkSvc from '../../services/networkSvc'; -import googleHelper from '../../services/providers/helpers/googleHelper'; import modalTemplate from './common/modalTemplate'; import store from '../../store'; import badgeSvc from '../../services/badgeSvc'; @@ -38,24 +37,17 @@ export default modalTemplate({ this.config.resolve(); const currentFile = store.getters['file/current']; store.dispatch('queue/enqueue', async () => { - const [sponsorToken, html] = await Promise.all([ - Promise.resolve().then(() => { - const tokenToRefresh = store.getters['workspace/sponsorToken']; - return tokenToRefresh && googleHelper.refreshToken(tokenToRefresh); - }), - exportSvc.applyTemplate( - currentFile.id, - this.allTemplatesById[this.selectedTemplate], - true, - ), - ]); + const html = await exportSvc.applyTemplate( + currentFile.id, + this.allTemplatesById[this.selectedTemplate], + true, + ); try { const { body } = await networkSvc.request({ method: 'POST', url: 'pdfExport', params: { - idToken: sponsorToken && sponsorToken.idToken, options: JSON.stringify(store.getters['data/computedSettings'].wkhtmltopdf), }, body: html, @@ -65,12 +57,8 @@ export default modalTemplate({ FileSaver.saveAs(body, `${currentFile.name}.pdf`); badgeSvc.addBadge('exportPdf'); } catch (err) { - if (err.status === 401) { - store.dispatch('modal/open', 'sponsorOnly'); - } else { - console.error(err); // eslint-disable-line no-console - store.dispatch('notification/error', err); - } + console.error(err); // eslint-disable-line no-console + store.dispatch('notification/error', err); } }); }, diff --git a/src/components/modals/PublishManagementModal.vue b/src/components/modals/PublishManagementModal.vue index 60a37152..6e8b9f45 100644 --- a/src/components/modals/PublishManagementModal.vue +++ b/src/components/modals/PublishManagementModal.vue @@ -16,7 +16,7 @@ {{location.description}}
-
@@ -26,10 +26,10 @@ {{location.url}}
- - +
diff --git a/src/components/modals/SettingsModal.vue b/src/components/modals/SettingsModal.vue index d9b7e7a4..826be272 100644 --- a/src/components/modals/SettingsModal.vue +++ b/src/components/modals/SettingsModal.vue @@ -3,19 +3,19 @@
- Custom settings + 自定义配置 - Default settings + 默认配置
-
+
-
+
@@ -24,8 +24,8 @@
{{error}}
- - + +
@@ -40,9 +40,7 @@ import defaultSettings from '../../data/defaults/defaultSettings.yml'; import store from '../../store'; import badgeSvc from '../../services/badgeSvc'; -const emptySettings = `# Add your custom settings here to override the -# default settings. -`; +const emptySettings = '# 增加您的自定义配置覆盖默认配置'; export default { components: { diff --git a/src/components/modals/SponsorModal.vue b/src/components/modals/SponsorModal.vue index ed700161..db648fd3 100644 --- a/src/components/modals/SponsorModal.vue +++ b/src/components/modals/SponsorModal.vue @@ -10,7 +10,7 @@
- +
diff --git a/src/components/modals/SyncManagementModal.vue b/src/components/modals/SyncManagementModal.vue index cfac0dae..38d0f120 100644 --- a/src/components/modals/SyncManagementModal.vue +++ b/src/components/modals/SyncManagementModal.vue @@ -4,8 +4,8 @@
-

{{currentFileName}} is synchronized with the following location(s):

-

{{currentFileName}} is not synchronized yet.

+

{{currentFileName}} 与以下位置同步：

+

{{currentFileName}}尚未同步。

@@ -16,20 +16,20 @@ {{location.description}}
-
- {{location.url || 'Google Drive app data'}} + {{location.url || 'Gitee app data'}}
- - +
@@ -37,11 +37,11 @@
- Tip: Removing a location won't delete any file. + 提示: 删除位置不会删除任何文件。
- +
diff --git a/src/components/modals/TemplatesModal.vue b/src/components/modals/TemplatesModal.vue index 3e25768e..71dd44a1 100644 --- a/src/components/modals/TemplatesModal.vue +++ b/src/components/modals/TemplatesModal.vue @@ -1,8 +1,8 @@ diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue index 04b6aa53..4a0906ea 100644 --- a/src/components/modals/WorkspaceManagementModal.vue +++ b/src/components/modals/WorkspaceManagementModal.vue @@ -1,10 +1,10 @@