Merge branch 'ticket_background'

frontend/src/pages/ticket.rs

@@ -169,16 +169,6 @@ pub fn submit_ticket_component() -> Html {
 
     let valid_rooms: HashSet<i16> = 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();
@@ -675,8 +665,16 @@ pub fn all_tickets_component() -> Html {
     } else {
         html! {
             <ul class= "postits">
-            { 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| html! {
+            { 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| {
-                    <div class="ticketbox">
+                let status_class = match t.status.as_str() {
+                    "ToDo" => "To-Do",
+                    "InProgress" => "InProgress",
+                    "Completed" => "Completed",
+                    "Archived" => "Archived",
+                    _ => "To-Do"
+                };
+                html! {
+                    <div class={classes!{status_class, "listbox"}}>
                         <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>
@@ -690,7 +688,8 @@ pub fn all_tickets_component() -> Html {
                         </li>
 
                     </div>
-                })}
+                }})}
+
                 <Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
             </ul>
         }

frontend/src/pages/user.rs

@@ -222,7 +222,7 @@ pub fn register_component() -> Html {
     };
 
     html! {
-        <form {onsubmit}>
+        <form {onsubmit} class="rundbg">
             <label>{ "Vorname:" }
                 <input type="text" value={(*first_name).clone()} oninput={fn_change}/>
             </label>
@@ -330,7 +330,7 @@ pub fn login_component() -> Html {
     html! {
         <div>
         <h1 class="headline">{ "Anmeldung" }</h1>
-        <form {onsubmit} class="rundbg">
+        <form {onsubmit} class="rundbg login">
             <input
                 placeholder="username"
                 value={(*username).clone()}
@@ -425,9 +425,9 @@ pub fn all_users_component() -> Html {
         html! { <p>{ format!("Error: {}", e) }</p> }
     } else {
         html! {
-            <ul>
+            <ul class="posti8s">
             { 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, t.id) }</h3></Link<crate::Route>>
                     </li>
                 })}

frontend/src/styles/components/_tickets.scss

@@ -13,21 +13,40 @@
 
 }
 
-.ticketbox {
+.listbox {
   max-width: auto;
   margin:0 0;
   margin-top: 96px;
   background-color: #90ff82;
+  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: 10px 10px 10px rgba(43, 43, 43, 0.8);
-  box-shadow: rgb(43, 43, 43);
   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 {
@@ -39,3 +58,4 @@
 .warning {
   color: #570000;
 }
+}

frontend/src/styles/main.scss

@@ -16,38 +16,52 @@ body {
 }
 
 .admin { display: flex; }
-.content { flex: 1; padding: variables.$spacing-md; }
 
 .layout {
-    display: flex;
+  display: flex;
-    min-height: 100vh;
+  height: 100vh;
+  overflow: hidden;
+  box-sizing: border-box;
 }
 
 .sidebar {
-    width: 260px;
+  width: 260px;
-    flex-shrink: 0;
+  flex-shrink: 0;
+  height: 100%;
+  overflow-y: auto;
+  box-sizing: border-box;
 }
 
 .content {
-    flex: 1;
+  flex: 1;
-    min-width: 0;
+  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;
   flex-direction: column;
   max-width: 40%;
   margin:0 auto;
-  margin-top: 96px;
   background-color: variables.$rundbgbackgroundcolor;
   padding-bottom: 96px;
   padding-left: 32px;
@@ -57,19 +71,28 @@ body {
   gap: 8px;
   border-color: #000000;
   border-style: double;
-  box-shadow: 20px 20px 10px;
+  box-shadow: 20px 20px 10px rgb(43, 43, 43);
-  box-shadow: rgb(43, 43, 43);
   font-size: 26px;
   
+  label {
+    display: block;
+    width: 100%;
+    box-sizing: border-box;
+  }
 
   input, button, a {
+  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 {
@@ -81,6 +104,14 @@ body {
     text-align: center;
     border-style: dashed;
   }
+  &.login {
+    margin-top: 96px;
+  }
+}
+
+.setup-form input {
+  width: 100%;
+  box-sizing: border-box;
 }