Merge branch 'main' of https://git.raffauf-clan.de/schn33fuchs/ticketsystem

frontend/src/lib.rs

@@ -269,6 +269,7 @@ fn switch(route: Route) -> Html {
 pub fn app() -> Html {
     html! {
         <BrowserRouter>
+            <basic_pages::Icon/>
             <Switch<Route> render={switch} />
         </BrowserRouter>
     }

frontend/src/pages/basic_pages.rs

@@ -109,3 +109,10 @@ pub fn denied_component() -> Html {
         </div>
     }
 }
+
+#[component(Icon)]
+pub fn icon_component() -> Html {
+    html! {
+        <img src="assets/csg.png" class="csg-icon" />
+    }
+}

frontend/src/pages/user.rs

@@ -336,7 +336,7 @@ pub fn login_component() -> Html {
                 value={(*username).clone()}
                 oninput={Callback::from(move |e: InputEvent| {
                     let input: web_sys::HtmlInputElement = e.target_unchecked_into();
-                    username.set(input.value());           
+                    username.set(input.value());
                     })}
             />
             <input
@@ -566,6 +566,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);
@@ -600,6 +601,7 @@ 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) => {

frontend/src/styles/components/_icon.scss

@@ -0,0 +1,17 @@
+.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;
+
+  img {
+    width: auto;
+    height: auto;
+  }
+}

frontend/src/styles/main.scss

@@ -6,6 +6,7 @@
 @use "components/diagnostics";
 @use "components/frontpage";
 @use "components/home";
+@use "components/icon";
 
 body {
   background: variables.$color-bg;
@@ -73,4 +74,4 @@ body {
   button {
     margin: 16px 0;
   }
-}
+}