diff --git a/frontend/Trunk.toml b/frontend/Trunk.toml
index f218f3a..f743902 100644
--- a/frontend/Trunk.toml
+++ b/frontend/Trunk.toml
@@ -1,6 +1,6 @@
[serve]
# The address to serve on LAN.
-addresses = ["127.0.0.1"] #,"10.150.9.7"]
+addresses = ["127.0.0.1"] #,"10.150.9.116"]
# The address to serve on WAN.
# address = "0.0.0.0"
# The port to serve on.
diff --git a/frontend/src/pages/basic_pages.rs b/frontend/src/pages/basic_pages.rs
index 4f948ce..d689e50 100644
--- a/frontend/src/pages/basic_pages.rs
+++ b/frontend/src/pages/basic_pages.rs
@@ -61,8 +61,10 @@ pub fn home_component() -> Html {
{ "Welcome" }
- { "You are logged in as: " }
- { &*name }
+
+
{ "You are logged in as: " }
+
{ &*name }
+
}
}
diff --git a/frontend/src/pages/ticket.rs b/frontend/src/pages/ticket.rs
index b3d76a4..cb9182e 100644
--- a/frontend/src/pages/ticket.rs
+++ b/frontend/src/pages/ticket.rs
@@ -665,25 +665,28 @@ pub fn all_tickets_component() -> Html {
html! { { format!("Error: {}", e) }
}
} else {
html! {
-
- { for tickets.iter().filter(|t| if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false }).map(|t| html! {
-
-
-
- to={crate::Route::TicketById{id: t.id}}>
{ format!("{} - #{}", t.betreff, t.id) }
>
- { &t.description }
- { match t.status.as_str() {
- "ToDo" => "Zu tun",
- "InProgress" => "In Bearbeitung",
- "Completed" => "Erledigt",
- "Archived" => "Archiviert",
- _ => "Ungültiger Status"
- }}
-
-
-
- })}
- to={crate::Route::Ticket}>{ "Zurück zur Startseite" }>
-
+
+
+ { for tickets.iter().filter(|t| 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",
+ "InProgress" => "InProgress",
+ "Completed" => "Completed",
+ "Archived" => "Archived",
+ _ => "To-Do"
+ };
+ html! {
+ -
+ to={crate::Route::TicketById{id: t.id}}>
{ format!("{}", t.betreff) }
>
+ { &t.description }
+
+ }
+ })}
+
+
+ to={crate::Route::Ticket}>{ "Zurück zur Startseite" }>
+
+
}
}
}
diff --git a/frontend/src/pages/user.rs b/frontend/src/pages/user.rs
index 5893032..6a25b63 100644
--- a/frontend/src/pages/user.rs
+++ b/frontend/src/pages/user.rs
@@ -333,32 +333,34 @@ pub fn login_component() -> Html {
};
html! {
-