Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨

Browse source
This commit is contained in:
Vanessa 2023-09-26 10:46:20 +08:00
parent 455d5c3908
commit cd8b537465
6 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/config/account.ts
View file

@ -200,7 +200,7 @@ ${renewHTML}
fetchPost("/api/setting/getCloudUser", { fetchPost("/api/setting/getCloudUser", {
token: window.siyuan.user.userToken, token: window.siyuan.user.userToken,
}, response => { }, response => {
window.siyuan.user = response.data || {}; window.siyuan.user = response.data;
element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(element); account.bindEvent(element);
showMessage(window.siyuan.languages.refreshUser, 3000); showMessage(window.siyuan.languages.refreshUser, 3000);
@ -211,7 +211,7 @@ ${renewHTML}
element.querySelector("#logout").addEventListener("click", () => { element.querySelector("#logout").addEventListener("click", () => {
fetchPost("/api/setting/logoutCloudUser", {}, () => { fetchPost("/api/setting/logoutCloudUser", {}, () => {
fetchPost("/api/setting/getCloudUser", {}, response => { fetchPost("/api/setting/getCloudUser", {}, response => {
window.siyuan.user = response.data || {}; window.siyuan.user = response.data;
element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(element); account.bindEvent(element);
account.onSetaccount(); account.onSetaccount();
@ -383,7 +383,7 @@ ${renewHTML}
}); });
}, },
_afterLogin(userResponse: IWebSocketData, element: Element) { _afterLogin(userResponse: IWebSocketData, element: Element) {
window.siyuan.user = userResponse.data || {}; window.siyuan.user = userResponse.data;
processSync(); processSync();
element.innerHTML = account.genHTML(); element.innerHTML = account.genHTML();
account.bindEvent(element); account.bindEvent(element);

2
app/src/index.ts
View file

@ -168,7 +168,7 @@ export class App {
window.siyuan.menus = new Menus(this); window.siyuan.menus = new Menus(this);
bootSync(); bootSync();
fetchPost("/api/setting/getCloudUser", {}, userResponse => { fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.user = userResponse.data || {}; window.siyuan.user = userResponse.data;
onGetConfig(response.data.start, this); onGetConfig(response.data.start, this);
account.onSetaccount(); account.onSetaccount();
setTitle(window.siyuan.languages.siyuanNote); setTitle(window.siyuan.languages.siyuanNote);

2
app/src/mobile/index.ts
View file

@ -89,7 +89,7 @@ class App {
initMessage(); initMessage();
initAssets(); initAssets();
fetchPost("/api/setting/getCloudUser", {}, userResponse => { fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.user = userResponse.data || {}; window.siyuan.user = userResponse.data;
fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { fetchPost("/api/system/getEmojiConf", {}, emojiResponse => {
window.siyuan.emojis = emojiResponse.data as IEmoji[]; window.siyuan.emojis = emojiResponse.data as IEmoji[];
setNoteBook(() => { setNoteBook(() => {

4
app/src/mobile/settings/account.ts
View file

@ -76,7 +76,7 @@ export const showAccountInfo = () => {
fetchPost("/api/setting/getCloudUser", { fetchPost("/api/setting/getCloudUser", {
token: window.siyuan.user.userToken, token: window.siyuan.user.userToken,
}, response => { }, response => {
window.siyuan.user = response.data || {}; window.siyuan.user = response.data;
showMessage(window.siyuan.languages.refreshUser, 3000); showMessage(window.siyuan.languages.refreshUser, 3000);
showAccountInfo(); showAccountInfo();
const menuAccountElement = document.getElementById("menuAccount"); const menuAccountElement = document.getElementById("menuAccount");
@ -169,7 +169,7 @@ const afterLogin = (response: IWebSocketData, deactive = false) => {
fetchPost("/api/setting/getCloudUser", { fetchPost("/api/setting/getCloudUser", {
token: response.data.token, token: response.data.token,
}, response => { }, response => {
window.siyuan.user = response.data || {}; window.siyuan.user = response.data;
closePanel(); closePanel();
document.getElementById("menuAccount").innerHTML = `<img class="b3-menu__icon" src="${window.siyuan.user.userAvatarURL}"/> document.getElementById("menuAccount").innerHTML = `<img class="b3-menu__icon" src="${window.siyuan.user.userAvatarURL}"/>
<span class="b3-menu__label">${window.siyuan.user.userName}</span>`; <span class="b3-menu__label">${window.siyuan.user.userName}</span>`;

3
app/src/util/needSubscribe.ts
View file

@ -12,8 +12,7 @@ export const needLogin = (tip = window.siyuan.languages.needLogin) => {
}; };
export const needSubscribe = (tip = window.siyuan.languages._kernel[29]) => { export const needSubscribe = (tip = window.siyuan.languages._kernel[29]) => {
if (window.siyuan.user && (window.siyuan.user.userSiYuanProExpireTime === -1 || window.siyuan.user.userSiYuanProExpireTime > 0) || if (window.siyuan.user && (window.siyuan.user.userSiYuanProExpireTime === -1 || window.siyuan.user.userSiYuanProExpireTime > 0)) {
window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
return false; return false;
} }
if (tip) { if (tip) {

2
app/src/window/index.ts
View file

@ -134,7 +134,7 @@ class App {
window.siyuan.languages = lauguages; window.siyuan.languages = lauguages;
window.siyuan.menus = new Menus(this); window.siyuan.menus = new Menus(this);
fetchPost("/api/setting/getCloudUser", {}, userResponse => { fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.user = userResponse.data || {}; window.siyuan.user = userResponse.data;
init(this); init(this);
setTitle(window.siyuan.languages.siyuanNote); setTitle(window.siyuan.languages.siyuanNote);
initMessage(); initMessage();