NextGraph
/
nextgraph-rs
1
2
Fork 0
Code Issues 1 Pull Requests Packages Projects 2 Releases 3 Activity

fix new IPC issue. deactivated with no-ipc-custom-protocol feature

Browse Source
pull/19/head
Niko PLP 1 year ago
parent 91e0aca939
commit 9189e70716
9 changed files with 597 additions and 205 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 719
      Cargo.lock
  2. 4
      ng-app/package.json
  3. 12
      ng-app/src-tauri/Cargo.toml
  4. 6
      ng-app/src/App.svelte
  5. 7
      ng-app/src/routes/WalletCreate.svelte
  6. 4
      ngaccount/web/package.json
  7. 23
      ngaccount/web/pnpm-lock.yaml
  8. 4
      ngaccount/web/src/routes/Create.svelte
  9. 23
      pnpm-lock.yaml

719
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
ng-app/package.json
Unescape View File

@ -17,8 +17,8 @@
},
"dependencies": {
"@popperjs/core": "^2.11.8",
"@tauri-apps/api": "2.0.0-alpha.5",
"@tauri-apps/plugin-window": "2.0.0-alpha.0",
"@tauri-apps/api": "2.0.0-alpha.6",
"@tauri-apps/plugin-window": "2.0.0-alpha.1",
"async-proxy": "^0.4.1",
"classnames": "^2.3.2",
"flowbite": "^1.6.5",

12
ng-app/src-tauri/Cargo.toml
Unescape View File

@ -14,20 +14,20 @@ crate-type = ["staticlib", "cdylib", "rlib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
tauri-build = { version = "=2.0.0-alpha.6", features = [] }
tauri-macros = { version = "=2.0.0-alpha.6" }
tauri-codegen = { version = "=2.0.0-alpha.6" }
tauri-utils = { version = "=2.0.0-alpha.6" }
tauri-build = { version = "2.0.0-alpha.6", features = [] }
# tauri-macros = { version = "=2.0.0-alpha.6" }
# tauri-codegen = { version = "=2.0.0-alpha.6" }
# tauri-utils = { version = "=2.0.0-alpha.6" }
[dependencies]
tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch="alpha.10-nextgraph", features = [] }
tauri = { git = "https://git.nextgraph.org/NextGraph/tauri.git", branch="alpha.11-nextgraph", features = ["no-ipc-custom-protocol"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
p2p-repo = { path = "../../p2p-repo" }
p2p-net = { path = "../../p2p-net" }
ng-wallet = { path = "../../ng-wallet" }
async-std = { version = "1.12.0", features = ["attributes", "unstable"] }
tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.0-nextgraph" }
tauri-plugin-window = { git = "https://git.nextgraph.org/NextGraph/plugins-workspace.git", branch="window-alpha.1-nextgraph" }
[features]
# this feature is used for production builds or when `devPath` points to the filesystem

6
ng-app/src/App.svelte
Unescape View File

@ -57,15 +57,15 @@
let window_api = await import("@tauri-apps/plugin-window");
let event_api = await import("@tauri-apps/api/event");
let main = window_api.WebviewWindow.getByLabel("main");
let main = window_api.Window.getByLabel("main");
unsub_main_close = await main.onCloseRequested(async (event) => {
console.log("onCloseRequested main");
await event_api.emit("close_all", {});
let registration = window_api.WebviewWindow.getByLabel("registration");
let registration = window_api.Window.getByLabel("registration");
if (registration) {
await registration.close();
}
let viewer = window_api.WebviewWindow.getByLabel("viewer");
let viewer = window_api.Window.getByLabel("viewer");
if (viewer) {
await viewer.close();
}

7
ng-app/src/routes/WalletCreate.svelte
Unescape View File

@ -323,7 +323,7 @@
async (event) => {
console.log("got accepted with payload", event.payload);
unsub_register();
let reg_popup = window_api.WebviewWindow.getByLabel("registration");
let reg_popup = window_api.Window.getByLabel("registration");
await reg_popup.close();
registration_success = bsp_name;
invitation = await ng.decode_invitation(event.payload.invite);
@ -334,15 +334,16 @@
if (event.payload) registration_error = event.payload.error;
else intro = true;
unsub_register();
let reg_popup = window_api.WebviewWindow.getByLabel("registration");
let reg_popup = window_api.Window.getByLabel("registration");
await reg_popup.close();
});
await tick();
await new Promise((resolve) => setTimeout(resolve, 1000));
let reg_popup = window_api.WebviewWindow.getByLabel("registration");
let reg_popup = window_api.Window.getByLabel("registration");
unsub_register_close = await reg_popup.onCloseRequested(async (event) => {
console.log("onCloseRequested");
intro = true;
unsub_register_close = undefined;
unsub_register();
});
}

4
ngaccount/web/package.json
Unescape View File

@ -10,8 +10,8 @@
"preview": "vite preview"
},
"dependencies": {
"@tauri-apps/api": "2.0.0-alpha.5",
"@tauri-apps/plugin-window": "2.0.0-alpha.0",
"@tauri-apps/api": "2.0.0-alpha.6",
"@tauri-apps/plugin-window": "2.0.0-alpha.1",
"flowbite": "^1.6.5",
"flowbite-svelte": "^0.37.1",
"svelte-spa-router": "^3.3.0"

23
ngaccount/web/pnpm-lock.yaml
Unescape View File

@ -2,8 +2,8 @@ lockfileVersion: 5.4
specifiers:
'@sveltejs/vite-plugin-svelte': ^2.0.4
'@tauri-apps/api': 2.0.0-alpha.5
'@tauri-apps/plugin-window': 2.0.0-alpha.0
'@tauri-apps/api': 2.0.0-alpha.6
'@tauri-apps/plugin-window': 2.0.0-alpha.1
autoprefixer: ^10.4.14
cross-env: ^7.0.3
flowbite: ^1.6.5
@ -18,8 +18,8 @@ specifiers:
vite-plugin-svelte-svg: ^2.2.1
dependencies:
'@tauri-apps/api': 2.0.0-alpha.5
'@tauri-apps/plugin-window': 2.0.0-alpha.0
'@tauri-apps/api': 2.0.0-alpha.6
'@tauri-apps/plugin-window': 2.0.0-alpha.1
flowbite: 1.6.6
flowbite-svelte: 0.37.5_svelte@3.59.1
svelte-spa-router: 3.3.0
@ -336,20 +336,15 @@ packages:
- supports-color
dev: true
/@tauri-apps/api/2.0.0-alpha.4:
resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==}
/@tauri-apps/api/2.0.0-alpha.6:
resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
/@tauri-apps/api/2.0.0-alpha.5:
resolution: {integrity: sha512-OqysC4c819itGxic50RoDMrmd+ofX+MMNkXKeRS0BV2rkKqrnuV17o3TrQXFI1xs/kXRmmPC+3Y42P9Y5uNvRg==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
/@tauri-apps/plugin-window/2.0.0-alpha.0:
resolution: {integrity: sha512-ZXFXOu9m8QiDB8d8LFFgwcfxIAbr0bhzj06YvmZDB3isuVtlFP9EyU4D+zmumWEWvNN2XP7xgpn68ivOVhmNNQ==}
/@tauri-apps/plugin-window/2.0.0-alpha.1:
resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==}
dependencies:
'@tauri-apps/api': 2.0.0-alpha.4
'@tauri-apps/api': 2.0.0-alpha.6
dev: false
/@trysound/sax/0.2.0:

4
ngaccount/web/src/routes/Create.svelte
Unescape View File

@ -58,7 +58,7 @@
error = "Closing due to " + (result.error || "an error");
}
let window_api = await import("@tauri-apps/plugin-window");
let main = window_api.WebviewWindow.getByLabel("main");
let main = window_api.Window.getByLabel("main");
if (main) {
await main.emit("error", result);
} else {
@ -79,7 +79,7 @@
// @ts-ignore
if (window.__TAURI__) {
let window_api = await import("@tauri-apps/plugin-window");
let main = window_api.WebviewWindow.getByLabel("main");
let main = window_api.Window.getByLabel("main");
if (main) {
await main.emit("accepted", result);
} else {

23
pnpm-lock.yaml
Unescape View File

@ -9,9 +9,9 @@ importers:
specifiers:
'@popperjs/core': ^2.11.8
'@sveltejs/vite-plugin-svelte': ^2.0.0
'@tauri-apps/api': 2.0.0-alpha.5
'@tauri-apps/api': 2.0.0-alpha.6
'@tauri-apps/cli': 2.0.0-alpha.11
'@tauri-apps/plugin-window': 2.0.0-alpha.0
'@tauri-apps/plugin-window': 2.0.0-alpha.1
'@tsconfig/svelte': ^3.0.0
'@types/node': ^18.7.10
async-proxy: ^0.4.1
@ -39,8 +39,8 @@ importers:
vite-plugin-wasm: ^3.2.2
dependencies:
'@popperjs/core': 2.11.8
'@tauri-apps/api': 2.0.0-alpha.5
'@tauri-apps/plugin-window': 2.0.0-alpha.0
'@tauri-apps/api': 2.0.0-alpha.6
'@tauri-apps/plugin-window': 2.0.0-alpha.1
async-proxy: 0.4.1
classnames: 2.3.2
flowbite: 1.6.5
@ -502,13 +502,8 @@ packages:
'@swc/core-win32-x64-msvc': 1.3.62
dev: false
/@tauri-apps/api/2.0.0-alpha.4:
resolution: {integrity: sha512-gWe5fFHbwFM+dmdDPtlDvVDVtoMneGRM+S8mECevWhKpXYxId0yxznE56YGAvPSJXC3vgsXw16mOmkTnEVKnaw==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
/@tauri-apps/api/2.0.0-alpha.5:
resolution: {integrity: sha512-OqysC4c819itGxic50RoDMrmd+ofX+MMNkXKeRS0BV2rkKqrnuV17o3TrQXFI1xs/kXRmmPC+3Y42P9Y5uNvRg==}
/@tauri-apps/api/2.0.0-alpha.6:
resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
@ -619,10 +614,10 @@ packages:
'@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.11
dev: true
/@tauri-apps/plugin-window/2.0.0-alpha.0:
resolution: {integrity: sha512-ZXFXOu9m8QiDB8d8LFFgwcfxIAbr0bhzj06YvmZDB3isuVtlFP9EyU4D+zmumWEWvNN2XP7xgpn68ivOVhmNNQ==}
/@tauri-apps/plugin-window/2.0.0-alpha.1:
resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==}
dependencies:
'@tauri-apps/api': 2.0.0-alpha.4
'@tauri-apps/api': 2.0.0-alpha.6
dev: false
/@trysound/sax/0.2.0:

Write Preview
Loading…
Cancel
Save