3 Commits
Author SHA1 Message Date
schn33fuchs a1d95f1ba2 Styling improvements 2026-06-17 15:47:42 +02:00
schn33fuchs 45e5c657c7 Translation to German 2026-06-17 15:47:34 +02:00
schn33fuchs 584a75009f README update 2026-06-17 13:35:29 +02:00
12 changed files with 126 additions and 118 deletions
+5 -1
View File
@@ -30,8 +30,12 @@ Keys:
The backend can either be run via `cargo run --release` or `cargo build --release` using the correct target architecture, e.g. 'x86_64-unknown-linux-gnu', The backend can either be run via `cargo run --release` or `cargo build --release` using the correct target architecture, e.g. 'x86_64-unknown-linux-gnu',
the executable will be placed in the `target/release` directory and can then be run via any method the executable will be placed in the `target/release` directory and can then be run via any method
Alternatively download the executable from the 'Releases' Page for your device
### Frontend ### Frontend
The HTML code for the frontend can be generated by using `trunk build`. The resulting files will end up in the `frontend/dist` directory and can be served over any webserver supporting wasm The HTML code for the frontend can be generated by using `trunk build`. The resulting files will end up in the `frontend/dist` directory and can be served over any webserver supporting WASM
Alternatively download the fontend files from the 'Releases' Page and serve them via any webserver supporting WASM
> [!NOTE] > [!NOTE]
> To install trunk run `cargo install trunk` > To install trunk run `cargo install trunk`
+2 -2
View File
@@ -109,7 +109,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
AuthState { AuthState {
is_authenticated: None, is_authenticated: None,
.. ..
} => html! { <div>{ "Loading..." } </div> }, } => html! { <div>{ "Wird geladen..." } </div> },
AuthState { AuthState {
is_authenticated: Some(false), is_authenticated: Some(false),
.. ..
@@ -126,7 +126,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
Some(false) => { Some(false) => {
html! { <Redirect<crate::Route> to={crate::Route::PermissionDenied}/> } html! { <Redirect<crate::Route> to={crate::Route::PermissionDenied}/> }
} }
None => html! { <div>{ "Checking permissions..." }</div> }, None => html! { <div>{ "Überprüfe Berechtigungen..." }</div> },
} }
} else { } else {
props.children.clone().into() props.children.clone().into()
+2 -2
View File
@@ -193,10 +193,10 @@ fn admin_check_wrapper(props: &AdminCheckWrapperProps) -> Html {
} }
match *admin_exists { match *admin_exists {
None => html! { <div>{ "Loading..." }</div> }, None => html! { <div>{ "Wird geladen..." }</div> },
Some(false) => { Some(false) => {
navigator.push(&Route::Setup); navigator.push(&Route::Setup);
html! { <div>{ "Redirecting to setup..." }</div> } html! { <div>{ "Wird weitergeleitet zur Einrichtung..." }</div> }
} }
Some(true) => props.children.clone().into(), Some(true) => props.children.clone().into(),
} }
+2 -2
View File
@@ -82,7 +82,7 @@ pub fn home_component() -> Html {
<div class="rundbg home"> <div class="rundbg home">
<crate::utilities::TicketCount/> <crate::utilities::TicketCount/>
<p class="login-status">{ "You are logged in as: " }</p> <p class="login-status">{ "Sie sind angemeldet als: " }</p>
<p class="name">{ &*name }</p> <p class="name">{ &*name }</p>
</div> </div>
} }
@@ -101,7 +101,7 @@ pub fn home_component() -> Html {
/// ``` /// ```
#[component(NotFound)] #[component(NotFound)]
pub fn not_found_component() -> Html { pub fn not_found_component() -> Html {
let message = "404 Not found"; let message = "404 Nicht gefunden";
html! { html! {
<div> <div>
<h1>{&message}</h1> <h1>{&message}</h1>
+21 -21
View File
@@ -103,7 +103,7 @@ pub fn initial_admin_setup() -> Html {
} }
if !*admin_check_done { if !*admin_check_done {
return html! { <div>{ "Checking..." }</div> }; return html! { <div>{ "Wird überprüft..." }</div> };
} }
let onsubmit = { let onsubmit = {
@@ -121,17 +121,17 @@ pub fn initial_admin_setup() -> Html {
e.prevent_default(); e.prevent_default();
if (*pwd).is_empty() || (*pwd_confirm).is_empty() { if (*pwd).is_empty() || (*pwd_confirm).is_empty() {
error.set("Password fields cannot be empty".to_string()); error.set("Passwortfelder dürfen nicht leer sein".to_string());
return; return;
} }
if *pwd != *pwd_confirm { if *pwd != *pwd_confirm {
error.set("Passwords do not match".to_string()); error.set("Passwörter stimmen nicht überein".to_string());
return; return;
} }
if (*username).is_empty() { if (*username).is_empty() {
error.set("Username cannot be empty".to_string()); error.set("Benutzername darf nicht leer sein".to_string());
return; return;
} }
@@ -172,10 +172,10 @@ pub fn initial_admin_setup() -> Html {
navigator.push(&crate::Route::Login); navigator.push(&crate::Route::Login);
} }
Ok(r) => { Ok(r) => {
let text = r.text().await.unwrap_or_else(|_| "unknown".into()); let text = r.text().await.unwrap_or_else(|_| "Unbekannt".into());
error.set(format!("HTTP {}: {}", r.status(), text)); error.set(text);
} }
Err(err) => error.set(format!("Network error: {}", err)), Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
} }
}); });
}) })
@@ -184,16 +184,16 @@ pub fn initial_admin_setup() -> Html {
html! { html! {
<div class="setup-container rundbg"> <div class="setup-container rundbg">
<div class="setup-box"> <div class="setup-box">
<h1>{ "Initial Admin Setup" }</h1> <h1>{ "Admin-Einrichtung" }</h1>
<p>{ "Create your first administrator account" }</p> <p>{ "Erstellen Sie Ihr erstes Administratorkonto" }</p>
<form {onsubmit} class="setup-form"> <form {onsubmit} class="setup-form">
<div class="form-group"> <div class="form-group">
<label for="first_name">{ "First Name:" } <label for="first_name">{ "Vorname:" }
<input <input
id="first_name" id="first_name"
type="text" type="text"
placeholder="First name" placeholder="Vorname"
value={(*first_name).clone()} value={(*first_name).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -204,11 +204,11 @@ pub fn initial_admin_setup() -> Html {
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="last_name">{ "Last Name:" } <label for="last_name">{ "Nachname:" }
<input <input
id="last_name" id="last_name"
type="text" type="text"
placeholder="Last name" placeholder="Nachname"
value={(*last_name).clone()} value={(*last_name).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -219,11 +219,11 @@ pub fn initial_admin_setup() -> Html {
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="username">{ "Username:" } <label for="username">{ "Benutzername:" }
<input <input
id="username" id="username"
type="text" type="text"
placeholder="Username" placeholder="Benutzername"
value={(*username).clone()} value={(*username).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -234,11 +234,11 @@ pub fn initial_admin_setup() -> Html {
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password">{ "Password:" } <label for="password">{ "Passwort:" }
<input <input
id="password" id="password"
type="password" type="password"
placeholder="Password" placeholder="Passwort"
value={(*pwd).clone()} value={(*pwd).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -249,11 +249,11 @@ pub fn initial_admin_setup() -> Html {
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="pwd_confirm">{ "Confirm Password:" } <label for="pwd_confirm">{ "Passwort bestätigen:" }
<input <input
id="pwd_confirm" id="pwd_confirm"
type="password" type="password"
placeholder="Confirm password" placeholder="Passwort bestätigen"
value={(*pwd_confirm).clone()} value={(*pwd_confirm).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -264,7 +264,7 @@ pub fn initial_admin_setup() -> Html {
</div> </div>
<button type="submit" disabled={*loading} class="submit-btn"> <button type="submit" disabled={*loading} class="submit-btn">
{ if *loading { "Creating..." } else { "Create Admin Account" } } { if *loading { "Wird erstellt..." } else { "Administratorkonto erstellen" } }
</button> </button>
if !error.is_empty() { if !error.is_empty() {
@@ -272,7 +272,7 @@ pub fn initial_admin_setup() -> Html {
} }
if *success { if *success {
<p class="success-message" style="color:green">{ "Admin account created successfully! Redirecting to login..." }</p> <p class="success-message" style="color:green">{ "Administratorkonto erfolgreich erstellt! Wird weitergeleitet zum Login..." }</p>
} }
</form> </form>
</div> </div>
+12 -9
View File
@@ -234,10 +234,10 @@ pub fn ticket_menu() -> Html {
html! { html! {
<ul class="submenu" role="menu"> <ul class="submenu" role="menu">
<li role="none"> <li role="none">
<Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Submit Ticket" }</span></Link<crate::Route>> <Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Ticket einreichen" }</span></Link<crate::Route>>
</li> </li>
<li role="none"> <li role="none">
<Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "View Tickets" }</span></Link<crate::Route>> <Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "Tickets anzeigen" }</span></Link<crate::Route>>
</li> </li>
</ul> </ul>
} }
@@ -289,7 +289,7 @@ pub fn users_menu() -> Html {
onclick={on_toggle} onclick={on_toggle}
aria-expanded={open.to_string()} aria-expanded={open.to_string()}
> >
{ "Users" } { "Benutzer" }
{ if open { "" } else { "" } } { if open { "" } else { "" } }
</button> </button>
@@ -298,10 +298,10 @@ pub fn users_menu() -> Html {
html! { html! {
<ul class="submenu" role="menu"> <ul class="submenu" role="menu">
<li role="none"> <li role="none">
<Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Create User" }</span></Link<crate::Route>> <Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Benutzer erstellen" }</span></Link<crate::Route>>
</li> </li>
<li role="none"> <li role="none">
<Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "View Users" }</span></Link<crate::Route>> <Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "Benutzer anzeigen" }</span></Link<crate::Route>>
</li> </li>
</ul> </ul>
} }
@@ -398,7 +398,7 @@ pub fn sidebar(props: &SidebarComponentProps) -> Html {
}; };
match *is_admin { match *is_admin {
None => html! { <div class="sidebar-loading">{ "Lade..." }</div> }, None => html! { <div class="sidebar-loading">{ "Wird geladen..." }</div> },
// Non-admin: render a condensed user sidebar (no diagnostics, limited links) // Non-admin: render a condensed user sidebar (no diagnostics, limited links)
Some(false) => { Some(false) => {
@@ -423,6 +423,7 @@ pub fn sidebar(props: &SidebarComponentProps) -> Html {
</li> </li>
<TicketMenu/> <TicketMenu/>
<li class="logout-item"> <li class="logout-item">
<crate::darkmode::ThemeToggle/>
<button <button
class="sidebar-button" class="sidebar-button"
onclick={on_logout.clone()} onclick={on_logout.clone()}
@@ -434,7 +435,7 @@ pub fn sidebar(props: &SidebarComponentProps) -> Html {
</nav> </nav>
</SidebarStateProvider> </SidebarStateProvider>
} }
}, }
// Admin: full sidebar wrapped in provider so submenu state persists // Admin: full sidebar wrapped in provider so submenu state persists
Some(true) => { Some(true) => {
@@ -462,6 +463,7 @@ pub fn sidebar(props: &SidebarComponentProps) -> Html {
<Link<crate::Route> to={crate::Route::Diagnostics}>{ "Statistiken" }</Link<crate::Route>> <Link<crate::Route> to={crate::Route::Diagnostics}>{ "Statistiken" }</Link<crate::Route>>
<Link<crate::Route> to={crate::Route::ArchivedTickets}>{ "Archiv" }</Link<crate::Route>> <Link<crate::Route> to={crate::Route::ArchivedTickets}>{ "Archiv" }</Link<crate::Route>>
<li class="logout-item"> <li class="logout-item">
<crate::darkmode::ThemeToggle/>
<button <button
class="sidebar-button" class="sidebar-button"
onclick={on_logout.clone()} onclick={on_logout.clone()}
@@ -473,6 +475,7 @@ pub fn sidebar(props: &SidebarComponentProps) -> Html {
</nav> </nav>
</SidebarStateProvider> </SidebarStateProvider>
} }
}, }
} }
} }
+30 -25
View File
@@ -180,7 +180,7 @@ pub fn submit_ticket_component() -> Html {
Callback::from(move |e: SubmitEvent| { Callback::from(move |e: SubmitEvent| {
e.prevent_default(); e.prevent_default();
if room.is_none() { if room.is_none() {
status.set(Some("Invalid room".into())); status.set(Some("Ungültiger Raum".into()));
return; return;
} }
let category = (*category).clone(); let category = (*category).clone();
@@ -188,7 +188,7 @@ pub fn submit_ticket_component() -> Html {
let description = (*description).clone(); let description = (*description).clone();
let room = room.unwrap(); let room = room.unwrap();
if !valid_rooms.contains(&room) { if !valid_rooms.contains(&room) {
status.set(Some("Room not allowed".into())); status.set(Some("Raum nicht erlaubt".into()));
return; return;
} }
let status = status.clone(); let status = status.clone();
@@ -208,9 +208,12 @@ pub fn submit_ticket_component() -> Html {
.expect("Failed to build request"); .expect("Failed to build request");
match request.send().await { match request.send().await {
Ok(response) if response.status() == 200 => status.set(Some("Success".into())), Ok(response) if response.status() == 200 => status.set(Some("Erfolg".into())),
Ok(response) => status.set(Some(format!("Error: {}", response.status()))), Ok(response) => {
Err(err) => status.set(Some(format!("Network error: {}", err))), let text = response.text().await.unwrap_or_else(|_| "Unbekannt".into());
status.set(Some(text));
},
Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
} }
}); });
}) })
@@ -313,14 +316,14 @@ pub fn submit_ticket_component() -> Html {
{ {
if !room_valid { if !room_valid {
html! { html! {
<p class="warning" >{ "Ungültiger / nicht erlaubter Raum (z. B. 101, K12, D5)" }</p> <p class="warning" >{ "Ungültiger/nicht erlaubter Raum (z. B. 101, K12, D5)" }</p>
} }
} else { } else {
html! {} html! {}
} }
} }
<br/> <br/>
<button type="submit">{ "Send" }</button> <button type="submit">{ "Absenden" }</button>
<Link<crate::Route> to={crate::Route::AllTickets}>{ "Tickets ansehen" }</Link<crate::Route>> <Link<crate::Route> to={crate::Route::AllTickets}>{ "Tickets ansehen" }</Link<crate::Route>>
@@ -448,9 +451,12 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
.expect("Failed to construct request"); .expect("Failed to construct request");
match request.send().await { match request.send().await {
Ok(response) if response.status() == 200 => error.set(Some("Success".into())), Ok(response) if response.status() == 200 => error.set(Some("Erfolg".into())),
Ok(response) => error.set(Some(format!("Error: {}", response.status()))), Ok(response) => {
Err(err) => error.set(Some(format!("Network error: {}", err))), let text = response.text().await.unwrap_or_else(|_| "Unbekannt".into());
error.set(Some(text));
},
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
}); });
}) })
@@ -488,14 +494,13 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
match request.send().await { match request.send().await {
Ok(resp) if resp.status() == 200 || resp.status() == 204 => { Ok(resp) if resp.status() == 200 || resp.status() == 204 => {
// remove local state or navigate away ticket_state.set(None);
ticket_state.set(None); // clears the shown item
} }
Ok(resp) => { Ok(resp) => {
let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into()); let txt = resp.text().await.unwrap_or_else(|_| "Unbekannt".into());
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt))); delete_error.set(Some(txt));
} }
Err(err) => delete_error.set(Some(format!("Network error: {}", err))), Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
deleting.set(false); deleting.set(false);
}); });
@@ -503,9 +508,9 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
}; };
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else if let Some(t) = &*ticket { } else if let Some(t) = &*ticket {
html! { html! {
<div class="rundbg"> <div class="rundbg">
@@ -549,7 +554,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
</div> </div>
} }
} else { } else {
html! { <p>{ "No ticket found." }</p> } html! { <p>{ "Kein Ticket gefunden." }</p> }
} }
} }
@@ -659,9 +664,9 @@ pub fn all_tickets_component() -> Html {
} }
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else { } else {
html! { html! {
<ul class= "postits"> <ul class= "postits">
@@ -742,17 +747,17 @@ pub fn archived_tickets_component() -> Html {
Ok(response) if response.status() == 200 => { Ok(response) if response.status() == 200 => {
match response.json::<Vec<Ticket>>().await { match response.json::<Vec<Ticket>>().await {
Ok(t) => tickets.set(t), Ok(t) => tickets.set(t),
Err(e) => error.set(Some(format!("parse error: {}", e))), Err(e) => error.set(Some(format!("Parsefehler: {}", e))),
} }
} }
Ok(response) => { Ok(response) => {
if let Ok(text) = response.text().await { if let Ok(text) = response.text().await {
error.set(Some(text)); error.set(Some(text));
} else { } else {
error.set(Some(format!("status {}", response.status()))); error.set(Some(format!("Status {}", response.status())));
} }
} }
Err(err) => error.set(Some(format!("Network error: {}", err))), Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
loading.set(false); loading.set(false);
}); });
@@ -792,9 +797,9 @@ pub fn archived_tickets_component() -> Html {
} }
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else { } else {
html! { html! {
<ul class="postits"> <ul class="postits">
+24 -22
View File
@@ -181,9 +181,12 @@ pub fn register_component() -> Html {
.expect("Error building request"); .expect("Error building request");
match request.send().await { match request.send().await {
Ok(response) if response.status() == 200 => status.set(Some("Success".into())), Ok(response) if response.status() == 200 => status.set(Some("Erfolg".into())),
Ok(response) => status.set(Some(format!("Error: {}", response.status()))), Ok(response) => {
Err(err) => status.set(Some(format!("Network error: {}", err))), let text = response.text().await.unwrap_or_else(|_| "Unbekannt".into());
status.set(Some(text));
},
Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
} }
}); });
}) })
@@ -326,10 +329,10 @@ pub fn login_component() -> Html {
navigator.push(&crate::Route::Home); navigator.push(&crate::Route::Home);
} }
Ok(r) => { Ok(r) => {
let text = r.text().await.unwrap_or_else(|_| "unknown".into()); let text = r.text().await.unwrap_or_else(|_| "Unbekannt".into());
error.set(format!("HTTP {}: {}", r.status(), text)); error.set(text);
} }
Err(err) => error.set(format!("Network error: {}", err)), Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
} }
}); });
}) })
@@ -340,7 +343,7 @@ pub fn login_component() -> Html {
<h1 class="headline">{ "Anmeldung" }</h1> <h1 class="headline">{ "Anmeldung" }</h1>
<form {onsubmit} class="rundbg login"> <form {onsubmit} class="rundbg login">
<input <input
placeholder="username" placeholder="Benutzername"
value={(*username).clone()} value={(*username).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
@@ -349,14 +352,14 @@ pub fn login_component() -> Html {
/> />
<input <input
type="password" type="password"
placeholder="password" placeholder="Passwort"
value={(*pwd).clone()} value={(*pwd).clone()}
oninput={Callback::from(move |e: InputEvent| { oninput={Callback::from(move |e: InputEvent| {
let input: web_sys::HtmlInputElement = e.target_unchecked_into(); let input: web_sys::HtmlInputElement = e.target_unchecked_into();
pwd.set(input.value()); pwd.set(input.value());
})} })}
/> />
<button type="submit" disabled={*loading}>{ if *loading { "Logging in..." } else { "Login" } }</button> <button type="submit" disabled={*loading}>{ if *loading { "Anmeldung läuft..." } else { "Anmelden" } }</button>
if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> } if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> }
</form> </form>
</div> </div>
@@ -428,9 +431,9 @@ pub fn all_users_component() -> Html {
} }
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else { } else {
html! { html! {
<ul class="postits"> <ul class="postits">
@@ -637,7 +640,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
// confirm // confirm
if !web_sys::window() if !web_sys::window()
.and_then(|w| { .and_then(|w| {
w.confirm_with_message("Are you sure you want to delete this item?") w.confirm_with_message("Möchten Sie diesen Eintrag wirklich löschen?")
.ok() .ok()
}) })
.unwrap_or(false) .unwrap_or(false)
@@ -653,19 +656,18 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
let user_state = user_state.clone(); let user_state = user_state.clone();
spawn_local(async move { spawn_local(async move {
let url = format!("/api/users/{}", id); // or /api/tickets/{} let url = format!("/api/users/{}", id);
let req = Request::delete(&url).credentials(web_sys::RequestCredentials::Include); let req = Request::delete(&url).credentials(web_sys::RequestCredentials::Include);
match req.send().await { match req.send().await {
Ok(resp) if resp.status() == 200 || resp.status() == 204 => { Ok(resp) if resp.status() == 200 || resp.status() == 204 => {
// remove local state or navigate away user_state.set(None);
user_state.set(None); // clears the shown item
} }
Ok(resp) => { Ok(resp) => {
let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into()); let txt = resp.text().await.unwrap_or_else(|_| "Unbekannt".into());
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt))); delete_error.set(Some(txt));
} }
Err(err) => delete_error.set(Some(format!("Network error: {}", err))), Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
deleting.set(false); deleting.set(false);
}); });
@@ -673,9 +675,9 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
}; };
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else if let Some(u) = &*user { } else if let Some(u) = &*user {
html! { html! {
<div class="rundbg"> <div class="rundbg">
@@ -743,7 +745,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
<button type="submit" disabled={*saving}>{ if *saving { "Speichern..." } else { "Speichern" } }</button> <button type="submit" disabled={*saving}>{ if *saving { "Speichern..." } else { "Speichern" } }</button>
if *save_success { if *save_success {
<p style="color:green">{ "Updated successfully" }</p> <p style="color:green">{ "Erfolgreich aktualisiert" }</p>
} }
if let Some(err) = &*save_error { if let Some(err) = &*save_error {
<p style="color:red">{ err.clone() }</p> <p style="color:red">{ err.clone() }</p>
@@ -761,6 +763,6 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
</div> </div>
} }
} else { } else {
html! { <p>{ "No ticket found." }</p> } html! { <p>{ "Kein Benutzer gefunden." }</p> }
} }
} }
+11 -11
View File
@@ -225,17 +225,17 @@ pub fn ticket_count_component() -> Html {
Ok(response) if response.status() == 200 => { Ok(response) if response.status() == 200 => {
match response.json::<Vec<Ticket>>().await { match response.json::<Vec<Ticket>>().await {
Ok(t) => tickets.set(t), Ok(t) => tickets.set(t),
Err(e) => error.set(Some(format!("parse error: {}", e))), Err(e) => error.set(Some(format!("Parsefehler: {}", e))),
} }
} }
Ok(response) => { Ok(response) => {
if let Ok(text) = response.text().await { if let Ok(text) = response.text().await {
error.set(Some(text)); error.set(Some(text));
} else { } else {
error.set(Some(format!("status {}", response.status()))); error.set(Some(format!("Status {}", response.status())));
} }
} }
Err(err) => error.set(Some(format!("Network error: {}", err))), Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
loading.set(false); loading.set(false);
}); });
@@ -275,9 +275,9 @@ pub fn ticket_count_component() -> Html {
} }
if *loading { if *loading {
html! {<p>{ "Loading" }</p>} html! {<p>{ "Wird geladen" }</p>}
} else if let Some(e) = &*error { } else if let Some(e) = &*error {
html! { <p>{ format!("Error: {}", e) }</p> } html! { <p>{ format!("Fehler: {}", e) }</p> }
} else { } else {
let status_conditions = |t: &Ticket| t.status == "ToDo" || t.status == "InProgress"; let status_conditions = |t: &Ticket| t.status == "ToDo" || t.status == "InProgress";
let count = tickets let count = tickets
@@ -342,17 +342,17 @@ pub fn submit_stats_component() -> Html {
Ok(response) if response.status() == 200 => { Ok(response) if response.status() == 200 => {
match response.json::<Vec<TicketPartial>>().await { match response.json::<Vec<TicketPartial>>().await {
Ok(t) => tickets.set(t), Ok(t) => tickets.set(t),
Err(e) => error.set(Some(format!("parse error: {}", e))), Err(e) => error.set(Some(format!("Parsefehler: {}", e))),
} }
} }
Ok(response) => { Ok(response) => {
if let Ok(text) = response.text().await { if let Ok(text) = response.text().await {
error.set(Some(text)); error.set(Some(text));
} else { } else {
error.set(Some(format!("status {}", response.status()))); error.set(Some(format!("Status {}", response.status())));
} }
} }
Err(err) => error.set(Some(format!("Network error: {}", err))), Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
} }
loading.set(false); loading.set(false);
}); });
@@ -372,7 +372,7 @@ pub fn submit_stats_component() -> Html {
} }
} }
let weekdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; let weekdays = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
let (max_idx, _max_val) = counts let (max_idx, _max_val) = counts
.iter() .iter()
.enumerate() .enumerate()
@@ -383,12 +383,12 @@ pub fn submit_stats_component() -> Html {
html! { html! {
<div class="diagnostics-section"> <div class="diagnostics-section">
if *loading { if *loading {
<p>{ "Loading..." }</p> <p>{ "Wird geladen..." }</p>
} }
if let Some(e) = &*error { if let Some(e) = &*error {
<p style="color: red;">{ e.clone() }</p> <p style="color: red;">{ e.clone() }</p>
} }
<h3>{ "Tickets per weekday" }</h3> <h3>{ "Tickets pro Wochentag" }</h3>
<div class="weekday-chart"> <div class="weekday-chart">
<div class="weekday-bars"> <div class="weekday-bars">
{ for (0..7).map(|i| { { for (0..7).map(|i| {
+4 -2
View File
@@ -9,7 +9,8 @@
--rundbgbackgroundcolor: #a0a0a0; --rundbgbackgroundcolor: #a0a0a0;
--sidebar-font: #fffefe; --sidebar-font: #fffefe;
--color: #ffffff; --color: #ffffff;
--color-container: #f0f0f0;
--color-text: #000000;
} }
[data-theme='dark'] { [data-theme='dark'] {
@@ -23,5 +24,6 @@
--rundbgbackgroundcolor: #505050; --rundbgbackgroundcolor: #505050;
--sidebar-font: #000000; --sidebar-font: #000000;
--color: #000000; --color: #000000;
--color-container: #1a1a1a;
--color-text: #ffffff;
} }
+13 -7
View File
@@ -19,7 +19,7 @@
text-decoration: none; text-decoration: none;
display: block; display: block;
padding: 8px 12px; padding: 8px 12px;
border-radius: $border-radius; border-radius: var(--border-radius);
transition: background 0.2s ease-in-out; transition: background 0.2s ease-in-out;
&:hover { background: rgba(255,255,255,0.1); } &:hover { background: rgba(255,255,255,0.1); }
} }
@@ -29,7 +29,7 @@
.submenu { .submenu {
margin-left: 8px; margin-left: 8px;
background: rgba(255,255,255,0.05); background: rgba(255,255,255,0.05);
border-radius: $border-radius; border-radius: var(--border-radius);
padding: 6px; padding: 6px;
li { padding: 4px 0; } li { padding: 4px 0; }
} }
@@ -49,6 +49,7 @@
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
text-align: left; text-align: left;
margin-top: var(--spacing-sm);
} }
.sidebar-header { .sidebar-header {
@@ -56,7 +57,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
margin-bottom: $spacing-md; margin-bottom: var(--spacing-md);
.home { .home {
flex-grow: 1; flex-grow: 1;
@@ -72,7 +73,7 @@
display: none; display: none;
background: transparent; background: transparent;
border: none; border: none;
color: #fff; color: var(--sidebar-font);
cursor: pointer; cursor: pointer;
padding: 8px; padding: 8px;
border-radius: 50%; border-radius: 50%;
@@ -88,7 +89,7 @@
svg { svg {
width: 20px; width: 20px;
height: 20px; height: 20px;
stroke: #fff; stroke: var(--sidebar-font);
} }
@media (max-width: 768px) { @media (max-width: 768px) {
@@ -116,7 +117,7 @@
position: fixed; position: fixed;
top: 1rem; top: 1rem;
left: 1rem; left: 1rem;
z-index: 998; z-index: 999;
width: 48px; width: 48px;
height: 48px; height: 48px;
border-radius: 50%; border-radius: 50%;
@@ -141,6 +142,11 @@
transform: translateY(-1px); transform: translateY(-1px);
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2); box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
background-color: var(--color-bg); background-color: var(--color-bg);
color: var(--color-container);
svg {
stroke: var(--color-container);
}
} }
&:active { &:active {
@@ -172,4 +178,4 @@
pointer-events: auto; pointer-events: auto;
} }
} }
} }
-14
View File
@@ -8,20 +8,6 @@
@use "components/home"; @use "components/home";
@use "components/icon"; @use "components/icon";
:root {
--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 { body {
background: var(--color-bg); background: var(--color-bg);
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial; font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial;