Compare commits

...

49 Commits

Author SHA1 Message Date
7a82ba2250 更新:README文件 2024-09-09 15:14:26 +08:00
445cfe69fc 更新:README文档 2024-09-09 14:50:22 +08:00
40e77fef15 更新gitee分享文件位置链接 2024-08-05 10:23:12 +08:00
348b5668fd 更新git后缀链接 2024-08-05 10:03:03 +08:00
60c751f340 更新站点icon图标 2024-08-04 17:36:02 +08:00
024706f20f 更新隐私政策 2024-08-04 17:35:16 +08:00
408618eceb 更新站点链接 2024-08-04 17:34:56 +08:00
9a7570b02f 更新首页信息 2024-08-04 17:34:01 +08:00
182c863eef 更新自述 2024-08-04 17:32:02 +08:00
xiaoqi.cxq
d422df5e42 去掉英文版入口 2024-03-22 16:14:05 +08:00
xiaoqi.cxq
91215e6db9 截断字符长度从25万改成1000万 2024-01-04 08:24:26 +08:00
xiaoqi.cxq
1286c42d4c 支持复制路径 2023-12-25 11:26:15 +08:00
xiaoqi.cxq
3467a6ee09 github作为主空间时的bug修复 2023-12-20 11:21:01 +08:00
xiaoqi.cxq
b4f4c71f85 快捷键会失效的问题修复 2023-10-20 13:50:33 +08:00
xiaoqi.cxq
39167fb193 主文档空间支持GitHub登录 2023-10-19 18:20:34 +08:00
xiaoqi.cxq
97b8d3c288 优化导出中的header生成 2023-10-18 10:09:46 +08:00
xiaoqi.cxq
b4c9407b06 优化预览header生成 2023-10-18 09:40:43 +08:00
xiaoqi.cxq
96ea8cd0db 避免undefined文件提交 2023-10-18 09:09:27 +08:00
xiaoqi.cxq
550bb2fd91 分享页面请求逻辑优化 2023-09-19 09:29:28 +08:00
xiaoqi.cxq
2092045b7f gitea publish bugfix 2023-09-08 14:40:22 +08:00
xiaoqi.cxq
12e4befa96 GitLab授权调整 2023-08-26 01:15:54 +08:00
xiaoqi.cxq
80e0e3bc99 修改chatgpt的api代理地址 2023-08-26 01:11:16 +08:00
xiaoqi.cxq
4747f91749 更改chatgpt接口地址 2023-08-08 13:25:43 +08:00
xiaoqi.cxq
e04fd5a911 chatgpt优化 2023-07-01 19:40:16 +08:00
xiaoqi.cxq
9cd27e274e 导出标题标签优化 2023-06-30 11:29:41 +08:00
xiaoqi.cxq
81cad7ee84 路径支持反斜杠 2023-06-30 11:28:26 +08:00
xiaoqi.cxq
81612deab7 标题锚点可以是数字开头 2023-06-30 11:28:00 +08:00
xiaoqi.cxq
282b546edc 修复h标签渲染包含图片锚点错误并图片渲染不了的问题 2023-06-30 09:40:52 +08:00
xiaoqi.cxq
1727be1eaf 增加Docker构建的脚本 2023-06-29 22:25:01 +08:00
xiaoqi.cxq
57931b9db2 渲染问题bugfix 2023-06-29 22:24:07 +08:00
xiaoqi.cxq
d175557ab9 图片加载bugfix 2023-06-29 21:49:16 +08:00
xiaoqi.cxq
8e12eaebd2 替换ChatGPT接口为其他免费接口 2023-06-29 21:49:02 +08:00
xiaoqi.cxq
90d887519d chatgpt调整 2023-06-13 18:32:49 +08:00
xiaoqi.cxq
c1232b59db chatgpt优化 2023-05-23 10:44:26 +08:00
xiaoqi.cxq
a40af9c545 更新隐私策略 2023-05-12 15:19:36 +08:00
xiaoqi.cxq
f3d827fef1 update google api scope 2023-05-09 11:37:12 +08:00
xiaoqi.cxq
92f2c4dee6 latex \$ bugfix 2023-04-11 11:28:09 +08:00
xiaoqi.cxq
74f25af839 删除非必要代码 2023-04-11 09:58:25 +08:00
xiaoqi.cxq
20d7a9d2db ChatGPT辅助写作窗口控制台报错bugfix 2023-04-11 09:30:15 +08:00
xiaoqi.cxq
64d493d692 优化文案 2023-04-10 19:57:33 +08:00
xiaoqi.cxq
eda517cd61 bugfix 2023-04-10 19:57:11 +08:00
xiaoqi.cxq
24635c54ed update readme 2023-04-10 14:53:39 +08:00
xiaoqi.cxq
87c37401ed update readme 2023-04-10 12:59:26 +08:00
xiaoqi.cxq
599d71b597 支持ChatGPT生成内容 2023-04-10 10:24:22 +08:00
xiaoqi.cxq
0e02822add 优化share 2023-04-09 21:35:55 +08:00
xiaoqi.cxq
1daa5afe39 update styles 2023-04-06 14:00:15 +08:00
xiaoqi.cxq
2e9e4b73f6 homepage update 2023-03-31 09:39:24 +08:00
xiaoqi.cxq
4243a41e31 update share.html 2023-03-30 18:21:22 +08:00
xiaoqi.cxq
ae828cfb56 支持分享功能 2023-03-30 15:56:24 +08:00
85 changed files with 2079 additions and 406 deletions

View File

@ -3,4 +3,7 @@ node_modules
dist dist
.history .history
images images
docs docs
Dockerfile
README.md
build.sh

View File

@ -5,7 +5,7 @@ StackEdit中文版
</h1> </h1>
<p align="center"> <p align="center">
<strong>笔记利器在线Markdown编辑器。</strong><br> <strong>笔记利器在线Markdown编辑器。</strong><br>
如果你喜欢该项目请点一下Star您的肯定是作者最大的动力 项目clone自<a href="https://gitee.com/mafgwo/stackedit" target="_blank" title="豆萁">豆萁/stackedit</a>如果你喜欢该项目,请过去点一下Star您的肯定是作者最大的动力
</p> </p>
<p align="center"> <p align="center">
<a href="https://stackedit.cn/">https://stackedit.cn</a> <a href="https://stackedit.cn/">https://stackedit.cn</a>
@ -22,18 +22,19 @@ StackEdit中文版
</a> </a>
</p> </p>
<br/> <br/>
<p align="center">
<a target="_blank" href="https://jq.qq.com/?_wv=1027&k=wUSCNqmN">
<img src="https://img.shields.io/badge/QQ交流群-703187410-orange"/></a>
</p>
<hr /> <hr />
1 笔记支持Gitee、GitHub、Gitea等Git仓库存储。<br> 1 笔记支持Gitee、GitHub、Gitea等Git仓库存储。<br>
2 支持直接上传图片也支持多种外部图床GitHub、Gitea、SM.MS、自定义图床粘贴或拖拽上传。<br> 2 支持直接上传图片也支持多种外部图床GitHub、Gitea、SM.MS、自定义图床粘贴或拖拽上传。<br>
3 编辑区域支持选择主题或自定义,总有你喜欢的主题。<br> 3 编辑区域支持选择主题或自定义,总有你喜欢的主题。<br>
4 支持历史版本管理,不用担心编辑覆盖后无法回滚。<br> 4 支持历史版本管理,不用担心编辑覆盖后无法回滚。<br>
5 支持KaTeX数学表达式、Mermaid UML图、乐谱等扩展。 5 支持ChatGPT辅助写作。<br>
6 支持KaTeX数学表达式、Mermaid UML图、乐谱等扩展。
<hr /> <hr />
## 说明
本项目为本人clone修改自用如果你也喜欢请至原作者处获取及交流。
## 截图 ## 截图
**亮暗主题切换、编辑主题切换** **亮暗主题切换、编辑主题切换**
@ -48,7 +49,11 @@ StackEdit中文版
**支持文档搜索** **支持文档搜索**
![](./images/search.gif) ![](./images/search.gif)
**ChatGPT集成协助写作**
![](./images/chatgpt.gif)
## 相比国外开源版本的区别: ## 相比国外开源版本的区别:
- 修复了Github授权登录问题 - 修复了Github授权登录问题
- 支持了Gitee仓库2022-05-25 - 支持了Gitee仓库2022-05-25
- 支持了Gitea仓库2022-05-25 - 支持了Gitea仓库2022-05-25
@ -71,14 +76,19 @@ StackEdit中文版
- 支持预览区域选择主题样式2022-12-04 - 支持预览区域选择主题样式2022-12-04
- Gitlab的支持优化2023-02-23 - Gitlab的支持优化2023-02-23
- 导出HTML、PDF支持带预览主题导出2023-02-26 - 导出HTML、PDF支持带预览主题导出2023-02-26
- 支持分享文档2023-03-30
- 支持ChatGPT生成内容2023-04-10
- GitLab授权接口调整2023-08-26
- 主文档空间支持GitHub登录2023-10-19
## 国外开源版本弊端: ## 国外开源版本弊端:
- 作者已经不维护了
- Github授权登录存在问题 - 作者已经不维护了或很少维护了
- 不支持国内常用Gitee - 不支持国内常用Gitee
- 强依赖GoogleDrive而Google Drive在国内不能正常访问 - 强依赖GoogleDrive而Google Drive在国内不能正常访问
## 部署说明 ## 部署说明
> 建议docker-compose方式部署其他部署方式如遇到问题欢迎提issue。 > 建议docker-compose方式部署其他部署方式如遇到问题欢迎提issue。
docker官方仓库下载太慢可以使用阿里云的镜像仓库镜像仓库地址registry.cn-hangzhou.aliyuncs.com/mafgwo/stackedit:【版本号】 docker官方仓库下载太慢可以使用阿里云的镜像仓库镜像仓库地址registry.cn-hangzhou.aliyuncs.com/mafgwo/stackedit:【版本号】
@ -107,6 +117,7 @@ services:
- GITEA_CLIENT_SECRET=【不需要支持则删掉】 - GITEA_CLIENT_SECRET=【不需要支持则删掉】
- GITEA_URL=【不需要支持则删掉】 - GITEA_URL=【不需要支持则删掉】
- GITLAB_CLIENT_ID=【不需要支持则删掉】 - GITLAB_CLIENT_ID=【不需要支持则删掉】
- GITLAB_CLIENT_SECRET=【不需要支持则删掉】
- GITLAB_URL=【不需要支持则删掉】 - GITLAB_URL=【不需要支持则删掉】
ports: ports:
- 8080:8080/tcp - 8080:8080/tcp
@ -115,6 +126,7 @@ services:
``` ```
docker-compose方式的启动或停止命令 docker-compose方式的启动或停止命令
```bash ```bash
# 在 docker-compose.yml 文件目录下 启动命令 # 在 docker-compose.yml 文件目录下 启动命令
docker-compose up -d docker-compose up -d
@ -143,25 +155,25 @@ docker run -itd --name stackedit \
-e GITEA_CLIENT_SECRET=【不需要支持则删掉】 \ -e GITEA_CLIENT_SECRET=【不需要支持则删掉】 \
-e GITEA_URL=【不需要支持则删掉】 \ -e GITEA_URL=【不需要支持则删掉】 \
-e GITLAB_CLIENT_ID=【不需要支持则删掉】 \ -e GITLAB_CLIENT_ID=【不需要支持则删掉】 \
-e GITLAB_CLIENT_SECRET=【不需要支持则删掉】 \
-e GITLAB_URL=【不需要支持则删掉】 \ -e GITLAB_URL=【不需要支持则删掉】 \
mafgwo/stackedit:【docker中央仓库找到最新版本】 mafgwo/stackedit:【docker中央仓库找到最新版本】
``` ```
## 如何创建三方平台应用 ## 如何创建三方平台应用
> 部署时如果需要支持Gitee或GitHub则需要自行到对应三方平台创建应用获取到应用ID和秘钥替换到以上的环境变量中再启动应用。 > 部署时如果需要支持Gitee或GitHub则需要自行到对应三方平台创建应用获取到应用ID和秘钥替换到以上的环境变量中再启动应用。
- Gitee的环境变量GITEE_CLIENT_ID、GITEE_CLIENT_SECRET**[如何创建Gitee应用](./docs/部署之Gitee应用创建.md)** - Gitee的环境变量GITEE_CLIENT_ID、GITEE_CLIENT_SECRET**[如何创建Gitee应用](./docs/部署之Gitee应用创建.md)**
- GitHub的环境变量GITHUB_CLIENT_ID、GITEE_CLIENT_SECRET**[如何创建GitHub应用](./docs/部署之GitHub应用创建.md)** - GitHub的环境变量GITHUB_CLIENT_ID、GITEE_CLIENT_SECRET**[如何创建GitHub应用](./docs/部署之GitHub应用创建.md)**
- Gitea可选择性配置环境变量未配置则在关联时前端指定有配置则仅允许配置的应用信息GITEA_CLIENT_ID、GITEA_CLIENT_SECRET、GITEA_URL**[如何创建Gitea应用](./docs/部署之Gitea应用创建.md)** - Gitea可选择性配置环境变量未配置则在关联时前端指定有配置则仅允许配置的应用信息GITEA_CLIENT_ID、GITEA_CLIENT_SECRET、GITEA_URL**[如何创建Gitea应用](./docs/部署之Gitea应用创建.md)**
- Gitlab可选择性配置环境变量未配置则在关联时前端指定有配置则仅允许配置的应用信息GITLAB_CLIENT_ID、GITLAB_CLIENT_SECRET、GITLAB_URL **如何创建Gitlab应用(待补充文档)**
- Gitlab可选择性配置环境变量未配置则在关联时前端指定有配置则仅允许配置的应用信息GITLAB_CLIENT_ID、GITLAB_URL **如何创建Gitlab应用(待补充文档)**
特别说明自建的Gitea、Gitlab要能接入stackedit必须支持跨域 特别说明自建的Gitea、Gitlab要能接入stackedit必须支持跨域
## 编译与运行 ## 编译与运行
> 编译运行的nodejs版本选择11.15.0版本 > 编译运行的nodejs版本选择11.15.0版本
```bash ```bash
@ -177,7 +189,3 @@ npm run build
# build for production and view the bundle analyzer report # build for production and view the bundle analyzer report
npm run build --report npm run build --report
``` ```
## 欢迎加群交流
关于StackEdit如果你有想法或者使用中遇到了问题可以提Issue如果需要快速得到反馈可以加QQ群如下加群后可直接@群主):
![](./images/qq.jpeg)

37
build.sh Normal file
View File

@ -0,0 +1,37 @@
#!/bin/bash
# 检查参数是否提供版本号
if [ -z "$1" ]; then
echo "请提供版本号作为参数"
exit 1
fi
# 定义版本号变量
VERSION="$1"
IMAGE_NAME="mafgwo/stackedit"
# 构建 Docker 镜像
build_image() {
docker build -t "$IMAGE_NAME" .
}
# 标记 Docker 镜像
tag_image() {
docker tag "$IMAGE_NAME" "$IMAGE_NAME:$VERSION"
docker tag "$IMAGE_NAME" "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
}
# 推送 Docker 镜像
push_image() {
docker push "$IMAGE_NAME"
docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME"
docker push "$IMAGE_NAME:$VERSION"
docker push "registry.cn-hangzhou.aliyuncs.com/$IMAGE_NAME:$VERSION"
}
# 执行构建、标记和推送
build_image
tag_image
push_image
echo "操作完成"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 960 B

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -1,28 +1,28 @@
{ {
"name": "StackEdit中文版", "name": "StackEdit中文版",
"description": "支持Gitee仓库/粘贴图片自动上传的浏览器内 Markdown 编辑器", "description": "支持Gitee仓库/粘贴图片自动上传的浏览器内 Markdown 编辑器",
"version": "5.15.17", "version": "5.15.17",
"manifest_version": 2, "manifest_version": 2,
"container" : "GITEE", "container": "GITEE",
"api_console_project_id" : "241271498917", "api_console_project_id": "241271498917",
"icons": { "icons": {
"16": "icon-16.png", "16": "icon-16.png",
"32": "icon-32.png", "32": "icon-32.png",
"64": "icon-64.png", "64": "icon-64.png",
"128": "icon-128.png", "128": "icon-128.png",
"256": "icon-256.png", "256": "icon-256.png",
"512": "icon-512.png" "512": "icon-512.png"
}, },
"app": { "app": {
"urls": [ "urls": [
"https://stackedit.cn/" "https://md.jonylee.top/"
], ],
"launch": { "launch": {
"web_url": "https://stackedit.cn/app" "web_url": "https://md.jonylee.top/app"
} }
}, },
"offline_enabled": true, "offline_enabled": true,
"permissions": [ "permissions": [
"unlimitedStorage" "unlimitedStorage"
] ]
} }

View File

@ -12,6 +12,7 @@ module.exports = merge(prodEnv, {
// GITEA_CLIENT_ID: '"fe30f8f9-b1e8-4531-8f72-c1a5d3912805"', // GITEA_CLIENT_ID: '"fe30f8f9-b1e8-4531-8f72-c1a5d3912805"',
// GITEA_CLIENT_SECRET: '"lus7oMnb3H6M1hsChndphArE20Txr7erwJLf7SDBQWTw"', // GITEA_CLIENT_SECRET: '"lus7oMnb3H6M1hsChndphArE20Txr7erwJLf7SDBQWTw"',
// GITEA_URL: '"https://gitea.test.com"', // GITEA_URL: '"https://gitea.test.com"',
// GITLAB_CLIENT_ID: '"33e01128c27fe75df3e5b35218d710c7df280e6ee9c90b6ca27ac9d9fdfb92f7"', GITLAB_CLIENT_ID: '"074cd5103c62dea0f479dac861039656ac80935e304c8113a02cc64c629496ae"',
// GITLAB_URL: '"http://gitlab.qicoder.com"', GITLAB_CLIENT_SECRET: '"6f406f24216b686d55d28313dec1913c2a8e599afdb08380d5e8ce838e16e41e"',
GITLAB_URL: '"http://gitlab.qicoder.com"',
}) })

BIN
images/chatgpt.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

View File

