From 9609a80f7fefaee55dbeb5ceccecf29ac96fb439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bianca=20F=C3=BCrstenau?= Date: Sun, 9 Feb 2025 09:01:59 +0100 Subject: [PATCH] Whui --- src-tauri/src/lib.rs | 14 ++++- src/index.html | 132 +++++++++++++++++++++---------------------- src/main.js | 43 ++++++++------ src/styles.css | 24 ++++---- 4 files changed, 120 insertions(+), 93 deletions(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index ebdb99c..dd34520 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -12,7 +12,11 @@ struct AppState { #[derive(Clone, Copy)] enum Store { Aldi, + Edeka, + Dm, + Lidl, Rewe, + Tegut, } impl TryFrom<&str> for Store { @@ -21,7 +25,11 @@ impl TryFrom<&str> for Store { fn try_from(s: &str) -> Result { match s { "aldi" => Ok(Store::Aldi), + "edeka" => Ok(Store::Edeka), + "dm" => Ok(Store::Dm), + "lidl" => Ok(Store::Lidl), "rewe" => Ok(Store::Rewe), + "tegut" => Ok(Store::Tegut), _ => Err(()), } } @@ -31,7 +39,11 @@ impl ToSql for Store { fn to_sql(&self) -> rusqlite::Result> { match self { Store::Aldi => 0.to_sql(), - Store::Rewe => 1.to_sql(), + Store::Edeka => 1.to_sql(), + Store::Dm => 2.to_sql(), + Store::Lidl => 3.to_sql(), + Store::Rewe => 4.to_sql(), + Store::Tegut => 5.to_sql(), } } } diff --git a/src/index.html b/src/index.html index 784742e..4ea453d 100644 --- a/src/index.html +++ b/src/index.html @@ -1,70 +1,70 @@ - - - - - Tauri App - - + + + + + Tauri App + + - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-

-
- + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+

+ diff --git a/src/main.js b/src/main.js index fa28c7e..d24ec47 100644 --- a/src/main.js +++ b/src/main.js @@ -7,24 +7,35 @@ let cntMsgEl; // greetMsgEl.textContent = await invoke("greet", { name: greetInputEl.value }); //} -async function aldi() { - await invoke("swap", { store: "aldi" }); - cntMsgEl.textContent = await invoke("count", {}); -} - -async function rewe() { - invoke("swap", { store: "rewe" }); +async function swap(s) { + invoke("swap", { store: s }); cntMsgEl.textContent = await invoke("count", {}); } window.addEventListener("DOMContentLoaded", () => { - cntMsgEl = document.querySelector("#cnt-msg"); - document.querySelector("#aldi-form").addEventListener("submit", (e) => { - e.preventDefault(); - aldi(); - }); - document.querySelector("#rewe-form").addEventListener("submit", (e) => { - e.preventDefault(); - rewe(); - }); + cntMsgEl = document.querySelector("#cnt-msg"); + document.querySelector("#aldi-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("aldi"); + }); + document.querySelector("#edeka-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("edeka"); + }); + document.querySelector("#dm-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("dm"); + }); + document.querySelector("#lidl-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("lidl"); + }); + document.querySelector("#rewe-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("rewe"); + }); + document.querySelector("#tegut-form").addEventListener("submit", (e) => { + e.preventDefault(); + swap("tegut"); + }); }); diff --git a/src/styles.css b/src/styles.css index 0a6a8a8..7a4774e 100644 --- a/src/styles.css +++ b/src/styles.css @@ -15,24 +15,30 @@ } .container { - margin: 0; + margin: auto; display: flex; flex-direction: row; - justify-content: center; + flex-wrap: wrap; + justify-content: space-around; text-align: center; + gap: 3mm; } .logo { + margin: auto; padding: 0em 0em; will-change: filter; transition: 0.75s; - max-height: 2cm; - width: 3cm; + max-height: 100%; + max-width: 100%; + width: 100%; } -.row { +.column { display: flex; justify-content: center; + flex: 1; + margin: auto; } a { @@ -50,7 +56,9 @@ h1 { } button { - width: 3.5cm; + margin: auto; + flex: 1; + min-width: 3.5cm; height: 2.5cm; border-radius: 8px; border: 1px solid transparent; @@ -81,10 +89,6 @@ button { outline: none; } -#greet-input { - margin-right: 5px; -} - @media (prefers-color-scheme: dark) { :root { color: #f6f6f6;