diff --git a/Cargo.toml b/Cargo.toml index 64749bf..7e55a1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,12 @@ [package] -authors = ["Bianca Fürstenau"] -description = "Buchhaltung für „Darmstadt sagt Nein zur Bezahlkarte!“" -edition = "2024" name = "bkbh" version = "0.1.0" +description = "Buchhaltung für „Darmstadt sagt Nein zur Bezahlkarte!“" +authors = ["Bianca Fürstenau"] +edition = "2021" [features] +tauri = ["server"] leptos = [] server = [ "dep:tauri", @@ -19,38 +20,29 @@ server = [ "dep:openssl", "dep:ring-compat", ] -tauri = ["server"] [lib] -crate-type = ["staticlib", "cdylib", "rlib"] name = "bkbh" +crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] tauri-build = { version = "2", features = [] } [dependencies] -console_error_panic_hook = { version = "0.1.7" } leptos = { version = "^0.7", features = ["csr"] } leptos_router = { version = "^0.7" } +tauri-sys = { git = "ssh://git@gitea.mathebau.de:3022/Peter/tauri-sys.git", branch = "v2", features = ["core"] } serde = { version = "1", features = ["derive"] } serde_json = { version = "1" } -tauri-sys = { git = "ssh://git@gitea.mathebau.de:3022/Peter/tauri-sys.git", branch = "v2", features = [ - "core", -] } -chrono = { version = "^0.4", optional = true } -curl = { version = "^0.4", optional = true } -openssl = { version = "^0.10", features = ["vendored"], optional = true } -rand = { version = "^0.8", optional = true } -ring-compat = { version = "^0.8", features = [ - "signature", - "rand_core", -], optional = true } -rusqlite = { version = "^0.33", features = [ - "backup", - "bundled", -], optional = true } tauri = { version = "2", features = [], optional = true } -tauri-plugin-fs = { version = "2", optional = true } tauri-plugin-opener = { version = "2", optional = true } -tokio = { version = "^1.43", optional = true } +tauri-plugin-fs = {version = "2", optional = true} +rusqlite = {version = "^0.33", features = ["backup", "bundled"], optional = true } +rand = {version = "^0.8", optional = true} +chrono = {version = "^0.4", optional = true} +tokio = {version = "^1.43", optional = true} +curl = {version = "^0.4", optional = true} +openssl = {version = "^0.10", features = ["vendored"], optional = true} +ring-compat = {version = "^0.8", features = ["signature", "rand_core"], optional = true} +console_error_panic_hook = {version = "0.1.7"} diff --git a/Trunk.toml b/Trunk.toml index 4cab13b..29257e2 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -1,9 +1,9 @@ [build] -dist = "www" -html_output = "index.html" target = "trunk.html" +html_output = "index.html" +dist = "www" [serve] -open = false port = 1420 +open = false ws_protocol = "ws" diff --git a/leptosfmt.toml b/leptosfmt.toml index adbe220..10c879c 100644 --- a/leptosfmt.toml +++ b/leptosfmt.toml @@ -1,4 +1,4 @@ -indentation_style = "Tabs" max_width = 80 -newline_style = "Unix" tab_spaces = 8 +indentation_style = "Tabs" +newline_style = "Unix" diff --git a/rustfmt.toml b/rustfmt.toml index bfca9ce..82ce7eb 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ edition = "2024" -hard_tabs = true max_width = 80 +hard_tabs = true tab_spaces = 8 diff --git a/src/server/app_state.rs b/src/server/app_state.rs index df2c61a..f2e7ce0 100644 --- a/src/server/app_state.rs +++ b/src/server/app_state.rs @@ -28,7 +28,7 @@ impl AppState { .unwrap(); let mut rng = rand::thread_rng(); let last_sync = i64::MIN; - let id = rng.r#gen(); + let id = rng.gen(); let key = SigningKey::generate(&mut rng); AppState { db, diff --git a/taplo.toml b/taplo.toml deleted file mode 100644 index 204dffa..0000000 --- a/taplo.toml +++ /dev/null @@ -1,3 +0,0 @@ -[formatting] -indent_string = " " -reorder_keys = true