@ -1,28 +1,31 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>StackEdit中文版</title> <title>Markdown编辑器-JonyLee的设计导航</title>
<link rel="canonical" href="https://stackedit.cn/app"> <link rel="canonical" href="https://md.jonylee.top">
<meta name="description" content="免费开源功能全面的Markdown编辑器。"> <meta name="description" content="StackEdit中文版免费开源功能全面的Markdown编辑器。">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<script> </head>
var _hmt = _hmt || [];
</script> <body>
</head>
<body>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<!-- baidu统计 -->
<script> <script>
(function() { var _hmt = _hmt || [];
var hm = document.createElement("script"); (function() {
hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035"; var hm = document.createElement("script");
var s = document.getElementsByTagName("script")[0]; hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
s.parentNode.insertBefore(hm, s); var s = document.getElementsByTagName("script")[0];
})(); s.parentNode.insertBefore(hm, s);
})();
</script> </script>
</body> <!-- baidu统计结束 -->
</html> </body>
</html>

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "stackedit", "name": "stackedit",
"version": "5.15.17", "version": "5.15.21",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "stackedit", "name": "stackedit",
"version": "5.15.18", "version": "5.15.21",
"description": "免费, 开源, 功能齐全的 Markdown 编辑器", "description": "免费, 开源, 功能齐全的 Markdown 编辑器",
"author": "Benoit Schweblin, 豆萁", "author": "Benoit Schweblin, 豆萁",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -15,6 +15,7 @@ const giteaClientId = process.env.GITEA_CLIENT_ID;
const giteaClientSecret = process.env.GITEA_CLIENT_SECRET; const giteaClientSecret = process.env.GITEA_CLIENT_SECRET;
const giteaUrl = process.env.GITEA_URL; const giteaUrl = process.env.GITEA_URL;
const gitlabClientId = process.env.GITLAB_CLIENT_ID; const gitlabClientId = process.env.GITLAB_CLIENT_ID;
const gitlabClientSecret = process.env.GITLAB_CLIENT_SECRET;
const gitlabUrl = process.env.GITLAB_URL; const gitlabUrl = process.env.GITLAB_URL;
exports.values = { exports.values = {
@ -33,6 +34,9 @@ exports.values = {
giteaClientId, giteaClientId,
giteaClientSecret, giteaClientSecret,
giteaUrl, giteaUrl,
gitlabClientId,
gitlabClientSecret,
gitlabUrl,
}; };
exports.publicValues = { exports.publicValues = {

View File

@ -1,4 +1,3 @@
const qs = require('qs');
const request = require('request'); const request = require('request');
const conf = require('./conf'); const conf = require('./conf');

40
server/gitlab.js Normal file
View File

@ -0,0 +1,40 @@
const request = require('request');
const conf = require('./conf');
function gitlabToken(queryParam) {
return new Promise((resolve, reject) => {
request({
method: 'POST',
url: `${conf.values.gitlabUrl}/oauth/token`,
headers: {
'content-type': 'application/json',
},
json: true,
qs: {
...queryParam,
client_id: conf.values.gitlabClientId,
client_secret: conf.values.gitlabClientSecret,
},
}, (err, res, body) => {
if (err) {
reject(err);
}
const token = body.access_token;
if (token) {
resolve(body);
} else {
reject(res.statusCode + ',body:' + JSON.stringify(body));
}
});
});
}
exports.gitlabToken = (req, res) => {
gitlabToken(req.query)
.then(
tokenBody => res.send(tokenBody),
err => res
.status(400)
.send(err ? err.message || err.toString() : 'bad_code'),
);
};

View File

@ -5,6 +5,7 @@ const path = require('path');
const github = require('./github'); const github = require('./github');
const gitee = require('./gitee'); const gitee = require('./gitee');
const gitea = require('./gitea'); const gitea = require('./gitea');
const gitlab = require('./gitlab');
const pdf = require('./pdf'); const pdf = require('./pdf');
const pandoc = require('./pandoc'); const pandoc = require('./pandoc');
const conf = require('./conf'); const conf = require('./conf');
@ -28,6 +29,7 @@ module.exports = (app) => {
app.get('/oauth2/githubToken', github.githubToken); app.get('/oauth2/githubToken', github.githubToken);
app.get('/oauth2/giteeToken', gitee.giteeToken); app.get('/oauth2/giteeToken', gitee.giteeToken);
app.get('/oauth2/giteaToken', gitea.giteaToken); app.get('/oauth2/giteaToken', gitea.giteaToken);
app.get('/oauth2/gitlabToken', gitlab.gitlabToken);
app.get('/conf', (req, res) => res.send(conf.publicValues)); app.get('/conf', (req, res) => res.send(conf.publicValues));
app.post('/pdfExport', pdf.generate); app.post('/pdfExport', pdf.generate);
app.post('/pandocExport', pandoc.generate); app.post('/pandocExport', pandoc.generate);
@ -61,13 +63,16 @@ module.exports = (app) => {
res.redirect(`./app#providerId=googleDrive&state=${encodeURIComponent(req.query.state)}`)); res.redirect(`./app#providerId=googleDrive&state=${encodeURIComponent(req.query.state)}`));
// Serve the static folder with 30 day max-age // Serve the static folder with 30 day max-age
app.use('/themes', serveStatic(resolvePath('static/themes'), { app.use('/themes', serveStatic(resolvePath('static/themes'), {
maxAge: '1d', maxAge: '5d',
})); }));
// Serve style.css with 1 day max-age // Serve style.css with 1 day max-age
app.get('/style.css', (req, res) => res.sendFile(resolvePath('dist/style.css'), { app.get('/style.css', (req, res) => res.sendFile(resolvePath('dist/style.css'), {
maxAge: '1d', maxAge: '1d',
})); }));
// Serve share.html
app.get('/share.html', (req, res) => res.sendFile(resolvePath('static/landing/share.html')));
app.get('/gistshare.html', (req, res) => res.sendFile(resolvePath('static/landing/gistshare.html')));
// Serve static resources // Serve static resources
if (process.env.NODE_ENV === 'production') { if (process.env.NODE_ENV === 'production') {

View File

@ -59,7 +59,7 @@ exports.generate = (req, res) => {
const metadata = readJson(req.query.metadata); const metadata = readJson(req.query.metadata);
const params = []; const params = [];
params.push('--latex-engine=xelatex'); params.push('--pdf-engine=xelatex');
params.push('--webtex=http://chart.apis.google.com/chart?cht=tx&chf=bg,s,FFFFFF00&chco=000000&chl='); params.push('--webtex=http://chart.apis.google.com/chart?cht=tx&chf=bg,s,FFFFFF00&chco=000000&chl=');
if (options.toc) { if (options.toc) {
params.push('--toc'); params.push('--toc');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -14,6 +14,7 @@
</div> </div>
<explorer-node v-for="node in node.files" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node> <explorer-node v-for="node in node.files" :key="node.item.id" :node="node" :depth="depth + 1"></explorer-node>
</div> </div>
<button ref="copyId" v-clipboard="copyPath()" @click="info('路径已复制到剪切板!')" style="display: none;"></button>
</div> </div>
</template> </template>
@ -23,6 +24,7 @@ import workspaceSvc from '../services/workspaceSvc';
import explorerSvc from '../services/explorerSvc'; import explorerSvc from '../services/explorerSvc';
import store from '../store'; import store from '../store';
import badgeSvc from '../services/badgeSvc'; import badgeSvc from '../services/badgeSvc';
import utils from '../services/utils';
export default { export default {
name: 'explorer-node', // Required for recursivity name: 'explorer-node', // Required for recursivity
@ -80,6 +82,9 @@ export default {
...mapActions('explorer', [ ...mapActions('explorer', [
'setDragTarget', 'setDragTarget',
]), ]),
...mapActions('notification', [
'info',
]),
select(id = this.node.item.id, doOpen = true) { select(id = this.node.item.id, doOpen = true) {
const node = store.getters['explorer/nodeMap'][id]; const node = store.getters['explorer/nodeMap'][id];
if (!node) { if (!node) {
@ -144,6 +149,11 @@ export default {
// See https://stackoverflow.com/a/3977637/1333165 // See https://stackoverflow.com/a/3977637/1333165
evt.dataTransfer.setData('Text', ''); evt.dataTransfer.setData('Text', '');
}, },
copyPath() {
let path = utils.getAbsoluteDir(this.node).replaceAll(' ', '%20');
path = path.indexOf('/') === 0 ? path : `/${path}`;
return this.node.isFolder ? path : `${path}.md`;
},
onDrop() { onDrop() {
const sourceNode = store.getters['explorer/dragSourceNode']; const sourceNode = store.getters['explorer/dragSourceNode'];
const targetNode = store.getters['explorer/dragTargetNodeFolder']; const targetNode = store.getters['explorer/dragTargetNodeFolder'];
@ -169,22 +179,26 @@ export default {
top: evt.clientY, top: evt.clientY,
}, },
items: [{ items: [{
name: 'New file', name: '新建文件',
disabled: !this.node.isFolder || this.node.isTrash, disabled: !this.node.isFolder || this.node.isTrash,
perform: () => explorerSvc.newItem(false), perform: () => explorerSvc.newItem(false),
}, { }, {
name: 'New folder', name: '新建文件夹',
disabled: !this.node.isFolder || this.node.isTrash || this.node.isTemp, disabled: !this.node.isFolder || this.node.isTrash || this.node.isTemp,
perform: () => explorerSvc.newItem(true), perform: () => explorerSvc.newItem(true),
}, { }, {
type: 'separator', type: 'separator',
}, { }, {
name: 'Rename', name: '重命名',
disabled: this.node.isTrash || this.node.isTemp, disabled: this.node.isTrash || this.node.isTemp,
perform: () => this.setEditingId(this.node.item.id), perform: () => this.setEditingId(this.node.item.id),
}, { }, {
name: 'Delete', name: '删除',
perform: () => explorerSvc.deleteItem(), perform: () => explorerSvc.deleteItem(),
}, {
name: '复制路径',
disabled: this.node.isTrash || this.node.isTemp,
perform: () => this.$refs.copyId.click(),
}], }],
}); });
if (item) { if (item) {

View File

@ -10,6 +10,7 @@
<div class="modal__button-bar"> <div class="modal__button-bar">
<button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button> <button class="button" v-if="simpleModal.rejectText" @click="config.reject()">{{simpleModal.rejectText}}</button>
<button class="button button--resolve" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button> <button class="button button--resolve" v-if="simpleModal.resolveText" @click="config.resolve()">{{simpleModal.resolveText}}</button>
<button v-for="(item, idx) in (simpleModal.resolveArray || [])" class="button button--resolve" @click="config.resolve(item.value)">{{item.text}}</button>
</div> </div>
</modal-inner> </modal-inner>
</div> </div>
@ -41,6 +42,7 @@ import BadgeManagementModal from './modals/BadgeManagementModal';
import SponsorModal from './modals/SponsorModal'; import SponsorModal from './modals/SponsorModal';
import CommitMessageModal from './modals/CommitMessageModal'; import CommitMessageModal from './modals/CommitMessageModal';
import WorkspaceImgPathModal from './modals/WorkspaceImgPathModal'; import WorkspaceImgPathModal from './modals/WorkspaceImgPathModal';
import ChatGptModal from './modals/ChatGptModal';
// Providers // Providers
import GooglePhotoModal from './modals/providers/GooglePhotoModal'; import GooglePhotoModal from './modals/providers/GooglePhotoModal';
@ -64,6 +66,8 @@ import GiteeOpenModal from './modals/providers/GiteeOpenModal';
import GiteeSaveModal from './modals/providers/GiteeSaveModal'; import GiteeSaveModal from './modals/providers/GiteeSaveModal';
import GiteeWorkspaceModal from './modals/providers/GiteeWorkspaceModal'; import GiteeWorkspaceModal from './modals/providers/GiteeWorkspaceModal';
import GiteePublishModal from './modals/providers/GiteePublishModal'; import GiteePublishModal from './modals/providers/GiteePublishModal';
import GiteeGistSyncModal from './modals/providers/GiteeGistSyncModal';
import GiteeGistPublishModal from './modals/providers/GiteeGistPublishModal';
import GitlabAccountModal from './modals/providers/GitlabAccountModal'; import GitlabAccountModal from './modals/providers/GitlabAccountModal';
import GitlabOpenModal from './modals/providers/GitlabOpenModal'; import GitlabOpenModal from './modals/providers/GitlabOpenModal';
import GitlabPublishModal from './modals/providers/GitlabPublishModal'; import GitlabPublishModal from './modals/providers/GitlabPublishModal';
@ -109,6 +113,7 @@ export default {
SponsorModal, SponsorModal,
CommitMessageModal, CommitMessageModal,
WorkspaceImgPathModal, WorkspaceImgPathModal,
ChatGptModal,
// Providers // Providers
GooglePhotoModal, GooglePhotoModal,
GoogleDriveAccountModal, GoogleDriveAccountModal,
@ -131,6 +136,8 @@ export default {
GiteeSaveModal, GiteeSaveModal,
GiteeWorkspaceModal, GiteeWorkspaceModal,
GiteePublishModal, GiteePublishModal,
GiteeGistSyncModal,
GiteeGistPublishModal,
GitlabAccountModal, GitlabAccountModal,
GitlabOpenModal, GitlabOpenModal,
GitlabPublishModal, GitlabPublishModal,
@ -181,6 +188,7 @@ export default {
// User has to sign in // User has to sign in
await store.dispatch('modal/open', 'signInForSponsorship'); await store.dispatch('modal/open', 'signInForSponsorship');
await giteeHelper.signin(); await giteeHelper.signin();
await syncSvc.afterSignIn();
syncSvc.requestSync(); syncSvc.requestSync();
} }
if (!store.getters.isSponsor) { if (!store.getters.isSponsor) {

View File

@ -4,6 +4,9 @@
<li class="before"> <li class="before">
<icon-ellipsis></icon-ellipsis> <icon-ellipsis></icon-ellipsis>
</li> </li>
<li title="分享">
<a href="javascript:void(0)" @click="share"><icon-share></icon-share></a>
</li>
<li title="切换预览主题"> <li title="切换预览主题">
<dropdown-menu :selected="selectedTheme" :options="allThemes" :closeOnItemClick="false" @change="changeTheme"> <dropdown-menu :selected="selectedTheme" :options="allThemes" :closeOnItemClick="false" @change="changeTheme">
<icon-select-theme></icon-select-theme> <icon-select-theme></icon-select-theme>
@ -21,6 +24,9 @@ import { mapGetters, mapActions } from 'vuex';
// import juice from 'juice'; // import juice from 'juice';
import store from '../store'; import store from '../store';
import DropdownMenu from './common/DropdownMenu'; import DropdownMenu from './common/DropdownMenu';
import publishSvc from '../services/publishSvc';
import giteeGistProvider from '../services/providers/giteeGistProvider';
import gistProvider from '../services/providers/gistProvider';
export default { export default {
components: { components: {
@ -56,12 +62,16 @@ export default {
value: 'custom', value: 'custom',
}], }],
baseCss: '', baseCss: '',
sharing: false,
}), }),
computed: { computed: {
...mapGetters('theme', [ ...mapGetters('theme', [
'currPreviewTheme', 'currPreviewTheme',
'customPreviewThemeStyle', 'customPreviewThemeStyle',
]), ]),
...mapGetters('publishLocation', {
publishLocations: 'current',
}),
selectedTheme() { selectedTheme() {
return { return {
value: this.currPreviewTheme || 'default', value: this.currPreviewTheme || 'default',
@ -84,6 +94,49 @@ export default {
this.toggleSideBar(true); this.toggleSideBar(true);
store.dispatch('data/setSideBarPanel', 'help'); store.dispatch('data/setSideBarPanel', 'help');
}, },
async share() {
if (this.sharing) {
store.dispatch('notification/info', '分享链接创建中...请稍后再试');
return;
}
try {
const currentFile = store.getters['file/current'];
await store.dispatch('modal/open', { type: 'shareHtmlPre', name: currentFile.name });
this.sharing = true;
const mainToken = store.getters['workspace/mainWorkspaceToken'];
if (!mainToken) {
store.dispatch('notification/info', '登录主文档空间之后才可使用分享功能!');
return;
}
let tempGistId = null;
const isGithub = mainToken.providerId === 'githubAppData';
const gistProviderId = isGithub ? 'gist' : 'giteegist';
const filterLocations = this.publishLocations.filter(it => it.providerId === gistProviderId
&& it.url && it.gistId);
if (filterLocations.length > 0) {
tempGistId = filterLocations[0].gistId;
}
const location = (isGithub ? gistProvider : giteeGistProvider).makeLocation(
mainToken,
`分享-${currentFile.name}`,
true,
null,
);
location.templateId = 'styledHtmlWithTheme';
location.fileId = currentFile.id;
location.gistId = tempGistId;
const { gistId } = await publishSvc.publishLocationAndStore(location);
const sharePage = mainToken.providerId === 'githubAppData' ? 'gistshare.html' : 'share.html';
const url = `${window.location.protocol}//${window.location.host}/${sharePage}?id=${gistId}`;
await store.dispatch('modal/open', { type: 'shareHtml', name: currentFile.name, url });
} catch (err) {
if (err) {
store.dispatch('notification/error', err);
}
} finally {
this.sharing = false;
}
},
}, },
}; };
</script> </script>
@ -94,7 +147,7 @@ export default {
.preview-in-page-buttons { .preview-in-page-buttons {
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
right: -68px; right: -98px;
height: 34px; height: 34px;
padding: 5px; padding: 5px;
background-color: rgba(84, 96, 114, 0.4); background-color: rgba(84, 96, 114, 0.4);

View File

@ -8,7 +8,7 @@
</option> </option>
</select> </select>
</p> </p>
<p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> 以同步您的主文档空间</p> <p v-if="!historyContext">同步 <b>{{currentFileName}}</b> 以启用修订历史 或者 <a href="javascript:void(0)" @click="signin">登录 Gitee</a> <a href="javascript:void(0)" @click="signinWithGithub">登录 GitHub</a> 以同步您的主文档空间</p>
<p v-else-if="loading">历史版本加载中</p> <p v-else-if="loading">历史版本加载中</p>
<p v-else-if="!revisionsWithSpacer.length"><b>{{currentFileName}}</b> 没有历史版本.</p> <p v-else-if="!revisionsWithSpacer.length"><b>{{currentFileName}}</b> 没有历史版本.</p>
<div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else> <div class="menu-entry menu-entry--info flex flex--row flex--align-center" v-else>
@ -55,6 +55,7 @@ import EditorClassApplier from '../common/EditorClassApplier';
import PreviewClassApplier from '../common/PreviewClassApplier'; import PreviewClassApplier from '../common/PreviewClassApplier';
import utils from '../../services/utils'; import utils from '../../services/utils';
import giteeHelper from '../../services/providers/helpers/giteeHelper'; import giteeHelper from '../../services/providers/helpers/giteeHelper';
import githubHelper from '../../services/providers/helpers/githubHelper';
import syncSvc from '../../services/syncSvc'; import syncSvc from '../../services/syncSvc';
import store from '../../store'; import store from '../../store';
import badgeSvc from '../../services/badgeSvc'; import badgeSvc from '../../services/badgeSvc';
@ -168,6 +169,16 @@ export default {
async signin() { async signin() {
try { try {
await giteeHelper.signin(); await giteeHelper.signin();
await syncSvc.afterSignIn();
syncSvc.requestSync();
} catch (e) {
// Cancel
}
},
async signinWithGithub() {
try {
await githubHelper.signin();
await syncSvc.afterSignIn();
syncSvc.requestSync(); syncSvc.requestSync();
} catch (e) { } catch (e) {
// Cancel // Cancel

View File

@ -14,6 +14,9 @@
<span v-if="currentWorkspace.providerId === 'giteeAppData'"> <span v-if="currentWorkspace.providerId === 'giteeAppData'">
<b>{{currentWorkspace.name}}</b> 与您的 Gitee 默认文档空间仓库同步 <b>{{currentWorkspace.name}}</b> 与您的 Gitee 默认文档空间仓库同步
</span> </span>
<span v-else-if="currentWorkspace.providerId === 'githubAppData'">
<b>{{currentWorkspace.name}}</b> 与您的 GitHub 默认文档空间仓库同步
</span>
<span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'"> <span v-else-if="currentWorkspace.providerId === 'googleDriveWorkspace'">
<b>{{currentWorkspace.name}}</b> <a :href="workspaceLocationUrl" target="_blank">Google Drive 文件夹</a>同步 <b>{{currentWorkspace.name}}</b> <a :href="workspaceLocationUrl" target="_blank">Google Drive 文件夹</a>同步
</span> </span>
@ -45,6 +48,11 @@
<div>使用 Gitee 登录</div> <div>使用 Gitee 登录</div>
<span>同步您的主文档空间并解锁功能</span> <span>同步您的主文档空间并解锁功能</span>
</menu-entry> </menu-entry>
<menu-entry v-if="!loginToken" @click.native="signinWithGithub">
<icon-login slot="icon"></icon-login>
<div>使用 GitHub 登录</div>
<span>同步您的主文档空间并解锁功能</span>
</menu-entry>
<menu-entry @click.native="setPanel('workspaces')"> <menu-entry @click.native="setPanel('workspaces')">
<icon-database slot="icon"></icon-database> <icon-database slot="icon"></icon-database>
<div><div class="menu-entry__label menu-entry__label--count" v-if="workspaceCount">{{workspaceCount}}</div> 文档空间</div> <div><div class="menu-entry__label menu-entry__label--count" v-if="workspaceCount">{{workspaceCount}}</div> 文档空间</div>
@ -142,6 +150,7 @@ import MenuEntry from './common/MenuEntry';
import providerRegistry from '../../services/providers/common/providerRegistry'; import providerRegistry from '../../services/providers/common/providerRegistry';
import UserImage from '../UserImage'; import UserImage from '../UserImage';
import giteeHelper from '../../services/providers/helpers/giteeHelper'; import giteeHelper from '../../services/providers/helpers/giteeHelper';
import githubHelper from '../../services/providers/helpers/githubHelper';
import syncSvc from '../../services/syncSvc'; import syncSvc from '../../services/syncSvc';
import userSvc from '../../services/userSvc'; import userSvc from '../../services/userSvc';
import store from '../../store'; import store from '../../store';
@ -194,6 +203,16 @@ export default {
async signin() { async signin() {
try { try {
await giteeHelper.signin(); await giteeHelper.signin();
await syncSvc.afterSignIn();
syncSvc.requestSync();
} catch (e) {
// Cancel
}
},
async signinWithGithub() {
try {
await githubHelper.signin();
await syncSvc.afterSignIn();
syncSvc.requestSync(); syncSvc.requestSync();
} catch (e) { } catch (e) {
// Cancel // Cancel

View File

@ -43,7 +43,7 @@
<div v-for="token in githubTokens" :key="token.sub"> <div v-for="token in githubTokens" :key="token.sub">
<menu-entry @click.native="publishGist(token)"> <menu-entry @click.native="publishGist(token)">
<icon-provider slot="icon" provider-id="gist"></icon-provider> <icon-provider slot="icon" provider-id="gist"></icon-provider>
<div>发布到 Gist</div> <div>发布到 GitHubGist</div>
<span>{{token.name}}</span> <span>{{token.name}}</span>
</menu-entry> </menu-entry>
<menu-entry @click.native="publishGithub(token)"> <menu-entry @click.native="publishGithub(token)">
@ -53,6 +53,11 @@
</menu-entry> </menu-entry>
</div> </div>
<div v-for="token in giteeTokens" :key="token.sub"> <div v-for="token in giteeTokens" :key="token.sub">
<menu-entry @click.native="publishGiteeGist(token)">
<icon-provider slot="icon" provider-id="giteegist"></icon-provider>
<div>发布到 GiteeGist</div>
<span>{{token.name}}</span>
</menu-entry>
<menu-entry @click.native="publishGitee(token)"> <menu-entry @click.native="publishGitee(token)">
<icon-provider slot="icon" provider-id="gitee"></icon-provider> <icon-provider slot="icon" provider-id="gitee"></icon-provider>
<div>发布到 Gitee</div> <div>发布到 Gitee</div>
@ -258,8 +263,8 @@ export default {
}, },
async addGitlabAccount() { async addGitlabAccount() {
try { try {
const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' }); const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
await gitlabHelper.addAccount(serverUrl, applicationId); await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
} catch (e) { /* cancel */ } } catch (e) { /* cancel */ }
}, },
async addGiteaAccount() { async addGiteaAccount() {
@ -289,8 +294,9 @@ export default {
publishBloggerPage: publishModalOpener('bloggerPagePublish', 'publishToBloggerPage'), publishBloggerPage: publishModalOpener('bloggerPagePublish', 'publishToBloggerPage'),
publishDropbox: publishModalOpener('dropboxPublish', 'publishToDropbox'), publishDropbox: publishModalOpener('dropboxPublish', 'publishToDropbox'),
publishGithub: publishModalOpener('githubPublish', 'publishToGithub'), publishGithub: publishModalOpener('githubPublish', 'publishToGithub'),
publishGitee: publishModalOpener('giteePublish', 'publishToGitee'),
publishGist: publishModalOpener('gistPublish', 'publishToGist'), publishGist: publishModalOpener('gistPublish', 'publishToGist'),
publishGitee: publishModalOpener('giteePublish', 'publishToGitee'),
publishGiteeGist: publishModalOpener('giteeGistPublish', 'publishGiteeGist'),
publishGitlab: publishModalOpener('gitlabPublish', 'publishToGitlab'), publishGitlab: publishModalOpener('gitlabPublish', 'publishToGitlab'),
publishGitea: publishModalOpener('giteaPublish', 'publishToGitea'), publishGitea: publishModalOpener('giteaPublish', 'publishToGitea'),
publishGoogleDrive: publishModalOpener('googleDrivePublish', 'publishToGoogleDrive'), publishGoogleDrive: publishModalOpener('googleDrivePublish', 'publishToGoogleDrive'),

View File

@ -46,7 +46,7 @@
</menu-entry> </menu-entry>
<menu-entry @click.native="saveGist(token)"> <menu-entry @click.native="saveGist(token)">
<icon-provider slot="icon" provider-id="gist"></icon-provider> <icon-provider slot="icon" provider-id="gist"></icon-provider>
<div>在Gist上保存</div> <div>在GitHubGist上保存</div>
<span>{{token.name}}</span> <span>{{token.name}}</span>
</menu-entry> </menu-entry>
</div> </div>
@ -61,6 +61,11 @@
<div>在Gitee上保存</div> <div>在Gitee上保存</div>
<span>{{token.name}}</span> <span>{{token.name}}</span>
</menu-entry> </menu-entry>
<menu-entry @click.native="saveGiteeGist(token)">
<icon-provider slot="icon" provider-id="giteegist"></icon-provider>
<div>在GiteeGist上保存</div>
<span>{{token.name}}</span>
</menu-entry>
</div> </div>
<div v-for="token in gitlabTokens" :key="token.sub"> <div v-for="token in gitlabTokens" :key="token.sub">
<menu-entry @click.native="openGitlab(token)"> <menu-entry @click.native="openGitlab(token)">
@ -234,8 +239,8 @@ export default {
}, },
async addGitlabAccount() { async addGitlabAccount() {
try { try {
const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' }); const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
await gitlabHelper.addAccount(serverUrl, applicationId); await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
} catch (e) { /* cancel */ } } catch (e) { /* cancel */ }
}, },
async addGiteaAccount() { async addGiteaAccount() {
@ -330,6 +335,12 @@ export default {
badgeSvc.addBadge('saveOnGist'); badgeSvc.addBadge('saveOnGist');
} catch (e) { /* cancel */ } } catch (e) { /* cancel */ }
}, },
async saveGiteeGist(token) {
try {
await openSyncModal(token, 'giteeGistSync');
badgeSvc.addBadge('saveOnGiteeGist');
} catch (e) { /* cancel */ }
},
async openGitlab(token) { async openGitlab(token) {
try { try {
const syncLocation = await store.dispatch('modal/open', { const syncLocation = await store.dispatch('modal/open', {

View File

@ -8,7 +8,8 @@
<hr> <hr>
<div class="workspace" v-for="(workspace, id) in workspacesById" :key="id"> <div class="workspace" v-for="(workspace, id) in workspacesById" :key="id">
<menu-entry :href="workspace.url" target="_blank"> <menu-entry :href="workspace.url" target="_blank">
<icon-provider slot="icon" :provider-id="workspace.providerId"></icon-provider> <icon-provider v-if="id === 'main' && !workspace.sub" slot="icon" :provider-id="'stackedit'"></icon-provider>
<icon-provider v-else slot="icon" :provider-id="workspace.providerId"></icon-provider>
<div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">当前</div>{{workspace.name}}</div> <div class="workspace__name"><div class="menu-entry__label" v-if="currentWorkspace === workspace">当前</div>{{workspace.name}}</div>
</menu-entry> </menu-entry>
</div> </div>
@ -85,8 +86,8 @@ export default {
}, },
async addGitlabWorkspace() { async addGitlabWorkspace() {
try { try {
const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' }); const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
const token = await gitlabHelper.addAccount(serverUrl, applicationId); const token = await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
store.dispatch('modal/open', { store.dispatch('modal/open', {
type: 'gitlabWorkspace', type: 'gitlabWorkspace',
token, token,

View File

@ -248,8 +248,8 @@ export default {
}, },
async addGitlabAccount() { async addGitlabAccount() {
try { try {
const { serverUrl, applicationId } = await store.dispatch('modal/open', { type: 'gitlabAccount' }); const { serverUrl, applicationId, applicationSecret } = await store.dispatch('modal/open', { type: 'gitlabAccount' });
await gitlabHelper.addAccount(serverUrl, applicationId); await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret);
} catch (e) { /* cancel */ } } catch (e) { /* cancel */ }
}, },
async addGiteaAccount() { async addGiteaAccount() {

View File

@ -0,0 +1,131 @@
<template>
<modal-inner class="modal__inner-1--chatgpt" aria-label="chatgpt">
<div class="modal__content">
<div class="modal__image">
<icon-chat-gpt></icon-chat-gpt>
</div>
<p><b>ChatGPT内容生成</b><br>生成时长受ChatGPT服务响应与网络响应时长影响时间可能较长</p>
<form-entry label="生成内容要求详细描述" error="content">
<textarea slot="field" class="text-input" type="text" placeholder="输入内容(支持换行)" v-model.trim="content" :disabled="generating"></textarea>
<div class="form-entry__info">
使用 <a href="https://api35.pxj123.cn/" target="_blank">api35.pxj123.cn</a> 的免费接口生成内容AI模型是GPT-3.5 Turbo
</div>
</form-entry>
<div class="modal__result">
<pre class="result_pre" v-if="generating && !result">(等待生成中...)</pre>
<pre class="result_pre" v-else v-text="result"></pre>
</div>
</div>
<div class="modal__button-bar">
<button class="button" @click="reject()">{{ generating ? '停止' : '关闭' }}</button>
<button class="button button--resolve" @click="generate" v-if="!generating && !!content">{{ !!result ? '重新生成' : '开始生成' }}</button>
<button class="button button--resolve" @click="resolve" v-if="!generating && !!result">确认插入</button>
</div>
</modal-inner>
</template>
<script>
import modalTemplate from './common/modalTemplate';
import chatGptSvc from '../../services/chatGptSvc';
import store from '../../store';
export default modalTemplate({
data: () => ({
generating: false,
content: '',
result: '',
xhr: null,
}),
methods: {
resolve(evt) {
evt.preventDefault();
const { callback } = this.config;
this.config.resolve();
callback(this.result);
},
process({ done, content, error }) {
if (done) {
this.generating = false;
//
} else if (content) {
this.result = this.result + content;
const container = document.querySelector('.result_pre');
container.scrollTo(0, container.scrollHeight); //
} else if (error) {
this.generating = false;
}
},
generate() {
this.generating = true;
this.result = '';
try {
this.xhr = chatGptSvc.chat({
content: `${this.content}\n(使用Markdown方式输出结果)`,
}, this.process);
} catch (err) {
this.generating = false;
store.dispatch('notification/error', err);
}
},
reject() {
if (this.generating) {
if (this.xhr) {
this.xhr.abort();
this.generating = false;
}
return;
}
const { callback } = this.config;
this.config.reject();
callback(null);
},
},
mounted() {
const script = document.createElement('script');
script.src = `https://api35.pxj123.cn/js/chat.js?t=${new Date().getTime()}`;
script.onload = () => {
/* eslint-disable */
console.log('加载外部chatgpt的js成功!');
};
this.$el.appendChild(script);
},
});
</script>
<style lang="scss">
@import '../../styles/variables.scss';
.modal__inner-1.modal__inner-1--chatgpt {
max-width: 560px;
.result_pre {
font-size: 0.9em;
font-variant-ligatures: no-common-ligatures;
line-height: 1.25;
white-space: pre-wrap;
word-break: break-word;
word-wrap: break-word;
height: 300px;
border: 1px solid rgb(126, 126, 126);
border-radius: $border-radius-base;
padding: 10px;
overflow-y: scroll; /* 开启垂直滚动条 */
}
.result_pre::-webkit-scrollbar {
display: none; /* 隐藏滚动条 */
}
.result_pre.scroll-bottom {
scroll-behavior: smooth;
}
.config-warning {
color: #f00;
}
.text-input {
min-height: 60px;
}
}
</style>

View File

@ -2,9 +2,12 @@
<modal-inner aria-label="提交信息"> <modal-inner aria-label="提交信息">
<p>自定义 <b>{{ config.name }}</b> 提交信息</p> <p>自定义 <b>{{ config.name }}</b> 提交信息</p>
<div class="modal__content"> <div class="modal__content">
<form-entry label="提交信息"> <div class="form-entry">
<input slot="field" class="textfield" placeholder="提交信息非必填" type="text" v-model.trim="commitMessage" @keydown.enter="resolve()"> <label class="form-entry__label">提交信息</label>
</form-entry> <div class="form-entry__field">
<input slot="field" class="textfield" placeholder="提交信息非必填" type="text" v-model.trim="commitMessage" @keydown.enter="resolve()">
</div>
</div>
</div> </div>
<div class="modal__button-bar"> <div class="modal__button-bar">
<button class="button" @click="config.reject()">取消</button> <button class="button" @click="config.reject()">取消</button>

View File

@ -4,8 +4,8 @@
<div class="modal__image"> <div class="modal__image">
<icon-upload></icon-upload> <icon-upload></icon-upload>
</div> </div>
<p v-if="publishLocations.length"><b>{{currentFileName}}</b> is published to the following location(s):</p> <p v-if="publishLocations.length"><b>{{currentFileName}}</b> 被发布到了以下位置:</p>
<p v-else><b>{{currentFileName}}</b> is not published yet.</p> <p v-else><b>{{currentFileName}}</b> 还没有被发布.</p>
<div> <div>
<div class="publish-entry flex flex--column" v-for="location in publishLocations" :key="location.id"> <div class="publish-entry flex flex--column" v-for="location in publishLocations" :key="location.id">
<div class="publish-entry__header flex flex--row flex--align-center"> <div class="publish-entry__header flex flex--row flex--align-center">
@ -26,7 +26,7 @@
{{location.url}} {{location.url}}
</div> </div>
<div class="publish-entry__buttons flex flex--row flex--center" v-if="location.url"> <div class="publish-entry__buttons flex flex--row flex--center" v-if="location.url">
<button class="publish-entry__button button" v-clipboard="location.url" @click="info('Location URL copied to clipboard!')" v-title="'复制URL'"> <button class="publish-entry__button button" v-clipboard="location.url" @click="info('位置URL已复制到剪贴板!')" v-title="'复制URL'">
<icon-content-copy></icon-content-copy> <icon-content-copy></icon-content-copy>
</button> </button>
<a class="publish-entry__button button" v-if="location.url" :href="location.url" target="_blank" v-title="'打开位置'"> <a class="publish-entry__button button" v-if="location.url" :href="location.url" target="_blank" v-title="'打开位置'">
@ -34,6 +34,19 @@
</a> </a>
</div> </div>
</div> </div>
<div class="publish-entry__row flex flex--row flex--align-center" v-if="shareUrl(location)">
<div class="publish-entry__url">
分享链接: {{shareUrl(location)}}
</div>
<div class="publish-entry__buttons flex flex--row flex--center">
<button class="publish-entry__button button" v-clipboard="shareUrl(location)" @click="info('分享URL已复制到剪贴板!')" v-title="'复制分享URL'">
<icon-content-copy></icon-content-copy>
</button>
<a class="publish-entry__button button" :href="shareUrl(location)" target="_blank" v-title="'打开分享'">
<icon-open-in-new></icon-open-in-new>
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="modal__info" v-if="publishLocations.length"> <div class="modal__info" v-if="publishLocations.length">
@ -75,6 +88,16 @@ export default {
store.commit('publishLocation/deleteItem', location.id); store.commit('publishLocation/deleteItem', location.id);
badgeSvc.addBadge('removePublishLocation'); badgeSvc.addBadge('removePublishLocation');
}, },
shareUrl(location) {
if (location.providerId !== 'giteegist' && location.providerId !== 'gist') {
return null;
}
if (!location.url || !location.gistId) {
return null;
}
const sharePage = location.providerId === 'gist' ? 'gistshare.html' : 'share.html';
return `${window.location.protocol}//${window.location.host}/${sharePage}?id=${location.gistId}`;
},
}, },
}; };
</script> </script>

View File

@ -9,7 +9,8 @@
<div class="flex flex--column"> <div class="flex flex--column">
<div class="workspace-entry__header flex flex--row flex--align-center"> <div class="workspace-entry__header flex flex--row flex--align-center">
<div class="workspace-entry__icon"> <div class="workspace-entry__icon">
<icon-provider :provider-id="workspace.providerId"></icon-provider> <icon-provider v-if="id === 'main' && !workspace.sub" :provider-id="'stackedit'"></icon-provider>
<icon-provider v-else :provider-id="workspace.providerId"></icon-provider>
</div> </div>
<input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName"> <input class="text-input" type="text" v-if="editedId === id" v-focus @blur="submitEdit()" @keydown.enter="submitEdit()" @keydown.esc.stop="submitEdit(true)" v-model="editingName">
<div class="workspace-entry__name" v-else>{{workspace.name}}</div> <div class="workspace-entry__name" v-else>{{workspace.name}}</div>
@ -17,7 +18,7 @@
<button class="workspace-entry__button button" @click="edit(id)" v-title="'编辑名称'"> <button class="workspace-entry__button button" @click="edit(id)" v-title="'编辑名称'">
<icon-pen></icon-pen> <icon-pen></icon-pen>
</button> </button>
<template v-if="workspace.providerId === 'giteeAppData' || workspace.providerId === 'githubWorkspace' <template v-if="workspace.providerId === 'giteeAppData' || workspace.providerId === 'githubAppData' || workspace.providerId === 'githubWorkspace'
|| workspace.providerId === 'giteeWorkspace' || workspace.providerId === 'gitlabWorkspace' || workspace.providerId === 'giteaWorkspace'"> || workspace.providerId === 'giteeWorkspace' || workspace.providerId === 'gitlabWorkspace' || workspace.providerId === 'giteaWorkspace'">
<button class="workspace-entry__button button" @click="stopAutoSync(id)" v-if="workspace.autoSync == undefined || workspace.autoSync" v-title="'关闭自动同步'"> <button class="workspace-entry__button button" @click="stopAutoSync(id)" v-if="workspace.autoSync == undefined || workspace.autoSync" v-title="'关闭自动同步'">
<icon-sync-auto></icon-sync-auto> <icon-sync-auto></icon-sync-auto>

View File

@ -17,7 +17,7 @@ export default {
uid: utils.uid(), uid: utils.uid(),
}), }),
mounted() { mounted() {
this.$el.querySelector('input,select').id = this.uid; this.$el.querySelector('input,select,textarea').id = this.uid;
}, },
}; };
</script> </script>

View File

@ -1,11 +1,11 @@
<template> <template>
<modal-inner aria-label="发布到Gist"> <modal-inner aria-label="发布到GitHubGist">
<div class="modal__content"> <div class="modal__content">
<div class="modal__image"> <div class="modal__image">
<icon-provider provider-id="gist"></icon-provider> <icon-provider provider-id="gist"></icon-provider>
</div> </div>
<p>发布<b> {{CurrentFileName}} </b><b>Gist</b></p> <p>发布<b> {{CurrentFileName}} </b><b>GitHubGist</b></p>
<form-entry label="Filename" error="filename"> <form-entry label="文件名" error="filename">
<input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
</form-entry> </form-entry>
<div class="form-entry"> <div class="form-entry">
@ -15,10 +15,10 @@
</label> </label>
</div> </div>
</div> </div>
<form-entry label="Existing Gist ID" info="可选的"> <form-entry label="存在Gist ID" info="可选的">
<input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
<div class="form-entry__info"> <div class="form-entry__info">
如果文件存在于Gist中则将被覆盖 如果文件存在于GitHubGist中则将被覆盖
</div> </div>
</form-entry> </form-entry>
<form-entry label="Template"> <form-entry label="Template">

View File

@ -1,11 +1,11 @@
<template> <template>
<modal-inner aria-label=" Gist 同步"> <modal-inner aria-label=" GitHubGist 同步">
<div class="modal__content"> <div class="modal__content">
<div class="modal__image"> <div class="modal__image">
<icon-provider provider-id="gist"></icon-provider> <icon-provider provider-id="gist"></icon-provider>
</div> </div>
<p><b> {{currentFileName}} </b>保存到<b>Gist</b>并保持同步</p> <p><b> {{currentFileName}} </b>保存到<b>GitHubGist</b>并保持同步</p>
<form-entry label="Filename" error="filename"> <form-entry label="文件名" error="filename">
<input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
</form-entry> </form-entry>
<div class="form-entry"> <div class="form-entry">
@ -15,10 +15,10 @@
</label> </label>
</div> </div>
</div> </div>
<form-entry label="Existing Gist ID" info="可选的"> <form-entry label="存在Gist ID" info="可选的">
<input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
<div class="form-entry__info"> <div class="form-entry__info">
如果文件存在于Gist中则将被覆盖 如果文件存在于GitHubGist中则将被覆盖
</div> </div>
</form-entry> </form-entry>
</div> </div>

View File

@ -4,11 +4,11 @@
<div class="modal__image"> <div class="modal__image">
<icon-provider provider-id="gitea"></icon-provider> <icon-provider provider-id="gitea"></icon-provider>
</div> </div>
<p>向您的<b> Gitea </b>项目发布<b> {{CurrentFileName}} </b></p> <p>向您的<b> Gitea </b>项目发布<b> {{ currentFileName }} </b></p>
<form-entry label="Project URL" error="projectUrl"> <form-entry label="Project URL" error="projectUrl">
<input slot="field" class="textfield" type="text" v-model.trim="projectUrl" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="projectUrl" @keydown.enter="resolve()">
<div class="form-entry__info"> <div class="form-entry__info">
<b>例如:</b> {{config.token.serverUrl}}/path/to/project <b>例如:</b> {{ config.token.serverUrl }}/path/to/project
</div> </div>
</form-entry> </form-entry>
<form-entry label="File path" error="path"> <form-entry label="File path" error="path">

View File

@ -0,0 +1,79 @@
<template>
<modal-inner aria-label="发布到GiteeGist">
<div class="modal__content">
<div class="modal__image">
<icon-provider provider-id="giteegist"></icon-provider>
</div>
<p>发布<b> {{CurrentFileName}} </b><b>GiteeGist</b></p>
<form-entry label="文件名" error="filename">
<input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
</form-entry>
<div class="form-entry">
<div class="form-entry__checkbox">
<label>
<input type="checkbox" v-model="isPublic"> 公开的
</label>
</div>
</div>
<form-entry label="存在Gist ID" info="可选的">
<input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
<div class="form-entry__info">
如果文件存在于GiteeGist中则将被覆盖
</div>
</form-entry>
<form-entry label="Template">
<select slot="field" class="textfield" v-model="selectedTemplate" @keydown.enter="resolve()">
<option v-for="(template, id) in allTemplatesById" :key="id" :value="id">
{{ template.name }}
</option>
</select>
<div class="form-entry__actions">
<a href="javascript:void(0)" @click="configureTemplates">配置模板</a>
</div>
</form-entry>
<div class="modal__info">
<b>ProTip:</b> You can provide a value for <code>title</code> in the <a href="javascript:void(0)" @click="openFileProperties">file properties</a>.
</div>
</div>
<div class="modal__button-bar">
<button class="button" @click="config.reject()">取消</button>
<button class="button button--resolve" @click="resolve()">确认</button>
</div>
</modal-inner>
</template>
<script>
import giteeGistProvider from '../../../services/providers/giteeGistProvider';
import modalTemplate from '../common/modalTemplate';
export default modalTemplate({
data: () => ({
filename: '',
gistId: '',
}),
computedLocalSettings: {
isPublic: 'gistIsPublic',
selectedTemplate: 'gistPublishTemplate',
},
created() {
this.filename = `${this.currentFileName}.md`;
},
methods: {
resolve() {
if (!this.filename) {
this.setError('filename');
} else {
// Return new location
const location = giteeGistProvider.makeLocation(
this.config.token,
this.filename,
this.isPublic,
this.gistId,
);
location.templateId = this.selectedTemplate;
this.config.resolve(location);
}
},
},
});
</script>

View File

@ -0,0 +1,64 @@
<template>
<modal-inner aria-label=" GiteeGist 同步">
<div class="modal__content">
<div class="modal__image">
<icon-provider provider-id="giteegist"></icon-provider>
</div>
<p><b> {{currentFileName}} </b>保存到<b>GiteeGist</b>并保持同步</p>
<form-entry label="文件名" error="filename">
<input slot="field" class="textfield" type="text" v-model.trim="filename" @keydown.enter="resolve()">
</form-entry>
<div class="form-entry">
<div class="form-entry__checkbox">
<label>
<input type="checkbox" v-model="isPublic"> 公开的
</label>
</div>
</div>
<form-entry label="存在Gist ID" info="可选的">
<input slot="field" class="textfield" type="text" v-model.trim="gistId" @keydown.enter="resolve()">
<div class="form-entry__info">
如果文件存在于GiteeGist中则将被覆盖
</div>
</form-entry>
</div>
<div class="modal__button-bar">
<button class="button" @click="config.reject()">取消</button>
<button class="button button--resolve" @click="resolve()">确认</button>
</div>
</modal-inner>
</template>
<script>
import giteeGistProvider from '../../../services/providers/giteeGistProvider';
import modalTemplate from '../common/modalTemplate';
export default modalTemplate({
data: () => ({
filename: '',
gistId: '',
}),
computedLocalSettings: {
isPublic: 'gistIsPublic',
},
created() {
this.filename = `${this.currentFileName}.md`;
},
methods: {
resolve() {
if (!this.filename) {
this.setError('filename');
} else {
// Return new location
const location = giteeGistProvider.makeLocation(
this.config.token,
this.filename,
this.isPublic,
this.gistId,
);
this.config.resolve(location);
}
},
},
});
</script>

View File

@ -4,7 +4,7 @@
<div class="modal__image"> <div class="modal__image">
<icon-provider provider-id="gitee"></icon-provider> <icon-provider provider-id="gitee"></icon-provider>
</div> </div>
<p>Save <b>{{currentFileName}}</b> to your <b>Gitee</b> repository and keep it synced.</p> <p>保存 <b>{{currentFileName}}</b> 并与您的 <b>Gitee</b> 仓库保持同步.</p>
<form-entry label="仓库URL" error="repoUrl"> <form-entry label="仓库URL" error="repoUrl">
<input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="repoUrl" @keydown.enter="resolve()">
<div class="form-entry__info"> <div class="form-entry__info">

View File

@ -18,6 +18,9 @@
</form-entry> </form-entry>
<form-entry label="Application ID" error="applicationId"> <form-entry label="Application ID" error="applicationId">
<input slot="field" class="textfield" type="text" v-model.trim="applicationId" @keydown.enter="resolve()"> <input slot="field" class="textfield" type="text" v-model.trim="applicationId" @keydown.enter="resolve()">
</form-entry>
<form-entry label="Application Secret" error="applicationSecret">
<input slot="field" class="textfield" type="text" v-model.trim="applicationSecret" @keydown.enter="resolve()">
<div class="form-entry__info"> <div class="form-entry__info">
您必须使用重定向url <b>{{redirectUrl}}</b>配置OAuth2应用程序 您必须使用重定向url <b>{{redirectUrl}}</b>配置OAuth2应用程序
</div> </div>
@ -47,6 +50,7 @@ export default modalTemplate({
computedLocalSettings: { computedLocalSettings: {
serverUrl: 'gitlabServerUrl', serverUrl: 'gitlabServerUrl',
applicationId: 'gitlabApplicationId', applicationId: 'gitlabApplicationId',
applicationSecret: 'gitlabApplicationSecret',
}, },
computed: { computed: {
httpAppUrl() { httpAppUrl() {
@ -78,7 +82,10 @@ export default modalTemplate({
if (!this.applicationId) { if (!this.applicationId) {
this.setError('applicationId'); this.setError('applicationId');
} }
if (serverUrl && this.applicationId) { if (!this.applicationSecret) {
this.setError('applicationSecret');
}
if (serverUrl && this.applicationId && this.applicationSecret) {
const parsedUrl = serverUrl.match(/^(http[s]?:\/\/[^/]+)/); const parsedUrl = serverUrl.match(/^(http[s]?:\/\/[^/]+)/);
if (!parsedUrl) { if (!parsedUrl) {
this.setError('serverUrl'); this.setError('serverUrl');
@ -86,6 +93,7 @@ export default modalTemplate({
this.config.resolve({ this.config.resolve({
serverUrl: parsedUrl[1], serverUrl: parsedUrl[1],
applicationId: this.applicationId, applicationId: this.applicationId,
applicationSecret: this.applicationSecret,
}); });
} }
} }

View File

@ -22,6 +22,6 @@ export default {
'badgeCreations', 'badgeCreations',
'serverConf', 'serverConf',
], ],
textMaxLength: 250000, textMaxLength: 10000000,
defaultName: 'Untitled', defaultName: 'Untitled',
}; };

View File

@ -24,6 +24,7 @@ export default () => ({
giteePublishTemplate: 'jekyllSite', giteePublishTemplate: 'jekyllSite',
gitlabServerUrl: '', gitlabServerUrl: '',
gitlabApplicationId: '', gitlabApplicationId: '',
gitlabApplicationSecret: '',
gitlabProjectUrl: '', gitlabProjectUrl: '',
gitlabWorkspaceProjectUrl: '', gitlabWorkspaceProjectUrl: '',
gitlabPublishTemplate: 'plainText', gitlabPublishTemplate: 'plainText',

View File

@ -43,6 +43,8 @@ editor:
link: true link: true
# 图片 # 图片
image: true image: true
# ChatGPT
chatgpt: true
# Keyboard shortcuts # Keyboard shortcuts
# See https://craig.is/killing/mice # See https://craig.is/killing/mice
@ -57,6 +59,7 @@ shortcuts:
mod+shift+h: heading mod+shift+h: heading
mod+shift+r: hr mod+shift+r: hr
mod+shift+g: image mod+shift+g: image
mod+shift+p: chatgpt
mod+shift+i: italic mod+shift+i: italic
mod+shift+l: link mod+shift+l: link
mod+shift+o: olist mod+shift+o: olist
@ -65,6 +68,8 @@ shortcuts:
mod+shift+t: table mod+shift+t: table
mod+shift+u: ulist mod+shift+u: ulist
mod+shift+f: inlineformula mod+shift+f: inlineformula
# 切换编辑与预览模式
mod+shift+e: toggleeditor
'= = > space': '= = > space':
method: expand method: expand
params: params:
@ -108,16 +113,16 @@ turndown:
# GitHub/GitLab/Gitee/Gitea commit messages # GitHub/GitLab/Gitee/Gitea commit messages
git: git:
createFileMessage: '{{path}} created from https://stackedit.cn/' createFileMessage: '{{path}} created from https://md.jonylee.top/'
updateFileMessage: '{{path}} updated from https://stackedit.cn/' updateFileMessage: '{{path}} updated from https://md.jonylee.top/'
deleteFileMessage: '{{path}} deleted from https://stackedit.cn/' deleteFileMessage: '{{path}} deleted from https://md.jonylee.top/'
# Default content for new files # Default content for new files
newFileContent: | newFileContent: |
> Written with [StackEdit中文版](https://stackedit.cn/). > Written with [Markdown编辑器-StackEdit中文版](https://md.jonylee.top/).
# Default properties for new files # Default properties for new files
newFileProperties: | newFileProperties: |

View File

@ -158,7 +158,19 @@ export default [
new Feature( new Feature(
'sponsor', 'sponsor',
'赞助', '赞助',
'使用 Google 登录并赞助 StackEdit 以解锁 PDF 和 Pandoc 导出。(暂不支持赞助)', '使用 Gitee 登录并赞助 StackEdit 以解锁 PDF 和 Pandoc 导出。(暂不支持赞助)',
),
],
),
new Feature(
'githubSignIn',
'登录',
'使用 Gitee 登录,同步您的主文档空间并解锁功能。',
[
new Feature(
'githubSyncMainWorkspace',
'主文档空间已同步',
'使用 GitHub 登录以将您的主文档空间与您的默认空间stackedit-app-data仓库数据同步。',
), ),
], ],
), ),
@ -316,6 +328,11 @@ export default [
'GitHub保存', 'GitHub保存',
'使用“同步”菜单将文件保存在GitHub仓库中。', '使用“同步”菜单将文件保存在GitHub仓库中。',
), ),
new Feature(
'saveOnGist',
'GitHubGist保存',
'使用“同步”菜单将文件保存在GitHubGist中。',
),
new Feature( new Feature(
'openFromGitee', 'openFromGitee',
'Gitee阅读器', 'Gitee阅读器',
@ -327,9 +344,9 @@ export default [
'使用“同步”菜单将文件保存在Gitee仓库中。', '使用“同步”菜单将文件保存在Gitee仓库中。',
), ),
new Feature( new Feature(
'saveOnGist', 'saveOnGiteeGist',
'Gist保存', 'GiteeGist保存',
'使用“同步”菜单将文件保存在GIST中。', '使用“同步”菜单将文件保存在GiteeGist中。',
), ),
new Feature( new Feature(
'openFromGitlab', 'openFromGitlab',
@ -405,14 +422,19 @@ export default [
), ),
new Feature( new Feature(
'publishToGist', 'publishToGist',
'Gist发布', 'GitHubGist发布',
'使用“发布”菜单将文件发布到GIST。', '使用“发布”菜单将文件发布到GitHubGist。',
), ),
new Feature( new Feature(
'publishToGitee', 'publishToGitee',
'Gitee发布', 'Gitee发布',
'使用“发布”菜单将文件发布到Gitee仓库。', '使用“发布”菜单将文件发布到Gitee仓库。',
), ),
new Feature(
'publishToGiteeGist',
'GiteeGist发布',
'使用“发布”菜单将文件发布到GiteeGist。',
),
new Feature( new Feature(
'publishToGitlab', 'publishToGitlab',
'GitLab发布', 'GitLab发布',

View File

@ -49,4 +49,8 @@ export default [{
method: 'image', method: 'image',
title: '图片', title: '图片',
icon: 'file-image', icon: 'file-image',
}, {
method: 'chatgpt',
title: 'ChatGPT',
icon: 'chat-gpt',
}]; }];

View File

@ -1,6 +1,7 @@
const simpleModal = (contentHtml, rejectText, resolveText) => ({ const simpleModal = (contentHtml, rejectText, resolveText, resolveArray) => ({
contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml, contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml,
rejectText, rejectText,
resolveArray,
resolveText, resolveText,
}); });
@ -60,17 +61,40 @@ export default {
'取消', '取消',
'确认清理', '确认清理',
), ),
shareHtml: simpleModal(
config => `<p>给文档 "${config.name}" 创建了分享链接如下:<br/><a href="${config.url}" target="_blank">${config.url}</a><br/>关闭该窗口后可以到发布中查看分享链接。</p>`,
'关闭窗口',
),
shareHtmlPre: simpleModal(
config => `<p>将给文档 "${config.name}" 创建分享链接创建后将会把文档公开发布到默认空间账号的Gist中。您确定吗</p>`,
'取消',
'确认分享',
),
signInForComment: simpleModal( signInForComment: simpleModal(
`<p>您必须使用 Google 登录才能开始评论。</p> `<p>您必须使用 Gitee或GitHub 登录默认文档空间后才能开始评论。</p>
<div class="modal__info"><b>注意:</b> </div>`, <div class="modal__info"><b>注意:</b> </div>`,
'取消', '取消',
'确认登录', '',
[{
text: 'Gitee登录',
value: 'gitee',
}, {
text: 'GitHub登录',
value: 'github',
}],
), ),
signInForSponsorship: simpleModal( signInForSponsorship: simpleModal(
`<p>您必须使用 Google 登录才能赞助。</p> `<p>您必须使用 Gitee或GitHub 登录才能赞助。</p>
<div class="modal__info"><b>注意:</b> </div>`, <div class="modal__info"><b>注意:</b> </div>`,
'取消', '取消',
'确认登录', '',
[{
text: 'Gitee登录',
value: 'gitee',
}, {
text: 'GitHub登录',
value: 'github',
}],
), ),
sponsorOnly: simpleModal( sponsorOnly: simpleModal(
'<p>此功能仅限于赞助商,因为它依赖于服务器资源。</p>', '<p>此功能仅限于赞助商,因为它依赖于服务器资源。</p>',

View File

@ -7,6 +7,16 @@
<title>{{files.0.name}}</title> <title>{{files.0.name}}</title>
<link rel="stylesheet" href="https://stackedit.cn/style.css" /> <link rel="stylesheet" href="https://stackedit.cn/style.css" />
<style type="text/css"> <style type="text/css">
.app--dark {
background-color: #444;
}
.app--dark .stackedit__html {
padding-left: 0;
padding-right: 0;
}
.app--dark .stackedit__content {
padding: 1px 20px 20px;
}
{{{files.0.content.themeStyleContent}}} {{{files.0.content.themeStyleContent}}}
</style> </style>
</head> </head>
@ -14,7 +24,7 @@
{{#if pdf}} {{#if pdf}}
<body class="stackedit stackedit--pdf"> <body class="stackedit stackedit--pdf">
{{else}} {{else}}
<body class="stackedit"> <body class="stackedit {{{files.0.content.colorThemeClass}}}">
{{/if}} {{/if}}
<div class="stackedit__left"> <div class="stackedit__left">
<div class="stackedit__toc"> <div class="stackedit__toc">
@ -23,7 +33,7 @@
</div> </div>
<div class="stackedit__right"> <div class="stackedit__right">
<div class="stackedit__html"> <div class="stackedit__html">
<div class="{{{files.0.content.themeClass}}}"> <div class="stackedit__content {{{files.0.content.themeClass}}}">
{{{files.0.content.html}}} {{{files.0.content.html}}}
</div> </div>
</div> </div>

View File

@ -7,6 +7,16 @@
<title>{{files.0.name}}</title> <title>{{files.0.name}}</title>
<link rel="stylesheet" href="https://stackedit.cn/style.css" /> <link rel="stylesheet" href="https://stackedit.cn/style.css" />
<style type="text/css"> <style type="text/css">
.app--dark {
background-color: #444;
}
.app--dark .stackedit__html {
padding-left: 0;
padding-right: 0;
}
.app--dark .stackedit__content {
padding: 1px 20px 20px;
}
{{{files.0.content.themeStyleContent}}} {{{files.0.content.themeStyleContent}}}
</style> </style>
</head> </head>
@ -14,10 +24,10 @@
{{#if pdf}} {{#if pdf}}
<body class="stackedit stackedit--pdf"> <body class="stackedit stackedit--pdf">
{{else}} {{else}}
<body class="stackedit"> <body class="stackedit {{{files.0.content.colorThemeClass}}}">
{{/if}} {{/if}}
<div class="stackedit__html"> <div class="stackedit__html">
<div class="{{{files.0.content.themeClass}}}"> <div class="stackedit__content {{{files.0.content.themeClass}}}">
{{{files.0.content.html}}} {{{files.0.content.html}}}
</div> </div>
</div> </div>

View File

@ -56,6 +56,7 @@ export default (md) => {
// According to http://pandoc.org/README.html#extension-auto_identifiers // According to http://pandoc.org/README.html#extension-auto_identifiers
let slug = headingContent let slug = headingContent
.replace(/<img[^>]*>/g, '') // Replace image to empty
.replace(/\s/g, '-') // Replace all spaces and newlines with hyphens .replace(/\s/g, '-') // Replace all spaces and newlines with hyphens
.replace(/[\0-,/:-@[-^`{-~]/g, '') // Remove all punctuation, except underscores, hyphens, and periods .replace(/[\0-,/:-@[-^`{-~]/g, '') // Remove all punctuation, except underscores, hyphens, and periods
.toLowerCase(); // Convert all alphabetic characters to lowercase .toLowerCase(); // Convert all alphabetic characters to lowercase
@ -64,7 +65,9 @@ export default (md) => {
let i; let i;
for (i = 0; i < slug.length; i += 1) { for (i = 0; i < slug.length; i += 1) {
const charCode = slug.charCodeAt(i); const charCode = slug.charCodeAt(i);
if ((charCode >= 0x61 && charCode <= 0x7A) || charCode > 0x7E) { if ((charCode >= 0x30 && charCode <= 0x39) || // 0-9
(charCode >= 0x61 && charCode <= 0x7A) || // a-z
charCode > 0x7E) {
break; break;
} }
} }

View File

@ -23,11 +23,21 @@ function texMath(state, silent) {
) { ) {
return false; return false;
} }
const endMarkerPos = state.src.indexOf(endMarker, startMathPos); function getIndex(tempStartMathPos) {
if (endMarkerPos === -1) { const tempEndMarkerPos = state.src.indexOf(endMarker, tempStartMathPos);
return false; if (tempEndMarkerPos === -1) {
return tempEndMarkerPos;
}
if (state.src.charCodeAt(tempEndMarkerPos - 1) === 0x5C /* \ */) {
if (state.src.length - 1 > tempEndMarkerPos) {
return getIndex(tempEndMarkerPos + 1);
}
return -1;
}
return tempEndMarkerPos;
} }
if (state.src.charCodeAt(endMarkerPos - 1) === 0x5C /* \ */) { const endMarkerPos = getIndex(startMathPos);
if (endMarkerPos === -1) {
return false; return false;
} }
const nextPos = endMarkerPos + endMarker.length; const nextPos = endMarkerPos + endMarker.length;

3
src/icons/ChatGpt.vue Normal file
View File

@ -0,0 +1,3 @@
<template>
<svg class="icon" width="24px" height="24px" viewBox="140 140 520 520"><defs><linearGradient id="linear" x1="100%" y1="22%" x2="0%" y2="78%"><stop offset="0%" stop-color="rgb(131,211,231)"></stop><stop offset="2%" stop-color="rgb(127,203,229)"></stop><stop offset="25%" stop-color="rgb(86,115,217)"></stop><stop offset="49%" stop-color="rgb(105,80,190)"></stop><stop offset="98%" stop-color="rgb(197,59,119)"></stop><stop offset="100%" stop-color="rgb(197,59,119)"></stop></linearGradient></defs><path id="logo" d="m617.24 354a126.36 126.36 0 0 0 -10.86-103.79 127.8 127.8 0 0 0 -137.65-61.32 126.36 126.36 0 0 0 -95.31-42.49 127.81 127.81 0 0 0 -121.92 88.49 126.4 126.4 0 0 0 -84.5 61.3 127.82 127.82 0 0 0 15.72 149.86 126.36 126.36 0 0 0 10.86 103.79 127.81 127.81 0 0 0 137.65 61.32 126.36 126.36 0 0 0 95.31 42.49 127.81 127.81 0 0 0 121.96-88.54 126.4 126.4 0 0 0 84.5-61.3 127.82 127.82 0 0 0 -15.76-149.81zm-190.66 266.49a94.79 94.79 0 0 1 -60.85-22c.77-.42 2.12-1.16 3-1.7l101-58.34a16.42 16.42 0 0 0 8.3-14.37v-142.39l42.69 24.65a1.52 1.52 0 0 1 .83 1.17v117.92a95.18 95.18 0 0 1 -94.97 95.06zm-204.24-87.23a94.74 94.74 0 0 1 -11.34-63.7c.75.45 2.06 1.25 3 1.79l101 58.34a16.44 16.44 0 0 0 16.59 0l123.31-71.2v49.3a1.53 1.53 0 0 1 -.61 1.31l-102.1 58.95a95.16 95.16 0 0 1 -129.85-34.79zm-26.57-220.49a94.71 94.71 0 0 1 49.48-41.68c0 .87-.05 2.41-.05 3.48v116.68a16.41 16.41 0 0 0 8.29 14.36l123.31 71.19-42.69 24.65a1.53 1.53 0 0 1 -1.44.13l-102.11-59a95.16 95.16 0 0 1 -34.79-129.81zm350.74 81.62-123.31-71.2 42.69-24.64a1.53 1.53 0 0 1 1.44-.13l102.11 58.95a95.08 95.08 0 0 1 -14.69 171.55c0-.88 0-2.42 0-3.49v-116.68a16.4 16.4 0 0 0 -8.24-14.36zm42.49-63.95c-.75-.46-2.06-1.25-3-1.79l-101-58.34a16.46 16.46 0 0 0 -16.59 0l-123.31 71.2v-49.3a1.53 1.53 0 0 1 .61-1.31l102.1-58.9a95.07 95.07 0 0 1 141.19 98.44zm-267.11 87.87-42.7-24.65a1.52 1.52 0 0 1 -.83-1.17v-117.92a95.07 95.07 0 0 1 155.9-73c-.77.42-2.11 1.16-3 1.7l-101 58.34a16.41 16.41 0 0 0 -8.3 14.36zm23.19-50 54.92-31.72 54.92 31.7v63.42l-54.92 31.7-54.92-31.7z" fill="#202123"></path></svg>
</template>

View File

@ -15,6 +15,7 @@ export default {
return 'google-drive'; return 'google-drive';
case 'googlePhotos': case 'googlePhotos':
return 'google-photos'; return 'google-photos';
case 'githubAppData':
case 'githubWorkspace': case 'githubWorkspace':
return 'github'; return 'github';
case 'gist': case 'gist':
@ -29,7 +30,10 @@ export default {
return 'couchdb'; return 'couchdb';
case 'giteeAppData': case 'giteeAppData':
case 'giteeWorkspace': case 'giteeWorkspace':
case 'giteegist':
return 'gitee'; return 'gitee';
case 'stackedit':
return 'stackedit';
default: default:
return this.providerId; return this.providerId;
} }

3
src/icons/Share.vue Normal file
View File

@ -0,0 +1,3 @@
<template>
<svg t="1680140298859" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2766" width="32" height="32"><path d="M769.14815 670.390403c-44.430932 0-84.182284 19.999496-110.768803 51.471278L389.219117 565.736878c6.597255-16.571421 10.228969-34.653241 10.228969-53.594639 0-17.006326-2.940982-33.332153-8.320503-48.497551l270.88143-157.119457c26.511817 29.069059 64.702628 47.312562 107.138112 47.312562 80.055291 0 144.95337-64.899102 144.95337-144.95337 0-80.055291-64.898079-144.954393-144.95337-144.954393s-144.95337 64.899102-144.95337 144.954393c0 15.991206 2.600221 31.386848 7.382131 45.776579L359.655801 412.377048c-26.417673-27.833929-63.756069-45.181015-105.161085-45.181015-80.055291 0-144.954393 64.890916-144.954393 144.946206 0 80.055291 64.898079 144.967696 144.954393 144.967696 39.409568 0 75.128071-15.741519 101.256148-41.24845l274.172383 159.024853c-3.725858 12.8384-5.729491 26.409486-5.729491 40.457434 0 80.0645 64.898079 144.954393 144.95337 144.954393s144.95337-64.889893 144.95337-144.954393C914.101519 735.297692 849.20344 670.390403 769.14815 670.390403z" p-id="2767"></path></svg>
</template>

View File

@ -64,6 +64,8 @@ import FindReplace from './FindReplace';
import SelectTheme from './SelectTheme'; import SelectTheme from './SelectTheme';
import Copy from './Copy'; import Copy from './Copy';
import Ellipsis from './Ellipsis'; import Ellipsis from './Ellipsis';
import Share from './Share';
import ChatGpt from './ChatGpt';
Vue.component('iconProvider', Provider); Vue.component('iconProvider', Provider);
Vue.component('iconFormatBold', FormatBold); Vue.component('iconFormatBold', FormatBold);
@ -130,3 +132,5 @@ Vue.component('iconFindReplace', FindReplace);
Vue.component('iconSelectTheme', SelectTheme); Vue.component('iconSelectTheme', SelectTheme);
Vue.component('iconCopy', Copy); Vue.component('iconCopy', Copy);
Vue.component('iconEllipsis', Ellipsis); Vue.component('iconEllipsis', Ellipsis);
Vue.component('iconShare', Share);
Vue.component('iconChatGpt', ChatGpt);

View File

@ -122,6 +122,7 @@ function Pagedown(options) {
hooks.addNoop("onPreviewRefresh"); // called with no arguments after the preview has been refreshed hooks.addNoop("onPreviewRefresh"); // called with no arguments after the preview has been refreshed
hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
hooks.addFalse("insertImageDialog"); hooks.addFalse("insertImageDialog");
hooks.addFalse("insertChatGptDialog");
/* called with one parameter: a callback to be called with the URL of the image. If the application creates /* called with one parameter: a callback to be called with the URL of the image. If the application creates
* its own image insertion dialog, this hook should return true, and the callback should be called with the chosen * its own image insertion dialog, this hook should return true, and the callback should be called with the chosen
* image url (or null if the user cancelled). If this hook returns false, the default dialog will be used. * image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
@ -477,6 +478,7 @@ function UIManager(input, commandManager) {
buttons.image = bindCommand(function (chunk, postProcessing) { buttons.image = bindCommand(function (chunk, postProcessing) {
return this.doLinkOrImage(chunk, postProcessing, true); return this.doLinkOrImage(chunk, postProcessing, true);
}); });
buttons.chatgpt = bindCommand("doChatGpt");
buttons.olist = bindCommand(function (chunk, postProcessing) { buttons.olist = bindCommand(function (chunk, postProcessing) {
this.doList(chunk, postProcessing, true); this.doList(chunk, postProcessing, true);
}); });
@ -846,6 +848,17 @@ commandProto.doLinkOrImage = function (chunk, postProcessing, isImage) {
} }
}; };
commandProto.doChatGpt = function (chunk, postProcessing) {
var enteredCallback = function (content) {
if (content !== null) {
chunk.before = `${chunk.before}${content}`;
chunk.selection = '';
}
postProcessing();
};
this.hooks.insertChatGptDialog(enteredCallback);
};
// When making a list, hitting shift-enter will put your cursor on the next line // When making a list, hitting shift-enter will put your cursor on the next line
// at the current indent level. // at the current indent level.
commandProto.doAutoindent = function (chunk) { commandProto.doAutoindent = function (chunk) {

View File

@ -0,0 +1,42 @@
import store from '../store';
export default {
chat({ content }, callback) {
const xhr = new XMLHttpRequest();
const url = 'https://api.openai-proxy.com/v1/chat/completions';
xhr.open('POST', url);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.setRequestHeader('Authorization', `Bearer ${window.my_api_key}`);
xhr.send(JSON.stringify({
model: 'gpt-3.5-turbo',
max_tokens: 3000,
top_p: 0,
temperature: 0.9,
frequency_penalty: 0,
presence_penalty: 0,
messages: [{ role: 'user', content }],
stream: true,
}));
let lastRespLen = 0;
xhr.onprogress = () => {
const responseText = xhr.response.substr(lastRespLen);
lastRespLen = xhr.response.length;
responseText.split('\n\n')
.filter(l => l.length > 0)
.forEach((text) => {
const item = text.substr(6);
if (item === '[DONE]') {
callback({ done: true });
} else {
const data = JSON.parse(item);
callback({ content: data.choices[0].delta.content });
}
});
};
xhr.onerror = () => {
store.dispatch('notification/error', 'ChatGPT接口请求异常');
callback({ error: 'ChatGPT接口请求异常' });
};
return xhr;
},
};

View File

@ -217,8 +217,8 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
]; ];
Array.prototype.slice.call(sectionPreviewElt.getElementsByTagName('a')).forEach((aElt) => { Array.prototype.slice.call(sectionPreviewElt.getElementsByTagName('a')).forEach((aElt) => {
const url = aElt.attributes.href.nodeValue; const url = aElt.attributes && aElt.attributes.href && aElt.attributes.href.nodeValue;
if (url.indexOf('http://') >= 0 || url.indexOf('https://') >= 0 || url.indexOf('#') >= 0) { if (!url || url.indexOf('http://') >= 0 || url.indexOf('https://') >= 0 || url.indexOf('#') >= 0) {
return; return;
} }
aElt.href = 'javascript:void(0);'; // eslint-disable-line no-script-url aElt.href = 'javascript:void(0);'; // eslint-disable-line no-script-url
@ -233,7 +233,21 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
const clonedElt = headingElt.cloneNode(true); const clonedElt = headingElt.cloneNode(true);
clonedElt.removeAttribute('id'); clonedElt.removeAttribute('id');
sectionTocElt.appendChild(clonedElt); sectionTocElt.appendChild(clonedElt);
headingElt.innerHTML = `<span class="prefix"></span><span class="content">${headingElt.innerHTML}</span><span class="suffix"></span>`; // 创建一个新的 <span> 元素
const contentElt = document.createElement('span');
contentElt.className = 'content';
// 将原始内容移动到新的 <span> 元素中
while (headingElt.firstChild) {
contentElt.appendChild(headingElt.firstChild);
}
const prefixElt = document.createElement('span');
prefixElt.className = 'prefix';
headingElt.insertBefore(prefixElt, headingElt.firstChild);
// 将新的 <span> 元素替换原始元素
headingElt.appendChild(contentElt);
const suffixElt = document.createElement('span');
suffixElt.className = 'suffix';
headingElt.appendChild(suffixElt);
} }
if (insertBeforeTocElt) { if (insertBeforeTocElt) {
this.tocElt.insertBefore(sectionTocElt, insertBeforeTocElt); this.tocElt.insertBefore(sectionTocElt, insertBeforeTocElt);
@ -439,6 +453,13 @@ const editorSvc = Object.assign(new Vue(), editorSvcDiscussions, editorSvcUtils,
}); });
return true; return true;
}); });
this.pagedownEditor.hooks.set('insertChatGptDialog', (callback) => {
store.dispatch('modal/open', {
type: 'chatGpt',
callback,
});
return true;
});
this.pagedownEditor.hooks.set('insertImageUploading', (callback) => { this.pagedownEditor.hooks.set('insertImageUploading', (callback) => {
callback(store.getters['img/currImgId']); callback(store.getters['img/currImgId']);
return true; return true;

View File

@ -73,6 +73,7 @@ export default {
const parsingCtx = markdownConversionSvc.parseSections(converter, content.text); const parsingCtx = markdownConversionSvc.parseSections(converter, content.text);
const conversionCtx = markdownConversionSvc.convert(parsingCtx); const conversionCtx = markdownConversionSvc.convert(parsingCtx);
const html = conversionCtx.htmlSectionList.map(htmlSanitizer.sanitizeHtml).join(''); const html = conversionCtx.htmlSectionList.map(htmlSanitizer.sanitizeHtml).join('');
const colorThemeClass = `app--${store.getters['data/computedSettings'].colorTheme}`;
const themeClass = `preview-theme--${store.state.theme.currPreviewTheme}`; const themeClass = `preview-theme--${store.state.theme.currPreviewTheme}`;
let themeStyleContent = ''; let themeStyleContent = '';
const themeStyleEle = document.getElementById(`preview-theme-${store.state.theme.currPreviewTheme}`); const themeStyleEle = document.getElementById(`preview-theme-${store.state.theme.currPreviewTheme}`);
@ -92,8 +93,8 @@ export default {
// 替换相对路径图片为blob图片 // 替换相对路径图片为blob图片
const imgs = Array.prototype.slice.call(containerElt.getElementsByTagName('img')).map((imgElt) => { const imgs = Array.prototype.slice.call(containerElt.getElementsByTagName('img')).map((imgElt) => {
let uri = imgElt.attributes.src.nodeValue; let uri = imgElt.attributes && imgElt.attributes.src && imgElt.attributes.src.nodeValue;
if (uri.indexOf('http://') !== 0 && uri.indexOf('https://') !== 0) { if (uri && uri.indexOf('http://') !== 0 && uri.indexOf('https://') !== 0) {
uri = decodeURIComponent(uri); uri = decodeURIComponent(uri);
imgElt.removeAttribute('src'); imgElt.removeAttribute('src');
return { imgElt, uri }; return { imgElt, uri };
@ -115,7 +116,21 @@ export default {
// Make TOC // Make TOC
const allHeaders = containerElt.querySelectorAll('h1,h2,h3,h4,h5,h6'); const allHeaders = containerElt.querySelectorAll('h1,h2,h3,h4,h5,h6');
Array.prototype.slice.call(allHeaders).forEach((headingElt) => { Array.prototype.slice.call(allHeaders).forEach((headingElt) => {
headingElt.innerHTML = `<span class="prefix"></span><span class="content">${headingElt.innerHTML}</span><span class="suffix"></span>`; // 创建一个新的 <span> 元素
const contentElt = document.createElement('span');
contentElt.className = 'content';
// 将原始内容移动到新的 <span> 元素中
while (headingElt.firstChild) {
contentElt.appendChild(headingElt.firstChild);
}
const prefixElt = document.createElement('span');
prefixElt.className = 'prefix';
headingElt.insertBefore(prefixElt, headingElt.firstChild);
// 将新的 <span> 元素替换原始元素
headingElt.appendChild(contentElt);
const suffixElt = document.createElement('span');
suffixElt.className = 'suffix';
headingElt.appendChild(suffixElt);
}); });
const headings = allHeaders.cl_map(headingElt => ({ const headings = allHeaders.cl_map(headingElt => ({
title: headingElt.textContent, title: headingElt.textContent,
@ -134,6 +149,7 @@ export default {
yamlProperties: content.properties, yamlProperties: content.properties,
html: containerElt.innerHTML, html: containerElt.innerHTML,
toc, toc,
colorThemeClass,
themeClass, themeClass,
themeStyleContent, themeStyleContent,
}, },

View File

@ -3,8 +3,8 @@ import store from '../../store';
import editorSvc from '../../services/editorSvc'; import editorSvc from '../../services/editorSvc';
import syncSvc from '../../services/syncSvc'; import syncSvc from '../../services/syncSvc';
// Skip shortcuts if modal is open or editor is hidden // Skip shortcuts if modal is open
Mousetrap.prototype.stopCallback = () => store.getters['modal/config'] || !store.getters['content/isCurrentEditable']; Mousetrap.prototype.stopCallback = () => store.getters['modal/config'];
const pagedownHandler = name => () => { const pagedownHandler = name => () => {
editorSvc.pagedownEditor.uiManager.doClick(name); editorSvc.pagedownEditor.uiManager.doClick(name);
@ -20,6 +20,14 @@ const findReplaceOpener = type => () => {
return true; return true;
}; };
const toggleEditor = () => () => {
store.dispatch('data/toggleEditor', !store.getters['data/layoutSettings'].showEditor);
return true;
};
// 非编辑模式下支持的快捷键
const noEditableShortcutMethods = ['toggleeditor'];
const methods = { const methods = {
bold: pagedownHandler('bold'), bold: pagedownHandler('bold'),
italic: pagedownHandler('italic'), italic: pagedownHandler('italic'),
@ -28,6 +36,7 @@ const methods = {
quote: pagedownHandler('quote'), quote: pagedownHandler('quote'),
code: pagedownHandler('code'), code: pagedownHandler('code'),
image: pagedownHandler('image'), image: pagedownHandler('image'),
chatgpt: pagedownHandler('chatgpt'),
olist: pagedownHandler('olist'), olist: pagedownHandler('olist'),
ulist: pagedownHandler('ulist'), ulist: pagedownHandler('ulist'),
clist: pagedownHandler('clist'), clist: pagedownHandler('clist'),
@ -35,6 +44,7 @@ const methods = {
inline: pagedownHandler('heading'), inline: pagedownHandler('heading'),
hr: pagedownHandler('hr'), hr: pagedownHandler('hr'),
inlineformula: pagedownHandler('inlineformula'), inlineformula: pagedownHandler('inlineformula'),
toggleeditor: toggleEditor(),
sync() { sync() {
if (syncSvc.isSyncPossible()) { if (syncSvc.isSyncPossible()) {
syncSvc.requestSync(); syncSvc.requestSync();
@ -66,8 +76,11 @@ const methods = {
}; };
store.watch( store.watch(
() => store.getters['data/computedSettings'], () => ({
(computedSettings) => { computedSettings: store.getters['data/computedSettings'],
isCurrentEditable: store.getters['content/isCurrentEditable'],
}),
({ computedSettings, isCurrentEditable }) => {
Mousetrap.reset(); Mousetrap.reset();
Object.entries(computedSettings.shortcuts).forEach(([key, shortcut]) => { Object.entries(computedSettings.shortcuts).forEach(([key, shortcut]) => {
@ -79,14 +92,18 @@ store.watch(
} }
if (Object.prototype.hasOwnProperty.call(methods, method)) { if (Object.prototype.hasOwnProperty.call(methods, method)) {
try { try {
Mousetrap.bind(`${key}`, () => !methods[method].apply(null, params)); // editor is editable or 一些非编辑模式下支持的快捷键
if (isCurrentEditable || noEditableShortcutMethods.indexOf(method) !== -1) {
Mousetrap.bind(`${key}`, () => !methods[method].apply(null, params));
}
} catch (e) { } catch (e) {
// Ignore // Ignore
} }
} }
} }
}); });
}, { },
{
immediate: true, immediate: true,
}, },
); );

View File

@ -36,7 +36,7 @@ export default new Provider({
async uploadContent(token, content, syncLocation) { async uploadContent(token, content, syncLocation) {
const updatedSyncLocation = { const updatedSyncLocation = {
...syncLocation, ...syncLocation,
projectId: await giteaHelper.getProjectId(syncLocation), projectId: await giteaHelper.getProjectId(token, syncLocation),
}; };
if (!savedSha[updatedSyncLocation.id]) { if (!savedSha[updatedSyncLocation.id]) {
try { try {
@ -59,7 +59,7 @@ export default new Provider({
async publish(token, html, metadata, publishLocation, commitMessage) { async publish(token, html, metadata, publishLocation, commitMessage) {
const updatedPublishLocation = { const updatedPublishLocation = {
...publishLocation, ...publishLocation,
projectId: await giteaHelper.getProjectId(publishLocation), projectId: await giteaHelper.getProjectId(token, publishLocation),
}; };
try { try {
// Get the last sha // Get the last sha
@ -81,7 +81,7 @@ export default new Provider({
async openFile(token, syncLocation) { async openFile(token, syncLocation) {
const updatedSyncLocation = { const updatedSyncLocation = {
...syncLocation, ...syncLocation,
projectId: await giteaHelper.getProjectId(syncLocation), projectId: await giteaHelper.getProjectId(token, syncLocation),
}; };
// Check if the file exists and open it // Check if the file exists and open it

View File

@ -0,0 +1,95 @@
import store from '../../store';
import giteeHelper from './helpers/giteeHelper';
import Provider from './common/Provider';
import utils from '../utils';
import userSvc from '../userSvc';
export default new Provider({
id: 'giteegist',
name: 'GiteeGist',
getToken({ sub }) {
return store.getters['data/giteeTokensBySub'][sub];
},
getLocationUrl({ gistId }) {
return `https://gitee.com/caojiezi2003/codes/${gistId}`;
},
getLocationDescription({ filename }) {
return filename;
},
async downloadContent(token, syncLocation) {
const content = await giteeHelper.downloadGist({
...syncLocation,
token,
});
return Provider.parseContent(content, `${syncLocation.fileId}/content`);
},
async uploadContent(token, content, syncLocation) {
const file = store.state.file.itemsById[syncLocation.fileId];
const description = utils.sanitizeName(file && file.name);
const gist = await giteeHelper.uploadGist({
...syncLocation,
token,
description,
content: Provider.serializeContent(content),
});
return {
...syncLocation,
gistId: gist.id,
};
},
async publish(token, html, metadata, publishLocation) {
const gist = await giteeHelper.uploadGist({
...publishLocation,
token,
description: metadata.title,
content: html,
});
return {
...publishLocation,
gistId: gist.id,
};
},
makeLocation(token, filename, isPublic, gistId) {
return {
providerId: this.id,
sub: token.sub,
filename,
isPublic,
gistId,
};
},
async listFileRevisions({ token, syncLocation }) {
const entries = await giteeHelper.getGistCommits({
...syncLocation,
token,
});
return entries.map((entry) => {
const sub = `${giteeHelper.subPrefix}:${entry.user.id}`;
userSvc.addUserInfo({ id: sub, name: entry.user.login, imageUrl: entry.user.avatar_url });
return {
sub,
id: entry.version,
message: entry.commit && entry.commit.message,
created: new Date(entry.committed_at).getTime(),
};
});
},
async loadFileRevision() {
// Revision are already loaded
return false;
},
// async getFileRevisionContent({
// token,
// contentId,
// syncLocation,
// revisionId,
// }) {
// const data = await giteeHelper.downloadGistRevision({
// ...syncLocation,
// token,
// sha: revisionId,
// });
// return Provider.parseContent(data, contentId);
// },
});

View File

@ -0,0 +1,292 @@
import store from '../../store';
import githubHelper from './helpers/githubHelper';
import Provider from './common/Provider';
import gitWorkspaceSvc from '../gitWorkspaceSvc';
import userSvc from '../userSvc';
const appDataRepo = 'stackedit-app-data';
const appDataBranch = 'master';
export default new Provider({
id: 'githubAppData',
name: 'Gitee应用数据',
getToken() {
return store.getters['workspace/syncToken'];
},
getWorkspaceParams() {
// No param as it's the main workspace
return {};
},
getWorkspaceLocationUrl() {
// No direct link to app data
return null;
},
getSyncDataUrl() {
// No direct link to app data
return null;
},
getSyncDataDescription({ id }) {
return id;
},
async initWorkspace() {
// Nothing much to do since the main workspace isn't necessarily synchronized
// Return the main workspace
return store.getters['workspace/workspacesById'].main;
},
getChanges() {
const token = this.getToken();
return githubHelper.getTree({
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
token,
});
},
prepareChanges(tree) {
return gitWorkspaceSvc.makeChanges(tree);
},
async saveWorkspaceItem({ item }) {
const syncData = {
id: store.getters.gitPathsByItemId[item.id],
type: item.type,
hash: item.hash,
};
// Files and folders are not in git, only contents
if (item.type === 'file' || item.type === 'folder') {
return { syncData };
}
// locations are stored as paths, so we upload an empty file
const syncToken = store.getters['workspace/syncToken'];
await githubHelper.uploadFile({
owner: syncToken.name,
repo: appDataRepo,
branch: appDataBranch,
token: syncToken,
path: syncData.id,
content: '',
sha: gitWorkspaceSvc.shaByPath[syncData.id],
commitMessage: item.commitMessage,
});
// Return sync data to save
return { syncData };
},
async removeWorkspaceItem({ syncData }) {
if (gitWorkspaceSvc.shaByPath[syncData.id]) {
const syncToken = store.getters['workspace/syncToken'];
await githubHelper.removeFile({
owner: syncToken.name,
repo: appDataRepo,
branch: appDataBranch,
token: syncToken,
path: syncData.id,
sha: gitWorkspaceSvc.shaByPath[syncData.id],
});
}
},
async downloadWorkspaceContent({
token,
contentId,
contentSyncData,
fileSyncData,
}) {
const { sha, data } = await githubHelper.downloadFile({
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
token,
path: fileSyncData.id,
});
gitWorkspaceSvc.shaByPath[fileSyncData.id] = sha;
const content = Provider.parseContent(data, contentId);
return {
content,
contentSyncData: {
...contentSyncData,
hash: content.hash,
sha,
},
};
},
async downloadFile({ token, path }) {
const { sha, data } = await githubHelper.downloadFile({
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
token,
path,
isImg: true,
});
return {
content: data,
sha,
};
},
async downloadWorkspaceData({ token, syncData }) {
if (!syncData) {
return {};
}
const path = `.stackedit-data/${syncData.id}.json`;
// const path = store.getters.gitPathsByItemId[syncData.id];
// const path = syncData.id;
const { sha, data } = await githubHelper.downloadFile({
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
token,
path,
});
if (!sha) {
return {};
}
gitWorkspaceSvc.shaByPath[path] = sha;
const item = JSON.parse(data);
return {
item,
syncData: {
...syncData,
hash: item.hash,
sha,
type: 'data',
},
};
},
async uploadWorkspaceContent({
token,
content,
file,
commitMessage,
}) {
const isImg = file.type === 'img';
const path = !isImg ? store.getters.gitPathsByItemId[file.id] : file.path;
const res = await githubHelper.uploadFile({
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
token,
path,
content: !isImg ? Provider.serializeContent(content) : file.content,
sha: gitWorkspaceSvc.shaByPath[!isImg ? path : file.path],
isImg,
commitMessage,
});
if (isImg) {
return {
sha: res.content.sha,
};
}
// Return new sync data
return {
contentSyncData: {
id: store.getters.gitPathsByItemId[content.id],
type: content.type,
hash: content.hash,
sha: res.content.sha,
},
fileSyncData: {
id: path,
type: 'file',
hash: file.hash,
},
};
},
async uploadWorkspaceData({
token,
item,
syncData,
}) {
const path = `.stackedit-data/${item.id}.json`;
// const path = store.getters.gitPathsByItemId[item.id];
// const path = syncData.id;
const res = await githubHelper.uploadFile({
token,
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
path,
content: JSON.stringify(item),
sha: gitWorkspaceSvc.shaByPath[path],
});
return {
syncData: {
...syncData,
type: item.type,
hash: item.hash,
data: item.data,
sha: res.content.sha,
},
};
},
async listFileRevisions({ token, fileSyncDataId }) {
const { owner, repo, branch } = {
owner: token.name,
repo: appDataRepo,
branch: appDataBranch,
};
const entries = await githubHelper.getCommits({
token,
owner,
repo,
sha: branch,
path: fileSyncDataId,
});
return entries.map(({
author,
committer,
commit,
sha,
}) => {
let user;
if (author && author.login) {
user = author;
} else if (committer && committer.login) {
user = committer;
}
const sub = `${githubHelper.subPrefix}:${user.login}`;
if (user.avatar_url && user.avatar_url.endsWith('.png') && !user.avatar_url.endsWith('no_portrait.png')) {
user.avatar_url = `${user.avatar_url}!avatar60`;
}
userSvc.addUserInfo({ id: sub, name: user.login, imageUrl: user.avatar_url });
const date = (commit.author && commit.author.date)
|| (commit.committer && commit.committer.date)
|| 1;
return {
id: sha,
sub,
message: commit.message,
created: new Date(date).getTime(),
};
});
},
async loadFileRevision() {
// Revisions are already loaded
return false;
},
async getFileRevisionContent({
token,
contentId,
fileSyncDataId,
revisionId,
}) {
const { data } = await githubHelper.downloadFile({
owner: token.name,
repo: appDataRepo,
branch: revisionId,
token,
path: fileSyncDataId,
});
return Provider.parseContent(data, contentId);
},
getFilePathUrl(path) {
const token = this.getToken();
if (!token) {
return null;
}
return `https://github.com/${token.name}/${appDataRepo}/blob/${appDataBranch}${path}`;
},
});

View File

@ -75,11 +75,11 @@ export default new Provider({
const sub = workspace ? workspace.sub : utils.queryParams.sub; const sub = workspace ? workspace.sub : utils.queryParams.sub;
let token = store.getters['data/gitlabTokensBySub'][sub]; let token = store.getters['data/gitlabTokensBySub'][sub];
if (!token) { if (!token) {
const { applicationId } = await store.dispatch('modal/open', { const { applicationId, applicationSecret } = await store.dispatch('modal/open', {
type: 'gitlabAccount', type: 'gitlabAccount',
forceServerUrl: serverUrl, forceServerUrl: serverUrl,
}); });
token = await gitlabHelper.addAccount(serverUrl, applicationId, sub); token = await gitlabHelper.addAccount(serverUrl, applicationId, applicationSecret, sub);
} }
if (!workspace) { if (!workspace) {

View File

@ -317,6 +317,12 @@ export default {
isImg, isImg,
commitMessage, commitMessage,
}) { }) {
// 非法的文件名 不让提交
if (!path || path.endsWith('undefined')) {
return new Promise((resolve) => {
resolve({ res: { content: { sha: null } } });
});
}
let uploadContent = content; let uploadContent = content;
if (isImg && typeof content !== 'string') { if (isImg && typeof content !== 'string') {
uploadContent = await utils.encodeFiletoBase64(content); uploadContent = await utils.encodeFiletoBase64(content);

View File

@ -147,6 +147,7 @@ export default {
sub: `${user.login}`, sub: `${user.login}`,
}; };
if (isMain) { if (isMain) {
token.providerId = 'giteeAppData';
// 检查 stackedit-app-data 仓库是否已经存在 如果不存在则创建该仓库 // 检查 stackedit-app-data 仓库是否已经存在 如果不存在则创建该仓库
await this.checkAndCreateRepo(token); await this.checkAndCreateRepo(token);
} }
@ -279,6 +280,12 @@ export default {
isImg, isImg,
commitMessage, commitMessage,
}) { }) {
// 非法的文件名 不让提交
if (!path || path.endsWith('undefined')) {
return new Promise((resolve) => {
resolve({ res: { content: { sha: null } } });
});
}
let uploadContent = content; let uploadContent = content;
if (isImg && typeof content !== 'string') { if (isImg && typeof content !== 'string') {
uploadContent = await utils.encodeFiletoBase64(content); uploadContent = await utils.encodeFiletoBase64(content);
@ -346,8 +353,8 @@ export default {
}, },
/** /**
* https://developer.gitee.com/v3/gists/#create-a-gist * https://gitee.com/api/v5/swagger#/postV5Gists
* https://developer.gitee.com/v3/gists/#edit-a-gist * https://gitee.com/api/v5/swagger#/patchV5GistsId
*/ */
async uploadGist({ async uploadGist({
token, token,
@ -357,8 +364,7 @@ export default {
isPublic, isPublic,
gistId, gistId,
}) { }) {
const refreshedToken = await this.refreshToken(token); const { body } = await request(token, gistId ? {
const { body } = await request(refreshedToken, gistId ? {
method: 'PATCH', method: 'PATCH',
url: `https://gitee.com/api/v5/gists/${gistId}`, url: `https://gitee.com/api/v5/gists/${gistId}`,
body: { body: {
@ -386,16 +392,15 @@ export default {
}, },
/** /**
* https://developer.gitee.com/v3/gists/#get-a-single-gist * https://gitee.com/api/v5/swagger#/getV5Gists
*/ */
async downloadGist({ async downloadGist({
token, token,
gistId, gistId,
filename, filename,
}) { }) {
const refreshedToken = await this.refreshToken(token); const result = (await request(token, {
const result = (await request(refreshedToken, { url: `https://api.github.com/gists/${gistId}`,
url: `https://gitee.com/api/v5/gists/${gistId}`,
})).body.files[filename]; })).body.files[filename];
if (!result) { if (!result) {
throw new Error('Gist file not found.'); throw new Error('Gist file not found.');
@ -404,35 +409,15 @@ export default {
}, },
/** /**
* https://developer.gitee.com/v3/gists/#list-gist-commits * https://gitee.com/api/v5/swagger#/getV5GistsIdCommits
*/ */
async getGistCommits({ async getGistCommits({
token, token,
gistId, gistId,
}) { }) {
const refreshedToken = await this.refreshToken(token); const { body } = await request(token, {
const { body } = await request(refreshedToken, {
url: `https://gitee.com/api/v5/gists/${gistId}/commits`, url: `https://gitee.com/api/v5/gists/${gistId}/commits`,
}); });
return body; return body;
}, },
/**
* https://developer.gitee.com/v3/gists/#get-a-specific-revision-of-a-gist
*/
async downloadGistRevision({
token,
gistId,
filename,
sha,
}) {
const refreshedToken = await this.refreshToken(token);
const result = (await request(refreshedToken, {
url: `https://gitee.com/api/v5/gists/${gistId}/${sha}`,
})).body.files[filename];
if (!result) {
throw new Error('Gist file not found.');
}
return result.content;
},
}; };

View File

@ -6,6 +6,8 @@ import badgeSvc from '../../badgeSvc';
const getScopes = token => [token.repoFullAccess ? 'repo' : 'public_repo', 'gist']; const getScopes = token => [token.repoFullAccess ? 'repo' : 'public_repo', 'gist'];
const appDataRepo = 'stackedit-app-data';
const request = (token, options) => networkSvc.request({ const request = (token, options) => networkSvc.request({
...options, ...options,
headers: { headers: {
@ -62,7 +64,7 @@ export default {
/** /**
* https://developer.github.com/apps/building-oauth-apps/authorization-options-for-oauth-apps/ * https://developer.github.com/apps/building-oauth-apps/authorization-options-for-oauth-apps/
*/ */
async startOauth2(scopes, sub = null, silent = false) { async startOauth2(scopes, sub = null, silent = false, isMain) {
await networkSvc.getServerConf(); await networkSvc.getServerConf();
const clientId = store.getters['data/serverConf'].githubClientId; const clientId = store.getters['data/serverConf'].githubClientId;
@ -110,16 +112,26 @@ export default {
const token = { const token = {
scopes, scopes,
accessToken, accessToken,
// 主文档空间的登录 标识登录
isLogin: !!isMain || (oldToken && !!oldToken.isLogin),
name: user.login, name: user.login,
sub: `${user.id}`, sub: `${user.id}`,
imgStorages: oldToken && oldToken.imgStorages, imgStorages: oldToken && oldToken.imgStorages,
repoFullAccess: scopes.includes('repo'), repoFullAccess: scopes.includes('repo'),
}; };
if (isMain) {
token.providerId = 'githubAppData';
// check stackedit-app-data repo exist?
await this.checkAndCreateRepo(token);
}
// Add token to github tokens // Add token to github tokens
store.dispatch('data/addGithubToken', token); store.dispatch('data/addGithubToken', token);
return token; return token;
}, },
signin() {
return this.startOauth2(['repo', 'gist'], null, false, true);
},
async addAccount(repoFullAccess = false) { async addAccount(repoFullAccess = false) {
const token = await this.startOauth2(getScopes({ repoFullAccess })); const token = await this.startOauth2(getScopes({ repoFullAccess }));
badgeSvc.addBadge('addGitHubAccount'); badgeSvc.addBadge('addGitHubAccount');
@ -148,6 +160,30 @@ export default {
return tree; return tree;
}, },
async checkAndCreateRepo(token) {
const url = `https://api.github.com/repos/${encodeURIComponent(token.name)}/${encodeURIComponent(appDataRepo)}`;
try {
await request(token, { url });
} catch (err) {
// create
if (err.status === 404) {
await request(token, {
method: 'POST',
url: 'https://api.github.com/repos/mafgwo/stackedit-appdata-template/generate',
body: {
owner: token.name,
name: appDataRepo,
description: 'StackEdit中文版默认空间.',
include_all_branches: false,
private: true,
},
});
} else {
throw err;
}
}
},
/** /**
* https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository * https://developer.github.com/v3/repos/commits/#list-commits-on-a-repository
*/ */
@ -157,11 +193,29 @@ export default {
repo, repo,
sha, sha,
path, path,
tryTimes,
}) { }) {
return repoRequest(token, owner, repo, { let tryCount = tryTimes || 1;
url: 'commits', try {
params: { sha, path }, return repoRequest(token, owner, repo, {
}); url: 'commits',
params: { sha, path },
});
} catch (err) {
// 主文档 并且 409 则重试3次
if (tryCount <= 3 && err.status === 409 && repo === appDataRepo) {
tryCount += 1;
return this.getCommits({
token,
owner,
repo,
sha,
path,
tryTimes: tryCount,
});
}
throw err;
}
}, },
/** /**
@ -179,6 +233,12 @@ export default {
isImg, isImg,
commitMessage, commitMessage,
}) { }) {
// 非法的文件名 不让提交
if (!path || path.endsWith('undefined')) {
return new Promise((resolve) => {
resolve({ res: { content: { sha: null } } });
});
}
let uploadContent = content; let uploadContent = content;
if (isImg && typeof content !== 'string') { if (isImg && typeof content !== 'string') {
uploadContent = await utils.encodeFiletoBase64(content); uploadContent = await utils.encodeFiletoBase64(content);
@ -228,14 +288,30 @@ export default {
path, path,
isImg, isImg,
}) { }) {
const { sha, content } = await repoRequest(token, owner, repo, { try {
url: `contents/${encodeURIComponent(path)}`, const { sha, content, encoding } = await repoRequest(token, owner, repo, {
params: { ref: branch }, url: `contents/${encodeURIComponent(path)}`,
}); params: { ref: branch },
return { });
sha, let tempContent = content;
data: !isImg ? utils.decodeBase64(content) : content, // 如果是图片且 encoding 为 none 则 需要获取 blob
}; if (isImg && encoding === 'none') {
const blobInfo = await repoRequest(token, owner, repo, {
url: `git/blobs/${sha}`,
});
tempContent = blobInfo.content;
}
return {
sha,
data: !isImg ? utils.decodeBase64(tempContent) : tempContent,
};
} catch (err) {
// not .stackedit-data throw err
if (err.status === 404 && path.indexOf('.stackedit-data') >= 0) {
return {};
}
throw err;
}
}, },
/** /**
* 获取仓库信息 * 获取仓库信息

View File

@ -3,6 +3,9 @@ import networkSvc from '../../networkSvc';
import store from '../../../store'; import store from '../../../store';
import userSvc from '../../userSvc'; import userSvc from '../../userSvc';
import badgeSvc from '../../badgeSvc'; import badgeSvc from '../../badgeSvc';
import constants from '../../../data/constants';
const tokenExpirationMargin = 5 * 60 * 1000;
const request = ({ accessToken, serverUrl }, options) => networkSvc.request({ const request = ({ accessToken, serverUrl }, options) => networkSvc.request({
...options, ...options,
@ -50,34 +53,90 @@ export default {
/** /**
* https://docs.gitlab.com/ee/api/oauth2.html * https://docs.gitlab.com/ee/api/oauth2.html
*/ */
async startOauth2(serverUrl, applicationId, sub = null, silent = false) { async startOauth2(
serverUrl, applicationId, applicationSecret,
sub = null, silent = false, refreshToken,
) {
let apiUrl = serverUrl; let apiUrl = serverUrl;
let clientId = applicationId; let clientId = applicationId;
// 获取gitea配置的参数 let useServerConf = false;
// 获取gitlab配置的参数
await networkSvc.getServerConf(); await networkSvc.getServerConf();
const confClientId = store.getters['data/serverConf'].gitlabClientId; const confClientId = store.getters['data/serverConf'].gitlabClientId;
const confServerUrl = store.getters['data/serverConf'].gitlabUrl; const confServerUrl = store.getters['data/serverConf'].gitlabUrl;
// 存在gitea配置则使用后端配置 // 存在gitlab配置则使用后端配置
if (confClientId && confServerUrl) { if (confClientId && confServerUrl) {
apiUrl = confServerUrl; apiUrl = confServerUrl;
clientId = confClientId; clientId = confClientId;
useServerConf = true;
}
let tokenBody;
if (!silent) {
// Get an OAuth2 code
const { code } = await networkSvc.startOauth2(
`${apiUrl}/oauth/authorize`,
{
client_id: clientId,
response_type: 'code',
redirect_uri: constants.oauth2RedirectUri,
},
silent,
);
if (useServerConf) {
tokenBody = (await networkSvc.request({
method: 'GET',
url: 'oauth2/gitlabToken',
params: {
code,
grant_type: 'authorization_code',
redirect_uri: constants.oauth2RedirectUri,
},
})).body;
} else {
// Exchange code with token
tokenBody = (await networkSvc.request({
method: 'POST',
url: `${apiUrl}/oauth/token`,
params: {
client_id: clientId,
client_secret: applicationSecret,
code,
grant_type: 'authorization_code',
redirect_uri: constants.oauth2RedirectUri,
},
})).body;
}
} else if (useServerConf) {
tokenBody = (await networkSvc.request({
method: 'GET',
url: 'oauth2/gitlabToken',
params: {
refresh_token: refreshToken,
grant_type: 'refresh_token',
redirect_uri: constants.oauth2RedirectUri,
},
})).body;
} else {
// Exchange refreshToken with token
tokenBody = (await networkSvc.request({
method: 'POST',
url: `${apiUrl}/oauth/token`,
body: {
client_id: clientId,
client_secret: applicationSecret,
refresh_token: refreshToken,
grant_type: 'refresh_token',
redirect_uri: constants.oauth2RedirectUri,
},
})).body;
} }
// Get an OAuth2 code
const { accessToken } = await networkSvc.startOauth2(
`${apiUrl}/oauth/authorize`,
{
client_id: clientId,
response_type: 'token',
scope: 'api',
},
silent,
);
const accessToken = tokenBody.access_token;
// Call the user info endpoint // Call the user info endpoint
const user = await request({ accessToken, serverUrl }, { const user = await request({ accessToken, serverUrl: apiUrl }, {
url: 'user', url: 'user',
}); });
const uniqueSub = `${serverUrl}/${user.id}`; const uniqueSub = `${apiUrl}/${user.id}`;
userSvc.addUserInfo({ userSvc.addUserInfo({
id: `${subPrefix}:${uniqueSub}`, id: `${subPrefix}:${uniqueSub}`,
name: user.username, name: user.username,
@ -89,11 +148,17 @@ export default {
throw new Error('GitLab account ID not expected.'); throw new Error('GitLab account ID not expected.');
} }
const oldToken = store.getters['data/gitlabTokensBySub'][uniqueSub];
// Build token object including scopes and sub // Build token object including scopes and sub
const token = { const token = {
accessToken, accessToken,
name: user.username, name: user.username,
serverUrl, applicationId: clientId,
applicationSecret,
imgStorages: oldToken && oldToken.imgStorages,
refreshToken: tokenBody.refresh_token,
expiresOn: Date.now() + ((tokenBody.expires_in || 7200) * 1000),
serverUrl: apiUrl,
sub: uniqueSub, sub: uniqueSub,
}; };
@ -101,12 +166,58 @@ export default {
store.dispatch('data/addGitlabToken', token); store.dispatch('data/addGitlabToken', token);
return token; return token;
}, },
async addAccount(serverUrl, applicationId, sub = null) { async addAccount(serverUrl, applicationId, applicationSecret, sub = null) {
const token = await this.startOauth2(serverUrl, applicationId, sub); const token = await this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
badgeSvc.addBadge('addGitLabAccount'); badgeSvc.addBadge('addGitLabAccount');
return token; return token;
}, },
// 刷新token
async refreshToken(token) {
const {
serverUrl,
applicationId,
applicationSecret,
sub,
} = token;
const lastToken = store.getters['data/gitlabTokensBySub'][sub];
// 兼容旧的没有过期时间
if (!lastToken.expiresOn || !lastToken.refreshToken) {
await store.dispatch('modal/open', {
type: 'providerRedirection',
name: 'Gitlab',
});
return this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
}
// lastToken is not expired
if (lastToken.expiresOn > Date.now() + tokenExpirationMargin) {
return lastToken;
}
// existing token is about to expire.
// Try to get a new token in background
try {
return await this.startOauth2(
serverUrl, applicationId, applicationSecret,
sub, true, lastToken.refreshToken,
);
} catch (err) {
// If it fails try to popup a window
if (store.state.offline) {
throw err;
}
await store.dispatch('modal/open', {
type: 'providerRedirection',
name: 'Gitlab',
});
return this.startOauth2(serverUrl, applicationId, applicationSecret, sub);
}
},
// 带刷新token
async requestWithRefreshToken(token, options) {
const refreshedToken = await this.refreshToken(token);
const result = await request(refreshedToken, options);
return result;
},
/** /**
* https://docs.gitlab.com/ee/api/projects.html#get-single-project * https://docs.gitlab.com/ee/api/projects.html#get-single-project
*/ */
@ -114,8 +225,7 @@ export default {
if (projectId) { if (projectId) {
return projectId; return projectId;
} }
const project = await this.requestWithRefreshToken(token, {
const project = await request(token, {
url: `projects/${encodeURIComponent(projectPath)}`, url: `projects/${encodeURIComponent(projectPath)}`,
}); });
return project.id; return project.id;
@ -129,7 +239,7 @@ export default {
projectId, projectId,
branch, branch,
}) { }) {
return request(token, { return this.requestWithRefreshToken(token, {
url: `projects/${encodeURIComponent(projectId)}/repository/tree`, url: `projects/${encodeURIComponent(projectId)}/repository/tree`,
params: { params: {
ref: branch, ref: branch,
@ -148,7 +258,7 @@ export default {
branch, branch,
path, path,
}) { }) {
return request(token, { return this.requestWithRefreshToken(token, {
url: `projects/${encodeURIComponent(projectId)}/repository/commits`, url: `projects/${encodeURIComponent(projectId)}/repository/commits`,
params: { params: {
ref_name: branch, ref_name: branch,
@ -171,11 +281,17 @@ export default {
isImg, isImg,
commitMessage, commitMessage,
}) { }) {
// 非法的文件名 不让提交
if (!path || path.endsWith('undefined')) {
return new Promise((resolve) => {
resolve({ res: { content: { sha: null } } });
});
}
let uploadContent = content; let uploadContent = content;
if (isImg && typeof content !== 'string') { if (isImg && typeof content !== 'string') {
uploadContent = await utils.encodeFiletoBase64(content); uploadContent = await utils.encodeFiletoBase64(content);
} }
return request(token, { return this.requestWithRefreshToken(token, {
method: sha ? 'PUT' : 'POST', method: sha ? 'PUT' : 'POST',
url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`, url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
body: { body: {
@ -198,7 +314,7 @@ export default {
path, path,
sha, sha,
}) { }) {
return request(token, { return this.requestWithRefreshToken(token, {
method: 'DELETE', method: 'DELETE',
url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`, url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
body: { body: {
@ -219,7 +335,7 @@ export default {
path, path,
isImg, isImg,
}) { }) {
const res = await request(token, { const res = await this.requestWithRefreshToken(token, {
url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`, url: `projects/${encodeURIComponent(projectId)}/repository/files/${encodeURIComponent(path)}`,
params: { ref: branch }, params: { ref: branch },
}); });

View File

@ -10,8 +10,7 @@ const tokenExpirationMargin = 5 * 60 * 1000; // 5 min (tokens expire after 1h)
const driveAppDataScopes = ['https://www.googleapis.com/auth/drive.appdata']; const driveAppDataScopes = ['https://www.googleapis.com/auth/drive.appdata'];
const getDriveScopes = token => [token.driveFullAccess const getDriveScopes = token => [token.driveFullAccess
? 'https://www.googleapis.com/auth/drive' ? 'https://www.googleapis.com/auth/drive'
: 'https://www.googleapis.com/auth/drive.file', : 'https://www.googleapis.com/auth/drive.file'];
'https://www.googleapis.com/auth/drive.install'];
const bloggerScopes = ['https://www.googleapis.com/auth/blogger']; const bloggerScopes = ['https://www.googleapis.com/auth/blogger'];
const photosScopes = ['https://www.googleapis.com/auth/photos']; const photosScopes = ['https://www.googleapis.com/auth/photos'];

View File

@ -139,6 +139,12 @@ const requestPublish = () => {
}); });
}; };
const publishLocationAndStore = async (publishLocation, commitMsg) => {
const publishLocationToStore = await publish(publishLocation, commitMsg);
workspaceSvc.addPublishLocation(publishLocationToStore);
return publishLocationToStore;
};
const createPublishLocation = (publishLocation, featureId) => { const createPublishLocation = (publishLocation, featureId) => {
const currentFile = store.getters['file/current']; const currentFile = store.getters['file/current'];
publishLocation.fileId = currentFile.id; publishLocation.fileId = currentFile.id;
@ -157,8 +163,7 @@ const createPublishLocation = (publishLocation, featureId) => {
return; return;
} }
} }
const publishLocationToStore = await publish(publishLocation, commitMsg); await publishLocationAndStore(publishLocation, commitMsg);
workspaceSvc.addPublishLocation(publishLocationToStore);
store.dispatch('notification/info', `添加了一个新的发布位置 "${currentFile.name}".`); store.dispatch('notification/info', `添加了一个新的发布位置 "${currentFile.name}".`);
if (featureId) { if (featureId) {
badgeSvc.addBadge(featureId); badgeSvc.addBadge(featureId);
@ -169,5 +174,6 @@ const createPublishLocation = (publishLocation, featureId) => {
export default { export default {
requestPublish, requestPublish,
publishLocationAndStore,
createPublishLocation, createPublishLocation,
}; };

View File

@ -6,6 +6,7 @@ import diffUtils from './diffUtils';
import networkSvc from './networkSvc'; import networkSvc from './networkSvc';
import providerRegistry from './providers/common/providerRegistry'; import providerRegistry from './providers/common/providerRegistry';
import giteeAppDataProvider from './providers/giteeAppDataProvider'; import giteeAppDataProvider from './providers/giteeAppDataProvider';
import githubAppDataProvider from './providers/githubAppDataProvider';
import './providers/couchdbWorkspaceProvider'; import './providers/couchdbWorkspaceProvider';
import './providers/githubWorkspaceProvider'; import './providers/githubWorkspaceProvider';
import './providers/giteeWorkspaceProvider'; import './providers/giteeWorkspaceProvider';
@ -830,7 +831,7 @@ const syncWorkspace = async (skipContents = false) => {
} }
if (workspace.id === 'main') { if (workspace.id === 'main') {
badgeSvc.addBadge('syncMainWorkspace'); badgeSvc.addBadge(workspace.providerId === 'giteeAppData' ? 'syncMainWorkspace' : 'githubSyncMainWorkspace');
} }
} catch (err) { } catch (err) {
if (err && err.message === 'TOO_LATE') { if (err && err.message === 'TOO_LATE') {
@ -969,6 +970,15 @@ const requestSync = (addTriggerSyncBadge = false) => {
}); });
}; };
const afterSignIn = async () => {
if (store.getters['workspace/currentWorkspace'].id === 'main' && workspaceProvider) {
const mainToken = store.getters['workspace/mainWorkspaceToken'];
// Try to find a suitable workspace sync provider
workspaceProvider = mainToken.providerId === 'githubAppData' ? githubAppDataProvider : giteeAppDataProvider;
await workspaceProvider.initWorkspace();
}
};
export default { export default {
async init() { async init() {
// Load workspaces and tokens from localStorage // Load workspaces and tokens from localStorage
@ -980,10 +990,11 @@ export default {
await actionProvider.initAction(); await actionProvider.initAction();
} }
const mainToken = store.getters['workspace/mainWorkspaceToken'];
// Try to find a suitable workspace sync provider // Try to find a suitable workspace sync provider
workspaceProvider = providerRegistry.providersById[utils.queryParams.providerId]; workspaceProvider = providerRegistry.providersById[utils.queryParams.providerId];
if (!workspaceProvider || !workspaceProvider.initWorkspace) { if (!workspaceProvider || !workspaceProvider.initWorkspace) {
workspaceProvider = giteeAppDataProvider; workspaceProvider = mainToken && mainToken.providerId === 'githubAppData' ? githubAppDataProvider : giteeAppDataProvider;
} }
const workspace = await workspaceProvider.initWorkspace(); const workspace = await workspaceProvider.initWorkspace();
// Fix the URL hash // Fix the URL hash
@ -1041,6 +1052,7 @@ export default {
}, 5000); }, 5000);
} }
}, },
afterSignIn,
syncImg, syncImg,
isSyncPossible, isSyncPossible,
requestSync, requestSync,

View File

@ -400,7 +400,8 @@ export default {
return path || ''; return path || '';
}, },
// 根据当前绝对路径 与 文件路径计算出文件绝对路径 // 根据当前绝对路径 与 文件路径计算出文件绝对路径
getAbsoluteFilePath(currDirNode, filePath) { getAbsoluteFilePath(currDirNode, originFilePath) {
const filePath = originFilePath && originFilePath.replaceAll('\\', '/');
const currAbsolutePath = this.getAbsoluteDir(currDirNode); const currAbsolutePath = this.getAbsoluteDir(currDirNode);
// "/"开头说明已经是绝对路径 // "/"开头说明已经是绝对路径
if (filePath.indexOf('/') === 0) { if (filePath.indexOf('/') === 0) {

View File

@ -1,5 +1,6 @@
import utils from '../services/utils'; import utils from '../services/utils';
import giteeHelper from '../services/providers/helpers/giteeHelper'; import giteeHelper from '../services/providers/helpers/giteeHelper';
import githubHelper from '../services/providers/helpers/githubHelper';
import syncSvc from '../services/syncSvc'; import syncSvc from '../services/syncSvc';
const idShifter = offset => (state, getters) => { const idShifter = offset => (state, getters) => {
@ -136,8 +137,13 @@ export default {
const loginToken = rootGetters['workspace/loginToken']; const loginToken = rootGetters['workspace/loginToken'];
if (!loginToken) { if (!loginToken) {
try { try {
await dispatch('modal/open', 'signInForComment', { root: true }); const signInWhere = await dispatch('modal/open', 'signInForComment', { root: true });
await giteeHelper.signin(); if (signInWhere === 'github') {
await githubHelper.signin();
} else {
await giteeHelper.signin();
}
await syncSvc.afterSignIn();
syncSvc.requestSync(); syncSvc.requestSync();
await dispatch('createNewDiscussion', selection); await dispatch('createNewDiscussion', selection);
} catch (e) { /* cancel */ } } catch (e) { /* cancel */ }

View File

@ -22,7 +22,7 @@ export default {
Object.entries(rootGetters['data/workspaces']).forEach(([id, workspace]) => { Object.entries(rootGetters['data/workspaces']).forEach(([id, workspace]) => {
const sanitizedWorkspace = { const sanitizedWorkspace = {
id, id,
providerId: 'giteeAppData', providerId: (mainWorkspaceToken && mainWorkspaceToken.providerId) || 'giteeAppData',
sub: mainWorkspaceToken && mainWorkspaceToken.sub, sub: mainWorkspaceToken && mainWorkspaceToken.sub,
...workspace, ...workspace,
}; };
@ -47,17 +47,19 @@ export default {
|| currentWorkspace.providerId === 'giteeWorkspace' || currentWorkspace.providerId === 'giteeWorkspace'
|| currentWorkspace.providerId === 'gitlabWorkspace' || currentWorkspace.providerId === 'gitlabWorkspace'
|| currentWorkspace.providerId === 'giteaWorkspace' || currentWorkspace.providerId === 'giteaWorkspace'
|| currentWorkspace.providerId === 'giteeAppData', || currentWorkspace.providerId === 'giteeAppData'
|| currentWorkspace.providerId === 'githubAppData',
currentWorkspaceHasUniquePaths: (state, { currentWorkspace }) => currentWorkspaceHasUniquePaths: (state, { currentWorkspace }) =>
currentWorkspace.providerId === 'githubWorkspace' currentWorkspace.providerId === 'githubWorkspace'
|| currentWorkspace.providerId === 'giteeWorkspace' || currentWorkspace.providerId === 'giteeWorkspace'
|| currentWorkspace.providerId === 'gitlabWorkspace' || currentWorkspace.providerId === 'gitlabWorkspace'
|| currentWorkspace.providerId === 'giteaWorkspace' || currentWorkspace.providerId === 'giteaWorkspace'
|| currentWorkspace.providerId === 'giteeAppData', || currentWorkspace.providerId === 'giteeAppData'
|| currentWorkspace.providerId === 'githubAppData',
lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`, lastSyncActivityKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastSyncActivity`,
lastFocusKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastWindowFocus`, lastFocusKey: (state, { currentWorkspace }) => `${currentWorkspace.id}/lastWindowFocus`,
mainWorkspaceToken: (state, getters, rootState, rootGetters) => mainWorkspaceToken: (state, getters, rootState, rootGetters) =>
utils.someResult(Object.values(rootGetters['data/giteeTokensBySub']), (token) => { utils.someResult([...Object.values(rootGetters['data/giteeTokensBySub']), ...Object.values(rootGetters['data/githubTokensBySub'])], (token) => {
if (token.isLogin) { if (token.isLogin) {
return token; return token;
} }
@ -85,8 +87,10 @@ export default {
switch (currentWorkspace.providerId) { switch (currentWorkspace.providerId) {
case 'googleDriveWorkspace': case 'googleDriveWorkspace':
return 'google'; return 'google';
case 'githubAppData':
case 'githubWorkspace': case 'githubWorkspace':
return 'github'; return 'github';
case 'giteeAppData':
case 'giteeWorkspace': case 'giteeWorkspace':
default: default:
return 'gitee'; return 'gitee';

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 264 KiB

View File

@ -0,0 +1,169 @@
<!DOCTYPE html>
<html>
<head>
<title>文章分享 - Markdown编辑器</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="canonical" href="https://md.jonylee.top/">
<link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
<meta charset="UTF-8">
<meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
<meta name="description" content="支持直接将码云Gitee、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片并且可以直接在页面编辑同步和管理的Markdown编辑器。">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<meta name="baidu-site-verification" content="code-tGpn2BT069" />
<meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
<link rel="stylesheet" href="style.css">
<style>
.share-header {
position: fixed;
top: 0;
left: 0;
width: 100%;
background-color: #383c4a;
color: #fff;
padding: 10px;
box-sizing: border-box;
z-index: 99999;
}
.share-header .logo {
margin: 0 0 -8px 0;
}
.share-header nav {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.share-header nav ul {
list-style-type: none;
margin: 0;
padding: 0;
display: flex;
flex-direction: row;
}
.share-header nav li {
margin: 0 10px;
}
.share-header nav a {
color: #fff;
text-decoration: none;
}
.share-header nav a:hover {
text-decoration: underline;
}
.share-content {
transform: translateY(50px);
height: 100vh;
}
</style>
<script type="text/javascript">
function getQueryString(name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
var r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
}
return null;
}
function appendTagHtml(newdoc, tagName, targetParentEle) {
const tags = newdoc.getElementsByTagName(tagName);
if (!tags) {
return;
}
for (let i = 0; i < tags.length; i++) {
targetParentEle.append(tags[i]);
}
}
window.onload = function() {
const xhr = new XMLHttpRequest();
const gistId = getQueryString('id');
let accessToken = null;
const tokens = window.localStorage.getItem('data/tokens');
if (tokens) {
const tokensObj = JSON.parse(tokens);
if (tokensObj.data && tokensObj.data.github) {
const tokenArr = Object.keys(tokensObj.data.github).map(it => tokensObj.data.github[it]).filter(it => it && it.isLogin);
if (tokenArr.length > 0) {
accessToken = tokenArr[0].accessToken;
}
}
}
const url = `https://api.github.com/gists/${gistId}`;
xhr.open('GET', url);
if (accessToken) {
xhr.setRequestHeader('Authorization', `Bearer ${accessToken}`);
}
xhr.onload = function() {
if (xhr.status === 200) {
const newdoc = document.implementation.createHTMLDocument("");
const body = JSON.parse(xhr.responseText);
for (let key in body.files) {
newdoc.documentElement.innerHTML = body.files[key].content;
}
const currHead = document.head;
// head
appendTagHtml(newdoc, 'style', currHead);
// title
document.title = newdoc.title + ' - StackEdit中文版';
// 内容
const shareContent = document.getElementsByClassName('share-content')[0];
shareContent.innerHTML = newdoc.body.innerHTML;
document.body.className = newdoc.body.className;
} else if (xhr.status === 403) {
const rateLimit = xhr.responseText && xhr.responseText.indexOf('Rate Limit') >= 0;
const appUri = `${window.location.protocol}//${window.location.host}/app`;
document.getElementById('div_info').innerHTML = `${rateLimit ? "请求太过频繁" : "无权限访问"}请使用GitHub登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
} else {
console.error('An error occurred: ' + xhr.status);
document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效请使用GitHub登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
}
};
xhr.send();
}
</script>
</head>
<body>
<div class="share-header">
<nav>
<a class="logo" href="https://md.jonylee.top" target="_blank">
<img src="static/landing/logo.svg" height="30px" />
</a>
<ul>
<li><a href="https://md.jonylee.top" target="_blank">首页</a></li>
<li><a href="https://md.jonylee.top/app" target="_blank">写笔记</a></li>
</ul>
</nav>
</div>
<div class="share-content stackedit">
<div id="div_info" style="text-align: center; height: 600px;">文章加载中......</div>
</div>
<script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
<!-- built files will be auto injected -->
<!-- baidu统计-->
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<!-- baidu统计结束-->
</body>
</html>

View File

@ -2,14 +2,13 @@
<html manifest="cache.manifest"> <html manifest="cache.manifest">
<head> <head>
<title>StackEdit中文版 浏览器内 Markdown 编辑器</title> <title>Markdown编辑器-JonyLee的设计导航</title>
<link rel="canonical" href="https://stackedit.cn/"> <link rel="canonical" href="https://md.jonylee.top/">
<link rel="icon" href="static/landing/favicon.ico" type="image/x-icon"> <link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记"> <meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
<meta name="description" <meta name="description" content="支持直接将码云Gitee、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片并且可以直接在页面编辑同步和管理的Markdown编辑器。">
content="支持直接将码云Gitee、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片并且可以直接在页面编辑同步和管理的Markdown编辑器。">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<meta name="baidu-site-verification" content="code-tGpn2BT069" /> <meta name="baidu-site-verification" content="code-tGpn2BT069" />
<meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" /> <meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
@ -18,22 +17,22 @@
body { body {
background-color: #fbfbfb; background-color: #fbfbfb;
} }
* { * {
box-sizing: border-box; box-sizing: border-box;
} }
h1 { h1 {
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
font-size: 2.5em; font-size: 2.5em;
margin: 2.5em 0; margin: 2.5em 0;
} }
h3 { h3 {
margin: 1em 0; margin: 1em 0;
} }
.button { .button {
color: #555; color: #555;
font-size: 20px; font-size: 20px;
@ -61,7 +60,7 @@
border-radius: 2px; border-radius: 2px;
text-decoration: none; text-decoration: none;
} }
.button:active, .button:active,
.button:focus, .button:focus,
.button:hover { .button:hover {
@ -70,46 +69,46 @@
outline: 0; outline: 0;
text-decoration: none; text-decoration: none;
} }
.icon { .icon {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: inline; display: inline;
} }
.icon * { .icon * {
fill: currentColor; fill: currentColor;
} }
.button .icon { .button .icon {
height: 30px; height: 30px;
width: 30px; width: 30px;
margin: -6px 6px -6px 0; margin: -6px 6px -6px 0;
} }
.row { .row {
margin: 8em 0; margin: 8em 0;
} }
.row::after { .row::after {
display: block; display: block;
content: ''; content: '';
clear: both; clear: both;
} }
@media (min-width: 700px) { @media (min-width: 700px) {
.column { .column {
width: 50%; width: 50%;
float: right; float: right;
} }
} }
.landing { .landing {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.landing__content { .landing__content {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -117,7 +116,7 @@
padding-right: 30px; padding-right: 30px;
max-width: 1000px; max-width: 1000px;
} }
.landing__footer { .landing__footer {
padding: 1em 0; padding: 1em 0;
text-align: center; text-align: center;
@ -125,11 +124,11 @@
color: rgba(255, 255, 255, 0.75); color: rgba(255, 255, 255, 0.75);
font-size: 0.9em; font-size: 0.9em;
} }
.landing__footer a { .landing__footer a {
color: #fff; color: #fff;
} }
.navigation-bar { .navigation-bar {
background-color: #2c2c2c; background-color: #2c2c2c;
position: fixed; position: fixed;
@ -138,25 +137,25 @@
width: 100%; width: 100%;
z-index: 1; z-index: 1;
} }
.navigation-bar__button { .navigation-bar__button {
color: #b9b9b9; color: #b9b9b9;
} }
.navigation-bar__button:active, .navigation-bar__button:active,
.navigation-bar__button:focus, .navigation-bar__button:focus,
.navigation-bar__button:hover { .navigation-bar__button:hover {
color: #fff; color: #fff;
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
.splash-screen { .splash-screen {
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
padding: 25px; padding: 25px;
} }
.splash-screen__logo { .splash-screen__logo {
width: 300px; width: 300px;
height: 150px; height: 150px;
@ -169,14 +168,14 @@
background: no-repeat center url('static/landing/logo.svg'); background: no-repeat center url('static/landing/logo.svg');
background-size: contain; background-size: contain;
} }
@media (min-width: 700px) { @media (min-width: 700px) {
.splash-screen__logo { .splash-screen__logo {
width: 600px; width: 600px;
height: 160px; height: 160px;
} }
} }
.splash-screen__subtitle { .splash-screen__subtitle {
position: absolute; position: absolute;
text-align: center; text-align: center;
@ -185,7 +184,7 @@
right: 5px; right: 5px;
font-size: 16px; font-size: 16px;
} }
@media (min-width: 700px) { @media (min-width: 700px) {
.splash-screen__subtitle { .splash-screen__subtitle {
text-align: right; text-align: right;
@ -193,7 +192,7 @@
font-size: 22px; font-size: 22px;
} }
} }
.splash-screen__footer { .splash-screen__footer {
position: absolute; position: absolute;
bottom: 25px; bottom: 25px;
@ -201,43 +200,42 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
.splash-screen__footer .button { .splash-screen__footer .button {
padding: 10px 20px; padding: 10px 20px;
} }
.social { .social {
margin: 0 5px; margin: 0 5px;
} }
.social a { .social a {
color: #555; color: #555;
text-decoration: none; text-decoration: none;
} }
.social a:active, .social a:active,
.social a:focus, .social a:focus,
.social a:hover { .social a:hover {
color: #333; color: #333;
outline: 0; outline: 0;
} }
.landing__footer .social a { .landing__footer .social a {
color: rgba(255, 255, 255, 0.85); color: rgba(255, 255, 255, 0.85);
} }
.landing__footer .social a:active, .landing__footer .social a:active,
.landing__footer .social a:focus, .landing__footer .social a:focus,
.landing__footer .social a:hover { .landing__footer .social a:hover {
color: #fff; color: #fff;
} }
.social .icon { .social .icon {
height: 30px; height: 30px;
width: 30px; width: 30px;
} }
.feature { .feature {
padding: 5px 5px; padding: 5px 5px;
border-radius: 2px; border-radius: 2px;
@ -245,7 +243,7 @@
margin: 1em auto; margin: 1em auto;
text-align: center; text-align: center;
} }
.image { .image {
display: block; display: block;
margin: 1em auto; margin: 1em auto;
@ -253,7 +251,7 @@
border-radius: 2px; border-radius: 2px;
background-color: #fff; background-color: #fff;
} }
.image img { .image img {
display: block; display: block;
margin: 0.5em auto; margin: 0.5em auto;
@ -261,7 +259,9 @@
</style> </style>
<script> <script>
function scrollTo(selector) { function scrollTo(selector) {
$('html,body').animate({scrollTop: $(selector).offset().top}, 500); $('html,body').animate({
scrollTop: $(selector).offset().top
}, 500);
} }
</script> </script>
</head> </head>
@ -270,34 +270,18 @@
<div class="landing"> <div class="landing">
<div class="navigation-bar"> <div class="navigation-bar">
<a class="navigation-bar__button button" href="app" title="The app"> <a class="navigation-bar__button button" href="app" title="The app">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 16.8363,2.73375C 16.45,2.73375 16.0688,2.88125 15.7712,3.17375L 13.6525,5.2925L 18.955,10.5962L 21.0737,8.47625C 21.665,7.89 21.665,6.94375 21.0737,6.3575L 17.895,3.17375C 17.6025,2.88125 17.2163,2.73375 16.8363,2.73375 Z M 12.9437,6.00125L 4.84375,14.1062L 7.4025,14.39L 7.57875,16.675L 9.85875,16.85L 10.1462,19.4088L 18.2475,11.3038M 4.2475,15.0437L 2.515,21.7337L 9.19875,19.9412L 8.955,17.7838L 6.645,17.6075L 6.465,15.2925"></path></svg> 开始写作
开始写作
</a> </a>
</div> </div>
<div class="splash-screen"> <div class="splash-screen">
<div class="splash-screen__logo"> <div class="splash-screen__logo">
<div class="splash-screen__subtitle"> <div class="splash-screen__subtitle">
笔记利器(浏览器内 Markdown 编辑器) 浏览器内 Markdown 笔记利器
<div class="social">
<a href="https://jq.qq.com/?_wv=1027&k=wUSCNqmN" target="_blank" title="QQ交流群">
<svg t="1665396466500" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3543" width="32" height="32">
<path d="M512 0C229.12 0 0 229.12 0 512c0 282.88 229.12 512 512 512s512-229.12 512-512C1024 229.12 794.88 0 512 0zM782.08 670.72c-11.52 6.4-30.72-7.68-48.64-34.56-6.4 28.16-24.32 53.76-48.64 74.24 25.6 8.96 42.24 25.6 42.24 42.24 0 29.44-46.08 52.48-102.4 52.48-51.2 0-93.44-19.2-101.12-43.52-2.56 0-10.24 0-12.8 0-7.68 24.32-49.92 43.52-101.12 43.52-56.32 0-102.4-23.04-102.4-52.48 0-17.92 16.64-33.28 42.24-42.24-24.32-20.48-42.24-46.08-48.64-74.24-17.92 25.6-37.12 39.68-48.64 34.56-17.92-8.96-14.08-57.6 7.68-107.52 16.64-39.68 39.68-69.12 57.6-75.52 0-2.56 0-5.12 0-7.68 0-15.36 3.84-29.44 11.52-40.96 0-1.28 0-1.28 0-2.56 0-7.68 1.28-14.08 5.12-19.2C340.48 312.32 408.32 230.4 518.4 230.4c110.08 0 177.92 81.92 183.04 185.6 2.56 5.12 5.12 12.8 5.12 19.2 0 1.28 0 1.28 0 2.56 7.68 11.52 11.52 25.6 11.52 40.96 0 2.56 0 5.12 0 7.68 17.92 6.4 40.96 35.84 57.6 75.52C796.16 613.12 800 661.76 782.08 670.72z" p-id="3544"></path>
</svg>
</a>
<a href="https://gitee.com/mafgwo/stackedit" target="_blank" title="码云开源仓库">
<svg t="1652950823759" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2991" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs><style type="text/css"></style></defs>
<path d="M512 1024C229.222 1024 0 794.778 0 512S229.222 0 512 0s512 229.222 512 512-229.222 512-512 512z m259.149-568.883h-290.74a25.293 25.293 0 0 0-25.292 25.293l-0.026 63.206c0 13.952 11.315 25.293 25.267 25.293h177.024c13.978 0 25.293 11.315 25.293 25.267v12.646a75.853 75.853 0 0 1-75.853 75.853h-240.23a25.293 25.293 0 0 1-25.267-25.293V417.203a75.853 75.853 0 0 1 75.827-75.853h353.946a25.293 25.293 0 0 0 25.267-25.292l0.077-63.207a25.293 25.293 0 0 0-25.268-25.293H417.152a189.62 189.62 0 0 0-189.62 189.645V771.15c0 13.977 11.316 25.293 25.294 25.293h372.94a170.65 170.65 0 0 0 170.65-170.65V480.384a25.293 25.293 0 0 0-25.293-25.267z" fill="#C71D23" p-id="2992"></path>
</svg>
</a>
</div>
</div> </div>
</div> </div>
<div class="splash-screen__footer"> <div class="splash-screen__footer">
<a class="button" href="javascript:scrollTo($('.anchor'))"> <a class="button" href="javascript:scrollTo($('.anchor'))">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="icon"><path d="M 11,4L 13,4L 13,16.0104L 18.5052,10.5052L 19.9194,11.9194L 12,19.8388L 4.08058,11.9194L 5.49479,10.5052L 11,16.0104L 11,4 Z "/></path></svg> 阅读更多
阅读更多
</a> </a>
</div> </div>
</div> </div>
@ -432,31 +416,24 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="column"> <div class="column">
<div class="image" style="width: 250px"> <div class="image" style="width: 250px">
<img width="230" src="static/landing/twemoji.png"> <img width="230" src="static/landing/twemoji.png">
</div>
</div> </div>
</div> <div class="column">
<div class="column"> <div class="feature">
<div class="feature"> <h3>Emojis表情</h3>
<h3>Emojis表情</h3> <p>StackEdit中文版 支持使用 Markdown 表情符号标记在文件中插入表情符号。</p>
<p>StackEdit中文版 支持使用 Markdown 表情符号标记在文件中插入表情符号。</p> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
<div class="landing__footer"> <div class="landing__footer">
<div class="social"> <a href="app" title="Markdown编辑器">Markdown编辑器</a> <a href="https://gitee.com/mafgwo" target="_blank" title="豆萁">代码作者</a><br> Copyright&nbsp;&copy;
<a href="https://gitee.com/mafgwo/stackedit" target="_blank"> <script>
<svg t="1652950823759" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2991" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"> document.write((new Date()).getFullYear())
<defs><style type="text/css"></style></defs> </script>&nbsp;<a href="https://jonylee.top">JonyLee</a>&nbsp;&amp;&nbsp;<a href="https://beian.miit.gov.cn/" target="_blank">沪ICP备2023021298号-1</a><br> 开源许可
<path d="M512 1024C229.222 1024 0 794.778 0 512S229.222 0 512 0s512 229.222 512 512-229.222 512-512 512z m259.149-568.883h-290.74a25.293 25.293 0 0 0-25.292 25.293l-0.026 63.206c0 13.952 11.315 25.293 25.267 25.293h177.024c13.978 0 25.293 11.315 25.293 25.267v12.646a75.853 75.853 0 0 1-75.853 75.853h-240.23a25.293 25.293 0 0 1-25.267-25.293V417.203a75.853 75.853 0 0 1 75.827-75.853h353.946a25.293 25.293 0 0 0 25.267-25.292l0.077-63.207a25.293 25.293 0 0 0-25.268-25.293H417.152a189.62 189.62 0 0 0-189.62 189.645V771.15c0 13.977 11.316 25.293 25.294 25.293h372.94a170.65 170.65 0 0 0 170.65-170.65V480.384a25.293 25.293 0 0 0-25.293-25.267z" fill="#C71D23" p-id="2992"></path>
</svg>
</a>
</div>
<a href="app" title="The app">The app</a> <a href="https://gitee.com/mafgwo/stackedit/issues" target="_blank" title="The app">Community</a><br>
© 2022 <a href="https://gitee.com/mafgwo" target="_blank">豆萁</a> <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备18096694号</a><br>
Licensed under an
<a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a> <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a>
<a href="privacy_policy.html" target="_blank">隐私策略</a> <a href="privacy_policy.html" target="_blank">隐私策略</a>
</div> </div>
@ -464,15 +441,17 @@
<script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<!-- baidu统计-->
<script> <script>
var _hmt = _hmt || []; var _hmt = _hmt || [];
(function() { (function() {
var hm = document.createElement("script"); var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?20a1e7a201b42702c49074c87a1f1035"; hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
var s = document.getElementsByTagName("script")[0]; var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s); s.parentNode.insertBefore(hm, s);
})(); })();
</script> </script>
<!-- baidu统计结束-->
</body> </body>
</html> </html>

View File

@ -1,90 +1,90 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8" />
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
<meta name="renderer" content="webkit" />
<meta name="viewport" id="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
<title> 隐私权政策</title>
<style>
html {
font-size: 14px;
color: #666;
}
* { <head>
margin: 0; <meta charset="utf-8" />
padding: 0; <meta name="format-detection" content="telephone=no" />
} <meta name="msapplication-tap-highlight" content="no" />
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
<meta name="renderer" content="webkit" />
<meta name="viewport" id="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width" />
<title> 隐私权政策</title>
<style>
html {
font-size: 14px;
color: #666;
}
* {
margin: 0;
padding: 0;
}
.title {
padding: 10px;
font-size: 16px;
color: #333;
text-align: center;
}
.date-text {
text-align: right;
padding-right: 20px;
color: #333;
padding-bottom: 6px;
}
body {
padding: 10px 10px 20px;
}
.main-text {
padding: 10px 0;
text-indent: 20px;
color: #333;
font-size: 16px;
}
.content {
text-indent: 20px;
line-height: 22px;
}
</style>
</head>
.title { <body>
padding: 10px; <h3 class="title"> 隐私权政策 </h3>
font-size: 16px; <div class="content">
color: #333; 【Markdown编辑器】以下简称“本站”深知个人信息对您的重要性 故不会特意收集个人信息。
text-align: center; </div>
} <div class="content">
请在使用本产品(或服务)前,仔细阅读并了解本《隐私权政策》。
</div>
<div class="main-text">
一、关于您的文件信息
</div>
<div class="content">
个人文档都是存储在第三方,本站对所有第三方的文件都是在您授权之后,通过您的浏览器直接访问,并不会在本站后端获取和保存您的任何个人文件信息。
</div>
<div class="main-text">
二、关于您的用户信息
</div>
<div class="content">
本站不存在注册行为,待您授权后,您在第三方平台上个人信息的获取仅仅是在您的浏览器中直接获取,并不会在本站后端获取和保存您的个人信息。
</div>
<div class="main-text">
三、其他
</div>
<div class="content">
本站可能会更新本隐私政策,以反映本站的业务需求和适用法律的变化。在更新隐私政策时,我会通过此网站或其他合适的方式通知您。如果您继续使用本站的服务,则意味着您同意更新后的隐私政策。
</div>
<div class="main-text">
四、如何联系我
</div>
<div class="content">
如果您对本隐私政策有任何疑问、意见或建议,可通过<a href="https://jonylee.top" target="_blank" title="个人主页-JonyLee的设计导航">个人主页</a>联系方式与我联系:
</div>
</body>
.date-text {
text-align: right;
padding-right: 20px;
color: #333;
padding-bottom: 6px;
}
body {
padding: 10px 10px 20px;
}
.main-text {
padding: 10px 0;
text-indent: 20px;
color: #333;
font-size: 16px;
}
.content {
text-indent: 20px;
line-height: 22px;
}
</style>
</head>
<body>
<h3 class="title"> 隐私权政策 </h3>
<div class="content">
【StackEdit中文版】以下简称“此站”深知个人信息对您的重要性 故不会特意收集个人信息。
</div>
<div class="content">
请在使用我们的产品(或服务)前,仔细阅读并了解本《隐私权政策》。
</div>
<div class="main-text">
一、我们不会收集个人文档信息
</div>
<div class="content">
个人文档都是存储在第三方此站仅仅是通过前端缓存的token来获取或保存文档到第三方并不会在本站后端保存用户的任何文档信息。
</div>
<div class="main-text">
二、我们不会收集个人第三方的Token或用户信息
</div>
<div class="content">
本站不存在注册行为不会收集个人信息但是为了正常从第三方把Markdown文档读取或写入有时需要借助本站后端获取第三方网站Token信息再返回给前端但是本站承诺绝不会收集个人第三方网站的Token信息只会在后端获取到之后返回给本站前端供前端使用。
</div>
<div class="main-text">
三、如何联系我们
</div>
<div class="content">
如果您对本隐私政策有任何疑问、意见或建议,通过以下方式与我们联系:
</div>
<div class="content">
邮箱【mafgwo@163.com】
</div>
<div class="content">
微信【qicoding】
</div>
<div class="content">
一般情况下,我们将在一周内回复。
</div>
</body>
</html> </html>

181
static/landing/share.html Normal file
View File

@ -0,0 +1,181 @@
<!DOCTYPE html>
<html>
<head>
<title>文章分享 - Markdown编辑器</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="canonical" href="https://md.jonylee.top/">
<link rel="icon" href="static/landing/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="static/landing/favicon.ico" type="image/x-icon">
<meta charset="UTF-8">
<meta name="keywords" content="Markdown编辑器,StackEdit中文版,StackEdit汉化版,StackEdit,在线Markdown,笔记利器,Markdown笔记">
<meta name="description" content="支持直接将码云Gitee、GitHub、Gitea等仓库作为笔记存储仓库且支持拖拽/粘贴上传图片并且可以直接在页面编辑同步和管理的Markdown编辑器。">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<meta name="baidu-site-verification" content="code-tGpn2BT069" />
<meta name="msvalidate.01" content="90A9558158543277BD284CFA054E7F5B" />
<link rel="stylesheet" href="style.css">
<style>
.share-header {
position: fixed;
top: 0;
left: 0;
width: 100%;
background-color: #383c4a;
color: #fff;
padding: 10px;
box-sizing: border-box;
z-index: 99999;
}
.share-header .logo {
margin: 0 0 -8px 0;
}
.share-header nav {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.share-header nav ul {
list-style-type: none;
margin: 0;
padding: 0;
display: flex;
flex-direction: row;
}
.share-header nav li {
margin: 0 10px;
}
.share-header nav a {
color: #fff;
text-decoration: none;
}
.share-header nav a:hover {
text-decoration: underline;
}
.share-content {
transform: translateY(50px);
height: 100vh;
}
</style>
<script type="text/javascript">
function getQueryString(name) {
var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
var r = window.location.search.substr(1).match(reg);
if (r != null) {
return unescape(r[2]);
}
return null;
}
function appendTagHtml(newdoc, tagName, targetParentEle) {
const tags = newdoc.getElementsByTagName(tagName);
if (!tags) {
return;
}
for (let i = 0; i < tags.length; i++) {
targetParentEle.append(tags[i]);
}
}
window.onload = function() {
const xhr = new XMLHttpRequest();
const gistId = getQueryString('id');
let accessToken = null;
const tokens = window.localStorage.getItem('data/tokens');
if (tokens) {
const tokensObj = JSON.parse(tokens);
if (tokensObj.data && tokensObj.data.gitee) {
const tokenArr = Object.keys(tokensObj.data.gitee).map(it => tokensObj.data.gitee[it]).filter(it => it && it.isLogin);
if (tokenArr.length > 0) {
accessToken = tokenArr[0].accessToken;
}
}
}
const url = `https://gitee.com/api/v5/gists/${gistId}`;
let urlWithToken = url;
let withToken = false;
if (accessToken) {
urlWithToken = `${url}?access_token=${accessToken}`;
withToken = true;
}
xhr.open('GET', urlWithToken);
xhr.onload = function() {
if (xhr.status === 200) {
const newdoc = document.implementation.createHTMLDocument("");
const body = JSON.parse(xhr.responseText);
for (let key in body.files) {
newdoc.documentElement.innerHTML = body.files[key].content;
}
const currHead = document.head;
// 头部
appendTagHtml(newdoc, 'style', currHead);
// title
document.title = newdoc.title + ' - StackEdit中文版';
// 内容
const shareContent = document.getElementsByClassName('share-content')[0];
shareContent.innerHTML = newdoc.body.innerHTML;
document.body.className = newdoc.body.className;
} else if (xhr.status === 403) {
const rateLimit = xhr.responseText && xhr.responseText.indexOf('Rate Limit') >= 0;
const appUri = `${window.location.protocol}//${window.location.host}/app`;
document.getElementById('div_info').innerHTML = `${rateLimit ? "请求太过频繁" : "无权限访问"},请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
} else if (xhr.status === 401) {
if (withToken) {
withToken = false;
xhr.open('GET', url);
xhr.send();
} else {
console.error('An error occurred: ' + xhr.status);
document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效!请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
}
} else {
console.error('An error occurred: ' + xhr.status);
document.getElementById('div_info').innerHTML = `分享内容获取失败或已失效!请登录 <a href="${appUri}" target="_brank">主文档空间</a> 后再刷新此页面!`;
}
};
xhr.send();
}
</script>
</head>
<body>
<div class="share-header">
<nav>
<a class="logo" href="https://md.jonylee.top" target="_blank">
<img src="static/landing/logo.svg" height="30px" />
</a>
<ul>
<li><a href="https://md.jonylee.top" target="_blank">首页</a></li>
<li><a href="https://md.jonylee.top/app" target="_blank">写笔记</a></li>
</ul>
</nav>
</div>
<div class="share-content stackedit">
<div id="div_info" style="text-align: center; height: 600px;">文章加载中......</div>
</div>
<script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
<!-- built files will be auto injected -->
<!-- baidu统计-->
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?dad4b4383b13eedea1ab45ee323df1c3";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
<!-- baidu统计结束-->
</body>
</html>

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://stackedit.cn/</loc> <loc>https://md.jonylee.top/</loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>1.0</priority> <priority>1.0</priority>
</url> </url>
<url> <url>
<loc>https://stackedit.cn/app</loc> <loc>https://md.jonylee.top/app</loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>1.0</priority> <priority>1.0</priority>
</url> </url>
@ -16,7 +16,7 @@
<priority>0.8</priority> <priority>0.8</priority>
</url> </url>
<url> <url>
<loc>https://stackedit.cn/privacy_policy.html</loc> <loc>https://md.jonylee.top/privacy_policy.html</loc>
<changefreq>monthly</changefreq> <changefreq>monthly</changefreq>
<priority>0.6</priority> <priority>0.6</priority>
</url> </url>

View File

@ -36,7 +36,7 @@ style.innerHTML = "/** activeblue 灵动蓝\n \
top: 0;\n \ top: 0;\n \
width: 60px;\n \ width: 60px;\n \
height: 60px;\n \ height: 60px;\n \
background: url(https://my-wechat.mdnice.com/ape_blue.svg);\n \ background: url(https://imgs.qicoder.com/stackedit/ape_blue.svg);\n \
background-size: 100% 100%;\n \ background-size: 100% 100%;\n \
opacity: .12;\n \ opacity: .12;\n \
}\n \ }\n \

View File

@ -100,7 +100,7 @@ style.innerHTML = "/* 草原绿 caoyuangreen\n \
width:30px;\n \ width:30px;\n \
height:30px;\n \ height:30px;\n \
display:block;\n \ display:block;\n \
background-image:url(https://files.mdnice.com/grass-green.png);\n \ background-image:url(https://imgs.qicoder.com/stackedit/grass-green.png);\n \
background-position:center;\n \ background-position:center;\n \
background-size:30px;\n \ background-size:30px;\n \
margin:auto;\n \ margin:auto;\n \
@ -172,7 +172,7 @@ style.innerHTML = "/* 草原绿 caoyuangreen\n \
padding-bottom: 25px;\n \ padding-bottom: 25px;\n \
border-left: none !important;\n \ border-left: none !important;\n \
border: 1px solid #1b900d !important;\n \ border: 1px solid #1b900d !important;\n \
background: #fff;\n \ background: #fff !important;\n \
\n \ \n \
}\n \ }\n \
\n \ \n \

View File

@ -152,6 +152,7 @@ background: rgba(0, 0, 0, 0.05) !important;\n \
\n \ \n \
/* 引用文字 */\n \ /* 引用文字 */\n \
.preview-theme--jikebrack blockquote p {\n \ .preview-theme--jikebrack blockquote p {\n \
margin: 0px;\n \
font-size: 15px;\n \ font-size: 15px;\n \
font-family: -apple-system-font, BlinkMacSystemFont, \"Helvetica Neue\", \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei UI\", \"Microsoft YaHei\", Arial, sans-serif;\n \ font-family: -apple-system-font, BlinkMacSystemFont, \"Helvetica Neue\", \"PingFang SC\", \"Hiragino Sans GB\", \"Microsoft YaHei UI\", \"Microsoft YaHei\", Arial, sans-serif;\n \
color: rgb(119, 119, 119);\n \ color: rgb(119, 119, 119);\n \

View File

@ -182,6 +182,7 @@ list-style-type: circle;\n \
border-left: 3px solid rgba(0, 0, 0, 0.65) !important;\n \ border-left: 3px solid rgba(0, 0, 0, 0.65) !important;\n \
border-right: 1px solid rgba(0, 0, 0, 0.65) !important;\n \ border-right: 1px solid rgba(0, 0, 0, 0.65) !important;\n \
background: rgb(249, 249, 249) !important;\n \ background: rgb(249, 249, 249) !important;\n \
color: rgba(0,0,0,0.5) !important;\n \
}\n \ }\n \
\n \ \n \
/* 引用文字 */\n \ /* 引用文字 */\n \