From c3b7321005bec3a67618691b0dcf7ac176bb996b Mon Sep 17 00:00:00 2001 From: schn33fuchs Date: Sat, 6 Jun 2026 18:18:22 +0200 Subject: [PATCH 1/2] Styling The ticket backgrounds have color depending on background and some improvements --- frontend/src/pages/ticket.rs | 15 ++++++++-- frontend/src/pages/user.rs | 8 +++--- frontend/src/styles/components/_tickets.scss | 29 ++++++++++++++++---- frontend/src/styles/main.scss | 8 ++++-- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/frontend/src/pages/ticket.rs b/frontend/src/pages/ticket.rs index e087578..0d9be26 100644 --- a/frontend/src/pages/ticket.rs +++ b/frontend/src/pages/ticket.rs @@ -675,8 +675,16 @@ pub fn all_tickets_component() -> Html { } else { html! { } diff --git a/frontend/src/pages/user.rs b/frontend/src/pages/user.rs index 0b93d1b..df6384d 100644 --- a/frontend/src/pages/user.rs +++ b/frontend/src/pages/user.rs @@ -222,7 +222,7 @@ pub fn register_component() -> Html { }; html! { -
+ @@ -330,7 +330,7 @@ pub fn login_component() -> Html { html! {

{ "Anmeldung" }

- + Html { html! {

{ format!("Error: {}", e) }

} } else { html! { -
    +
      { for users.iter().map(|t| html! { -
    • +
    • to={crate::Route::UserByID{id: t.id}}>

      { format!("{} {}- #{}", t.first_name, t.last_name, t.id) }

      >
      • })} diff --git a/frontend/src/styles/components/_tickets.scss b/frontend/src/styles/components/_tickets.scss index 1be5f73..7731194 100644 --- a/frontend/src/styles/components/_tickets.scss +++ b/frontend/src/styles/components/_tickets.scss @@ -13,25 +13,42 @@ } -.ticketbox { +.listbox { max-width: auto; margin:0 0; - margin-top: 96px; - background-color: #ffec3f; + background-color: $rundbgbackgroundcolor; padding-bottom: 96px; + color: white; padding-left: 32px; padding-right: 32px; padding-top: 96px; border-radius: 20px; border-color: #000000; border-style: double; - box-shadow: 20px 20px 10px; - box-shadow: rgb(43, 43, 43); + box-shadow: 10px 10px 10px rgba(43, 43, 43, 0.8); font-size: 26px; + list-style-type: none; + + + &.To-Do { + background-color: #b1003b; + } + + &.InProgress { + background-color: #fff385; + } + + &.Completed { + background-color: #90ff82; + } + + &.Archived { + background-color: #af69ee; + } } .postits { display: grid; grid-template-columns: auto auto auto; gap: 8px; -} \ No newline at end of file +} diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scss index f1c5e95..8b8c613 100644 --- a/frontend/src/styles/main.scss +++ b/frontend/src/styles/main.scss @@ -47,7 +47,6 @@ body { flex-direction: column; max-width: 40%; margin:0 auto; - margin-top: 96px; background-color: variables.$rundbgbackgroundcolor; padding-bottom: 96px; padding-left: 32px; @@ -57,8 +56,7 @@ body { gap: 8px; border-color: #000000; border-style: double; - box-shadow: 20px 20px 10px; - box-shadow: rgb(43, 43, 43); + box-shadow: 20px 20px 10px rgb(43, 43, 43); font-size: 26px; @@ -75,4 +73,8 @@ body { button { margin: 16px 0; } + + &.login { + margin-top: 96px; + } } From b404ff5bc98b0e2df0881b3a5a42aaa34f227660 Mon Sep 17 00:00:00 2001 From: schn33fuchs Date: Sat, 6 Jun 2026 18:31:05 +0200 Subject: [PATCH 2/2] Path Fixed layout issues and joke message --- frontend/src/pages/ticket.rs | 12 +------- frontend/src/styles/main.scss | 57 ++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/frontend/src/pages/ticket.rs b/frontend/src/pages/ticket.rs index 0d9be26..9b6bed4 100644 --- a/frontend/src/pages/ticket.rs +++ b/frontend/src/pages/ticket.rs @@ -169,16 +169,6 @@ pub fn submit_ticket_component() -> Html { let valid_rooms: HashSet = VALID_ROOMS.iter().copied().collect(); - { - let message = "Bevor sie zum Support weitergeleitet werden prüfen sie ob: \r\n - Ob das Problem durch Neustarten gelößt wird \r\n - Ob sie die richtigen Anmeldedaten genutzt habem \r\n - Alle notwendigen Kabel eingesteckt sind".to_string(); - use_effect(move || { - if let Some(win) = web_sys::window() { - let _ = win.alert_with_message(&message); - } - || () - }); - } - let onsubmit = { let category = category.clone(); let betreff = betreff.clone(); @@ -684,7 +674,7 @@ pub fn all_tickets_component() -> Html { _ => "To-Do" }; html! { -
      +
    • to={crate::Route::TicketById{id: t.id}}>

      { format!("{} - #{}", t.betreff, t.id) }

      >

      { &t.description }

      diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scss index 8b8c613..497f5f2 100644 --- a/frontend/src/styles/main.scss +++ b/frontend/src/styles/main.scss @@ -16,31 +16,46 @@ body { } .admin { display: flex; } -.content { flex: 1; padding: variables.$spacing-md; } .layout { - display: flex; - min-height: 100vh; + display: flex; + height: 100vh; + overflow: hidden; + box-sizing: border-box; } .sidebar { - width: 260px; - flex-shrink: 0; + width: 260px; + flex-shrink: 0; + height: 100%; + overflow-y: auto; + box-sizing: border-box; } .content { - flex: 1; - min-width: 0; + flex: 1; + min-width: 0; + height: 100%; + overflow-y: auto; + padding: variables.$spacing-md; + box-sizing: border-box; } @media (max-width: 768px) { - .sidebar { position: fixed; left: -100%; transition: left .2s; } + .sidebar { + position: fixed; + top: 0; + bottom: 0; + left: -100%; + transition: left .2s; + z-index: 1000; + height: 100%; + box-sizing: border-box; + } .sidebar.open { left: 0; } - .content { margin-left: 0; } + .content { margin-left: 0; padding: variables.$spacing-md; box-sizing: border-box; } } - - .rundbg { display: flex; justify-content: center; @@ -59,15 +74,24 @@ body { box-shadow: 20px 20px 10px rgb(43, 43, 43); font-size: 26px; + label { + display: block; + width: 100%; + box-sizing: border-box; + } - input, button { + input, select, button { + width: 100%; + box-sizing: border-box; padding: 16px; font-size: 1.8rem; background-color: #f0f0f0; box-shadow: #6d6d6d; - box-shadow: 6px 6px 8px - + box-shadow: 6px 6px 8px; + } + input[type="checkbox"] { + width: auto; } button { @@ -78,3 +102,8 @@ body { margin-top: 96px; } } + +.setup-form input { + width: 100%; + box-sizing: border-box; +}