diff --git a/ng-app/src/App.svelte b/ng-app/src/App.svelte index f93f24f..4c6711f 100644 --- a/ng-app/src/App.svelte +++ b/ng-app/src/App.svelte @@ -61,7 +61,7 @@ try { await disconnections_subscribe(); } catch (e) { - console.log("called disconnections_subscribe twice"); + //console.log("called disconnections_subscribe twice"); } let tauri_platform = import.meta.env.TAURI_PLATFORM; //console.log(await ng.test()); @@ -92,7 +92,7 @@ let event_api = await import("@tauri-apps/api/event"); let main = window_api.Window.getByLabel("main"); unsub_main_close = await main.onCloseRequested(async (event) => { - console.log("onCloseRequested main"); + //console.log("onCloseRequested main"); await event_api.emit("close_all", {}); let registration = window_api.Window.getByLabel("registration"); if (registration) { @@ -126,7 +126,7 @@ window.wallet_channel = wallet_channel; wallet_channel.postMessage({ cmd: "startup" }, location.href); wallet_channel.onmessage = async (event) => { - console.log(event.data.cmd, event.data); + //console.log(event.data.cmd, event.data); if (!location.href.startsWith(event.origin)) return; switch (event.data.cmd) { case "startup": diff --git a/ng-app/src/api.ts b/ng-app/src/api.ts index 328367f..5c9b107 100644 --- a/ng-app/src/api.ts +++ b/ng-app/src/api.ts @@ -94,7 +94,7 @@ const handler = { // TODO: install timestamp V0 : { client_type, details: JSON.stringify(info), version, timestamp_install:0, timestamp_updated:0 } }; - console.log(info,res); + //console.log(info,res); return res; } else if (path[0] === "disconnections_subscribe") { let { getCurrent } = await import("@tauri-apps/plugin-window"); @@ -117,7 +117,7 @@ const handler = { } else if (path[0] === "app_request_stream") { let stream_id = (lastStreamId += 1).toString(); - console.log("stream_id",stream_id); + //console.log("stream_id",stream_id); let { getCurrent } = await import("@tauri-apps/plugin-window"); let session_id = args[0]; let request = args[1]; diff --git a/ng-app/src/lib/FullLayout.svelte b/ng-app/src/lib/FullLayout.svelte index 028c4da..27ecf8d 100644 --- a/ng-app/src/lib/FullLayout.svelte +++ b/ng-app/src/lib/FullLayout.svelte @@ -35,6 +35,7 @@ PaperAirplane, Bell, User, + Share, } from "svelte-heros-v2"; let width: number; @@ -139,6 +140,14 @@ /> + + + + + {:else} diff --git a/ng-app/src/routes/User.svelte b/ng-app/src/routes/User.svelte index 1a33c36..f072019 100644 --- a/ng-app/src/routes/User.svelte +++ b/ng-app/src/routes/User.svelte @@ -191,7 +191,7 @@ /> Logout -
  • Switch wallet -
  • + --> {#if !downloading}
  • { pub shortcode: &'a str, pub code: &'a str, } - +#[allow(non_upper_case_globals)] const face: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f600", @@ -92,7 +92,7 @@ const face: [EmojiDef<'static>; 15] = [ code: "sleeping", }, ]; - +#[allow(non_upper_case_globals)] const face_unwell: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f637", @@ -171,7 +171,7 @@ const face_unwell: [EmojiDef<'static>; 15] = [ code: "annoyed", }, ]; - +#[allow(non_upper_case_globals)] const face_costume: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f921", @@ -249,7 +249,7 @@ const face_costume: [EmojiDef<'static>; 15] = [ code: "fairy", }, ]; - +#[allow(non_upper_case_globals)] const emotion: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f48c", @@ -327,7 +327,7 @@ const emotion: [EmojiDef<'static>; 15] = [ code: "praying", }, ]; - +#[allow(non_upper_case_globals)] const body: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f4aa", @@ -405,7 +405,7 @@ const body: [EmojiDef<'static>; 15] = [ code: "shoe", }, ]; - +#[allow(non_upper_case_globals)] const sport: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f93a", @@ -483,8 +483,8 @@ const sport: [EmojiDef<'static>; 15] = [ code: "martial", }, ]; - -const big_animal: [EmojiDef<'static>; 15] = [ +#[allow(non_upper_case_globals)] +const bigger_animal: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f981", shortcode: "lion", @@ -541,9 +541,9 @@ const big_animal: [EmojiDef<'static>; 15] = [ code: "rhinoceros", }, EmojiDef { - hexcode: "1f407", - shortcode: "rabbit", - code: "rabbit", + hexcode: "1f9a9", + shortcode: "flamingo", + code: "flamingo", }, EmojiDef { hexcode: "1f433", @@ -562,11 +562,12 @@ const big_animal: [EmojiDef<'static>; 15] = [ }, ]; -const animal: [EmojiDef<'static>; 15] = [ +#[allow(non_upper_case_globals)] +const smaller_animal: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f413", shortcode: "rooster", - code: "chicken", + code: "rooster", }, EmojiDef { hexcode: "1f423", @@ -589,9 +590,9 @@ const animal: [EmojiDef<'static>; 15] = [ code: "owl", }, EmojiDef { - hexcode: "1f9a9", - shortcode: "flamingo", - code: "flamingo", + hexcode: "1f407", + shortcode: "rabbit", + code: "rabbit", }, EmojiDef { hexcode: "1f427", @@ -639,7 +640,7 @@ const animal: [EmojiDef<'static>; 15] = [ code: "octopus", }, ]; - +#[allow(non_upper_case_globals)] const plants: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f40c", @@ -717,7 +718,7 @@ const plants: [EmojiDef<'static>; 15] = [ code: "mushroom", }, ]; - +#[allow(non_upper_case_globals)] const fruits: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f347", @@ -795,7 +796,7 @@ const fruits: [EmojiDef<'static>; 15] = [ code: "pepper", }, ]; - +#[allow(non_upper_case_globals)] const food: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f950", @@ -873,7 +874,7 @@ const food: [EmojiDef<'static>; 15] = [ code: "two_glasses", }, ]; - +#[allow(non_upper_case_globals)] const travel: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f3d4", @@ -923,7 +924,7 @@ const travel: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f695", shortcode: "taxi", - code: "car", + code: "taxi", }, EmojiDef { hexcode: "1f3cd", @@ -951,7 +952,7 @@ const travel: [EmojiDef<'static>; 15] = [ code: "rocket", }, ]; - +#[allow(non_upper_case_globals)] const sky: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "2600", @@ -1029,7 +1030,7 @@ const sky: [EmojiDef<'static>; 15] = [ code: "rainbow", }, ]; - +#[allow(non_upper_case_globals)] const play: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f3b8", @@ -1107,7 +1108,7 @@ const play: [EmojiDef<'static>; 15] = [ code: "scuba_diving", }, ]; - +#[allow(non_upper_case_globals)] const house: [EmojiDef<'static>; 15] = [ EmojiDef { hexcode: "1f9f9", @@ -1194,8 +1195,8 @@ lazy_static! { ("emotion", emotion), ("body", body), ("sport", sport), - ("big_animal", big_animal), - ("animal", animal), + ("bigger_animal", bigger_animal), + ("smaller_animal", smaller_animal), ("plants", plants), ("fruits", fruits), ("food", food), @@ -1211,8 +1212,8 @@ lazy_static! { pub const EMOJI_CAT: [&'static str; 15] = [ "face", "sport", - "big_animal", - "animal", + "bigger_animal", + "smaller_animal", "plants", "fruits", "food", diff --git a/ng-wallet/src/lib.rs b/ng-wallet/src/lib.rs index ca81e76..f93e245 100644 --- a/ng-wallet/src/lib.rs +++ b/ng-wallet/src/lib.rs @@ -320,7 +320,7 @@ pub fn open_wallet_with_pazzle( return Err(NgWalletError::InvalidPin); } - log_info!("pazzle={:?}", pazzle); + //log_info!("pazzle={:?}", pazzle); let opening_pazzle = Instant::now();