Mobile fix

The CSG logo shrinks when on mobile screens

.gitignore

@@ -21,9 +21,9 @@ frontend/node_modules/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
-.antigravitycli/
 
 
 # Added by cargo
 
 /target
+.antigravitycli/

backend/src/cookie/jwt.rs

@@ -43,7 +43,7 @@ pub fn encode_token(header: &Header, id: String, key: &EncodingKey) -> String {
         expires: expires as usize,
     };
     let token = encode(header, &claims, key);
-    token.expect("token return failed")
+    return token.expect("token return failed");
 }
 
 /// Decodes and validates a JSON Web Token (JWT).
@@ -77,5 +77,5 @@ pub fn decode_token(token: String, key: &DecodingKey) -> Result<Claims, (StatusC
             (StatusCode::UNAUTHORIZED, Json(error))
         })?
         .claims;
-    Ok(claims)
+    return Ok(claims);
 }

backend/src/cookie/validation.rs

@@ -48,7 +48,13 @@ pub async fn validate_token(
                 .headers()
                 .get(header::AUTHORIZATION)
                 .and_then(|header| header.to_str().ok())
-                .and_then(|value| value.strip_prefix("Bearer ").map(|s| s.to_owned()))
+                .and_then(|value| {
+                    if value.starts_with("Bearer ") {
+                        Some(value[7..].to_owned())
+                    } else {
+                        None
+                    }
+                })
         });
 
     let token = token.ok_or_else(|| {
@@ -71,7 +77,7 @@ pub async fn validate_token(
         (status, Json(error))
     })?;
 
-    let uuid = claims.sub.parse::<i16>().map_err(|_| {
+    let uuid = (&claims.sub).parse::<i16>().map_err(|_| {
         let error = json!({
             "status": "error",
             "message": "Invalid user id"
@@ -137,7 +143,13 @@ pub async fn validate_admin(
                 .headers()
                 .get(header::AUTHORIZATION)
                 .and_then(|header| header.to_str().ok())
-                .and_then(|value| value.strip_prefix("Bearer ").map(|s| s.to_owned()))
+                .and_then(|value| {
+                    if value.starts_with("Bearer ") {
+                        Some(value[7..].to_owned())
+                    } else {
+                        None
+                    }
+                })
         });
 
     let token = token.ok_or_else(|| {
@@ -160,7 +172,7 @@ pub async fn validate_admin(
         (status, Json(error))
     })?;
 
-    let uuid = claims.sub.parse::<i16>().map_err(|_| {
+    let uuid = (&claims.sub).parse::<i16>().map_err(|_| {
         let error = json!({
             "status": "error",
             "message": "Invalid user id"

backend/src/env.rs

@@ -21,8 +21,6 @@ pub struct Env {
     pub token_secret: String,
     /// Frontend origin URL for CORS policy
     pub origin: String,
-    /// Backend port number
-    pub backend_port: String,
 }
 
 impl Env {
@@ -47,12 +45,10 @@ impl Env {
         let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
         let token_secret = std::env::var("TOKEN_SECRET").expect("TOKEN_SECRET must be set");
         let origin = std::env::var("ORIGIN").expect("ORIGIN must be set");
-        let backend_port = std::env::var("BACKEND_PORT").expect("BACKEND_PORT must be set");
         Env {
             db_url,
             token_secret,
             origin,
-            backend_port,
         }
     }
 }

backend/src/handlers/auth.rs

@@ -60,7 +60,7 @@ pub async fn create_user(
         )
     })?;
 
-    if exist_check.is_some() {
+    if let Some(_) = exist_check {
         return Err((
             StatusCode::BAD_REQUEST,
             Json(json!({"status": "error", "message": "user already exists"})),
@@ -90,10 +90,10 @@ pub async fn create_user(
         })?;
 
     if user.rows_affected() < 1 {
-        Err((
+        return Err((
             StatusCode::INTERNAL_SERVER_ERROR,
             Json(json!({"status": "error", "message": "Error creating user"})),
-        ))
+        ));
     } else {
         Ok(Json(json!({"status": "success", "result": "User created"})))
     }
@@ -145,19 +145,19 @@ pub async fn login(
         .ok_or_else(|| {
             (
                 StatusCode::BAD_REQUEST,
-                Json(json!({"status": "error", "message": "Ungültiger Benutzername"})),
+                Json(json!({"status": "error", "message": "Invalid username"})),
             )
         })?;
 
     let pwd_hash = PasswordHash::new(&user.pwd);
     let valid_pwd = Argon2::default()
-        .verify_password(request.pwd.as_bytes(), &pwd_hash.unwrap())
+        .verify_password(&request.pwd.as_bytes(), &pwd_hash.unwrap())
         .is_ok();
 
     if !valid_pwd {
         let error_response = serde_json::json!({
             "status": "error",
-            "message": "Ungültiges passwort"
+            "message": "Invalid password"
         });
         return Err((StatusCode::BAD_REQUEST, Json(error_response)));
     }
@@ -338,7 +338,10 @@ pub async fn get_users(
             (StatusCode::INTERNAL_SERVER_ERROR, Json(error))
         })?;
 
-    let response = users.iter().map(filter_user).collect::<Vec<FilteredUser>>();
+    let response = users
+        .iter()
+        .map(|user| filter_user(&user))
+        .collect::<Vec<FilteredUser>>();
     let json_respnse = json!(response);
     Ok(Json(json_respnse))
 }
@@ -369,20 +372,22 @@ pub async fn get_user_by_id(
     match query {
         Ok(user) => {
             let response = serde_json::json!(filter_user(&user));
-            Ok(Json(response))
+            return Ok(Json(response));
         }
         Err(sqlx::Error::RowNotFound) => {
             let error_response = serde_json::json!({
                 "status": "fail",
                 "message": format!("User with ID {} not found", id)
             });
-            Err((StatusCode::NOT_FOUND, Json(error_response)))
+            return Err((StatusCode::NOT_FOUND, Json(error_response)));
         }
-        Err(e) => Err((
+        Err(e) => {
+            return Err((
                 StatusCode::INTERNAL_SERVER_ERROR,
                 Json(json!({"status": "error", "message": format!("{:?}", e)})),
-        )),
+            ));
         }
+    };
 }
 
 /// Updates an existing user's information.
@@ -410,6 +415,7 @@ pub async fn update_user(
     State(data): State<Arc<AppState>>,
     Json(body): Json<UserUpdateScheme>,
 ) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
+    let update_result = if !body.new_pwd.is_empty() {
         let argon = Argon2::default();
         let salt = SaltString::generate(&mut OsRng);
         let hashed_pwd = match argon.hash_password(body.new_pwd.clone().as_bytes(), &salt) {
@@ -417,15 +423,25 @@ pub async fn update_user(
             Err(e) => panic!("Error hashing {:}", e),
         };
 
-    let update_result = sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, pwd = $4, is_admin = $5 WHERE id = $6"#)
+        sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, pwd = $4, is_admin = $5 WHERE id = $6"#)
             .bind(body.first_name.to_owned())
             .bind(body.last_name.to_owned())
             .bind(body.username.to_owned())
-        .bind(&hashed_pwd)
+            .bind(hashed_pwd)
             .bind(body.make_admin.to_owned())
             .bind(id)
             .execute(&data.db)
             .await
+    } else {
+        sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, is_admin = $4 WHERE id = $5"#)
+            .bind(body.first_name.to_owned())
+            .bind(body.last_name.to_owned())
+            .bind(body.username.to_owned())
+            .bind(body.make_admin.to_owned())
+            .bind(id)
+            .execute(&data.db)
+            .await
+    }
     .map_err(|e| {
         (
             StatusCode::INTERNAL_SERVER_ERROR,
@@ -567,10 +583,10 @@ pub async fn setup_initial_admin(
         })?;
 
     if user.rows_affected() < 1 {
-        Err((
+        return Err((
             StatusCode::INTERNAL_SERVER_ERROR,
             Json(json!({"status": "error", "message": "Error creating admin user"})),
-        ))
+        ));
     } else {
         Ok(Json(
             json!({"status": "success", "result": "Admin user created"}),
@@ -611,6 +627,6 @@ pub fn filter_user(user: &User) -> FilteredUser {
         first_name: user.first_name.clone(),
         last_name: user.last_name.clone(),
         username: user.username.clone(),
-        is_admin: user.is_admin,
+        is_admin: user.is_admin.clone(),
     }
 }

backend/src/handlers/ticket.rs

@@ -230,22 +230,22 @@ pub async fn get_ticket_by_id(
                 user_last_name: row.get("last_name"),
             };
             let response = serde_json::json!(ticket_response);
-            Ok(Json(response))
+            return Ok(Json(response));
         }
         Err(sqlx::Error::RowNotFound) => {
             let error_response = serde_json::json!({
                 "status": "fail",
                 "message": format!("Ticket with ID {} not found", id)
             });
-            Err((StatusCode::NOT_FOUND, Json(error_response)))
+            return Err((StatusCode::NOT_FOUND, Json(error_response)));
         }
         Err(e) => {
-            Err((
+            return Err((
                 StatusCode::INTERNAL_SERVER_ERROR,
                 Json(json!({"status": "error", "message": format!("{:?}", e)})),
-            ))
+            ));
-        }
         }
+    };
 }
 
 /// Updates a ticket's status.

backend/src/main.rs

@@ -64,7 +64,7 @@ async fn main() {
     let database_url = &env.db_url;
 
     // Establish connection pool to PostgreSQL
-    let pool = match PgPoolOptions::new().connect(database_url).await {
+    let pool = match PgPoolOptions::new().connect(&database_url).await {
         Ok(pool) => {
             println!("Database connection successful");
             pool
@@ -90,7 +90,6 @@ async fn main() {
     .layer(cors);
 
     // Start listening for incoming connections
-    let uri = format!("0.0.0.0:{}", env.backend_port);
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:8001").await.unwrap();
-    let listener = tokio::net::TcpListener::bind(&uri).await.unwrap();
     let _ = axum::serve(listener, app).await;
 }

data/compose.yaml

@@ -8,7 +8,7 @@ services:
     environment:
       - POSTGRES_PASSWORD=tickets
     volumes:
-      - pg_data:/var/lib/postgresql/pg_data
+      - pg_data:/var/lib/postregsql/pg_data
 
 volumes:
   pg_data:

frontend/Cargo.toml

@@ -16,8 +16,7 @@ serde = { workspace = true }
 wasm-bindgen-futures = "0.4.70"
 web-sys = { version = "0.3.95", features = [
   "Window","Document","Request","Response","Headers", "HtmlSelectElement", "RequestCredentials",
-  "SubmitEvent","InputEvent","HtmlInputElement","Event", "HtmlFormElement", "MouseEvent",
+  "SubmitEvent","InputEvent","HtmlInputElement","Event", "HtmlFormElement", "MouseEvent"
-  "Element", "MediaQueryList", "DomTokenList"
 ] }
 gloo-net = "0.7.0"
 gloo-storage = "0.4.0"

frontend/Trunk.toml

@@ -1,6 +1,6 @@
 [serve]
 # The address to serve on LAN.
-addresses = ["127.0.0.1"] #,"10.150.9.116"]
+addresses = ["127.0.0.1"] #,"10.150.9.7"]
 # The address to serve on WAN.
 # address = "0.0.0.0"
 # The port to serve on.

frontend/index.html

@@ -5,8 +5,9 @@
     <link data-trunk rel="rust" data-bin="bin" />
     <link data-trunk rel="scss" href="src/styles/main.scss" />
     <link data-trunk rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
+    <link data-trunk rel="copy-dir" href="src/assets" />
     <meta charset="utf-8" />
-    <title>Ticket System CSG</title>
+    <title>Yew App</title>
 </head>
 
 <body></body>

frontend/src/auth.rs

@@ -109,7 +109,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
         AuthState {
             is_authenticated: None,
             ..
-        } => html! { <div>{ "Lade..." } </div> },
+        } => html! { <div>{ "Loading..." } </div> },
         AuthState {
             is_authenticated: Some(false),
             ..
@@ -126,7 +126,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
                     Some(false) => {
                         html! { <Redirect<crate::Route> to={crate::Route::PermissionDenied}/> }
                     }
-                    None => html! { <div>{ "Berechtigungen werden geprüft..." }</div> },
+                    None => html! { <div>{ "Checking permissions..." }</div> },
                 }
             } else {
                 props.children.clone().into()

frontend/src/dark_mode.rs

@@ -1,74 +0,0 @@
-use gloo_storage::{LocalStorage, Storage};
-use web_sys::window;
-use yew::prelude::*;
-
-/// A persistent, floating toggle button to switch the user interface theme between Dark Mode and Light Mode.
-///
-/// # Functionality
-/// 1. **System Preference Check**: If the user hasn't explicitly set a preference, detects the operating system theme 
-///    preference using browser `match_media("(prefers-color-scheme: dark)")` query.
-/// 2. **Session Persistence**: Caches the selected theme choice under the `"dark-mode"` key in the browser's `LocalStorage` 
-///    so that user preferences persist across page reloads.
-/// 3. **Dynamic Style Swapping**: Injects or removes the `.theme-dark` / `.theme-light` classes directly on the document 
-///    `body` element, triggering the theme change via globally defined CSS variables.
-#[function_component(DarkModeToggle)]
-pub fn dark_mode_toggle() -> Html {
-    // 1. Initialize state from LocalStorage or system preference
-    let is_dark = use_state(|| {
-        LocalStorage::get::<bool>("dark-mode").unwrap_or_else(|_| {
-            // Fallback to system preference if not set
-            window()
-                .and_then(|w| w.match_media("(prefers-color-scheme: dark)").ok().flatten())
-                .map(|m| m.matches())
-                .unwrap_or(false)
-        })
-    });
-
-    // 2. Synchronize the class on the body when the state changes
-    {
-        let is_dark = is_dark.clone();
-        use_effect_with(is_dark, |is_dark| {
-            if let Some(win) = window() {
-                if let Some(doc) = win.document() {
-                    if let Some(body) = doc.body() {
-                        if **is_dark {
-                            let _ = body.class_list().add_1("theme-dark");
-                            let _ = body.class_list().remove_1("theme-light");
-                            let _ = LocalStorage::set("dark-mode", true);
-                        } else {
-                            let _ = body.class_list().add_1("theme-light");
-                            let _ = body.class_list().remove_1("theme-dark");
-                            let _ = LocalStorage::set("dark-mode", false);
-                        }
-                    }
-                }
-            }
-            || ()
-        });
-    }
-
-    // 3. Toggle action
-    let onclick = {
-        let is_dark = is_dark.clone();
-        Callback::from(move |_| {
-            is_dark.set(!*is_dark);
-        })
-    };
-
-    html! {
-        <button class="dark-mode-toggle" {onclick}>
-            if *is_dark {
-                // Sun Icon for switching to light mode
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <circle cx="12" cy="12" r="4"/>
-                    <path d="M12 2v2M12 20v2M4.93 4.93l1.41 1.41M17.66 17.66l1.41 1.41M2 12h2M20 12h2M6.34 17.66l-1.41 1.41M19.07 4.93l-1.41 1.41"/>
-                </svg>
-            } else {
-                // Moon Icon for switching to dark mode
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M12 3a6 6 0 0 0 9 9 9 9 0 1 1-9-9Z"/>
-                </svg>
-            }
-        </button>
-    }
-}

frontend/src/lib.rs

@@ -1,6 +1,5 @@
 mod auth;
 mod pages;
-mod dark_mode;
 use crate::auth::ProtectedRoute;
 use crate::pages::*;
 use gloo_net::http::Request;
@@ -138,6 +137,7 @@ fn sidebar_shell(props: &SidebarShellProps) -> Html {
     }
 }
 
+
 /// Props for the AdminCheckWrapper component.
 #[derive(Properties, PartialEq)]
 pub struct AdminCheckWrapperProps {
@@ -192,10 +192,10 @@ fn admin_check_wrapper(props: &AdminCheckWrapperProps) -> Html {
     }
 
     match *admin_exists {
-        None => html! { <div>{ "Lade..." }</div> },
+        None => html! { <div>{ "Loading..." }</div> },
         Some(false) => {
             navigator.push(&Route::Setup);
-            html! { <div>{ "Leite weiter zur Einrichtung..." }</div> }
+            html! { <div>{ "Redirecting to setup..." }</div> }
         }
         Some(true) => props.children.clone().into(),
     }
@@ -316,7 +316,7 @@ fn switch(route: Route) -> Html {
 pub fn app() -> Html {
     html! {
         <BrowserRouter>
-            <dark_mode::DarkModeToggle />
+            <basic_pages::Icon/>
             <Switch<Route> render={switch} />
         </BrowserRouter>
     }

frontend/src/pages/basic_pages.rs

@@ -3,7 +3,6 @@ use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 use yew_router::prelude::*;
 
-#[macro_export]
 /// Removes surrounding double quotes from a string.
 ///
 /// This macro takes an expression that evaluates to a string and returns a new `String`
@@ -72,7 +71,7 @@ pub fn home_component() -> Html {
                         );
                         name.set(name_value);
                     }
-                    _ => name.set("Unbekannt".to_string()),
+                    _ => name.set("Unknown".to_string()),
                 }
             });
             || ()
@@ -80,15 +79,11 @@ pub fn home_component() -> Html {
     }
 
     html! {
-        <div class="form-container home">
+        <div class="rundbg">
-            <div class="page-header">
-                <h1>{ "Willkommen" }</h1>
-            </div>
             <crate::utilities::TicketCount/>
-            <div>
+
-                <p>{ "Sie sind angemeldet als: " }</p>
+            <p>{ "You are logged in as: " }</p>
-                <p class="text-muted">{ &*name }</p>
+            <p>{ &*name }</p>
-            </div>
         </div>
     }
 }
@@ -106,14 +101,11 @@ pub fn home_component() -> Html {
 /// ```
 #[component(NotFound)]
 pub fn not_found_component() -> Html {
-    let message = "404 Nicht gefunden";
+    let message = "404 Not found";
     html! {
-        <div class="form-container">
+        <div>
-            <div class="empty-state">
             <h1>{&message}</h1>
-                <p>{ "Die von Ihnen gesuchte Seite existiert nicht." }</p>
+            <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
-                <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zur Startseite" }</Link<crate::Route>>
-            </div>
         </div>
     }
 }
@@ -133,13 +125,17 @@ pub fn not_found_component() -> Html {
 #[component(PermissionDenied)]
 pub fn denied_component() -> Html {
     html! {
-        <div class="form-container">
+        <div>
-            <div class="empty-state">
+            <h1>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</h1>
-                <h1>{ "Zugriff verweigert" }</h1>
+            <h3>{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</h3>
-                <p>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</p>
+            <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
-                <p class="text-muted">{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</p>
-                <Link<crate::Route> to={crate::Route::Home}>{ "Zurück zur Startseite" }</Link<crate::Route>>
-            </div>
         </div>
     }
 }
+
+#[component(Icon)]
+pub fn icon_component() -> Html {
+    html! {
+        <img src="assets/csg.png" class="csg-icon" />
+    }
+}

frontend/src/pages/setup.rs

@@ -67,7 +67,7 @@ pub fn initial_admin_setup() -> Html {
     let username = use_state(|| "".to_string());
     let pwd = use_state(|| "".to_string());
     let pwd_confirm = use_state(|| "".to_string());
-    let error = use_state(String::new);
+    let error = use_state(|| String::new());
     let success = use_state(|| false);
     let loading = use_state(|| false);
     let admin_check_done = use_state(|| false);
@@ -103,7 +103,7 @@ pub fn initial_admin_setup() -> Html {
     }
 
     if !*admin_check_done {
-        return html! { <div>{ "Wird überprüft..." }</div> };
+        return html! { <div>{ "Checking..." }</div> };
     }
 
     let onsubmit = {
@@ -121,17 +121,17 @@ pub fn initial_admin_setup() -> Html {
             e.prevent_default();
 
             if (*pwd).is_empty() || (*pwd_confirm).is_empty() {
-                error.set("Passwortfelder dürfen nicht leer sein".to_string());
+                error.set("Password fields cannot be empty".to_string());
                 return;
             }
 
             if *pwd != *pwd_confirm {
-                error.set("Passwörter stimmen nicht überein".to_string());
+                error.set("Passwords do not match".to_string());
                 return;
             }
 
             if (*username).is_empty() {
-                error.set("Benutzername darf nicht leer sein".to_string());
+                error.set("Username cannot be empty".to_string());
                 return;
             }
 
@@ -175,7 +175,7 @@ pub fn initial_admin_setup() -> Html {
                         let text = r.text().await.unwrap_or_else(|_| "unknown".into());
                         error.set(format!("HTTP {}: {}", r.status(), text));
                     }
-                    Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
+                    Err(err) => error.set(format!("Network error: {}", err)),
                 }
             });
         })
@@ -184,16 +184,16 @@ pub fn initial_admin_setup() -> Html {
     html! {
         <div class="setup-container">
             <div class="setup-box">
-                <h1>{ "Erstmalige Admin-Einrichtung" }</h1>
+                <h1>{ "Initial Admin Setup" }</h1>
-                <p>{ "Erstellen Sie Ihr erstes Administrator-Konto" }</p>
+                <p>{ "Create your first administrator account" }</p>
 
                 <form {onsubmit} class="setup-form">
                     <div class="form-group">
-                        <label for="first_name">{ "Vorname:" }
+                        <label for="first_name">{ "First Name:" }
                             <input
                                 id="first_name"
                                 type="text"
-                                placeholder="Vorname"
+                                placeholder="First name"
                                 value={(*first_name).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
                                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -204,11 +204,11 @@ pub fn initial_admin_setup() -> Html {
                     </div>
 
                     <div class="form-group">
-                        <label for="last_name">{ "Nachname:" }
+                        <label for="last_name">{ "Last Name:" }
                             <input
                                 id="last_name"
                                 type="text"
-                                placeholder="Nachname"
+                                placeholder="Last name"
                                 value={(*last_name).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
                                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -219,11 +219,11 @@ pub fn initial_admin_setup() -> Html {
                     </div>
 
                     <div class="form-group">
-                        <label for="username">{ "Benutzername:" }
+                        <label for="username">{ "Username:" }
                             <input
                                 id="username"
                                 type="text"
-                                placeholder="Benutzername"
+                                placeholder="Username"
                                 value={(*username).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
                                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -234,11 +234,11 @@ pub fn initial_admin_setup() -> Html {
                     </div>
 
                     <div class="form-group">
-                        <label for="password">{ "Passwort:" }
+                        <label for="password">{ "Password:" }
                             <input
                                 id="password"
                                 type="password"
-                                placeholder="Passwort"
+                                placeholder="Password"
                                 value={(*pwd).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
                                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -249,11 +249,11 @@ pub fn initial_admin_setup() -> Html {
                     </div>
 
                     <div class="form-group">
-                        <label for="pwd_confirm">{ "Passwort bestätigen:" }
+                        <label for="pwd_confirm">{ "Confirm Password:" }
                             <input
                                 id="pwd_confirm"
                                 type="password"
-                                placeholder="Passwort bestätigen"
+                                placeholder="Confirm password"
                                 value={(*pwd_confirm).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
                                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -264,7 +264,7 @@ pub fn initial_admin_setup() -> Html {
                     </div>
 
                     <button type="submit" disabled={*loading} class="submit-btn">
-                        { if *loading { "Wird erstellt..." } else { "Admin-Konto erstellen" } }
+                        { if *loading { "Creating..." } else { "Create Admin Account" } }
                     </button>
 
                     if !error.is_empty() {
@@ -272,7 +272,7 @@ pub fn initial_admin_setup() -> Html {
                     }
 
                     if *success {
-                        <p class="success-message" style="color:green">{ "Admin-Konto erfolgreich erstellt! Weiterleitung zum Login..." }</p>
+                        <p class="success-message" style="color:green">{ "Admin account created successfully! Redirecting to login..." }</p>
                     }
                 </form>
             </div>

frontend/src/pages/sidebar.rs

@@ -234,10 +234,10 @@ pub fn ticket_menu() -> Html {
                     html! {
                         <ul class="submenu" role="menu">
                             <li role="none">
-                                <Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Ticket erstellen" }</span></Link<crate::Route>>
+                                <Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Submit Ticket" }</span></Link<crate::Route>>
                             </li>
                             <li role="none">
-                                <Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "Tickets anzeigen" }</span></Link<crate::Route>>
+                                <Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "View Tickets" }</span></Link<crate::Route>>
                             </li>
                         </ul>
                     }
@@ -289,7 +289,7 @@ pub fn users_menu() -> Html {
                 onclick={on_toggle}
                 aria-expanded={open.to_string()}
             >
-                { "Benutzer" }
+                { "Users" }
                 { if open { " ▾" } else { " ▸" } }
             </button>
 
@@ -298,10 +298,10 @@ pub fn users_menu() -> Html {
                     html! {
                         <ul class="submenu" role="menu">
                             <li role="none">
-                                <Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Benutzer erstellen" }</span></Link<crate::Route>>
+                                <Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Create User" }</span></Link<crate::Route>>
                             </li>
                             <li role="none">
-                                <Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "Benutzer anzeigen" }</span></Link<crate::Route>>
+                                <Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "View Users" }</span></Link<crate::Route>>
                             </li>
                         </ul>
                     }

frontend/src/pages/ticket.rs

@@ -180,7 +180,7 @@ pub fn submit_ticket_component() -> Html {
         Callback::from(move |e: SubmitEvent| {
             e.prevent_default();
             if room.is_none() {
-                status.set(Some("Ungültiger Raum".into()));
+                status.set(Some("Invalid room".into()));
                 return;
             }
             let category = (*category).clone();
@@ -188,7 +188,7 @@ pub fn submit_ticket_component() -> Html {
             let description = (*description).clone();
             let room = room.unwrap();
             if !valid_rooms.contains(&room) {
-                status.set(Some("Raum nicht erlaubt".into()));
+                status.set(Some("Room not allowed".into()));
                 return;
             }
             let status = status.clone();
@@ -208,11 +208,9 @@ pub fn submit_ticket_component() -> Html {
                     .expect("Failed to build request");
 
                 match request.send().await {
-                    Ok(response) if response.status() == 200 => {
+                    Ok(response) if response.status() == 200 => status.set(Some("Success".into())),
-                        status.set(Some("Erfolgreich".into()))
+                    Ok(response) => status.set(Some(format!("Error: {}", response.status()))),
-                    }
+                    Err(err) => status.set(Some(format!("Network error: {}", err))),
-                    Ok(response) => status.set(Some(format!("Fehler: {}", response.status()))),
-                    Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
                 }
             });
         })
@@ -267,7 +265,10 @@ pub fn submit_ticket_component() -> Html {
                         Err(_) => None,
                     }
                 } else {
-                    raw_trim.parse::<i16>().ok()
+                    match raw_trim.parse::<i16>() {
+                        Ok(n) => Some(n),
+                        Err(_) => None,
+                    }
                 }
             };
 
@@ -286,53 +287,52 @@ pub fn submit_ticket_component() -> Html {
     let room_valid = (*room).is_some();
 
     html! {
-        <div class="form-container">
+        <form class="rundbg" {onsubmit}>
-            <div class="page-header">
-                <h1>{ "Ticket erstellen" }</h1>
-            </div>
-            <form {onsubmit}>
             <label>{ "Betreff:" }
                 <input type="text" value={(*betreff).clone()} oninput={betreff_change}/>
             </label>
+            <br/>
             <label>{ "Beschreibung:" }
-                    <textarea value={(*description).clone()} oninput={description_change}/>
+                <input type="text" value={(*description).clone()} oninput={description_change}/>
             </label>
+            <br/>
             <label>{ "Kategorie:" }
                 <select value={(*category).clone()} onchange={category_change}>
                     <option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
                     <option value="Internet">{ "Internet" }</option>
                     <option value="iPad Koffer">{ "iPad Koffer" }</option>
-                        <option value="Apple TV" selected=true>{ "Apple TV" }</option>
+                    <option value="Apple TV">{ "Apple TV" }</option>
                     <option value="Docu Cam">{ "Dokumenten Kamera" }</option>
                     <option value="Sonstiges">{ "Sonstiges" }</option>
                 </select>
             </label>
+            <br/>
             <label>{ "Raum:" }
                 <input type="text" value={(*room_input).clone()} oninput={room_change}/>
             </label>
             {
                 if !room_valid {
                     html! {
-                            <p class="alert error">{ "Ungültiger oder nicht erlaubter Raum (z. B. 101, K8, D1)" }</p>
+                        <p class="warning" >{ "Ungültiger / nicht erlaubter Raum (z. B. 101, K12, D5)" }</p>
                     }
                 } else {
                     html! {}
                 }
             }
-                <button type="submit">{ "Absenden" }</button>
+            <br/>
+            <button type="submit">{ "Send" }</button>
 
-                <Link<crate::Route> to={crate::Route::AllTickets}>{ "Alle Tickets anzeigen" }</Link<crate::Route>>
+            <Link<crate::Route> to={crate::Route::AllTickets}>{ "Tickets ansehen" }</Link<crate::Route>>
 
             {
                 if let Some(s) = &*status {
-                        html!{ <p class="alert success">{ s }</p> }
+                    html!{ <p>{ s }</p> }
                 } else {
                     html!{}
                 }
             }
 
         </form>
-        </div>
     }
 }
 
@@ -396,7 +396,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                         if status == 200 {
                             match response.json::<Ticket>().await {
                                 Ok(t) => ticket.set(Some(t)),
-                                Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
+                                Err(err) => error.set(Some(format!("Parse error: {}", err))),
                             }
                         } else {
                             match response.json::<ApiError>().await {
@@ -405,13 +405,13 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                                     if let Ok(text) = response.text().await {
                                         error.set(Some(text));
                                     } else {
-                                        error.set(Some(format!("Server-Fehler: {}", status)));
+                                        error.set(Some(format!("Server error: {}", status)));
                                     }
                                 }
                             }
                         }
                     }
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
                 loading.set(false);
             });
@@ -420,6 +420,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
     }
     let onsubmit = {
         let status = status.clone();
+        let id = id.clone();
         let error = error.clone();
 
         Callback::from(move |e: SubmitEvent| {
@@ -435,6 +436,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                 .unwrap_or_else(|| (*status).clone());
             status.set(new_status.clone());
 
+            let id = id.clone();
             let error = error.clone();
 
             spawn_local(async move {
@@ -446,11 +448,9 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                     .expect("Failed to construct request");
 
                 match request.send().await {
-                    Ok(response) if response.status() == 200 => {
+                    Ok(response) if response.status() == 200 => error.set(Some("Success".into())),
-                        error.set(Some("Erfolgreich".into()))
+                    Ok(response) => error.set(Some(format!("Error: {}", response.status()))),
-                    }
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
-                    Ok(response) => error.set(Some(format!("Fehler: {}", response.status()))),
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
                 }
             });
         })
@@ -463,6 +463,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
         let deleting = deleting.clone();
         let delete_error = delete_error.clone();
         let ticket_state = ticket.clone();
+        let id = id;
 
         Callback::from(move |e: MouseEvent| {
             e.prevent_default();
@@ -491,10 +492,10 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                         ticket_state.set(None); // clears the shown item
                     }
                     Ok(resp) => {
-                        let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
+                        let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
                         delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
                     }
-                    Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => delete_error.set(Some(format!("Network error: {}", err))),
                 }
                 deleting.set(false);
             });
@@ -502,9 +503,9 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
     };
 
     if *loading {
-        html! {<p>{ "Lade..." }</p>}
+        html! {<p>{ "Loading" }</p>}
     } else if let Some(e) = &*error {
-        html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
+        html! { <p>{ format!("Error: {}", e) }</p> }
     } else if let Some(t) = &*ticket {
         html! {
             <div>
@@ -537,18 +538,18 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
                     <button type="submit">{ "Aktualisieren" }</button>
                 </form>
 
-                <button onclick={ondelete} disabled={*deleting} class="delete">
+                <button onclick={ondelete} disabled={*deleting}>
                     {if *deleting {"Löschen..."} else {"Löschen"}}
                 </button>
 
-                <Link<crate::Route> to={crate::Route::AllTickets} classes="return-to">{ "Zurück zur Ticketübersicht" }</Link<crate::Route>>
+                <Link<crate::Route> to={crate::Route::AllTickets}>{ "Zurück zur Ticketübersicht" }</Link<crate::Route>>
                 if let Some(err) = &*delete_error {
-                    <p class="alert error">{ err.clone() }</p>
+                    <p style="color:red">{ err.clone() }</p>
                 }
             </div>
         }
     } else {
-        html! { <p>{ "Kein Ticket gefunden." }</p> }
+        html! { <p>{ "No ticket found." }</p> }
     }
 }
 
@@ -587,7 +588,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
 /// ```
 #[component(AllTickets)]
 pub fn all_tickets_component() -> Html {
-    let tickets = use_state(Vec::<Ticket>::new);
+    let tickets = use_state(|| Vec::<Ticket>::new());
     let error = use_state(|| None::<String>);
     let loading = use_state(|| false);
     let user = use_state(|| ActiveUser {
@@ -603,22 +604,22 @@ pub fn all_tickets_component() -> Html {
         use_effect_with((), move |_| {
             loading.set(true);
             spawn_local(async move {
-                let url = "/api/tickets".to_string();
+                let url = format!("/api/tickets");
                 match Request::get(&url).send().await {
                     Ok(response) if response.status() == 200 => {
                         match response.json::<Vec<Ticket>>().await {
                             Ok(t) => tickets.set(t),
-                            Err(e) => error.set(Some(format!("Parser-Fehler: {}", e))),
+                            Err(e) => error.set(Some(format!("parse error: {}", e))),
                         }
                     }
                     Ok(response) => {
                         if let Ok(text) = response.text().await {
                             error.set(Some(text));
                         } else {
-                            error.set(Some(format!("Status {}", response.status())));
+                            error.set(Some(format!("status {}", response.status())));
                         }
                     }
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
                 loading.set(false);
             });
@@ -635,9 +636,9 @@ pub fn all_tickets_component() -> Html {
                     .credentials(web_sys::RequestCredentials::Include)
                     .send()
                     .await
-                    && response.status() == 200
-                    && let Ok(json) = response.json::<serde_json::Value>().await
                 {
+                    if response.status() == 200 {
+                        if let Ok(json) = response.json::<serde_json::Value>().await {
                             let id = json
                                 .get("data")
                                 .and_then(|d| d.get("id"))
@@ -650,22 +651,20 @@ pub fn all_tickets_component() -> Html {
                                 .unwrap_or(false);
                             user.set(ActiveUser { id, is_admin });
                         }
+                    }
+                }
             });
             || ()
         });
     }
 
     if *loading {
-        html! {<p>{ "Lade..." }</p>}
+        html! {<p>{ "Loading" }</p>}
     } else if let Some(e) = &*error {
-        html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
+        html! { <p>{ format!("Error: {}", e) }</p> }
     } else {
         html! {
-            <div>
+            <ul class= "postits">
-                <div class="page-header">
-                    <h1>{ "Alle Tickets" }</h1>
-                </div>
-                <ul class="ticket-list">
             { for tickets.iter().filter(|t| t.status != "Archived" && (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| {
                 let status_class = match t.status.as_str() {
                     "ToDo" => "To-Do",
@@ -675,17 +674,24 @@ pub fn all_tickets_component() -> Html {
                     _ => "To-Do"
                 };
                 html! {
-                            <li key={t.id.to_string()} class={status_class}>
+                    <div class={classes!{status_class, "listbox"}}>
-                                <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
+                        <li key={t.id.to_string()}>
+                            <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
                             <p>{ &t.description }</p>
+                            <p>{ match t.status.as_str() {
+                                "ToDo" => "Zu tun",
+                                "InProgress" => "In Bearbeitung",
+                                "Completed" => "Erledigt",
+                                "Archived" => "Archiviert",
+                                _ => "Ungültiger Status"
+                            }}</p>
                         </li>
-                        }
+
-                    })}
+                    </div>
-                </ul>
+                }})}
-                <div class="ticket-list-actions">
+
                 <Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
-                </div>
+            </ul>
-            </div>
         }
     }
 }
@@ -725,7 +731,7 @@ pub fn all_tickets_component() -> Html {
 /// ```
 #[component(ArchivedTickets)]
 pub fn archived_tickets_component() -> Html {
-    let tickets = use_state(Vec::<Ticket>::new);
+    let tickets = use_state(|| Vec::<Ticket>::new());
     let error = use_state(|| None::<String>);
     let loading = use_state(|| false);
     let user = use_state(|| ActiveUser {
@@ -741,22 +747,22 @@ pub fn archived_tickets_component() -> Html {
         use_effect_with((), move |_| {
             loading.set(true);
             spawn_local(async move {
-                let url = "/api/tickets".to_string();
+                let url = format!("/api/tickets");
                 match Request::get(&url).send().await {
                     Ok(response) if response.status() == 200 => {
                         match response.json::<Vec<Ticket>>().await {
                             Ok(t) => tickets.set(t),
-                            Err(e) => error.set(Some(format!("Parser-Fehler: {}", e))),
+                            Err(e) => error.set(Some(format!("parse error: {}", e))),
                         }
                     }
                     Ok(response) => {
                         if let Ok(text) = response.text().await {
                             error.set(Some(text));
                         } else {
-                            error.set(Some(format!("Status {}", response.status())));
+                            error.set(Some(format!("status {}", response.status())));
                         }
                     }
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
                 loading.set(false);
             });
@@ -773,9 +779,9 @@ pub fn archived_tickets_component() -> Html {
                     .credentials(web_sys::RequestCredentials::Include)
                     .send()
                     .await
-                    && response.status() == 200
-                    && let Ok(json) = response.json::<serde_json::Value>().await
                 {
+                    if response.status() == 200 {
+                        if let Ok(json) = response.json::<serde_json::Value>().await {
                             let id = json
                                 .get("data")
                                 .and_then(|d| d.get("id"))
@@ -788,34 +794,37 @@ pub fn archived_tickets_component() -> Html {
                                 .unwrap_or(false);
                             user.set(ActiveUser { id, is_admin });
                         }
+                    }
+                }
             });
             || ()
         });
     }
 
     if *loading {
-        html! {<p>{ "Lade..." }</p>}
+        html! {<p>{ "Loading" }</p>}
     } else if let Some(e) = &*error {
-        html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
+        html! { <p>{ format!("Error: {}", e) }</p> }
     } else {
         html! {
-            <div>
+            <ul>
-                <div class="page-header">
-                                <h1>{ "Archivierte Tickets" }</h1>
-                            </div>
-                <ul class="ticket-list">
             { for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
                     <div>
-
                         <li key={t.id.to_string()}>
-                                <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
+                            <Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
                             <p>{ &t.description }</p>
+                            <p>{ match t.status.as_str() {
+                                "ToDo" => "Zu tun",
+                                "InProgress" => "In Bearbeitung",
+                                "Completed" => "Erledigt",
+                                "Archived" => "Archiviert",
+                                _ => "Ungültiger Status"
+                            }}</p>
                         </li>
 
                     </div>
                 })}
             </ul>
-            </div>
         }
     }
 }

frontend/src/pages/user.rs

@@ -1,4 +1,3 @@
-use crate::dequote;
 use gloo_net::http::Request;
 use serde::{Deserialize, Serialize};
 use wasm_bindgen_futures::spawn_local;
@@ -182,11 +181,9 @@ pub fn register_component() -> Html {
                     .expect("Error building request");
 
                 match request.send().await {
-                    Ok(response) if response.status() == 200 => {
+                    Ok(response) if response.status() == 200 => status.set(Some("Success".into())),
-                        status.set(Some("Erfolgreich".into()))
+                    Ok(response) => status.set(Some(format!("Error: {}", response.status()))),
-                    }
+                    Err(err) => status.set(Some(format!("Network error: {}", err))),
-                    Ok(response) => status.set(Some(format!("Fehler: {}", response.status()))),
-                    Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
                 }
             });
         })
@@ -233,11 +230,7 @@ pub fn register_component() -> Html {
     };
 
     html! {
-        <div class="form-container">
+        <form {onsubmit} class="rundbg">
-            <div class="page-header">
-                <h1>{ "Benutzer registrieren" }</h1>
-            </div>
-            <form {onsubmit}>
             <label>{ "Vorname:" }
                 <input type="text" value={(*first_name).clone()} oninput={fn_change}/>
             </label>
@@ -250,12 +243,11 @@ pub fn register_component() -> Html {
             <label>{ "Admin:" }
                 <input type="checkbox" checked={*is_admin} onchange={admin_change}/>
             </label>
-                <label>{ "Passwort:" }
+            <label>{ "Password:" }
                 <input type="password" value={(*pwd).clone()} oninput={pwd_change}/>
             </label>
             <button type="submit">{ "Bestätigen" }</button>
         </form>
-        </div>
     }
 }
 
@@ -290,7 +282,7 @@ pub fn login_component() -> Html {
     let username = use_state(|| "".to_string());
     let pwd = use_state(|| "".to_string());
     let loading = use_state(|| false);
-    let error = use_state(String::new);
+    let error = use_state(|| String::new());
     let success = use_state(|| false);
     let navigator = use_navigator().unwrap();
 
@@ -334,25 +326,21 @@ pub fn login_component() -> Html {
                         navigator.push(&crate::Route::Home);
                     }
                     Ok(r) => {
-                        let text: serde_json::Value =
+                        let text = r.text().await.unwrap_or_else(|_| "unknown".into());
-                            r.json().await.unwrap_or_else(|_| "unbekannt".into());
+                        error.set(format!("HTTP {}: {}", r.status(), text));
-                        error.set(dequote!(format!("{}", text["message"].to_string())));
                     }
-                    Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
+                    Err(err) => error.set(format!("Network error: {}", err)),
                 }
             });
         })
     };
 
     html! {
-        <main class="content login">
+        <div>
-            <div class="form-container">
+        <h1 class="headline">{ "Anmeldung" }</h1>
-                <div class="page-header">
+        <form {onsubmit} class="rundbg login">
-                    <h1>{ "Anmelden" }</h1>
-                </div>
-                <form {onsubmit}>
             <input
-                        placeholder="Benutzername"
+                placeholder="username"
                 value={(*username).clone()}
                 oninput={Callback::from(move |e: InputEvent| {
                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -361,18 +349,17 @@ pub fn login_component() -> Html {
             />
             <input
                 type="password"
-                        placeholder="Passwort"
+                placeholder="password"
                 value={(*pwd).clone()}
                 oninput={Callback::from(move |e: InputEvent| {
                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
                     pwd.set(input.value());
                 })}
             />
-                    <button type="submit" disabled={*loading}>{ if *loading { "Wird angemeldet..." } else { "Anmelden" } }</button>
+            <button type="submit" disabled={*loading}>{ if *loading { "Logging in..." } else { "Login" } }</button>
-                    if !error.is_empty() { <p class="alert error">{(*error).clone()}</p> }
+            if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> }
         </form>
         </div>
-        </main>
     }
 }
 
@@ -405,7 +392,7 @@ pub fn login_component() -> Html {
 /// ```
 #[component(AllUsers)]
 pub fn all_users_component() -> Html {
-    let users = use_state(Vec::<FilteredUser>::new);
+    let users = use_state(|| Vec::<FilteredUser>::new());
     let error = use_state(|| None::<String>);
     let loading = use_state(|| false);
 
@@ -417,22 +404,22 @@ pub fn all_users_component() -> Html {
         use_effect_with((), move |_| {
             loading.set(true);
             spawn_local(async move {
-                let url = "/api/users".to_string();
+                let url = format!("/api/users");
                 match Request::get(&url).send().await {
                     Ok(response) if response.status() == 200 => {
                         match response.json::<Vec<FilteredUser>>().await {
                             Ok(u) => users.set(u),
-                            Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
+                            Err(err) => error.set(Some(format!("Parse error: {}", err))),
                         }
                     }
                     Ok(response) => {
                         if let Ok(text) = response.text().await {
                             error.set(Some(text));
                         } else {
-                            error.set(Some(format!("Status {}", response.status())));
+                            error.set(Some(format!("status {}", response.status())));
                         }
                     }
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
                 loading.set(false);
             });
@@ -441,37 +428,18 @@ pub fn all_users_component() -> Html {
     }
 
     if *loading {
-        html! {
+        html! {<p>{ "Loading" }</p>}
-            <div class="form-container">
-                <div class="page-header">
-                    <h1>{ "Alle Benutzer" }</h1>
-                </div>
-                <p>{ "Lade..." }</p>
-            </div>
-        }
     } else if let Some(e) = &*error {
-        html! {
+        html! { <p>{ format!("Error: {}", e) }</p> }
-            <div class="form-container">
-                <div class="page-header">
-                    <h1>{ "Alle Benutzer" }</h1>
-                </div>
-                <p class="alert error">{ format!("Fehler: {}", e) }</p>
-            </div>
-        }
     } else {
         html! {
-            <div class="form-container">
+            <ul class="postits">
-                <div class="page-header">
-                    <h1>{ "Alle Benutzer" }</h1>
-                </div>
-                <ul class="user-list">
             { for users.iter().map(|t| html! {
-                        <li key={t.id.to_string()}>
+                    <li key={t.id.to_string()} class="listbox">
-                            <Link<crate::Route> to={crate::Route::UserByID{id: t.id}}><h3>{ format!("{} {}", t.first_name, t.last_name) }</h3></Link<crate::Route>>
+                        <Link<crate::Route> to={crate::Route::UserByID{id: t.id}}><h3>{ format!("{} {}- #{}", t.first_name, t.last_name, t.id) }</h3></Link<crate::Route>>
                     </li>
                 })}
             </ul>
-            </div>
         }
     }
 }
@@ -539,7 +507,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                         if status == 200 {
                             match response.json::<FilteredUser>().await {
                                 Ok(u) => user.set(Some(u)),
-                                Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
+                                Err(err) => error.set(Some(format!("Parse error: {}", err))),
                             }
                         } else {
                             match response.json::<ApiError>().await {
@@ -548,13 +516,13 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                                     if let Ok(text) = response.text().await {
                                         error.set(Some(text));
                                     } else {
-                                        error.set(Some(format!("Server-Fehler: {}", status)));
+                                        error.set(Some(format!("Server error: {}", status)));
                                     }
                                 }
                             }
                         }
                     }
-                    Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
                 loading.set(false);
             });
@@ -566,7 +534,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
     let last_name = use_state(|| "".to_string());
     let username = use_state(|| "".to_string());
     let make_admin = use_state(|| false);
-    let new_pwd = use_state(String::new);
+    let new_pwd = use_state(|| String::new());
     let saving = use_state(|| false);
     let save_error = use_state(|| None::<String>);
     let save_success = use_state(|| false);
@@ -606,6 +574,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
             let last_name = (*last_name).clone();
             let username = (*username).clone();
             let make_admin = *make_admin;
+            let new_pwd_state = new_pwd.clone();
             let new_pwd = (*new_pwd).clone();
 
             saving.set(true);
@@ -616,10 +585,11 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
             let save_error = save_error.clone();
             let save_success = save_success.clone();
             let user_state = user_state.clone();
+            let id = id;
 
             spawn_local(async move {
                 let payload = UserUpdateScheme {
-                    id,
+                    id: id,
                     first_name,
                     last_name,
                     username,
@@ -639,13 +609,14 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                         if let Ok(updated) = resp.json::<FilteredUser>().await {
                             user_state.set(Some(updated));
                         }
+                        new_pwd_state.set(String::new());
                         save_success.set(true);
                     }
                     Ok(resp) => {
-                        let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
+                        let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
                         save_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
                     }
-                    Err(err) => save_error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => save_error.set(Some(format!("Network error: {}", err))),
                 }
                 saving.set(false);
             });
@@ -659,15 +630,14 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
         let deleting = deleting.clone();
         let delete_error = delete_error.clone();
         let user_state = user.clone(); // or ticket
+        let id = id;
 
         Callback::from(move |e: MouseEvent| {
             e.prevent_default();
             // confirm
             if !web_sys::window()
                 .and_then(|w| {
-                    w.confirm_with_message(
+                    w.confirm_with_message("Are you sure you want to delete this item?")
-                        "Sind Sie sicher, dass Sie dieses Element löschen möchten?",
-                    )
                         .ok()
                 })
                 .unwrap_or(false)
@@ -692,10 +662,10 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                         user_state.set(None); // clears the shown item
                     }
                     Ok(resp) => {
-                        let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
+                        let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
                         delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
                     }
-                    Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
+                    Err(err) => delete_error.set(Some(format!("Network error: {}", err))),
                 }
                 deleting.set(false);
             });
@@ -703,9 +673,9 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
     };
 
     if *loading {
-        html! {<p>{ "Lade..." }</p>}
+        html! {<p>{ "Loading" }</p>}
     } else if let Some(e) = &*error {
-        html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
+        html! { <p>{ format!("Error: {}", e) }</p> }
     } else if let Some(u) = &*user {
         html! {
             <div>
@@ -716,7 +686,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                     <p><strong>{ "Ist Admin: " }</strong>{ u.is_admin }</p>
                 </div>
 
-                <h1>{ format!("Benutzer #{}", u.id) }</h1>
+                <h1>{ format!("User #{}", u.id) }</h1>
                 <form onsubmit={onsubmit}>
                     <div>
                         <label>{ "Vorname" }
@@ -760,7 +730,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
                         </label>
                     </div>
                     <div>
-                        <label>{ "Neues Passwort (leer = unverändert)" }
+                        <label>{ "Neues Passwort (leer = unchanged)" }
                             <input name="new_pwd" type="password"
                                 value={(*new_pwd).clone()}
                                 oninput={Callback::from(move |e: InputEvent| {
@@ -773,24 +743,24 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
 
                     <button type="submit" disabled={*saving}>{ if *saving { "Speichern..." } else { "Speichern" } }</button>
                     if *save_success {
-                        <p class="alert success">{ "Erfolgreich aktualisiert" }</p>
+                        <p style="color:green">{ "Updated successfully" }</p>
                     }
                     if let Some(err) = &*save_error {
-                        <p class="alert error">{ err.clone() }</p>
+                        <p style="color:red">{ err.clone() }</p>
                     }
                 </form>
 
-                <button onclick={ondelete} disabled={*deleting} class="delete">
+                <button onclick={ondelete} disabled={*deleting}>
                     {if *deleting {"Löschen..."} else {"Löschen"}}
                 </button>
 
-                <Link<crate::Route> to={crate::Route::AllUsers} classes="return-to">{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
+                <Link<crate::Route> to={crate::Route::AllUsers}>{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
                 if let Some(err) = &*delete_error {
-                    <p class="alert error">{ err.clone() }</p>
+                    <p style="color:red">{ err.clone() }</p>
                 }
             </div>
         }
     } else {
-        html! { <p>{ "Kein Benutzer gefunden." }</p> }
+        html! { <p>{ "No ticket found." }</p> }
     }
 }

frontend/src/pages/utilities.rs

@@ -6,7 +6,6 @@ use serde::Deserialize;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 
-use crate::dequote;
 use crate::pages::ticket::{ActiveUser, Ticket};
 
 /// A partial representation of a ticket, containing only the fields necessary for statistical analysis.
@@ -21,23 +20,6 @@ use crate::pages::ticket::{ActiveUser, Ticket};
 struct TicketPartial {
     date: DateTime<Utc>,
     room: i16,
-    user_id: i16,
-}
-
-/// A partial representation of a user, containing only the fields necessary for statistical analysis.
-///
-/// This struct is used to efficiently retrieve and process user data for diagnostics
-/// without fetching the full user details.
-///
-/// # Fields
-/// - `id`: The unique identifier of the user.
-/// - `first_name`: The first name of the user.
-/// - `last_name`: The last name of the user.
-#[derive(Debug, Deserialize, Clone, PartialEq)]
-struct UserPartial {
-    id: i16,
-    first_name: String,
-    last_name: String,
 }
 
 /// Properties for components that display room-wise ticket totals.
@@ -52,20 +34,6 @@ struct RoomTotalsProps {
     tickets: Vec<TicketPartial>,
 }
 
-/// Properties for components that display user-wise ticket totals.
-///
-/// This struct passes a list of partial user data and partial ticket data to a component
-/// responsible for calculating and visualizing ticket distribution per user.
-///
-/// # Fields
-/// - `users`: A vector of [`UserPartial`] containing user data relevant for user totals.
-/// - `tickets`: A vector of [`TicketPartial`] containing ticket data relevant for user totals.
-#[derive(Properties, PartialEq)]
-struct UserTotalProps {
-    users: Vec<UserPartial>,
-    tickets: Vec<TicketPartial>,
-}
-
 /// Converts a `chrono::DateTime<Utc>` object's weekday to a 0-indexed integer.
 ///
 /// This function maps `chrono::Weekday` values (where Monday is 1, Sunday is 7)
@@ -156,7 +124,7 @@ fn day_counts(partials: &[TicketPartial]) -> [usize; 7] {
             chrono::Weekday::Sun => 6,
         };
         occ[idx] += 1;
-        current += chrono::Duration::days(1);
+        current = current + chrono::Duration::days(1);
     }
 
     occ
@@ -236,7 +204,7 @@ pub fn diagnostics_component() -> Html {
 /// ```
 #[component(TicketCount)]
 pub fn ticket_count_component() -> Html {
-    let tickets = use_state(Vec::<Ticket>::new);
+    let tickets = use_state(|| Vec::<Ticket>::new());
     let error = use_state(|| None::<String>);
     let loading = use_state(|| false);
     let user = use_state(|| ActiveUser {
@@ -252,7 +220,7 @@ pub fn ticket_count_component() -> Html {
         use_effect_with((), move |_| {
             loading.set(true);
             spawn_local(async move {
-                let url = "/api/tickets".to_string();
+                let url = format!("/api/tickets");
                 match Request::get(&url).send().await {
                     Ok(response) if response.status() == 200 => {
                         match response.json::<Vec<Ticket>>().await {
@@ -284,9 +252,9 @@ pub fn ticket_count_component() -> Html {
                     .credentials(web_sys::RequestCredentials::Include)
                     .send()
                     .await
-                    && response.status() == 200
-                    && let Ok(json) = response.json::<serde_json::Value>().await
                 {
+                    if response.status() == 200 {
+                        if let Ok(json) = response.json::<serde_json::Value>().await {
                             let id = json
                                 .get("data")
                                 .and_then(|d| d.get("id"))
@@ -299,25 +267,30 @@ pub fn ticket_count_component() -> Html {
                                 .unwrap_or(false);
                             user.set(ActiveUser { id, is_admin });
                         }
+                    }
+                }
             });
             || ()
         });
     }
 
     if *loading {
-        html! {<p>{ "Lade..." }</p>}
+        html! {<p>{ "Loading" }</p>}
     } else if let Some(e) = &*error {
-        html! { <p>{ format!("Fehler: {}", e) }</p> }
+        html! { <p>{ format!("Error: {}", e) }</p> }
     } else {
         let status_conditions = |t: &Ticket| t.status == "ToDo" || t.status == "InProgress";
         let count = tickets
             .iter()
-            .filter(|t| status_conditions(t) && (user.is_admin || (user.id == Some(t.user_id))))
+            .filter(|t| {
+                status_conditions(t)
+                    && (user.is_admin || user.id.map_or(false, |uid| t.user_id == uid))
+            })
             .count();
         html! {
-            <div class="open-tickets">
+            <div>
-                <h2 class="left">{ "Offene Tickets" }</h2>
+                <h2>{ "Offene Tickets" }</h2>
-                <h4 class="ticket_count center">{ count }</h4>
+                <h4>{ count }</h4>
             </div>
         }
     }
@@ -352,14 +325,12 @@ pub fn ticket_count_component() -> Html {
 /// ```
 #[component(SubmitStats)]
 pub fn submit_stats_component() -> Html {
-    let tickets = use_state(Vec::<TicketPartial>::new);
+    let tickets = use_state(|| Vec::<TicketPartial>::new());
-    let users = use_state(Vec::<UserPartial>::new);
     let error = use_state(|| None::<String>);
     let loading = use_state(|| false);
 
     {
         let tickets = tickets.clone();
-        let users = users.clone();
         let error = error.clone();
         let loading = loading.clone();
 
@@ -383,24 +354,6 @@ pub fn submit_stats_component() -> Html {
                     }
                     Err(err) => error.set(Some(format!("Network error: {}", err))),
                 }
-
-                match Request::get("/api/users").send().await {
-                    Ok(response) if response.status() == 200 => {
-                        match response.json::<Vec<UserPartial>>().await {
-                            Ok(u) => users.set(u),
-                            Err(e) => error.set(Some(format!("users parse error: {}", e))),
-                        }
-                    }
-                    Ok(response) => {
-                        if let Ok(text) = response.text().await {
-                            error.set(Some(text));
-                        } else {
-                            error.set(Some(format!("users status {}", response.status())));
-                        }
-                    }
-                    Err(err) => error.set(Some(format!("users network error: {}", err))),
-                }
-
                 loading.set(false);
             });
             || ()
@@ -419,7 +372,7 @@ pub fn submit_stats_component() -> Html {
         }
     }
 
-    let weekdays = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
+    let weekdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
     let (max_idx, _max_val) = counts
         .iter()
         .enumerate()
@@ -430,12 +383,12 @@ pub fn submit_stats_component() -> Html {
     html! {
         <div class="diagnostics-section">
             if *loading {
-                <p>{ "Lade..." }</p>
+                <p>{ "Loading..." }</p>
             }
             if let Some(e) = &*error {
-                <p class="alert error">{ e.clone() }</p>
+                <p style="color: red;">{ e.clone() }</p>
             }
-            <h3>{ "Tickets pro Wochentag" }</h3>
+            <h3>{ "Tickets per weekday" }</h3>
             <div class="weekday-chart">
                 <div class="weekday-bars">
                     { for (0..7).map(|i| {
@@ -462,17 +415,8 @@ pub fn submit_stats_component() -> Html {
                     })}
                 </div>
             </div>
-            <div class="diagnostics-row">
-                <div class="diagnostics-column">
-                    <h3>{ "Tickets pro Raum" }</h3>
             <RoomTotalTickets tickets={(*tickets).clone()}/>
         </div>
-                <div class="diagnostics-column">
-                    <h3>{ "Tickets pro Benutzer" }</h3>
-                    <UserTotal users={(*users).clone()} tickets={(*tickets).clone()}/>
-                </div>
-            </div>
-        </div>
     }
 }
 
@@ -513,96 +457,19 @@ fn room_total_component(props: &RoomTotalsProps) -> Html {
 
     html! {
         <div class="diagnostics-section">
-            <div class="chart">
+            <h3>{ "Tickets pro Raum" }</h3>
+            <div class="room-chart">
                 { for totals_vec.into_iter().map(|(room, count)| {
                     let label = parse_room(room);
                     let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
                     html! {
-                        <div class="bar-item">
+                        <div class="room-bar-item">
-                            <div class="diagnostics-header">
+                            <div class="room-header">
-                                <span class="diagnostics-label">{ label }</span>
+                                <span class="room-label">{ label }</span>
-                                <span class="diagnostics-count">{ count }</span>
+                                <span class="room-count">{ count }</span>
                             </div>
-                            <div class="bar-container">
+                            <div class="room-bar-container">
-                                <div class="bar" style={format!("width: {}%;", bar_width_percent)}>
+                                <div class="room-bar" style={format!("width: {}%;", bar_width_percent)}>
-                                </div>
-                            </div>
-                        </div>
-                    }
-                }) }
-            </div>
-        </div>
-    }
-}
-
-/// A component that displays the total number of tickets per user.
-///
-/// This component takes lists of [`UserPartial`] and [`TicketPartial`] items to calculate
-/// and display the total number of tickets submitted by each user.
-/// The results are presented in a sorted list with a bar chart visualization.
-///
-/// # Props
-/// - `users`: A `Vec<UserPartial>` containing partial user data.
-/// - `tickets`: A `Vec<TicketPartial>` containing partial ticket data for analysis.
-///
-/// # Functionality
-/// - **Maps User Names**: Creates a map from user IDs to their first and last names for display.
-/// - **Calculates Totals**: Aggregates ticket counts for each user.
-/// - **Sorts Results**: Displays users sorted by their ticket count in descending order.
-/// - **Visualizes Data**: Renders a bar chart where the width of each bar is proportional
-///   to the ticket count for that user, relative to the user with the maximum tickets.
-/// - **Name Formatting**: Uses the [`dequote!`] macro to clean up user names before display.
-///
-/// # Example
-/// ```rust
-/// html! {
-///     <UserTotal users={my_user_partials} tickets={my_ticket_partials} />
-/// }
-/// ```
-#[component(UserTotal)]
-fn user_total_component(props: &UserTotalProps) -> Html {
-    let name_map: HashMap<i16, (String, String)> = props
-        .users
-        .iter()
-        .map(|u| (u.id, (u.first_name.clone(), u.last_name.clone())))
-        .collect();
-
-    let mut counts: HashMap<i16, usize> = HashMap::new();
-    for t in &props.tickets {
-        *counts.entry(t.user_id).or_insert(0) += 1;
-    }
-
-    let mut totals_vec: Vec<(i16, String, String, usize)> = name_map
-        .into_iter()
-        .map(|(id, (fname, lname))| {
-            let c = counts.get(&id).cloned().unwrap_or(0);
-            (id, fname, lname, c)
-        })
-        .collect();
-
-    totals_vec.sort_by(|a, b| b.3.cmp(&a.3));
-
-    let max_count = totals_vec
-        .iter()
-        .map(|(_, _, _, c)| *c)
-        .max()
-        .unwrap_or(1)
-        .max(1);
-
-    html! {
-        <div class="diagnostics-section">
-            <div class="chart">
-                { for totals_vec.into_iter().map(|(_id, fname, lname, count)| {
-                    let label = format!("{} {}", dequote!(fname), dequote!(lname));
-                    let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
-                    html! {
-                        <div class="bar-item">
-                            <div class="diagnostics-header">
-                                <span class="diagnostics-label">{ label }</span>
-                                <span class="diagnostics-count">{ count }</span>
-                            </div>
-                            <div class="bar-container">
-                                <div class="bar" style={format!("width: {}%;", bar_width_percent)}>
                                 </div>
                             </div>
                         </div>

frontend/src/styles/_mixins.scss

@@ -1,12 +1,8 @@
 @use "variables" as *;
 
 @mixin card {
-  background: $color-container;
+  backgroud: #fff;
-  border-radius: $border-radius;
+  border-radius: &border-radius;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0,0,0,0.06);
   padding: $spacing-md;
-
-  @media (prefers-color-scheme: dark) {
-    background: $color-container-dark;
-  }
 }

frontend/src/styles/_utilities.scss

@@ -3,3 +3,4 @@
 .u-hidden { display: none !important; }
 .u-gap-sm { gap: $spacing-sm; }
 .text-muted { color: $color-muted; }
+

frontend/src/styles/_variables.scss

@@ -1,34 +1,8 @@
-// Color Palette (Reference Style)
+$color-bg: #ffffff;
-$color-bg: var(--color-bg);
+$color-sidebar: #570000;
-$color-bg-dark: var(--color-bg-dark);
+$color-accent: #2563eb;
-$color-container: var(--color-container);
-$color-container-dark: var(--color-container-dark);
-$color-sidebar: #0f172a;
-$color-primary: #2b79c2;
-$color-primary-hover: #1d5fa0;
-$color-accent: #2b79c2;
 $color-muted: #6b7280;
-$color-text: var(--color-text);
-$color-text-dark: var(--color-text-dark);
-
-// Status Colors
-$color-status-todo: #ffcccc;
-$color-status-todo-text: #a00;
-$color-status-inprogress: #fff3cd;
-$color-status-inprogress-text: #856404;
-$color-status-done: #d4edda;
-$color-status-done-text: #155724;
-$color-status-archived: #e0e0e0;
-$color-status-archived-text: #666666;
-
-// Action Colors
-$color-logout: #ff4d4d;
-$color-logout-hover: #e60000;
-
-// Spacing
 $spacing-sm: 8px;
 $spacing-md: 16px;
-$spacing-lg: 2rem;
+$border-radius: 6px;
-$border-radius: 0.5rem;
+$rundbgbackgroundcolor: #a0a0a0;
-$border-radius-lg: 10px;
-

frontend/src/styles/components/_alltickets.scss

@@ -1,82 +0,0 @@
-@use "../variables" as *;
-
-.ticket-list {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-  margin-bottom: $spacing-lg;
-
-  li {
-    border-left: 4px solid;
-    padding: 1rem;
-    margin-bottom: 1rem;
-    border-radius: $border-radius-lg;
-    background: $color-container;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-
-    @media (prefers-color-scheme: dark) {
-      background: $color-container-dark;
-    }
-
-    h3 {
-      margin-top: 0;
-      margin-bottom: $spacing-md;
-      color: $color-primary;
-
-      a {
-        color: $color-primary;
-        text-decoration: none;
-        transition: color 0.2s ease-in-out;
-
-        &:hover {
-          color: $color-primary-hover;
-          text-decoration: underline;
-        }
-      }
-    }
-
-    p {
-      margin: 0.3rem 0;
-    }
-
-    &.To-Do {
-      border-left-color: $color-status-todo-text;
-    }
-
-    &.InProgress {
-      border-left-color: $color-status-inprogress-text;
-    }
-
-    &.Completed {
-      border-left-color: $color-status-done-text;
-    }
-
-    &.Archived {
-      border-left-color: $color-status-archived-text;
-    }
-  }
-}
-
-.ticket-list-actions {
-  display: flex;
-  gap: $spacing-md;
-  flex-wrap: wrap;
-  margin-top: $spacing-lg;
-
-  a {
-    display: inline-block;
-    padding: $spacing-md $spacing-lg;
-    background: $color-primary;
-    color: white;
-    text-decoration: none;
-    border-radius: $border-radius;
-    font-weight: bold;
-    cursor: pointer;
-    transition: background-color 0.2s ease-in-out;
-
-    &:hover {
-      background-color: $color-primary-hover;
-    }
-  }
-}
-

frontend/src/styles/components/_allusers.scss

@@ -1,13 +0,0 @@
-@use "../variables" as *;
-
-.user-list {
-  list-style: none;
-  padding-left: 0;
-  margin: 0;
-
-  li {
-    h3 {
-      margin-top: 0;
-    }
-  }
-}

frontend/src/styles/components/_dark_mode.scss

@@ -1,75 +0,0 @@
-:root {
-  --color-bg: #f0f2f5;
-  --color-bg-dark: #121212;
-  --color-container: #ffffff;
-  --color-container-dark: #333333;
-  --color-text: #111827;
-  --color-text-dark: #e2e2e2;
-}
-
-// Automatically respect standard media query if no override is set
-@media (prefers-color-scheme: dark) {
-  :root {
-    --color-bg: #121212;
-    --color-container: #333333;
-    --color-text: #e2e2e2;
-  }
-}
-
-// Force Light Mode overrides
-body.theme-light {
-  --color-bg: #f0f2f5;
-  --color-bg-dark: #f0f2f5;
-  --color-container: #ffffff;
-  --color-container-dark: #ffffff;
-  --color-text: #111827;
-  --color-text-dark: #111827;
-}
-
-// Force Dark Mode overrides
-body.theme-dark {
-  --color-bg: #121212;
-  --color-bg-dark: #121212;
-  --color-container: #333333;
-  --color-container-dark: #333333;
-  --color-text: #e2e2e2;
-  --color-text-dark: #e2e2e2;
-}
-
-// Fixed positioning ensures NO other component's layout is ever altered
-.dark-mode-toggle {
-  position: fixed;
-  top: 1rem;
-  right: 1rem;
-  z-index: 9999;
-  width: 55px;
-  height: 55px;
-  border-radius: 50%;
-  border: 1px solid rgba(128, 128, 128, 0.2);
-  background-color: var(--color-container);
-  color: var(--color-text);
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-  cursor: pointer;
-  transition: all 0.2s ease-in-out;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-
-  svg {
-    width: 36px;
-    height: 36px;
-    stroke: var(--color-text);
-    transition: stroke 0.2s ease-in-out;
-  }
-
-  &:hover {
-    transform: translateY(-1px);
-    box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
-    background-color: var(--color-bg);
-  }
-
-  &:active {
-    transform: translateY(0);
-  }
-}

frontend/src/styles/components/_diagnostics.scss

@@ -8,18 +8,14 @@
 }
 
 .diagnostics-section {
-  background-color: $color-container;
+  background-color: $color-bg;
   border-radius: $border-radius;
   padding: $spacing-md;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
-
-  @media (prefers-color-scheme: dark) {
-    background-color: $color-container-dark;
-  }
 
   h3 {
-    margin: 0;
+    margin: 0 0 $spacing-md 0;
-    color: $color-primary;
+    color: #1f2937;
     font-size: 1.1rem;
     font-weight: 600;
   }
@@ -31,13 +27,7 @@
   gap: 12px;
   border: 1px solid #e5e7eb;
   border-radius: $border-radius;
-  background-color: $color-container;
+  background-color: #f9fafb;
-  margin: 16px 0px;
-
-  @media (prefers-color-scheme: dark) {
-    background-color: $color-container-dark;
-    border-color: #555;
-  }
 }
 
 .weekday-bars {
@@ -53,7 +43,6 @@
 .weekday-bar {
   display: flex;
   flex-direction: column;
-  justify-content: flex-end;
   align-items: center;
   flex: 1;
   min-width: 60px;
@@ -61,7 +50,7 @@
 
   .bar {
     width: 100%;
-    background-color: $color-primary;
+    background-color: $color-accent;
     border-radius: 4px 4px 0 0;
     transition: background-color 0.2s ease;
 
@@ -87,12 +76,8 @@
     .day {
       font-weight: 600;
       font-size: 12px;
-      color: $color-text;
+      color: #1f2937;
       margin-bottom: 2px;
-
-      @media (prefers-color-scheme: dark) {
-        color: $color-text-dark;
-      }
     }
 
     .value {
@@ -102,116 +87,51 @@
   }
 }
 
-.chart {
+.room-chart {
   display: flex;
   flex-direction: column;
   gap: 12px;
   padding: $spacing-md;
   border: 1px solid #e5e7eb;
   border-radius: $border-radius;
-  background-color: $color-container;
+  background-color: #f9fafb;
-  width: 100%;
-
-  @media (prefers-color-scheme: dark) {
-    background-color: $color-container-dark;
-    border-color: #555;
-  }
 }
 
-.bar-item {
+.room-bar-item {
   display: flex;
   flex-direction: column;
   gap: 4px;
 
-  .diagnostics-header {
+  .room-header {
     display: flex;
     justify-content: space-between;
     align-items: center;
 
-    .diagnostics-label {
+    .room-label {
       font-weight: 600;
       font-size: 14px;
-      color: $color-text;
+      color: #1f2937;
       min-width: 50px;
-
-      @media (prefers-color-scheme: dark) {
-        color: $color-text-dark;
-      }
     }
 
-    .diagnostics-count {
+    .room-count {
       font-size: 12px;
       color: $color-muted;
       font-weight: 500;
     }
   }
 
-  .bar-container {
+  .room-bar-container {
     width: 100%;
     height: 24px;
     background-color: #e5e7eb;
     border-radius: 4px;
     overflow: hidden;
 
-    @media (prefers-color-scheme: dark) {
+    .room-bar {
-      background-color: #555;
-    }
-
-    .bar {
       height: 100%;
-      background-color: $color-primary;
+      background-color: #570000;
       transition: width 0.3s ease;
     }
   }
 }
-
-.diagnostics-row {
-  display: flex;
-  gap: 24px;              
-  align-items: flex-start;
-  flex-wrap: wrap;        
-}
-
-.diagnostics-column {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  width: 48%;             
-  min-width: 280px;       
-}
-
-.open-tickets{
-  display: flex;
-  align-items: center;
-  position: relative;
-  width: 100%;
-  padding: 0 1rem;
-  box-sizing: border-box;
-  min-height: 60px;
-
-  .left {
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    max-width: 30%;
-    
-    h2 {
-      margin: 0;
-      white-space: nowrap;
-    }
-  }
-  
-  .center {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-  }
-}
-
-.home {
-  .ticket_count {
-    font-size: xxx-large;
-    height: 115px;
-  }
-}

frontend/src/styles/components/_forms.scss

@@ -1,97 +0,0 @@
-@use "../variables" as *;
-
-.form-container {
-  display: flex;
-  flex-direction: column;
-  gap: $spacing-lg;
-  margin-bottom: $spacing-lg;
-
-  form {
-    display: flex;
-    flex-direction: column;
-    gap: $spacing-md;
-
-    label {
-      display: flex;
-      flex-direction: column;
-      gap: $spacing-sm;
-      font-weight: 500;
-      color: $color-text;
-
-      @media (prefers-color-scheme: dark) {
-        color: $color-text-dark;
-      }
-    }
-
-    input, textarea, select {
-      padding: $spacing-md;
-      border: 1px solid #ccc;
-      border-radius: $border-radius;
-      font-family: Arial, sans-serif;
-      font-size: 1rem;
-
-      @media (prefers-color-scheme: dark) {
-        background-color: #6b6b6b;
-        color: $color-text-dark;
-        border-color: #555;
-      }
-
-      &:focus {
-        outline: none;
-        border-color: $color-primary;
-        box-shadow: 0 0 0 2px rgba($color-primary, 0.2);
-      }
-    }
-
-    textarea {
-      min-height: 120px;
-      resize: vertical;
-    }
-
-    button {
-      align-self: flex-start;
-      padding: $spacing-md $spacing-lg;
-      background-color: $color-primary;
-      color: white;
-      border: none;
-      border-radius: $border-radius;
-      font-size: 1rem;
-      font-weight: bold;
-      cursor: pointer;
-      transition: background-color 0.2s ease-in-out;
-
-      &:hover {
-        background-color: $color-primary-hover;
-      }
-
-      &:active {
-        transform: scale(0.98);
-      }
-    }
-
-    a {
-      display: inline-block;
-      padding: $spacing-md $spacing-lg;
-      background: $color-primary;
-      color: white;
-      text-decoration: none;
-      border-radius: $border-radius;
-      text-align: center;
-      transition: background-color 0.2s ease-in-out;
-      align-self: flex-start;
-
-      &:hover {
-        background-color: $color-primary-hover;
-      }
-    }
-  }
-
-  ul {
-    list-style: none;
-    padding-left: 0;
-
-    li h3 {
-      margin-top: 0;
-    }
-  }
-}

frontend/src/styles/components/_frontpage.scss

@@ -0,0 +1,7 @@
+.headline {
+    font-size: 40px;
+    font-weight: bold;
+    text-align: center;
+    color: #570000;
+    margin-top: 150px;
+}   

frontend/src/styles/components/_icon.scss

@@ -0,0 +1,27 @@
+.csg-icon {
+  position: fixed;
+  top: 1rem;
+  right: 1rem;
+  z-index: 9999;
+  width: auto;
+  height: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+
+  @media (max-width: 768px) {
+    max-width: 60px;
+    
+    img {
+      width: 100%;
+      height: auto;
+    }
+  }
+
+  img {
+    width: auto;
+    height: auto;
+  }
+}
+

frontend/src/styles/components/_login.scss

@@ -1,43 +0,0 @@
-@use "../variables" as *;
-
-.login-btn {
-  display: inline-block;
-  padding: 12px 400px;
-  background: $color-primary;
-  color: white;
-  border-radius: $border-radius-lg;
-  text-decoration: none;
-  font-weight: bold;
-  font-size: 1rem;
-  cursor: pointer;
-  border: none;
-  transition: all 0.2s ease-in-out;
-  margin-bottom: 15px;
-
-  &:hover {
-    background: $color-primary-hover;
-    transform: scale(1.05);
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
-  }
-}
-
-.logout-btn {
-  display: inline-block;
-  padding: 10px 20px;
-  background: $color-logout;
-  color: white;
-  border-radius: $border-radius-lg;
-  text-decoration: none;
-  font-weight: bold;
-  transition: 0.2s ease-in-out;
-  margin-bottom: 20px;
-
-  &:hover {
-    background: $color-logout-hover;
-    transform: scale(1.05);
-  }
-}
-
-.content.login {
-  margin: 0;
-}

frontend/src/styles/components/_pages.scss

@@ -1,294 +0,0 @@
-@use "../variables" as *;
-
-.page-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: $spacing-lg;
-  padding-bottom: $spacing-md;
-  border-bottom: 2px solid #e5e7eb;
-
-  @media (prefers-color-scheme: dark) {
-    border-bottom-color: #555;
-  }
-
-  h1 {
-    margin: 0;
-    color: $color-primary;
-    font-size: 1.75rem;
-  }
-}
-
-.page-actions {
-  display: flex;
-  gap: $spacing-md;
-  flex-wrap: wrap;
-
-  a, button {
-    display: inline-block;
-    padding: $spacing-md;
-    background: $color-primary;
-    color: white;
-    text-decoration: none;
-    border: none;
-    border-radius: $border-radius;
-    font-weight: bold;
-    cursor: pointer;
-    transition: background-color 0.2s ease-in-out;
-
-    &:hover {
-      background-color: $color-primary-hover;
-    }
-  }
-}
-
-input[type="checkbox"] {
-  width: fit-content;
-}
-
-.grid-list {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-  gap: $spacing-lg;
-  margin-top: $spacing-lg;
-
-  .grid-item {
-    background: $color-container;
-    border: 1px solid #e5e7eb;
-    border-radius: $border-radius;
-    padding: $spacing-md;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    transition: box-shadow 0.2s ease, transform 0.2s ease;
-
-    @media (prefers-color-scheme: dark) {
-      background: $color-container-dark;
-      border-color: #555;
-    }
-
-    &:hover {
-      box-shadow: 0 0 15px rgba(0, 0, 0, 0.15);
-      transform: translateY(-2px);
-    }
-
-    h3 {
-      color: $color-primary;
-      margin-top: 0;
-      margin-bottom: $spacing-md;
-    }
-
-    p {
-      margin: $spacing-sm 0;
-      color: $color-muted;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    .item-actions {
-      display: flex;
-      gap: $spacing-md;
-      margin-top: $spacing-md;
-      flex-wrap: wrap;
-
-      a, button {
-        flex: 1;
-        min-width: 100px;
-        padding: $spacing-md;
-        border: none;
-        border-radius: $border-radius;
-        font-weight: bold;
-        cursor: pointer;
-        text-decoration: none;
-        text-align: center;
-        transition: background-color 0.2s ease-in-out;
-      }
-
-      a.view, button.view {
-        background: $color-primary;
-        color: white;
-
-        &:hover {
-          background-color: $color-primary-hover;
-        }
-      }
-
-      a.edit, button.edit {
-        background: #f59e0b;
-        color: white;
-
-        &:hover {
-          background-color: #d97706;
-        }
-      }
-
-      a.delete, button.delete {
-        background: $color-logout;
-        color: white;
-
-        &:hover {
-          background-color: $color-logout-hover;
-        }
-      }
-    }
-  }
-}
-
-.table-container {
-  overflow-x: auto;
-  margin-top: $spacing-lg;
-  border-radius: $border-radius;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-
-  @media (prefers-color-scheme: dark) {
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-  }
-
-  table {
-    width: 100%;
-    border-collapse: collapse;
-    background: $color-container;
-
-    @media (prefers-color-scheme: dark) {
-      background: $color-container-dark;
-    }
-
-    thead {
-      background: $color-primary;
-      color: white;
-
-      th {
-        padding: $spacing-md;
-        text-align: left;
-        font-weight: 600;
-        border-bottom: 2px solid darken($color-primary, 10%);
-      }
-    }
-
-    tbody {
-      tr {
-        border-bottom: 1px solid #e5e7eb;
-        transition: background-color 0.2s ease;
-
-        @media (prefers-color-scheme: dark) {
-          border-bottom-color: #555;
-        }
-
-        &:hover {
-          background-color: #f9fafb;
-
-          @media (prefers-color-scheme: dark) {
-            background-color: #444;
-          }
-        }
-
-        td {
-          padding: $spacing-md;
-          color: $color-text;
-
-          @media (prefers-color-scheme: dark) {
-            color: $color-text-dark;
-          }
-        }
-      }
-    }
-  }
-}
-
-.alert {
-  padding: $spacing-md;
-  border-radius: $border-radius;
-  margin-bottom: $spacing-lg;
-  border-left: 4px solid;
-
-  &.success {
-    background: $color-status-done;
-    color: $color-status-done-text;
-    border-left-color: $color-status-done-text;
-  }
-
-  &.error {
-    background: $color-status-todo;
-    color: $color-status-todo-text;
-    border-left-color: $color-status-todo-text;
-  }
-
-  &.warning {
-    background: $color-status-inprogress;
-    color: $color-status-inprogress-text;
-    border-left-color: $color-status-inprogress-text;
-  }
-
-  &.info {
-    background: #dbeafe;
-    color: #1e40af;
-    border-left-color: #1e40af;
-
-    @media (prefers-color-scheme: dark) {
-      background: #1e3a8a;
-      color: #93c5fd;
-      border-left-color: #93c5fd;
-    }
-  }
-}
-
-.loading-spinner {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  border: 3px solid #e5e7eb;
-  border-top-color: $color-primary;
-  border-radius: 50%;
-  animation: spin 0.8s linear infinite;
-
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
-}
-
-.empty-state {
-  text-align: center;
-  padding: $spacing-lg;
-  color: $color-muted;
-
-  p {
-    font-size: 1.1rem;
-    margin-bottom: $spacing-md;
-  }
-
-  a {
-    display: inline-block;
-    padding: $spacing-md $spacing-lg;
-    background: $color-primary;
-    color: white;
-    text-decoration: none;
-    border-radius: $border-radius;
-    transition: background-color 0.2s ease-in-out;
-
-    &:hover {
-      background-color: $color-primary-hover;
-    }
-  }
-}
-
-.return-to {
-  display: block;
-  padding: 16px 2rem;
-  background: #2b79c2;
-    background-color: rgb(43, 121, 194);
-  color: white;
-  text-decoration: none;
-  text-align: center;
-  border-radius: 0.5rem;
-  transition: background-color 0.2s ease-in-out;
-
-  &:hover {
-    background-color: #1d5fa0;
-  }
-}
-
-.delete {
-  display: block;
-  width: 100%;
-  text-align: center;
-}

frontend/src/styles/components/_setup.scss

@@ -1,120 +0,0 @@
-@use "../variables" as *;
-
-.setup-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  min-height: 100vh;
-  background: $color-bg;
-  padding: $spacing-lg;
-
-  @media (prefers-color-scheme: dark) {
-    background: $color-bg-dark;
-  }
-}
-
-.setup-box {
-  width: 100%;
-  max-width: 400px;
-  background: $color-container;
-  padding: $spacing-lg;
-  border-radius: 1rem;
-  box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
-
-  @media (prefers-color-scheme: dark) {
-    background: $color-container-dark;
-  }
-
-  h1 {
-    color: $color-primary;
-    text-align: center;
-    margin-top: 0;
-    margin-bottom: $spacing-md;
-  }
-
-  p {
-    text-align: center;
-    color: $color-muted;
-    margin-bottom: $spacing-lg;
-  }
-}
-
-.setup-form {
-  display: flex;
-  flex-direction: column;
-  gap: $spacing-md;
-
-  .form-group {
-    display: flex;
-    flex-direction: column;
-    gap: $spacing-sm;
-
-    label {
-      font-weight: 500;
-      color: $color-text;
-
-      @media (prefers-color-scheme: dark) {
-        color: $color-text-dark;
-      }
-    }
-  }
-
-  input {
-    padding: $spacing-md;
-    border: 1px solid #ccc;
-    border-radius: $border-radius;
-    font-family: Arial, sans-serif;
-    font-size: 1rem;
-
-    @media (prefers-color-scheme: dark) {
-      background-color: #6b6b6b;
-      color: $color-text-dark;
-      border-color: #555;
-    }
-
-    &:focus {
-      outline: none;
-      border-color: $color-primary;
-      box-shadow: 0 0 0 2px rgba($color-primary, 0.2);
-    }
-  }
-
-  button {
-    padding: $spacing-md;
-    background-color: $color-primary;
-    color: white;
-    border: none;
-    border-radius: $border-radius;
-    font-size: 1rem;
-    font-weight: bold;
-    cursor: pointer;
-    transition: background-color 0.2s ease-in-out;
-    margin-top: $spacing-md;
-
-    &:hover {
-      background-color: $color-primary-hover;
-    }
-
-    &:active {
-      transform: scale(0.98);
-    }
-  }
-}
-
-.success-message {
-  background: $color-status-done;
-  color: $color-status-done-text;
-  padding: $spacing-md;
-  border-radius: $border-radius;
-  margin-bottom: $spacing-md;
-  border-left: 4px solid $color-status-done-text;
-}
-
-.error-message {
-  background: $color-status-todo;
-  color: $color-status-todo-text;
-  padding: $spacing-md;
-  border-radius: $border-radius;
-  margin-bottom: $spacing-md;
-  border-left: 4px solid $color-status-todo-text;
-}

frontend/src/styles/components/_sidebar.scss

@@ -171,4 +171,3 @@
     }
   }
 }
-

frontend/src/styles/components/_tickets.scss

@@ -1,80 +1,59 @@
 @use "../mixins" as *;
 @use "../variables" as *;
 
-.ticket {
-  border: 1px solid #ccc;
-  padding: 1rem;
-  margin-bottom: 1rem;
-  border-radius: $border-radius-lg;
-  background: $color-container;
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-
-  @media (prefers-color-scheme: dark) {
-    background: $color-container-dark;
-  }
-
-  h3 {
-    margin-top: 0;
-    color: $color-primary;
-  }
-
-  p {
-    margin: 0.3rem 0;
-  }
-}
-
 .ticket-card {
   @include card();
-  border-left: 4px solid $color-primary;
+  border-left: 4px solid $color-accent;
   display: flex;
   flex-direction: column;
   gap: $spacing-sm;
+
   .meta { color: $color-muted; font-size: 0.9rem; }
   .title { font-weight: 600; }
+
 }
 
-.status {
+.listbox {
-  display: inline-block;
+  max-width: auto;
-  padding: 4px 10px;
+  margin:0 0;
-  border-radius: 8px;
+  background-color: #90ff82;
-  font-size: 0.8rem;
+  background-color: $rundbgbackgroundcolor;
-  font-weight: bold;
+  padding-bottom: 96px;
-  margin-top: 8px;
+  color: white;
+  padding-left: 32px;
+  padding-right: 32px;
+  padding-top: 96px;
+  border-radius: 20px;
+  border-color: #000000;
+  border-style: double;
+  box-shadow: 10px 10px 10px rgba(43, 43, 43, 0.8);
+  font-size: 26px;
+  list-style-type: none;
+
   
   &.To-Do {
-    background: $color-status-todo; 
+    background-color: #b1003b;
-    color: $color-status-todo-text; 
   }
 
   &.InProgress {
-    background: $color-status-inprogress; 
+    background-color: #fff385;
-    color: $color-status-inprogress-text; 
-  }
-
-  &.Done { 
-    background: $color-status-done; 
-    color: $color-status-done-text; 
   }
 
   &.Completed {
-    background: $color-status-done; 
+    background-color: #90ff82;
-    color: $color-status-done-text; 
   }
 
   &.Archived {
-    background: $color-status-archived; 
+    background-color: #af69ee;
-    color: $color-status-archived-text; 
   }
 }
 
-.ticket_count {
+.postits {
-  text-align: center;
+  display: grid;
-  align-content: center;
+  grid-template-columns: auto auto auto;
-  color: #005f00;
+  gap: 8px;
-  border: 2px solid #848484;
+  margin-top: 96px; 
-  border-radius: 10px;
+}
-  height: 50px;
+.warning {
-  width: 250px;
+  color: #570000;
-  margin: 0;
-  font-size: xx-large;
 }

frontend/src/styles/main.scss

@@ -3,126 +3,39 @@
 @use "utilities";
 @use "components/sidebar";
 @use "components/tickets";
-@use "components/alltickets";
-@use "components/allusers";
-@use "components/forms";
-@use "components/login";
 @use "components/diagnostics";
-@use "components/pages";
+@use "components/frontpage";
-@use "components/setup";
+@use "components/home";
-@use "components/dark_mode";
+@use "components/icon";
 
-* {
+:root {
-  box-sizing: border-box;
+  --color-bg: #ffffff;
+  --color-container: #ffffff;
+  --color-text: #111827;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --color-bg: #121212;
+    --color-container: #333333;
+    --color-text: #e2e2e2;
+  }
 }
 
 body {
   background: variables.$color-bg;
-  font-family: Arial, sans-serif;
+  font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial;
-  color: variables.$color-text;
+  color: #111827;
   margin: 0;
-  padding: 0;
-
-  @media (prefers-color-scheme: dark) {
-    background: variables.$color-bg-dark;
-    color: variables.$color-text-dark;
-  }
-}
-
-input, textarea, select {
-  width: 100%;
-  padding: variables.$spacing-md;
-  font-size: 1rem;
-  border-radius: variables.$border-radius;
-  border: 1px solid #ccc;
-  box-sizing: border-box;
-  margin-bottom: 15px;
-  font-family: Arial, sans-serif;
-
-  @media (prefers-color-scheme: dark) {
-    background-color: #6b6b6b;
-    color: variables.$color-text-dark;
-    border-color: #555;
-  }
-}
-
-button {
-  padding: variables.$spacing-md;
-  font-size: 1rem;
-  border-radius: variables.$border-radius;
-  background-color: variables.$color-primary;
-  color: white;
-  border: none;
-  cursor: pointer;
-  margin-bottom: 15px;
-  transition: background-color 0.2s ease-in-out;
-  font-family: Arial, sans-serif;
-  font-weight: bold;
-
-  &:hover {
-    background-color: variables.$color-primary-hover;
-  }
-}
-
-form {
-  display: flex;
-  flex-direction: column;
-  gap: variables.$spacing-md;
-
-  label {
-    display: flex;
-    flex-direction: column;
-    gap: variables.$spacing-sm;
-    font-weight: 500;
-  }
-
-  a {
-    display: inline-block;
-    padding: variables.$spacing-md;
-    background: variables.$color-primary;
-    color: white;
-    text-decoration: none;
-    border-radius: variables.$border-radius;
-    text-align: center;
-    transition: background-color 0.2s ease-in-out;
-
-    &:hover {
-      background-color: variables.$color-primary-hover;
-    }
-  }
-}
-
-.container {
-  max-width: 900px;
-  margin: auto;
-  background: variables.$color-container;
-  padding: variables.$spacing-lg;
-  border-radius: 1rem;
-  box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
-
-  @media (prefers-color-scheme: dark) {
-    background: variables.$color-container-dark;
-  }
-}
-
-.header-with-image {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.header-with-image img {
-  height: 60px;
 }
 
 .admin { display: flex; }
 
 .layout {
   display: flex;
-  min-height: 100vh;
+  height: 100vh;
-  margin: 0;
+  overflow: hidden;
-  padding: 0;
+  box-sizing: border-box;
 }
 
 .sidebar {
@@ -133,44 +46,90 @@ form {
   top: 0;
   height: 100vh;
   overflow-y: auto;
+  box-sizing: border-box;
 }
 
 .content {
   flex: 1;
   min-width: 0;
   margin-left: 260px;
-  padding: variables.$spacing-lg;
+  height: 100%;
-  
+  overflow-y: auto;
-  > :first-child {
+  padding: variables.$spacing-md;
-    max-width: 900px;
+  box-sizing: border-box;
-    margin: 0 auto;
-    background: variables.$color-container;
-    padding: variables.$spacing-lg;
-    border-radius: 1rem;
-    box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
-
-    @media (prefers-color-scheme: dark) {
-      background: variables.$color-container-dark;
-    }
-  }
-
-  h1, h2, h3 {
-    color: variables.$color-primary;
-    margin-top: 0;
-  }
 }
 
 @media (max-width: 768px) {
   .sidebar {
     position: fixed;
+    top: 0;
+    bottom: 0;
     left: -260px;
     transition: left .3s ease-in-out;
     z-index: 1000;
+    height: 100%;
+    box-sizing: border-box;
   }
-  .sidebar.open { 
+  .sidebar.open { left: 0; }
-    left: 0; 
+  .content { margin-left: 0; padding: variables.$spacing-md; box-sizing: border-box; }
+}
+
+.rundbg {
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  max-width: 40%;
+  margin: 0 auto;
+  background-color: variables.$rundbgbackgroundcolor;
+  padding-bottom: 96px;
+  padding-left: 32px;
+  padding-right: 32px;
+  padding-top: 96px;
+  border-radius: 20px;
+  gap: 8px;
+  border-color: #000000;
+  border-style: double;
+  box-shadow: 20px 20px 10px rgb(43, 43, 43);
+  font-size: 26px;
+  
+  label {
+    display: block;
+    width: 100%;
+    box-sizing: border-box;
   }
-  .content { 
+
-    margin-left: 0;
+  input, select, button, a {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 16px;
+    font-size: 1.8rem;
+    background-color: #f0f0f0;
+    box-shadow: #6d6d6d;
+    box-shadow: 6px 6px 8px;
+  }
+
+  input[type="checkbox"] {
+    width: auto;
+  }
+
+  button {
+    margin: 16px 0;
+  }
+
+  a {
+    color: #000000;
+    text-align: center;
+    border-style: dashed;
+  }
+
+  &.login {
+    margin-top: 96px;
   }
 }
+
+.setup-form input {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+