diff --git a/app/src/sync/syncGuide.ts b/app/src/sync/syncGuide.ts index 20f4dee66..13dc7d823 100644 --- a/app/src/sync/syncGuide.ts +++ b/app/src/sync/syncGuide.ts @@ -169,22 +169,17 @@ const setSync = (key?: string, dialog?: Dialog) => { const setKey = () => { const dialog = new Dialog({ title: window.siyuan.languages.dataRepoKey, - content: `
-
${window.siyuan.languages.dataRepoKeyTip1}
+ content: `
+ +
+
-
${window.siyuan.languages.dataRepoKeyTip2}
-
- -
- -
- +
+
${window.siyuan.languages.dataRepoKeyTip1}
+
${window.siyuan.languages.dataRepoKeyTip2}
@@ -194,70 +189,16 @@ const setKey = () => { dialog.element.querySelector(".b3-button--cancel").addEventListener("click", () => { dialog.destroy(); }); - dialog.element.querySelector("#importKey").addEventListener("click", () => { - const passwordDialog = new Dialog({ - title: "🔑 " + window.siyuan.languages.key, - content: `
- -
-
-
- -
`, - width: isMobile() ? "80vw" : "520px", - }); - const textAreaElement = passwordDialog.element.querySelector("textarea"); - textAreaElement.focus(); - const btnsElement = passwordDialog.element.querySelectorAll(".b3-button"); - btnsElement[0].addEventListener("click", () => { - passwordDialog.destroy(); - }); - btnsElement[1].addEventListener("click", () => { - fetchPost("/api/repo/importRepoKey", {key: textAreaElement.value}, () => { - setSync(textAreaElement.value, dialog); - passwordDialog.destroy(); - }); - }); - }); - dialog.element.querySelector("#initKey").addEventListener("click", () => { - confirmDialog("🔑 " + window.siyuan.languages.genKey, window.siyuan.languages.initRepoKeyTip, () => { - fetchPost("/api/repo/initRepoKey", {}, (response) => { + dialog.element.querySelector("#initKeyByPW").addEventListener("click", () => { + const inputElement = dialog.element.querySelector(".b3-text-field") as HTMLInputElement + if (!inputElement.value) { + showMessage(window.siyuan.languages._kernel[142]); + return; + } + confirmDialog("🔑 " + window.siyuan.languages.genKeyByPW, window.siyuan.languages.initRepoKeyTip, () => { + fetchPost("/api/repo/InitRepoKeyFromPassphrase", {pass: inputElement.value}, (response) => { setSync(response.data.key, dialog); }); }); }); - dialog.element.querySelector("#initKeyByPW").addEventListener("click", () => { - const initDialog = new Dialog({ - title: "🔑 " + window.siyuan.languages.genKeyByPW, - content: `
- -
-
-
- -
`, - width: isMobile() ? "80vw" : "520px", - }); - const inputElement = initDialog.element.querySelector(".b3-text-field") as HTMLInputElement; - inputElement.focus(); - const btnsElement = initDialog.element.querySelectorAll(".b3-button"); - initDialog.bindInput(inputElement, () => { - (btnsElement[1] as HTMLButtonElement).click(); - }); - btnsElement[0].addEventListener("click", () => { - initDialog.destroy(); - }); - btnsElement[1].addEventListener("click", () => { - if (!inputElement.value) { - showMessage(window.siyuan.languages._kernel[142]); - return; - } - confirmDialog("🔑 " + window.siyuan.languages.genKeyByPW, window.siyuan.languages.initRepoKeyTip, () => { - initDialog.destroy(); - fetchPost("/api/repo/InitRepoKeyFromPassphrase", {pass: inputElement.value}, (response) => { - setSync(response.data.key, dialog); - }); - }); - }); - }); }; diff --git a/app/stage/images/sync-guide.svg b/app/stage/images/sync-guide.svg new file mode 100644 index 000000000..41f61f405 --- /dev/null +++ b/app/stage/images/sync-guide.svg @@ -0,0 +1 @@ +real-time sync \ No newline at end of file diff --git a/app/stage/protyle/images/img-loading.svg b/app/stage/protyle/images/img-loading.svg deleted file mode 100644 index 02a716041..000000000 --- a/app/stage/protyle/images/img-loading.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - -