diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 97e0b0eaa..4475453b1 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -676,7 +676,7 @@ "account10": "Annual subscription", "account11": "Until the end of the early bird discount", "account12": "Life companion", - "clickMeToRenew": "Go to Renew", + "clickMeToRenew": "Go to Renew", "dataHistory": "Data History", "quitApp": "Quit?", "reset": "Reset", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 056dda785..ca239ade9 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -676,7 +676,7 @@ "account10": "Suscripción anual", "account11": "Hasta que finalice el descuento por pronto pago", "account12": "Compañero de vida", - "clickMeToRenew": "Ir a la renovación", + "clickMeToRenew": "Ir a la renovación", "dataHistory": "Historial de datos", "quitApp": "¿Cerrar?", "reset": "Reiniciar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 244a35fe8..76ffdae1e 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -676,7 +676,7 @@ "account10": "Abonnement annuel", "account11": "Jusqu'à la fin de la réduction pour les early bird", "account12": "Compagnon de vie", - "clickMeToRenew": "Aller à renouveler", + "clickMeToRenew": "Aller à renouveler", "dataHistory": "Historique des données", "quitApp": "Quitter?", "reset": "Réinitialiser", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 479f3ac28..a1d55a63b 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -676,7 +676,7 @@ "account10": "年付訂閱", "account11": "早鳥優惠活動結束還剩", "account12": "相伴一生", - "clickMeToRenew": "前往續訂", + "clickMeToRenew": "前往續訂", "dataHistory": "數據歷史", "quitApp": "是否退出？", "reset": "重置", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index da0a8f53a..d735dc16c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -676,7 +676,7 @@ "account10": "年付订阅", "account11": "早鸟优惠活动结束还剩", "account12": "相伴一生", - "clickMeToRenew": "前往续订", + "clickMeToRenew": "前往续订", "dataHistory": "数据历史", "quitApp": "是否退出？", "reset": "重置", diff --git a/app/src/boot/onGetConfig.ts b/app/src/boot/onGetConfig.ts index 5cc2cc211..e4c5682cf 100644 --- a/app/src/boot/onGetConfig.ts +++ b/app/src/boot/onGetConfig.ts @@ -23,7 +23,7 @@ import {showMessage} from "../dialog/message"; import {replaceLocalPath} from "../editor/rename"; import {setTabPosition} from "../window/setHeader"; import {initBar} from "../layout/topBar"; -import {setProxy} from "../config/util/setProxy"; +import {setProxy} from "../config/util/about"; import {openChangelog} from "./openChangelog"; import {getIdFromSYProtocol, isSYProtocol} from "../util/pathName"; import {App} from "../index"; diff --git a/app/src/config/about.ts b/app/src/config/about.ts index 85f839ca0..64ce364e1 100644 --- a/app/src/config/about.ts +++ b/app/src/config/about.ts @@ -4,14 +4,13 @@ import {ipcRenderer, shell} from "electron"; /// #endif import {isBrowser} from "../util/functions"; import {fetchPost} from "../util/fetch"; -import {setAccessAuthCode} from "./util/setAccessAuthCode"; +import {setAccessAuthCode, setProxy} from "./util/about"; import {exportLayout} from "../layout/util"; import {exitSiYuan, processSync} from "../dialog/processSystem"; import {openByMobile, writeText} from "../protyle/util/compatibility"; import {showMessage} from "../dialog/message"; import {Dialog} from "../dialog"; import {confirmDialog} from "../dialog/confirmDialog"; -import {setProxy} from "./util/setProxy"; import {setKey} from "../sync/syncGuide"; export const about = { diff --git a/app/src/config/account.ts b/app/src/config/account.ts index 6350688ea..35b96ff7b 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -10,6 +10,7 @@ import {processSync} from "../dialog/processSystem"; import {needSubscribe} from "../util/needSubscribe"; import {syncGuide} from "../sync/syncGuide"; import {hideElements} from "../protyle/ui/hideElements"; +import {getCloudURL} from "./util/about"; export const account = { element: undefined as Element, @@ -60,18 +61,22 @@ ${window.siyuan.languages.account2} activeSubscriptionHTML = ""; subscriptionHTML = `
${Constants.SIYUAN_IMAGE_VIP}${window.siyuan.languages.account12}
`; } else if (window.siyuan.user.userSiYuanProExpireTime > 0) { + const renewHTML = `
+
+ ${window.siyuan.languages.account6} + ${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))} + ${window.siyuan.languages.day} + ${window.siyuan.languages.clickMeToRenew} +
` if (window.siyuan.user.userSiYuanSubscriptionPlan === 2) { subscriptionHTML = `
${window.siyuan.languages.account3}
-
-
${window.siyuan.languages.account6} ${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))} ${window.siyuan.languages.day} ${window.siyuan.languages.clickMeToRenew}
+${renewHTML}
${window.siyuan.languages.account8} ${window.siyuan.languages.account9} `; } else { - subscriptionHTML = `
${window.siyuan.languages.account10}
-
-
${window.siyuan.languages.account6} ${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))} ${window.siyuan.languages.day} ${window.siyuan.languages.clickMeToRenew}
`; + subscriptionHTML = `
${window.siyuan.languages.account10}
${renewHTML}`; } } return `
diff --git a/app/src/config/util/about.ts b/app/src/config/util/about.ts new file mode 100644 index 000000000..e7de993ac --- /dev/null +++ b/app/src/config/util/about.ts @@ -0,0 +1,55 @@ +/// #if !BROWSER +import {getCurrentWindow} from "@electron/remote"; +/// #endif +import {Dialog} from "../../dialog"; +import {isMobile} from "../../util/functions"; +import {fetchPost} from "../../util/fetch"; + +export const setProxy = () => { + /// #if !BROWSER + if ("" === window.siyuan.config.system.networkProxy.scheme) { + console.log("network proxy [system]"); + return; + } + + const session = getCurrentWindow().webContents.session; + session.closeAllConnections().then(() => { + const proxyURL = `${window.siyuan.config.system.networkProxy.scheme}://${window.siyuan.config.system.networkProxy.host}:${window.siyuan.config.system.networkProxy.port}`; + session.setProxy({proxyRules: proxyURL}).then( + () => console.log("network proxy [" + proxyURL + "]"), + ); + }); + /// #endif +}; + +export const setAccessAuthCode = () => { + const dialog = new Dialog({ + title: window.siyuan.languages.about5, + content: `
+ +
${window.siyuan.languages.about6}
+
+
+
+ +
`, + width: isMobile() ? "92vw" : "520px", + }); + const inputElement = dialog.element.querySelector("input") as HTMLInputElement; + const btnsElement = dialog.element.querySelectorAll(".b3-button"); + dialog.bindInput(inputElement, () => { + (btnsElement[1] as HTMLButtonElement).click(); + }); + inputElement.select(); + btnsElement[0].addEventListener("click", () => { + dialog.destroy(); + }); + btnsElement[1].addEventListener("click", () => { + fetchPost("/api/system/setAccessAuthCode", {accessAuthCode: inputElement.value}); + }); +}; + +export const getCloudURL = (key: string) => { + const origin = window.siyuan.config.cloudRegion === 0 ? "https://ld246.com" : "https://liuyun.io"; + return `${origin}/${key}`; +} diff --git a/app/src/config/util/setAccessAuthCode.ts b/app/src/config/util/setAccessAuthCode.ts index 770ffde11..8e1b09b17 100644 --- a/app/src/config/util/setAccessAuthCode.ts +++ b/app/src/config/util/setAccessAuthCode.ts @@ -2,29 +2,3 @@ import {Dialog} from "../../dialog"; import {isMobile} from "../../util/functions"; import {fetchPost} from "../../util/fetch"; -export const setAccessAuthCode = () => { - const dialog = new Dialog({ - title: window.siyuan.languages.about5, - content: `
- -
${window.siyuan.languages.about6}
-
-
-
- -
`, - width: isMobile() ? "92vw" : "520px", - }); - const inputElement = dialog.element.querySelector("input") as HTMLInputElement; - const btnsElement = dialog.element.querySelectorAll(".b3-button"); - dialog.bindInput(inputElement, () => { - (btnsElement[1] as HTMLButtonElement).click(); - }); - inputElement.select(); - btnsElement[0].addEventListener("click", () => { - dialog.destroy(); - }); - btnsElement[1].addEventListener("click", () => { - fetchPost("/api/system/setAccessAuthCode", {accessAuthCode: inputElement.value}); - }); -}; diff --git a/app/src/config/util/setProxy.ts b/app/src/config/util/setProxy.ts deleted file mode 100644 index 93e569a29..000000000 --- a/app/src/config/util/setProxy.ts +++ /dev/null @@ -1,20 +0,0 @@ -/// #if !BROWSER -import {getCurrentWindow} from "@electron/remote"; -/// #endif - -export const setProxy = () => { - /// #if !BROWSER - if ("" === window.siyuan.config.system.networkProxy.scheme) { - console.log("network proxy [system]"); - return; - } - - const session = getCurrentWindow().webContents.session; - session.closeAllConnections().then(() => { - const proxyURL = `${window.siyuan.config.system.networkProxy.scheme}://${window.siyuan.config.system.networkProxy.host}:${window.siyuan.config.system.networkProxy.port}`; - session.setProxy({proxyRules: proxyURL}).then( - () => console.log("network proxy [" + proxyURL + "]"), - ); - }); - /// #endif -}; diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts index 3fe4421ee..c636db890 100644 --- a/app/src/mobile/settings/about.ts +++ b/app/src/mobile/settings/about.ts @@ -1,5 +1,5 @@ import {Constants} from "../../constants"; -import {setAccessAuthCode} from "../../config/util/setAccessAuthCode"; +import {setAccessAuthCode} from "../../config/util/about"; import {Dialog} from "../../dialog"; import {fetchPost} from "../../util/fetch"; import {confirmDialog} from "../../dialog/confirmDialog";