Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b26155118 | ||
|
|
a653bf3f45 | ||
|
|
fb30d4ab83 | ||
|
|
26384d2849 | ||
|
|
bec2a8a451 | ||
|
|
f96db06a33 | ||
|
|
6ef50d06aa | ||
|
|
04b9ef8f9e |
+8
-3
@@ -45,14 +45,19 @@ location /api/ {
|
|||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Usage of AI
|
## Usage of AI
|
||||||
|
|
||||||
Github Copilot CLI was used with the model Claude Haiku 4.5 to generate most of the documentation:
|
Github Copilot CLI was used with the model Claude Haiku 4.5 to generate most of the documentation
|
||||||
|
|
||||||
|
Google Antigravity generated the Sequence Diagrams
|
||||||
|
|
||||||
### Prompt
|
### Prompt
|
||||||
Generate comments for cargo doc describing the indivilual components and create links to relevant structs, functions etc.
|
Generate comments for cargo doc describing the indivilual components and create links to relevant structs, functions etc.
|
||||||
|
|
||||||
|
Generate a sequence diagramm in @[README.md] behind the class diagramms
|
||||||
|
|
||||||
### Output
|
### Output
|
||||||
The comments with `///` or `//!`
|
The comments with `///` or `//!`
|
||||||
I've gone over most of it and modified it to my needs and opinions
|
I've gone over it and modified it to my needs and opinions
|
||||||
|
|
||||||
|
The general structure sequence diagrams above. I've modified and fixed any errors and discrepancys
|
||||||
|
|||||||
@@ -248,6 +248,10 @@ classDiagram
|
|||||||
class SidebarShellProps {
|
class SidebarShellProps {
|
||||||
+children: Children
|
+children: Children
|
||||||
}
|
}
|
||||||
|
class SidebarComponentProps {
|
||||||
|
+is_open: bool
|
||||||
|
+on_close: Callback~()~
|
||||||
|
}
|
||||||
class AdminCheckWrapperProps {
|
class AdminCheckWrapperProps {
|
||||||
+children: Children
|
+children: Children
|
||||||
}
|
}
|
||||||
@@ -255,6 +259,7 @@ classDiagram
|
|||||||
RoomTotalsProps --> TicketPartial
|
RoomTotalsProps --> TicketPartial
|
||||||
UserTotalProps --> UserPartial
|
UserTotalProps --> UserPartial
|
||||||
UserTotalProps --> TicketPartial
|
UserTotalProps --> TicketPartial
|
||||||
|
SidebarShellProps ..> SidebarComponentProps
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -306,7 +311,7 @@ sequenceDiagram
|
|||||||
|
|
||||||
BE-->>FE: HTTP 200 OK {"status": "success", "token": "...", "user": {...}}
|
BE-->>FE: HTTP 200 OK {"status": "success", "token": "...", "user": {...}}
|
||||||
Note over BE,FE: Header: Set-Cookie: token=...#59; Path=/#59; HttpOnly#59; SameSite=Lax
|
Note over BE,FE: Header: Set-Cookie: token=...#59; Path=/#59; HttpOnly#59; SameSite=Lax
|
||||||
|
|
||||||
Note over FE: Save auth state to global context
|
Note over FE: Save auth state to global context
|
||||||
FE-->>User: Redirect to Dashboard / Home
|
FE-->>User: Redirect to Dashboard / Home
|
||||||
else Password Invalid
|
else Password Invalid
|
||||||
@@ -351,6 +356,15 @@ sequenceDiagram
|
|||||||
DB-->>BE: Success
|
DB-->>BE: Success
|
||||||
BE-->>FE: HTTP 200 OK {"status": "success"}
|
BE-->>FE: HTTP 200 OK {"status": "success"}
|
||||||
FE-->>Admin: Update ticket status in UI
|
FE-->>Admin: Update ticket status in UI
|
||||||
|
|
||||||
|
Note over Admin, DB: Ticket Archiving Flow (Admin Only Route)
|
||||||
|
Admin->>FE: Open Archived Tickets page
|
||||||
|
FE->>BE: GET /api/tickets/archive (Includes 'token' cookie)
|
||||||
|
Note over BE: validate_admin middleware verifies token & admin role
|
||||||
|
BE->>DB: SELECT * FROM tickets WHERE status = 'Archived'
|
||||||
|
DB-->>BE: Return archived tickets
|
||||||
|
BE-->>FE: HTTP 200 OK [Archived Tickets]
|
||||||
|
FE-->>Admin: Render historical archive board
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage of AI
|
## Usage of AI
|
||||||
@@ -366,6 +380,6 @@ Generate a sequence diagramm in @[README.md] behind the class diagramms
|
|||||||
|
|
||||||
### Output
|
### Output
|
||||||
The comments with `///` or `//!`
|
The comments with `///` or `//!`
|
||||||
I've gone over most of it and modified it to my needs and opinions
|
I've gone over it and modified it to my needs and opinions
|
||||||
|
|
||||||
The sequence Diagrams above
|
The general structure sequence diagrams above. I've modified and fixed any errors and discrepancys
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ pub async fn login(
|
|||||||
.ok_or_else(|| {
|
.ok_or_else(|| {
|
||||||
(
|
(
|
||||||
StatusCode::BAD_REQUEST,
|
StatusCode::BAD_REQUEST,
|
||||||
Json(json!({"status": "error", "message": "Invalid username"})),
|
Json(json!({"status": "error", "message": "Ungültiger Benutzername"})),
|
||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
@@ -157,7 +157,7 @@ pub async fn login(
|
|||||||
if !valid_pwd {
|
if !valid_pwd {
|
||||||
let error_response = serde_json::json!({
|
let error_response = serde_json::json!({
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"message": "Invalid password"
|
"message": "Ungültiges passwort"
|
||||||
});
|
});
|
||||||
return Err((StatusCode::BAD_REQUEST, Json(error_response)));
|
return Err((StatusCode::BAD_REQUEST, Json(error_response)));
|
||||||
}
|
}
|
||||||
@@ -268,7 +268,7 @@ pub async fn get_current_user(
|
|||||||
/// - `404 Not Found` if user doesn't exist
|
/// - `404 Not Found` if user doesn't exist
|
||||||
/// - `500 Internal Server Error` if database error occurs
|
/// - `500 Internal Server Error` if database error occurs
|
||||||
pub async fn delete_user(
|
pub async fn delete_user(
|
||||||
Path(id): Path<i32>,
|
Path(id): Path<i16>,
|
||||||
State(data): State<Arc<AppState>>,
|
State(data): State<Arc<AppState>>,
|
||||||
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
||||||
let query = sqlx::query(r#"DELETE FROM users WHERE id = $1"#)
|
let query = sqlx::query(r#"DELETE FROM users WHERE id = $1"#)
|
||||||
@@ -338,10 +338,7 @@ pub async fn get_users(
|
|||||||
(StatusCode::INTERNAL_SERVER_ERROR, Json(error))
|
(StatusCode::INTERNAL_SERVER_ERROR, Json(error))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let response = users
|
let response = users.iter().map(filter_user).collect::<Vec<FilteredUser>>();
|
||||||
.iter()
|
|
||||||
.map(filter_user)
|
|
||||||
.collect::<Vec<FilteredUser>>();
|
|
||||||
let json_respnse = json!(response);
|
let json_respnse = json!(response);
|
||||||
Ok(Json(json_respnse))
|
Ok(Json(json_respnse))
|
||||||
}
|
}
|
||||||
@@ -381,12 +378,10 @@ pub async fn get_user_by_id(
|
|||||||
});
|
});
|
||||||
Err((StatusCode::NOT_FOUND, Json(error_response)))
|
Err((StatusCode::NOT_FOUND, Json(error_response)))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => Err((
|
||||||
Err((
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
||||||
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
)),
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -411,7 +406,7 @@ pub async fn get_user_by_id(
|
|||||||
/// - This endpoint requires admin privileges (enforced by middleware via
|
/// - This endpoint requires admin privileges (enforced by middleware via
|
||||||
/// [`validate_admin`](crate::cookie::validation::validate_admin)).
|
/// [`validate_admin`](crate::cookie::validation::validate_admin)).
|
||||||
pub async fn update_user(
|
pub async fn update_user(
|
||||||
Path(id): Path<i32>,
|
Path(id): Path<i16>,
|
||||||
State(data): State<Arc<AppState>>,
|
State(data): State<Arc<AppState>>,
|
||||||
Json(body): Json<UserUpdateScheme>,
|
Json(body): Json<UserUpdateScheme>,
|
||||||
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
||||||
|
|||||||
@@ -2,6 +2,15 @@ use gloo_storage::{LocalStorage, Storage};
|
|||||||
use web_sys::window;
|
use web_sys::window;
|
||||||
use yew::prelude::*;
|
use yew::prelude::*;
|
||||||
|
|
||||||
|
/// A persistent, floating toggle button to switch the user interface theme between Dark Mode and Light Mode.
|
||||||
|
///
|
||||||
|
/// # Functionality
|
||||||
|
/// 1. **System Preference Check**: If the user hasn't explicitly set a preference, detects the operating system theme
|
||||||
|
/// preference using browser `match_media("(prefers-color-scheme: dark)")` query.
|
||||||
|
/// 2. **Session Persistence**: Caches the selected theme choice under the `"dark-mode"` key in the browser's `LocalStorage`
|
||||||
|
/// so that user preferences persist across page reloads.
|
||||||
|
/// 3. **Dynamic Style Swapping**: Injects or removes the `.theme-dark` / `.theme-light` classes directly on the document
|
||||||
|
/// `body` element, triggering the theme change via globally defined CSS variables.
|
||||||
#[function_component(DarkModeToggle)]
|
#[function_component(DarkModeToggle)]
|
||||||
pub fn dark_mode_toggle() -> Html {
|
pub fn dark_mode_toggle() -> Html {
|
||||||
// 1. Initialize state from LocalStorage or system preference
|
// 1. Initialize state from LocalStorage or system preference
|
||||||
|
|||||||
+46
-2
@@ -70,8 +70,15 @@ pub struct SidebarShellProps {
|
|||||||
/// This component is designed to wrap page-specific content, ensuring that the sidebar
|
/// This component is designed to wrap page-specific content, ensuring that the sidebar
|
||||||
/// is always present for navigation. Integrates with [`crate::pages::sidebar::Sidebar`] for navigation.
|
/// is always present for navigation. Integrates with [`crate::pages::sidebar::Sidebar`] for navigation.
|
||||||
///
|
///
|
||||||
|
/// # Mobile Support
|
||||||
|
/// On mobile displays, the sidebar is hidden by default and can be toggled:
|
||||||
|
/// - **Menu Toggle Button**: Renders a floating menu button to slide the sidebar open.
|
||||||
|
/// - **Dark Mode Toggle**: Floating button to change theme.
|
||||||
|
/// - **Overlay Backdrop**: Dims the screen when the sidebar is open. Clicking it closes the sidebar.
|
||||||
|
/// - **Auto-Close on Navigation**: Automatically closes the sidebar when navigating to a new route.
|
||||||
|
///
|
||||||
/// # Components
|
/// # Components
|
||||||
/// - [`crate::pages::sidebar::Sidebar`]: The navigation sidebar component.
|
/// - [`crate::pages::sidebar::Sidebar`]: The navigation sidebar component, accepting mobile open state.
|
||||||
/// - Main content area: Renders the `children` passed to this component.
|
/// - Main content area: Renders the `children` passed to this component.
|
||||||
///
|
///
|
||||||
/// # Example
|
/// # Example
|
||||||
@@ -84,9 +91,46 @@ pub struct SidebarShellProps {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(SidebarShell)]
|
#[component(SidebarShell)]
|
||||||
fn sidebar_shell(props: &SidebarShellProps) -> Html {
|
fn sidebar_shell(props: &SidebarShellProps) -> Html {
|
||||||
|
let route = use_route::<Route>();
|
||||||
|
let mobile_sidebar_open = use_state(|| false);
|
||||||
|
|
||||||
|
// Close mobile sidebar automatically on any route transition
|
||||||
|
{
|
||||||
|
let mobile_sidebar_open = mobile_sidebar_open.clone();
|
||||||
|
use_effect_with(route, move |_| {
|
||||||
|
mobile_sidebar_open.set(false);
|
||||||
|
|| ()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let on_open = {
|
||||||
|
let mobile_sidebar_open = mobile_sidebar_open.clone();
|
||||||
|
Callback::from(move |_: MouseEvent| mobile_sidebar_open.set(true))
|
||||||
|
};
|
||||||
|
|
||||||
|
let on_close = {
|
||||||
|
let mobile_sidebar_open = mobile_sidebar_open.clone();
|
||||||
|
Callback::from(move |_: ()| mobile_sidebar_open.set(false))
|
||||||
|
};
|
||||||
|
|
||||||
|
let on_close_click = {
|
||||||
|
let on_close = on_close.clone();
|
||||||
|
Callback::from(move |_: MouseEvent| on_close.emit(()))
|
||||||
|
};
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<div class="layout">
|
<div class="layout">
|
||||||
<sidebar::Sidebar/>
|
<button class="mobile-menu-toggle" onclick={on_open}>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<line x1="4" x2="20" y1="12" y2="12"/>
|
||||||
|
<line x1="4" x2="20" y1="6" y2="6"/>
|
||||||
|
<line x1="4" x2="20" y1="18" y2="18"/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div class={if *mobile_sidebar_open { "sidebar-overlay open" } else { "sidebar-overlay" }} onclick={on_close_click}></div>
|
||||||
|
|
||||||
|
<sidebar::Sidebar is_open={*mobile_sidebar_open} on_close={on_close} />
|
||||||
<main class="content">
|
<main class="content">
|
||||||
{ for props.children.iter() }
|
{ for props.children.iter() }
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -319,6 +319,11 @@ pub fn users_menu() -> Html {
|
|||||||
/// and administrative status. It fetches the current user's details via `/api/users/current`
|
/// and administrative status. It fetches the current user's details via `/api/users/current`
|
||||||
/// to determine what menu items to display.
|
/// to determine what menu items to display.
|
||||||
///
|
///
|
||||||
|
/// # Mobile Support
|
||||||
|
/// On small screens:
|
||||||
|
/// - Slides into view from the left when `props.is_open` is `true`.
|
||||||
|
/// - Renders a close button (`✕`) in the header that emits `props.on_close`.
|
||||||
|
///
|
||||||
/// # Structure
|
/// # Structure
|
||||||
/// - Wraps its content in a [`SidebarStateProvider`] to allow nested menus to manage their state.
|
/// - Wraps its content in a [`SidebarStateProvider`] to allow nested menus to manage their state.
|
||||||
/// - Contains a navigation (`<nav>`) element with an unordered list (`<ul>`) of menu items.
|
/// - Contains a navigation (`<nav>`) element with an unordered list (`<ul>`) of menu items.
|
||||||
@@ -337,8 +342,22 @@ pub fn users_menu() -> Html {
|
|||||||
/// # Logout Functionality
|
/// # Logout Functionality
|
||||||
/// The "Logout" button sends a GET request to `/api/logout`, clears the user's session,
|
/// The "Logout" button sends a GET request to `/api/logout`, clears the user's session,
|
||||||
/// and then redirects the user to the login page (`crate::Route::Login`).
|
/// and then redirects the user to the login page (`crate::Route::Login`).
|
||||||
|
/// Properties for the [`Sidebar`] component.
|
||||||
|
///
|
||||||
|
/// These properties enable managing and controlling the responsive mobile sidebar
|
||||||
|
/// layout and its visibility settings.
|
||||||
|
#[derive(Properties, PartialEq)]
|
||||||
|
pub struct SidebarComponentProps {
|
||||||
|
/// A boolean flag indicating whether the mobile sidebar is currently slid open (`true`) or hidden (`false`).
|
||||||
|
#[prop_or_default]
|
||||||
|
pub is_open: bool,
|
||||||
|
/// A callback emitted when the user requests to close/hide the mobile sidebar.
|
||||||
|
#[prop_or_default]
|
||||||
|
pub on_close: Callback<()>,
|
||||||
|
}
|
||||||
|
|
||||||
#[component(Sidebar)]
|
#[component(Sidebar)]
|
||||||
pub fn sidebar() -> Html {
|
pub fn sidebar(props: &SidebarComponentProps) -> Html {
|
||||||
let is_admin = use_state(|| None::<bool>);
|
let is_admin = use_state(|| None::<bool>);
|
||||||
let navigator = use_navigator().expect("Sidebar must be used within a Router");
|
let navigator = use_navigator().expect("Sidebar must be used within a Router");
|
||||||
|
|
||||||
@@ -382,56 +401,78 @@ pub fn sidebar() -> Html {
|
|||||||
None => html! { <div class="sidebar-loading">{ "Lade..." }</div> },
|
None => html! { <div class="sidebar-loading">{ "Lade..." }</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) => html! {
|
Some(false) => {
|
||||||
<SidebarStateProvider>
|
let on_close = props.on_close.clone();
|
||||||
<nav class="sidebar user">
|
html! {
|
||||||
<ul>
|
<SidebarStateProvider>
|
||||||
<Link<crate::Route> to={crate::Route::Home} classes="home">
|
<nav class={if props.is_open { "sidebar user open" } else { "sidebar user" }}>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="home-svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<ul>
|
||||||
<path d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
<li class="sidebar-header">
|
||||||
<polyline points="9 22 9 12 15 12 15 22"/>
|
<Link<crate::Route> to={crate::Route::Home} classes="home">
|
||||||
</svg>
|
<svg xmlns="http://www.w3.org/2000/svg" class="home-svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
</Link<crate::Route>>
|
<path d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
||||||
<TicketMenu/>
|
<polyline points="9 22 9 12 15 12 15 22"/>
|
||||||
<li class="logout-item">
|
</svg>
|
||||||
<button
|
</Link<crate::Route>>
|
||||||
class="logout-button"
|
<button class="sidebar-close" onclick={move |_| on_close.emit(())}>
|
||||||
onclick={on_logout.clone()}
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
>
|
<line x1="18" y1="6" x2="6" y2="18"/>
|
||||||
{ "Abmelden" }
|
<line x1="6" y1="6" x2="18" y2="18"/>
|
||||||
</button>
|
</svg>
|
||||||
</li>
|
</button>
|
||||||
</ul>
|
</li>
|
||||||
</nav>
|
<TicketMenu/>
|
||||||
</SidebarStateProvider>
|
<li class="logout-item">
|
||||||
|
<button
|
||||||
|
class="logout-button"
|
||||||
|
onclick={on_logout.clone()}
|
||||||
|
>
|
||||||
|
{ "Abmelden" }
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
</SidebarStateProvider>
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// Admin: full sidebar wrapped in provider so submenu state persists
|
// Admin: full sidebar wrapped in provider so submenu state persists
|
||||||
Some(true) => html! {
|
Some(true) => {
|
||||||
<SidebarStateProvider>
|
let on_close = props.on_close.clone();
|
||||||
<nav class="sidebar admin">
|
html! {
|
||||||
<ul>
|
<SidebarStateProvider>
|
||||||
<Link<crate::Route> to={crate::Route::Home} classes="home">
|
<nav class={if props.is_open { "sidebar admin open" } else { "sidebar admin" }}>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" class="home-svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
<ul>
|
||||||
<path d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
<li class="sidebar-header">
|
||||||
<polyline points="9 22 9 12 15 12 15 22"/>
|
<Link<crate::Route> to={crate::Route::Home} classes="home">
|
||||||
</svg>
|
<svg xmlns="http://www.w3.org/2000/svg" class="home-svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
</Link<crate::Route>>
|
<path d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/>
|
||||||
<TicketMenu/>
|
<polyline points="9 22 9 12 15 12 15 22"/>
|
||||||
<UsersMenu/>
|
</svg>
|
||||||
<Link<crate::Route> to={crate::Route::Diagnostics}>{ "Statistiken" }</Link<crate::Route>>
|
</Link<crate::Route>>
|
||||||
<Link<crate::Route> to={crate::Route::ArchivedTickets}>{ "Archiv" }</Link<crate::Route>>
|
<button class="sidebar-close" onclick={move |_| on_close.emit(())}>
|
||||||
<li class="logout-item">
|
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
<button
|
<line x1="18" y1="6" x2="6" y2="18"/>
|
||||||
class="logout-button"
|
<line x1="6" y1="6" x2="18" y2="18"/>
|
||||||
onclick={on_logout.clone()}
|
</svg>
|
||||||
>
|
</button>
|
||||||
{ "Abmelden" }
|
</li>
|
||||||
</button>
|
<TicketMenu/>
|
||||||
</li>
|
<UsersMenu/>
|
||||||
</ul>
|
<Link<crate::Route> to={crate::Route::Diagnostics}>{ "Statistiken" }</Link<crate::Route>>
|
||||||
</nav>
|
<Link<crate::Route> to={crate::Route::ArchivedTickets}>{ "Archiv" }</Link<crate::Route>>
|
||||||
</SidebarStateProvider>
|
<li class="logout-item">
|
||||||
|
<button
|
||||||
|
class="logout-button"
|
||||||
|
onclick={on_logout.clone()}
|
||||||
|
>
|
||||||
|
{ "Abmelden" }
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
</SidebarStateProvider>
|
||||||
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
<option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
|
<option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
|
||||||
<option value="Internet">{ "Internet" }</option>
|
<option value="Internet">{ "Internet" }</option>
|
||||||
<option value="iPad Koffer">{ "iPad Koffer" }</option>
|
<option value="iPad Koffer">{ "iPad Koffer" }</option>
|
||||||
<option value="Apple TV">{ "Apple TV" }</option>
|
<option value="Apple TV" selected=true>{ "Apple TV" }</option>
|
||||||
<option value="Docu Cam">{ "Dokumenten Kamera" }</option>
|
<option value="Docu Cam">{ "Dokumenten Kamera" }</option>
|
||||||
<option value="Sonstiges">{ "Sonstiges" }</option>
|
<option value="Sonstiges">{ "Sonstiges" }</option>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use crate::dequote;
|
||||||
use gloo_net::http::Request;
|
use gloo_net::http::Request;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use wasm_bindgen_futures::spawn_local;
|
use wasm_bindgen_futures::spawn_local;
|
||||||
@@ -333,8 +334,9 @@ 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(|_| "unbekannt".into());
|
let text: serde_json::Value =
|
||||||
error.set(format!("HTTP {}: {}", r.status(), text));
|
r.json().await.unwrap_or_else(|_| "unbekannt".into());
|
||||||
|
error.set(dequote!(format!("{}", text["message"].to_string())));
|
||||||
}
|
}
|
||||||
Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
|
Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
|
||||||
}
|
}
|
||||||
@@ -343,7 +345,7 @@ pub fn login_component() -> Html {
|
|||||||
};
|
};
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<main class="content">
|
<main class="content login">
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1>{ "Anmelden" }</h1>
|
<h1>{ "Anmelden" }</h1>
|
||||||
@@ -771,10 +773,10 @@ 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">{ "Erfolgreich aktualisiert" }</p>
|
<p class="alert success">{ "Erfolgreich aktualisiert" }</p>
|
||||||
}
|
}
|
||||||
if let Some(err) = &*save_error {
|
if let Some(err) = &*save_error {
|
||||||
<p style="color:red">{ err.clone() }</p>
|
<p class="alert error">{ err.clone() }</p>
|
||||||
}
|
}
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
@@ -784,7 +786,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
|
|
||||||
<Link<crate::Route> to={crate::Route::AllUsers} classes="return-to">{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::AllUsers} classes="return-to">{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
|
||||||
if let Some(err) = &*delete_error {
|
if let Some(err) = &*delete_error {
|
||||||
<p style="color:red">{ err.clone() }</p>
|
<p class="alert error">{ err.clone() }</p>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -285,19 +285,20 @@ pub fn ticket_count_component() -> Html {
|
|||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
&& response.status() == 200
|
&& response.status() == 200
|
||||||
&& let Ok(json) = response.json::<serde_json::Value>().await {
|
&& let Ok(json) = response.json::<serde_json::Value>().await
|
||||||
let id = json
|
{
|
||||||
.get("data")
|
let id = json
|
||||||
.and_then(|d| d.get("id"))
|
.get("data")
|
||||||
.and_then(|v| v.as_i64())
|
.and_then(|d| d.get("id"))
|
||||||
.and_then(|n| i16::try_from(n).ok());
|
.and_then(|v| v.as_i64())
|
||||||
let is_admin = json
|
.and_then(|n| i16::try_from(n).ok());
|
||||||
.get("data")
|
let is_admin = json
|
||||||
.and_then(|d| d.get("is_admin"))
|
.get("data")
|
||||||
.and_then(|v| v.as_bool())
|
.and_then(|d| d.get("is_admin"))
|
||||||
.unwrap_or(false);
|
.and_then(|v| v.as_bool())
|
||||||
user.set(ActiveUser { id, is_admin });
|
.unwrap_or(false);
|
||||||
}
|
user.set(ActiveUser { id, is_admin });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
});
|
});
|
||||||
@@ -311,10 +312,7 @@ pub fn ticket_count_component() -> Html {
|
|||||||
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
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|t| {
|
.filter(|t| status_conditions(t) && (user.is_admin || (user.id == Some(t.user_id))))
|
||||||
status_conditions(t)
|
|
||||||
&& (user.is_admin || (user.id == Some(t.user_id)))
|
|
||||||
})
|
|
||||||
.count();
|
.count();
|
||||||
html! {
|
html! {
|
||||||
<div class="open-tickets">
|
<div class="open-tickets">
|
||||||
@@ -435,7 +433,7 @@ pub fn submit_stats_component() -> Html {
|
|||||||
<p>{ "Lade..." }</p>
|
<p>{ "Lade..." }</p>
|
||||||
}
|
}
|
||||||
if let Some(e) = &*error {
|
if let Some(e) = &*error {
|
||||||
<p style="color: red;">{ e.clone() }</p>
|
<p class="alert error">{ e.clone() }</p>
|
||||||
}
|
}
|
||||||
<h3>{ "Tickets pro Wochentag" }</h3>
|
<h3>{ "Tickets pro Wochentag" }</h3>
|
||||||
<div class="weekday-chart">
|
<div class="weekday-chart">
|
||||||
|
|||||||
@@ -37,3 +37,7 @@
|
|||||||
transform: scale(1.05);
|
transform: scale(1.05);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.content.login {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|||||||
@@ -49,9 +49,50 @@
|
|||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home {
|
.sidebar-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom: $spacing-md;
|
||||||
|
|
||||||
|
.home {
|
||||||
|
flex-grow: 1;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
padding-left: 36px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-close {
|
||||||
|
display: none;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
color: #fff;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 8px;
|
||||||
|
border-radius: 50%;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
transition: background 0.2s ease-in-out;
|
||||||
|
margin-bottom: 0;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background: rgba(255, 255, 255, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
stroke: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-svg {
|
.home-svg {
|
||||||
@@ -64,3 +105,70 @@
|
|||||||
&.user { width: 220px; background: darken($color-sidebar, 6%); }
|
&.user { width: 220px; background: darken($color-sidebar, 6%); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Floating mobile menu toggle button
|
||||||
|
.mobile-menu-toggle {
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
display: flex;
|
||||||
|
position: fixed;
|
||||||
|
top: 1rem;
|
||||||
|
left: 1rem;
|
||||||
|
z-index: 998;
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 1px solid rgba(128, 128, 128, 0.2);
|
||||||
|
background-color: var(--color-container);
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
||||||
|
cursor: pointer;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
transition: all 0.2s ease-in-out;
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
stroke: var(--color-text);
|
||||||
|
transition: stroke 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2);
|
||||||
|
background-color: var(--color-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overlay backdrop that dims the screen and allows dismissals on mobile
|
||||||
|
.sidebar-overlay {
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
display: block;
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
background: rgba(0, 0, 0, 0.4);
|
||||||
|
backdrop-filter: blur(4px);
|
||||||
|
z-index: 999;
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
transition: opacity 0.3s ease-in-out;
|
||||||
|
|
||||||
|
&.open {
|
||||||
|
opacity: 1;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user