From d7d6a32334053e117b61eea092c06eb2584a6a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bianca=20F=C3=BCrstenau?= Date: Wed, 12 Feb 2025 04:35:23 +0100 Subject: [PATCH] Stuff --- src-tauri/Cargo.lock | 38 ++++++++++++++++---------------- src-tauri/Cargo.toml | 4 ++-- src-tauri/src/data_door.rs | 15 ++++++++----- src/assets/hessen_sagt_nein.otf | Bin 0 -> 9508 bytes src/index.html | 26 +++++++++++++++++----- src/styles.css | 24 ++++++++++++++++++-- 6 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 src/assets/hessen_sagt_nein.otf diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index de948fa..2cee9ae 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2,6 +2,25 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "NEIN" +version = "0.1.0" +dependencies = [ + "chrono", + "curl", + "openssl", + "rand 0.8.5", + "ring-compat", + "rusqlite", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-fs", + "tauri-plugin-opener", + "tokio", +] + [[package]] name = "addr2line" version = "0.24.2" @@ -304,25 +323,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bkbh" -version = "0.1.0" -dependencies = [ - "chrono", - "curl", - "openssl", - "rand 0.8.5", - "ring-compat", - "rusqlite", - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-fs", - "tauri-plugin-opener", - "tokio", -] - [[package]] name = "block" version = "0.1.6" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1cabfea..e2994ae 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "bkbh" +name = "NEIN" version = "0.1.0" -description = "A Tauri App" +description = "Buchhaltung für „Darmstadt sagt Nein zur Bezahlkarte!“" authors = ["Bianca Fürstenau"] edition = "2021" diff --git a/src-tauri/src/data_door.rs b/src-tauri/src/data_door.rs index 16b7d55..2d7b473 100644 --- a/src-tauri/src/data_door.rs +++ b/src-tauri/src/data_door.rs @@ -101,13 +101,15 @@ async fn push_key(id: &u64, key: &SigningKey) -> Result<(), ()> { Ok(()) } -fn push_db(id: &u64, db: &Connection) -> Result<(), ()> { - let file = format!("{:016X}.sqlite", id); - db.backup(DatabaseName::Main, "tmp.sqlite", None) +fn push_db(id: &u64, db: &Connection, app: tauri::AppHandle) -> Result<(), ()> { + let filename = format!("{:016X}.sqlite", id); + let path = app.path().resolve(&filename, tauri::path::BaseDirectory::Temp) .map_err(|e| println!("{:?}", e))?; - let buf = std::fs::read("tmp.sqlite") + db.backup(DatabaseName::Main, &path, None) .map_err(|e| println!("{:?}", e))?; - let mut client = put_client(&file, buf.as_ref())?; + let buf = std::fs::read(&path) + .map_err(|e| println!("{:?}", e))?; + let mut client = put_client(&filename, buf.as_ref())?; let perf = client.perform() .map_err(|e| println!("{:?}", e))?; Ok(()) @@ -115,10 +117,11 @@ fn push_db(id: &u64, db: &Connection) -> Result<(), ()> { #[tauri::command] pub async fn push_data( + app: tauri::AppHandle, state: State<'_, Mutex>, ) -> Result<(), ()> { let state = state.lock().await; push_key(&state.id, &state.key).await?; - push_db(&state.id, &state.db); + push_db(&state.id, &state.db, app); Ok(()) } diff --git a/src/assets/hessen_sagt_nein.otf b/src/assets/hessen_sagt_nein.otf new file mode 100644 index 0000000000000000000000000000000000000000..46cb76127da2dab98168e701f744752059fddc26 GIT binary patch literal 9508 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 QbR79I+y}!E>t;g!2XPoZ3IG5A literal 0 HcmV?d00001 diff --git a/src/index.html b/src/index.html index 2ec4ca7..55e6d2f 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,8 @@ -
+
+
-
-

-
-
+ +
+ + + +
+
+
+

+
+
+
-
+

diff --git a/src/styles.css b/src/styles.css index 7a4774e..5f44d56 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,5 +1,10 @@ +@font-face { + font-family: hessenSagtNein; + src: url(assets/hessen_sagt_nein.otf); +} + :root { - font-family: Inter, Avenir, Helvetica, Arial, sans-serif; + font-family: Noto Sans, sans-serif; font-size: 16px; line-height: 24px; font-weight: 400; @@ -14,7 +19,7 @@ -webkit-text-size-adjust: 100%; } -.container { +.h-container { margin: auto; display: flex; flex-direction: row; @@ -24,6 +29,16 @@ gap: 3mm; } +.v-container { + margin: auto; + display: flex; + flex-direction: column; + flex-wrap: wrap; + justify-content: space-around; + text-align: center; + gap: 3mm; +} + .logo { margin: auto; padding: 0em 0em; @@ -76,6 +91,11 @@ button { cursor: pointer; } +.shout { + font-size: 1.2cm; + font-family: hessenSagtNein; +} + button:hover { border-color: #396cd8; }