diff --git a/.eslintrc b/.eslintrc index 2a31e86..c14c3b6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -8,7 +8,8 @@ "@typescript-eslint/no-var-requires": "off", "@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/no-unused-vars": "off", - "react-refresh/only-export-components": ["warn", { "allowConstantExport": true }] + "react-refresh/only-export-components": "off", + "react-hooks/exhaustive-deps": "off" }, "env": { "browser": true, diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index fb6188b..c533d05 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -174,7 +174,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -191,7 +191,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bitflags" @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -633,7 +633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -667,7 +667,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -678,7 +678,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -802,9 +802,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" dependencies = [ "enumflags2_derive", "serde", @@ -812,13 +812,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -931,7 +931,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -1020,7 +1020,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -1658,9 +1658,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "4f7765dccf8c39c3a470fc694efe322969d791e713ca46bc7b5c506886157572" dependencies = [ "serde", "serde_json", @@ -1724,9 +1724,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libloading" @@ -1755,9 +1755,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "lock_api" @@ -2371,9 +2371,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] @@ -2623,14 +2623,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.7", "windows-sys 0.48.0", ] @@ -2716,14 +2716,14 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa 1.0.9", "ryu", @@ -2738,7 +2738,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -2788,7 +2788,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -2912,9 +2912,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3025,9 +3025,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" dependencies = [ "proc-macro2", "quote", @@ -3116,7 +3116,7 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" version = "2.0.0-alpha.14" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "anyhow", "bytes", @@ -3146,11 +3146,11 @@ dependencies = [ "serialize-to-javascript", "state", "swift-rs", - "tauri-build 2.0.0-alpha.8 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-build 2.0.0-alpha.8 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "thiserror", "tokio", "tray-icon", @@ -3184,7 +3184,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.8" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "anyhow", "cargo_toml", @@ -3195,7 +3195,7 @@ dependencies = [ "serde", "serde_json", "swift-rs", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "tauri-winres", "walkdir", ] @@ -3203,7 +3203,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "base64", "brotli", @@ -3217,7 +3217,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "thiserror", "time", "url", @@ -3228,20 +3228,20 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "heck", "proc-macro2", "quote", "syn 1.0.109", "tauri-codegen", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", ] [[package]] name = "tauri-runtime" version = "1.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "gtk", "http", @@ -3250,7 +3250,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "thiserror", "url", "uuid", @@ -3260,7 +3260,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "1.0.0-alpha.2" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "cocoa 0.24.1", "gtk", @@ -3270,7 +3270,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "tauri-runtime", - "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git)", + "tauri-utils 2.0.0-alpha.7 (git+https://github.com/tauri-apps/tauri.git?branch=dev)", "uuid", "webkit2gtk", "webview2-com", @@ -3309,7 +3309,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.7" -source = "git+https://github.com/tauri-apps/tauri.git#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" +source = "git+https://github.com/tauri-apps/tauri.git?branch=dev#9a2b2f49a5e1748ca4e095118e663ef025c5b87d" dependencies = [ "brotli", "ctor", @@ -3353,7 +3353,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.11", + "rustix 0.38.13", "windows-sys 0.48.0", ] @@ -3391,7 +3391,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -3459,7 +3459,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2 0.5.4", "windows-sys 0.48.0", ] @@ -3479,9 +3479,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -3500,9 +3500,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.0.0", "serde", @@ -3537,7 +3537,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] @@ -3637,9 +3637,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3779,7 +3779,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", "wasm-bindgen-shared", ] @@ -3813,7 +3813,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3912,7 +3912,7 @@ checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.33", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 658b89b..422d885 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -18,7 +18,7 @@ tauri-build = { version = "2.0.0-alpha", features = [] } [dependencies] # tauri = { version = "2.0.0-alpha", features = [] } -tauri = { git = "https://github.com/tauri-apps/tauri.git", features = [] } +tauri = { git = "https://github.com/tauri-apps/tauri.git", branch = "dev", features = [] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/src/App.tsx b/src/App.tsx index 1416fac..f1b68d4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,7 +6,6 @@ import LoginPage from "./pages/LoginPage"; import NotFoundPage from "./pages/NotFound"; import RegistrationPage from "./pages/RegistrationPage"; -import { invoke } from "@tauri-apps/api"; import { reaction } from "mobx"; import Loader from "./components/Loader"; import OfflineBanner from "./components/banners/OfflineBanner"; @@ -19,7 +18,6 @@ import SwipeTest from "./pages/SwipeTest"; import ChannelPage from "./pages/subpages/ChannelPage"; import { useAppStore } from "./stores/AppStore"; import { Globals } from "./utils/Globals"; -import { isTauri } from "./utils/Utils"; function App() { const app = useAppStore(); @@ -56,7 +54,6 @@ function App() { logger.debug("Loading complete"); app.setAppLoading(false); - if (isTauri) invoke("close_splashscreen"); return dispose; }, []); @@ -68,7 +65,7 @@ function App() { element: , }); else bannerContext.close(); - }, [app.isNetworkConnected]); + }, [app.isNetworkConnected, bannerContext]); return ( diff --git a/src/components/Loader.tsx b/src/components/Loader.tsx index 2072226..872ba2d 100644 --- a/src/components/Loader.tsx +++ b/src/components/Loader.tsx @@ -1,7 +1,9 @@ +import { invoke } from "@tauri-apps/api"; import { observer } from "mobx-react-lite"; import React from "react"; import LoadingPage from "../pages/LoadingPage"; import { useAppStore } from "../stores/AppStore"; +import { isTauri } from "../utils/Utils"; interface Props { children: React.ReactNode; @@ -13,6 +15,9 @@ function Loader(props: Props) { return ; } + // close tauri splashscreen + if (isTauri) invoke("close_splashscreen"); + return <>{props.children}; }