Skip to content

Commit dc1a6ea

Browse files
insdraminsdram
committed
2023-07-02 13:41:54
1 parent dd76e14 commit dc1a6ea

File tree

3 files changed

+98
-39
lines changed

3 files changed

+98
-39
lines changed

‎push.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
echo -e "\033[0;32mDeploying updates to GitHub...\033[0m"
4+
5+
# Add changes to git.
6+
git add -A
7+
8+
# Commit changes.
9+
msg="`date +"%Y-%m-%d %H:%M:%S"`"
10+
if [ $# -eq 1 ]
11+
then msg="$1"
12+
fi
13+
git commit -m "$msg"
14+
15+
# Push source and build repos.
16+
git push origin main:main
17+
# Come Back
18+
cd ..

‎static/css/main.css

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
.button,a.button,button,select {
2+
position: relative;
3+
display: flex;
4+
outline: none;
5+
border: 1px solid transparent;
6+
border-radius: .33rem;
7+
text-align: center;
8+
text-decoration: none;
9+
font-weight: 500;
10+
cursor: pointer;
11+
align-items: center;
12+
justify-content: center;
13+
-webkit-appearance: none;
14+
-moz-appearance: none;
15+
appearance: none;
16+
transition: all .3s linear;
17+
}
18+
19+
.dark-theme .button,
20+
.dark-theme a.button,
21+
.dark-theme button {
22+
background: #000;
23+
color: inherit;
24+
}
25+
26+
.button.outline,
27+
a.button.outline,
28+
button.outline,
29+
select.outline {
30+
border-color: #fff;
31+
background: transparent;
32+
box-shadow: none;
33+
}
34+
35+
.dark-theme .button.outline,
36+
.dark-theme a.button.outline,
37+
.dark-theme button.outline,
38+
.dark-theme select.outline {
39+
border-color: #000;
40+
color: inherit;
41+
}
42+
43+
textarea {
44+
font-family: "PingFangSC-Regular", "PingFang SC", "Microsoft YaHei", Arial, Helvetica, "WenQuanYi Micro Hei", "tohoma,sans-serif";
45+
}
46+
47+
input {
48+
outline: none;
49+
border-color: #fff;
50+
border-style: solid;
51+
border-width: 1px;
52+
border-radius: .33rem;
53+
background-color: transparent;
54+
box-shadow: none;
55+
color: inherit;
56+
}
57+
58+
.dark-theme input {
59+
border-color: #000;
60+
}

‎static/js/memos-editor.js

+20-39
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var memosDom = document.querySelector("#memos");
2-
var editIcon = "<button class='load-memos-editor p-1'><i class='iconfont iconedit-square'></i></button>";
3-
var editorCont = "<div class='memos-editor animate__animated animate__fadeIn d-none col-12'><div class='memos-editor-body mb-3 p-3'><div class='memos-editor-inner animate__animated animate__fadeIn'><div class='memos-editor-content'><textarea class='memos-editor-inputer text-sm' rows='1' placeholder='任何想法...'></textarea></div><div class='memos-editor-tools pt-3'><div class='d-flex'><div class='button outline action-btn tag-btn mr-2'><i class='iconfont iconnumber'></i></div><div class='button outline action-btn todo-btn mr-2'><i class='iconfont iconunorderedlist'></i></div><div class='button outline action-btn code-btn mr-2'><i class='iconfont iconcode'></i></div><div class='button outline action-btn link-btn'><i class='iconfont iconlink'></i></div></div><div class='d-flex flex-fill'><div class='memos-tag-list d-none mt-2 animate__animated animate__fadeIn'></div></div></div><div class='memos-editor-footer border-t pt-3 mt-3'><div class='editor-selector mr-2'><select class='select-memos-value outline px-2 py-1'><option value='PUBLIC'>所有人可见</option><option value='PROTECTED'>登录用户可见</option><option value='PRIVATE'>仅自己可见</option></select></div><div class='editor-submit d-flex flex-fill justify-content-end'><button class='primary submit-memos-btn px-3 py-1'>记下</button></div></div></div><div class='memos-editor-option animate__animated animate__fadeIn'><input name='memos-api-url' class='memos-open-api-input input-text flex-fill mr-3 px-2 py-1' type='text' value='' maxlength='120' placeholder='OpenAPI'><div class='memos-open-api-submit'><button class='primary submit-openapi-btn px-3 py-1'>保存</button></div></div></div></div>";
1+
var memosDom = document.querySelector(memosData.dom);
2+
var editIcon = '<button class="load-memos-editor outline p-1"><i class="iconfont iconedit-square"></i></button>';
3+
var editorCont = '<div class="memos-editor animate__animated animate__fadeIn d-none col-12"><div class="memos-editor-body mb-3 p-3"><div class="memos-editor-inner animate__animated animate__fadeIn"><div class="memos-editor-content"><textarea class="memos-editor-inputer text-sm" rows="1" placeholder="任何想法..."></textarea></div><div class="memos-editor-tools pt-3"><div class="d-flex"><div class="button outline action-btn tag-btn mr-2"><i class="iconfont iconnumber"></i></div><div class="button outline action-btn todo-btn mr-2"><i class="iconfont iconunorderedlist"></i></div><div class="button outline action-btn code-btn mr-2"><i class="iconfont iconcode"></i></div><div class="button outline action-btn link-btn"><i class="iconfont iconlink"></i></div></div><div class="d-flex flex-fill"><div class="memos-tag-list d-none mt-2 animate__animated animate__fadeIn"></div></div></div><div class="memos-editor-footer border-t pt-3 mt-3"><div class="editor-selector mr-2"><select class="select-memos-value outline px-2 py-1"><option value="PUBLIC">所有人可见</option><option value="PROTECTED">登录用户可见</option><option value="PRIVATE">仅自己可见</option></select></div><div class="editor-submit d-flex flex-fill justify-content-end"><button class="primary submit-memos-btn px-3 py-1">记下</button></div></div></div><div class="memos-editor-option animate__animated animate__fadeIn"><input name="memos-api-url" class="memos-open-api-input input-text flex-fill mr-3 px-2 py-1" type="text" value="" maxlength="120" placeholder="OpenAPI"><div class="memos-open-api-submit"><button class="primary submit-openapi-btn px-3 py-1">保存</button></div></div></div></div>';
44

55
document.body.insertAdjacentHTML('afterend', editIcon);
66
memosDom.insertAdjacentHTML('afterbegin',editorCont);
@@ -26,9 +26,10 @@ document.addEventListener("DOMContentLoaded", () => {
2626
});
2727

2828
function getEditIcon() {
29-
var memosOpenId = getCookie("open-api");
3029
var memosContent = '',memosVisibility = '';
31-
var getEditor = window.localStorage && window.localStorage.getItem("memos-editor");
30+
var memosPath = window.localStorage && window.localStorage.getItem("memos-access-path");
31+
var memosOpenId = window.localStorage && window.localStorage.getItem("memos-access-token");
32+
var getEditor = window.localStorage && window.localStorage.getItem("nuoea-memos-editor");
3233
var isHide = getEditor === "hide";
3334
memosTextarea.addEventListener('input', (e) => {
3435
memosTextarea.style.height = 'inherit';
@@ -43,8 +44,8 @@ function getEditIcon() {
4344
loadEditorBtn.addEventListener("click", function () {
4445
getEditor != "show" ? hasMemosOpenId() : ''
4546
document.querySelector(".memos-editor").classList.toggle("d-none");
46-
window.localStorage && window.localStorage.setItem("memos-editor", document.querySelector(".memos-editor").classList.contains("d-none") ? "hide" : "show");
47-
getEditor = window.localStorage && window.localStorage.getItem("memos-editor");
47+
window.localStorage && window.localStorage.setItem("nuoea-memos-editor", document.querySelector(".memos-editor").classList.contains("d-none") ? "hide" : "show");
48+
getEditor = window.localStorage && window.localStorage.getItem("nuoea-memos-editor");
4849
});
4950

5051
taglistBtn.addEventListener("click", function () {
@@ -85,7 +86,7 @@ function getEditIcon() {
8586
memosVisibility = memosVisibilitySelect.value
8687
let hasContent = memosContent.length !== 0;
8788
if (memosOpenId && hasContent) {
88-
let memoUrl = bbMemo.memos+"/api/memo?openId="+memosOpenId;
89+
let memoUrl = memosPath+"/api/memo?openId="+memosOpenId;
8990
let memoBody = {content:memosContent,visibility:memosVisibility}
9091
fetch(memoUrl, {
9192
method: 'post',
@@ -114,62 +115,42 @@ function getEditIcon() {
114115
}else{
115116
memosEditorOption.classList.add("d-none");
116117
cocoMessage.success('准备就绪');
117-
let tagUrl = bbMemo.memos+"/api/tag?openId="+memosOpenId;
118+
let tagUrl = memosPath+"/api/tag?openId="+memosOpenId;
118119
let response = fetch(tagUrl).then(response => response.json()).then(resdata => {
119120
return resdata.data
120121
}).then(response => {
121122
let taglist = "";
122123
response.map((t)=>{
123-
taglist += "<div class='memos-tag d-flex text-xs mt-2 mr-2'><a class='d-flex px-2 justify-content-center' onclick='setMemoTag(this)'>#"+t+"</a></div>"
124+
taglist += '<div class="memos-tag d-flex text-xs mt-2 mr-2"><a class="d-flex px-2 justify-content-center" onclick="setMemoTag(this)">#'+t+'</a></div>'
124125
})
125126
document.querySelector(".memos-tag-list").insertAdjacentHTML('beforeend', taglist);
126127
}).catch(err => cocoMessage.error('Memos Open API 有误，请重新输入!'));
127128
}
128129
}
129130

130131
function getMemosData(e) {
131-
let apiReg = /openId=([^&]*)/;
132+
let apiReg = /openId=([^&]*)/,urlReg = /(.+?)(?:\/api)/;
132133
fetch(e).then(res => {
133134
if (res.status == 200) {
134-
let apiRes = e.match(apiReg);
135-
memosOpenId = apiRes[1]
136-
setCookie("open-api",memosOpenId);
135+
let apiRes = e.match(apiReg),urlRes = e.match(urlReg)[1];
136+
memosOpenId = apiRes[1];
137+
memosPath = urlRes;
138+
window.localStorage && window.localStorage.setItem("memos-access-path", urlRes);
139+
window.localStorage && window.localStorage.setItem("memos-access-token", memosOpenId);
137140
cocoMessage.success(
138141
'保存成功',
139142
()=>{
140143
memosEditorOption.classList.add("d-none");
141144
memosEditorInner.classList.remove("d-none");
142-
memosOpenId = getCookie("open-api");
145+
memosPath = window.localStorage && window.localStorage.getItem("memos-access-path");
146+
memosOpenId = window.localStorage && window.localStorage.getItem("memos-access-token");
143147
hasMemosOpenId()
144148
})
145149
}else{
146150
cocoMessage.error('出错了，再检查一下吧!')
147151
}
148152
})
149-
.catch(err => {cocoMessage.error('出错了，再检查一下吧!')});
150-
}
151-
152-
function getCookie(name) {
153-
var allcookies = document.cookie;
154-
var cookie_pos = allcookies.indexOf(name);
155-
// 如果找到了索引，就代表cookie存在,否则不存在
156-
if (cookie_pos != -1) {
157-
cookie_pos = cookie_pos + name.length + 1;
158-
//计算取cookie值得结束索引
159-
var cookie_end = allcookies.indexOf(";", cookie_pos);
160-
if (cookie_end == -1) {
161-
cookie_end = allcookies.length;
162-
}
163-
//得到想要的cookie的值
164-
var value = unescape(allcookies.substring(cookie_pos, cookie_end));
165-
}
166-
return value;
167-
}
168-
169-
function setCookie(name, val) {
170-
var data = new Date();
171-
data.setTime(data.getTime() + 7 * 24 * 3600 * 1000)
172-
document.cookie = name + '=' + val + ';expires=' + data.toUTCString()
153+
.catch(err => {cocoMessage.error(err)});
173154
}
174155
}
175156

0 commit comments

Comments
 (0)