Compare commits
16
Commits
Silas
...
721e43c380
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
721e43c380 | ||
|
|
0db9b76cad | ||
|
|
7f4237a6b7 | ||
|
|
d029c5a347 | ||
|
|
b1869595ac | ||
|
|
0d4a6c4711 | ||
|
|
726a581a9e | ||
|
|
e99026e3d6 | ||
|
|
b25e045b99 | ||
|
|
99c5aa613c | ||
|
|
cf24d6156c | ||
|
|
de2199e1c3 | ||
|
|
5199300856 | ||
|
|
289f83df3b | ||
|
|
928ca1de11 | ||
|
|
10de47b911 |
+1
-1
@@ -20,7 +20,7 @@ frontend/node_modules/
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
.idea/
|
||||
|
||||
|
||||
# Added by cargo
|
||||
|
||||
@@ -6,3 +6,54 @@ A ticket system with backend and frontend components.
|
||||
|
||||
- **[Backend](../backend/index.html)** - The server-side API and business logic
|
||||
- **[Frontend](../frontend/index.html)** - The client-side user interface
|
||||
|
||||
## Usage
|
||||
### Prerequisite
|
||||
> [!IMPORTANT]
|
||||
> Before compiling the programm you have to install the rust toolchain.
|
||||
> For a guide to do this, visit: <https://rust-lang.org/tools/install/>
|
||||
|
||||
A instance of a postgresql has to be accessible to the backend. Place the connection details in a .env file into the variable `DATABASE_URL`
|
||||
To setup the tables you either can create them manually by following the sheme specified in `backend/migrations` or apply them with sqlx
|
||||
To install sqlx run `cargo install sqlx` and then in the `backend` directory run `sqlx migrate run` to create the tables
|
||||
|
||||
### Environment
|
||||
The .env file has to be in the root directory of the project or in the same directory as the executable
|
||||
|
||||
Keys:
|
||||
`DATABASE_URL`: Specifying the url and connection details for the database
|
||||
`TOKEN_SECRET`: The JWT token secret, can theoretically be anything but is more secure when generated with a tool, e.g: <https://jwtsecrets.com/>
|
||||
`ORIGIN`: The origin of the frontend, used for CORS rules
|
||||
`BACKEND_PORT`: The port which the backend should use to run on
|
||||
|
||||
### Backend
|
||||
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
|
||||
|
||||
### 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
|
||||
> [!NOTE]
|
||||
> To install trunk run `cargo install trunk`
|
||||
|
||||
> [!IMPORTANT]
|
||||
> Requests from the frontend to /api/* have to be proxied to the Backend
|
||||
> Example with nginx and frontend running at localhost:8000 and backend at localhost:9000 :
|
||||
> ```nginx
|
||||
> location /api/ {
|
||||
> proxy_pass http://localhost:9000/api;
|
||||
> }
|
||||
> ```
|
||||
|
||||
|
||||
|
||||
|
||||
## Usage of AI
|
||||
|
||||
Github Copilot CLI was used with the model Claude Haiku 4.5 to generate most of the documentation:
|
||||
|
||||
### Prompt
|
||||
Generate comments for cargo doc describing the indivilual components and create links to relevant structs, functions etc.
|
||||
|
||||
### Output
|
||||
The comments with `///` or `//!`
|
||||
I've gone over most of it and modified it to my needs and opinions
|
||||
|
||||
@@ -6,8 +6,8 @@ use crate::models::Claims;
|
||||
|
||||
/// Error response for JWT token operations.
|
||||
///
|
||||
/// Returned when token encoding or decoding fails. Used in error responses
|
||||
/// for invalid or expired tokens.
|
||||
/// Returned when token encoding or decoding fails via `encode_token` or `decode_token`.
|
||||
/// Used in error responses for invalid or expired [`Claims`] tokens.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `status`: HTTP status text (e.g., "error")
|
||||
@@ -22,7 +22,7 @@ pub struct Error {
|
||||
///
|
||||
/// This function creates a new JWT with the provided user ID as the subject,
|
||||
/// sets the issued-at and expiration times (60 minutes from now), and signs it
|
||||
/// using the given encoding key.
|
||||
/// using the given encoding key. The resulting token is a serialized [`Claims`].
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `header`: The JWT header, specifying the algorithm (e.g., HS256).
|
||||
@@ -30,7 +30,7 @@ pub struct Error {
|
||||
/// - `key`: The `EncodingKey` used to sign the JWT.
|
||||
///
|
||||
/// # Returns
|
||||
/// A `String` representing the encoded JWT.
|
||||
/// A `String` representing the encoded JWT containing [`Claims`].
|
||||
///
|
||||
/// # Panics
|
||||
/// Panics if the token encoding fails for any reason (e.g., invalid key).
|
||||
@@ -50,14 +50,15 @@ pub fn encode_token(header: &Header, id: String, key: &EncodingKey) -> String {
|
||||
///
|
||||
/// This function attempts to decode a JWT string, validate its signature and claims
|
||||
/// using the provided decoding key. It specifically ignores expiration (`validate_exp`)
|
||||
/// and "not before" (`validate_nbf`) claims during validation.
|
||||
/// and "not before" (`validate_nbf`) claims during validation. Returns the extracted [`Claims`]
|
||||
/// on success.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `token`: The JWT string to decode.
|
||||
/// - `key`: The `DecodingKey` used to verify the JWT's signature.
|
||||
///
|
||||
/// # Returns
|
||||
/// - `Ok(Claims)`: If the token is successfully decoded and verified, returns the extracted `Claims`.
|
||||
/// - `Ok(Claims)`: If the token is successfully decoded and verified, returns the extracted [`Claims`].
|
||||
/// - `Err((StatusCode, Json<Error>))`: If the token is invalid, expired, or cannot be decoded,
|
||||
/// returns an `UNAUTHORIZED` status code along with a JSON error message.
|
||||
pub fn decode_token(token: String, key: &DecodingKey) -> Result<Claims, (StatusCode, Json<Error>)> {
|
||||
|
||||
@@ -17,9 +17,10 @@ use crate::{AppState, cookie::jwt::decode_token, handlers::auth::filter_user, mo
|
||||
/// Axum middleware to validate a JWT token present in cookies or Authorization header.
|
||||
///
|
||||
/// This function extracts a JWT from the request (either from the `token` cookie or
|
||||
/// the `Authorization: Bearer` header), decodes and validates it. If valid, it fetches
|
||||
/// the corresponding user from the database and inserts a `FilteredUser` into the
|
||||
/// request extensions for subsequent handlers to use.
|
||||
/// the `Authorization: Bearer` header), decodes and validates it using [`decode_token`](`crate::cookie::jwt::decode_token`)).
|
||||
/// If valid, it fetches the corresponding [`User`] from the database and inserts a
|
||||
/// [`FilteredUser`](crate::models::FilteredUser)
|
||||
/// (converted via [`filter_user`](`crate::handlers::auth::filter_user`)) into the request extensions for subsequent handlers to use.
|
||||
///
|
||||
/// If the token is missing, invalid, or the user is not found, it returns an
|
||||
/// appropriate error response (401 Unauthorized).
|
||||
@@ -110,9 +111,10 @@ pub async fn validate_token(
|
||||
|
||||
/// Axum middleware to validate JWT token and ensure the authenticated user has admin privileges.
|
||||
///
|
||||
/// This middleware first performs all checks of `validate_token`: extracting, decoding,
|
||||
/// and validating the JWT, and fetching the associated user from the database.
|
||||
/// Additionally, it verifies that the fetched user has `is_admin` set to `true`.
|
||||
/// This middleware first performs all checks of [`validate_token`]: extracting, decoding,
|
||||
/// and validating the JWT via [`decode_token`](`crate::cookie::jwt::decode_token`), and fetching the associated [`User`] from the database.
|
||||
/// Additionally, it verifies that the fetched user has `is_admin` set to `true`. Returns a [`FilteredUser`](crate::models::FilteredUser)
|
||||
/// (converted via [`filter_user`](`crate::handlers::auth::filter_user`)) in the request extensions if both authentication and admin status are valid.
|
||||
///
|
||||
/// If the user is not authenticated or not an administrator, it returns an
|
||||
/// appropriate error response (401 Unauthorized or 403 Forbidden).
|
||||
|
||||
+18
-5
@@ -1,12 +1,13 @@
|
||||
/// Environment configuration for the application.
|
||||
///
|
||||
/// Loads required configuration from environment variables at startup.
|
||||
/// All variables must be present or the application will panic.
|
||||
/// All variables must be present or the application will panic during [`Env::load`].
|
||||
/// Used by [`AppState`](crate::AppState) for configuring JWT signing and CORS.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `db_url`: PostgreSQL database connection URL.
|
||||
/// - `token_secret`: Secret key used to sign and verify JWT tokens.
|
||||
/// - `origin`: Frontend origin URL for CORS policy.
|
||||
/// - `db_url`: PostgreSQL database connection URL
|
||||
/// - `token_secret`: Secret key used to sign and verify [`Claims`](crate::models::Claims) in JWT tokens
|
||||
/// - `origin`: Frontend origin URL for CORS policy configuration
|
||||
///
|
||||
/// # Required Environment Variables
|
||||
/// - `DATABASE_URL`: PostgreSQL connection string (e.g., `postgresql://user:pass@localhost/dbname`)
|
||||
@@ -20,26 +21,38 @@ pub struct Env {
|
||||
pub token_secret: String,
|
||||
/// Frontend origin URL for CORS policy
|
||||
pub origin: String,
|
||||
/// Backend port number
|
||||
pub backend_port: String,
|
||||
}
|
||||
|
||||
impl Env {
|
||||
/// Loads environment configuration from system environment variables.
|
||||
///
|
||||
/// Panics if any required variable is missing.
|
||||
/// Reads `DATABASE_URL`, `TOKEN_SECRET`, and `ORIGIN` from the environment and returns
|
||||
/// a configured [`Env`] instance. Used during server initialization in the `main` function.
|
||||
///
|
||||
/// # Panics
|
||||
/// If any required variable is missing (DATABASE_URL, TOKEN_SECRET, or ORIGIN).
|
||||
///
|
||||
/// # Example
|
||||
/// ```ignore
|
||||
/// let env = Env::load();
|
||||
/// // Environment must have DATABASE_URL, TOKEN_SECRET, and ORIGIN set
|
||||
/// let app_state = AppState {
|
||||
/// db: pool,
|
||||
/// env,
|
||||
/// };
|
||||
/// ```
|
||||
pub fn load() -> Env {
|
||||
let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
||||
let token_secret = std::env::var("TOKEN_SECRET").expect("TOKEN_SECRET must be set");
|
||||
let origin = std::env::var("ORIGIN").expect("ORIGIN must be set");
|
||||
let backend_port = std::env::var("BACKEND_PORT").expect("BACKEND_PORT must be set");
|
||||
Env {
|
||||
db_url,
|
||||
token_secret,
|
||||
origin,
|
||||
backend_port,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,11 +22,12 @@ use crate::{
|
||||
|
||||
/// Registers a new user in the system.
|
||||
///
|
||||
/// Creates a new user account with the provided credentials. The password is hashed using Argon2
|
||||
/// before being stored. Only administrators can create new users.
|
||||
/// Creates a new [`User`] account with the provided [`UserCreateScheme`] credentials.
|
||||
/// The password is hashed using Argon2 before being stored. Only administrators can create new users.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `request`: User creation details including first/last name, username, admin flag, and password
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
/// - `request`: [`UserCreateScheme`] containing user details including first/last name, username, admin flag, and password
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` on successful user creation
|
||||
@@ -34,12 +35,7 @@ use crate::{
|
||||
/// - `500 Internal Server Error` if database insertion fails
|
||||
///
|
||||
/// # Password Hashing
|
||||
/// Uses Argon2 with a cryptographically secure random salt:
|
||||
/// ```ignore
|
||||
/// let argon = Argon2::default();
|
||||
/// let salt = SaltString::generate(&mut OsRng);
|
||||
/// let hashed_pwd = argon.hash_password(password.as_bytes(), &salt)?;
|
||||
/// ```
|
||||
/// Uses Argon2 with a cryptographically secure random salt.
|
||||
pub async fn create_user(
|
||||
State(data): State<Arc<AppState>>,
|
||||
Json(request): Json<UserCreateScheme>,
|
||||
@@ -106,27 +102,23 @@ pub async fn create_user(
|
||||
/// Authenticates a user and creates a JWT token for session management.
|
||||
///
|
||||
/// Verifies the provided username and password against stored credentials using Argon2 verification.
|
||||
/// On successful authentication, generates a JWT token and sets it as an HTTP-only cookie.
|
||||
/// On successful authentication, generates and encodes a [`Claims`](crate::models::Claims) token via [`encode_token`](`crate::cookie::jwt::encode_token`) and sets it as an HTTP-only cookie.
|
||||
/// The token is valid for 1 hour.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `request`: Login credentials (username, password)
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
/// - `request`: [`LoginScheme`] containing login credentials (username, password)
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with JSON containing token and filtered user info
|
||||
/// - `200 OK` with JSON containing token and filtered [`FilteredUser`] info
|
||||
/// - `400 Bad Request` if username not found or password invalid
|
||||
/// - `500 Internal Server Error` if database query fails
|
||||
///
|
||||
/// # Security Features
|
||||
/// - HTTP-only cookie prevents JavaScript access
|
||||
/// - SameSite=Lax protects against CSRF attacks
|
||||
/// - Password verification uses Argon2:
|
||||
/// ```ignore
|
||||
/// let valid_pwd = Argon2::default()
|
||||
/// .verify_password(&request.pwd.as_bytes(), &pwd_hash.unwrap())
|
||||
/// .is_ok();
|
||||
/// ```
|
||||
/// - JWT token includes user ID and expiration timestamp
|
||||
/// - Password verification uses Argon2 with stored [`User`] hash
|
||||
/// - JWT token includes user ID and expiration timestamp via [`Claims`](crate::models::Claims) encoded by [`encode_token`](`crate::cookie::jwt::encode_token`)
|
||||
///
|
||||
/// # Example Response
|
||||
/// ```json
|
||||
@@ -195,7 +187,7 @@ pub async fn login(
|
||||
///
|
||||
/// Sets the authentication cookie to expire immediately (max_age = -1 hour) which causes
|
||||
/// the browser to discard it. This effectively logs the user out without requiring server-side
|
||||
/// session invalidation.
|
||||
/// session invalidation. The cookie no longer contains a valid [`Claims`](crate::models::Claims) token.
|
||||
///
|
||||
/// # Returns
|
||||
/// Always returns `200 OK` with success message and an expired cookie header
|
||||
@@ -227,11 +219,11 @@ pub async fn logout() -> Result<impl IntoResponse, (StatusCode, Json<serde_json:
|
||||
|
||||
/// Retrieves the currently authenticated user's information.
|
||||
///
|
||||
/// Uses the user data embedded in the JWT token (via middleware).
|
||||
/// Uses the [`FilteredUser`] data embedded in the JWT token (via middleware).
|
||||
/// Useful for frontends to display logged-in user info or verify authentication.
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with user data (excluding password)
|
||||
/// - `200 OK` with [`FilteredUser`] data (excluding password)
|
||||
/// - Automatically returns `401 Unauthorized` if not authenticated (middleware)
|
||||
///
|
||||
/// # Example Response
|
||||
@@ -264,11 +256,12 @@ pub async fn get_current_user(
|
||||
|
||||
/// Deletes a user account from the system.
|
||||
///
|
||||
/// Only admins can delete users. The user account and all associated data is removed.
|
||||
/// Only admins can delete users (enforced by middleware). The [`User`] account and all associated data is removed.
|
||||
/// Note: Tickets created by deleted users will have NULL user_id references.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `id`: User ID to delete
|
||||
/// - `Path(id)`: [`User`] ID to delete, extracted from URL path
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Returns
|
||||
/// - `204 No Content` on successful deletion
|
||||
@@ -302,11 +295,14 @@ pub async fn delete_user(
|
||||
|
||||
/// Retrieves all users in the system.
|
||||
///
|
||||
/// Only admins can call this endpoint. Returns all users sorted alphabetically by last name.
|
||||
/// Password hashes are not included in the response.
|
||||
/// Only admins can call this endpoint (enforced by middleware). Returns all [`User`] records converted to [`FilteredUser`]
|
||||
/// and sorted alphabetically by last name. Password hashes are not included in the response.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with array of FilteredUser objects
|
||||
/// - `200 OK` with array of [`FilteredUser`] objects
|
||||
/// - `500 Internal Server Error` if database query fails
|
||||
///
|
||||
/// # Example Response
|
||||
@@ -352,15 +348,15 @@ pub async fn get_users(
|
||||
|
||||
/// Retrieves a single user's details by their ID.
|
||||
///
|
||||
/// This endpoint allows fetching a specific user's information. It returns a `FilteredUser`
|
||||
/// object, ensuring sensitive data like password hashes are not exposed.
|
||||
/// This endpoint allows fetching a specific [`User`]'s information. It returns a [`FilteredUser`]
|
||||
/// object (converted via [`filter_user`]), ensuring sensitive data like password hashes are not exposed.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `Path(id)`: The ID of the user to retrieve, extracted from the URL path.
|
||||
/// - `State(data)`: Application state containing `AppState` for database access.
|
||||
/// - `Path(id)`: The ID of the [`User`] to retrieve, extracted from the URL path.
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access.
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with a `FilteredUser` JSON object if the user is found.
|
||||
/// - `200 OK` with a [`FilteredUser`] JSON object if the user is found.
|
||||
/// - `404 Not Found` if a user with the given ID does not exist.
|
||||
/// - `500 Internal Server Error` if a database query error occurs.
|
||||
///
|
||||
@@ -396,23 +392,24 @@ pub async fn get_user_by_id(
|
||||
|
||||
/// Updates an existing user's information.
|
||||
///
|
||||
/// This endpoint allows administrators to modify a user's `first_name`, `last_name`,
|
||||
/// This endpoint allows administrators to modify a [`User`]'s `first_name`, `last_name`,
|
||||
/// `username`, `is_admin` status, and optionally their password. If `new_pwd` in the
|
||||
/// request body is an empty string, the user's password remains unchanged.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `Path(id)`: The ID of the user to update, extracted from the URL path.
|
||||
/// - `State(data)`: Application state containing `AppState` for database access.
|
||||
/// - `Json(body)`: `UserUpdateScheme` containing the fields to update.
|
||||
/// - `Path(id)`: The ID of the [`User`] to update, extracted from the URL path.
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access.
|
||||
/// - `Json(body)`: [`UserUpdateScheme`] containing the fields to update.
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with the `FilteredUser` object of the updated user.
|
||||
/// - `200 OK` with the [`FilteredUser`] object of the updated user (converted via [`filter_user`]).
|
||||
/// - `404 Not Found` if a user with the given ID does not exist.
|
||||
/// - `500 Internal Server Error` if a database query or password hashing error occurs.
|
||||
///
|
||||
/// # Security Note
|
||||
/// - Passwords are hashed using Argon2 before storage.
|
||||
/// - This endpoint typically requires admin privileges (enforced by middleware).
|
||||
/// - This endpoint requires admin privileges (enforced by middleware via
|
||||
/// [`validate_admin`](crate::cookie::validation::validate_admin)).
|
||||
pub async fn update_user(
|
||||
Path(id): Path<i32>,
|
||||
State(data): State<Arc<AppState>>,
|
||||
@@ -471,7 +468,10 @@ pub async fn update_user(
|
||||
/// Checks if any administrator user exists in the system.
|
||||
///
|
||||
/// This endpoint is used during initialization to determine if the setup page should be displayed.
|
||||
/// It counts all users with `is_admin = true` in the database.
|
||||
/// It counts all [`User`] records with `is_admin = true` in the database.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with JSON: `{"has_admin": bool}` - Whether at least one admin exists
|
||||
@@ -501,28 +501,24 @@ pub async fn check_admin_exists(
|
||||
|
||||
/// Creates the initial administrator account for a fresh system.
|
||||
///
|
||||
/// This function handles the one-time setup of the first admin user. It checks that no admin exists
|
||||
/// before allowing creation. This endpoint is only functional when the system has no administrators.
|
||||
/// This function handles the one-time setup of the first admin [`User`]. It checks that no admin exists
|
||||
/// before allowing creation via database count. This endpoint is only functional when the system has no administrators.
|
||||
/// Once created, subsequent admin registrations must go through the normal `create_user` endpoint
|
||||
/// with proper authorization.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `request`: User creation details (first_name, last_name, username, password)
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
/// - `request`: [`UserCreateScheme`] containing user creation details (first_name, last_name, username, password)
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with success message if admin account created
|
||||
/// - `400 Bad Request` if:
|
||||
/// - Admin already exists
|
||||
/// - Admin already exists (checked via admin count)
|
||||
/// - Username or password is empty
|
||||
/// - `500 Internal Server Error` if database insertion fails
|
||||
///
|
||||
/// # Security Note
|
||||
/// The password is hashed using Argon2 with a random salt before storage:
|
||||
/// ```ignore
|
||||
/// let argon = Argon2::default();
|
||||
/// let salt = SaltString::generate(&mut OsRng);
|
||||
/// let hashed_pwd = argon.hash_password(request.pwd.as_bytes(), &salt)?;
|
||||
/// ```
|
||||
/// The password is hashed using Argon2 with a random salt before storage.
|
||||
pub async fn setup_initial_admin(
|
||||
State(data): State<Arc<AppState>>,
|
||||
Json(request): Json<UserCreateScheme>,
|
||||
@@ -587,17 +583,18 @@ pub async fn setup_initial_admin(
|
||||
}
|
||||
}
|
||||
|
||||
/// Converts a User with sensitive data into a FilteredUser safe for API responses.
|
||||
/// Converts a [`User`] with sensitive data into a [`FilteredUser`] safe for API responses.
|
||||
///
|
||||
/// This function removes password hashes and other sensitive information before
|
||||
/// returning user data to clients. Always use this helper instead of directly
|
||||
/// serializing User objects.
|
||||
/// returning [`User`] data to clients. Always use this helper instead of directly
|
||||
/// serializing [`User`] objects.
|
||||
/// Used by all authentication endpoints to ensure passwords are never exposed.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `user`: Reference to the internal User struct containing password hash
|
||||
/// - `user`: Reference to the internal [`User`] struct containing password hash
|
||||
///
|
||||
/// # Returns
|
||||
/// FilteredUser with only safe-to-share information:
|
||||
/// [`FilteredUser`] with only safe-to-share information:
|
||||
/// - `id`: User ID
|
||||
/// - `first_name`, `last_name`: User name
|
||||
/// - `username`: Login username
|
||||
@@ -610,7 +607,7 @@ pub async fn setup_initial_admin(
|
||||
/// # Example
|
||||
/// ```ignore
|
||||
/// let user = get_user_from_db(1).await?;
|
||||
/// let safe_user = filter_user(&user);
|
||||
/// let safe_user = filter_user(&user); // Convert User to FilteredUser
|
||||
/// // safe_user can be safely serialized and sent to client
|
||||
/// ```
|
||||
pub fn filter_user(user: &User) -> FilteredUser {
|
||||
|
||||
@@ -16,12 +16,14 @@ use crate::{
|
||||
|
||||
/// Creates a new support ticket.
|
||||
///
|
||||
/// Associates the ticket with the authenticated user and sets the current timestamp.
|
||||
/// Associates the ticket with the authenticated [`FilteredUser`] and sets the current timestamp.
|
||||
/// Converts the [`TicketCreateScheme`] request into a database record.
|
||||
/// Tickets are automatically created with "open" status.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `user`: Authenticated user (extracted from JWT token)
|
||||
/// - `body`: Ticket details (category, subject, description, room)
|
||||
/// - `Extension(user)`: Authenticated [`FilteredUser`] (extracted from JWT token via middleware)
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
/// - `Json(body)`: [`TicketCreateScheme`] containing ticket details (category, subject, description, room)
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` on successful creation
|
||||
@@ -60,10 +62,11 @@ pub async fn create_ticket(
|
||||
|
||||
/// Deletes a ticket by ID.
|
||||
///
|
||||
/// Only admins can delete tickets. Marks the ticket as deleted or removes from database.
|
||||
/// Only admins can delete tickets (enforced by middleware). Removes the [`TicketResponse`] and associated data from the database.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `id`: Ticket ID to delete
|
||||
/// - `Path(id)`: Ticket ID to delete, extracted from URL path
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Returns
|
||||
/// - `204 No Content` on successful deletion
|
||||
@@ -97,15 +100,18 @@ pub async fn delete_ticket(
|
||||
|
||||
/// Retrieves all non-archived tickets.
|
||||
///
|
||||
/// Returns a list of all active tickets with user information denormalized for easier rendering.
|
||||
/// Tickets are ordered by creation date (newest first).
|
||||
/// Returns a list of all active [`TicketResponse`] objects with user information denormalized for easier rendering.
|
||||
/// Tickets are ordered by creation date (newest first). Joins with [`User`](crate::models::User) table to include creator information.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Filtering
|
||||
/// - Excludes tickets with status "Archived"
|
||||
/// - Uses LEFT JOIN to include creator information
|
||||
/// - Uses LEFT JOIN to include creator information from [`User`](crate::models::User)
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with array of TicketResponse objects
|
||||
/// - `200 OK` with array of [`TicketResponse`] objects
|
||||
/// - `500 Internal Server Error` if database query fails
|
||||
///
|
||||
/// # Example Response
|
||||
@@ -169,12 +175,14 @@ pub async fn get_tickets(
|
||||
/// Retrieves a specific ticket by ID.
|
||||
///
|
||||
/// Includes full ticket details and denormalized user information (creator name).
|
||||
/// Returns a [`TicketResponse`] with all metadata by joining with [`User`](crate::models::User) table.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `id`: Ticket ID to retrieve
|
||||
/// - `Path(id)`: Ticket ID to retrieve, extracted from URL path
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with TicketResponse object
|
||||
/// - `200 OK` with [`TicketResponse`] object
|
||||
/// - `404 Not Found` if ticket doesn't exist
|
||||
/// - `500 Internal Server Error` if database error occurs
|
||||
///
|
||||
@@ -242,15 +250,16 @@ pub async fn get_ticket_by_id(
|
||||
|
||||
/// Updates a ticket's status.
|
||||
///
|
||||
/// Only admins can update ticket status. This is typically used to transition tickets
|
||||
/// through their lifecycle (open → in_progress → resolved → archived).
|
||||
/// Only admins can update ticket status (enforced by middleware). Applies [`TicketUpdateScheme`] to modify the [`TicketResponse`].
|
||||
/// This is typically used to transition tickets through their lifecycle (open → in_progress → resolved → archived).
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `id`: Ticket ID to update
|
||||
/// - `body`: Update payload containing new status
|
||||
/// - `Path(id)`: Ticket ID to update, extracted from URL path
|
||||
/// - `State(data)`: Application state containing [`AppState`] for database access
|
||||
/// - `Json(body)`: [`TicketUpdateScheme`] update payload containing new status
|
||||
///
|
||||
/// # Returns
|
||||
/// - `200 OK` with updated TicketResponse
|
||||
/// - `200 OK` with updated [`TicketResponse`]
|
||||
/// - `500 Internal Server Error` if ticket not found or database error
|
||||
///
|
||||
/// # Typical Status Flow
|
||||
|
||||
+13
-7
@@ -25,11 +25,12 @@ use crate::env::Env;
|
||||
/// Shared application state passed to all route handlers.
|
||||
///
|
||||
/// Contains the database connection pool and environment configuration.
|
||||
/// This is wrapped in Arc for thread-safe sharing across async tasks.
|
||||
/// This is wrapped in Arc for thread-safe sharing across async tasks and cloned into each route
|
||||
/// via `with_state`.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `db`: PostgreSQL connection pool for database access
|
||||
/// - `env`: Configuration loaded from environment variables
|
||||
/// - `db`: PostgreSQL connection pool for database access (via `sqlx::PgPool`)
|
||||
/// - `env`: [`Env`] configuration loaded from environment variables
|
||||
pub struct AppState {
|
||||
db: PgPool,
|
||||
env: Env,
|
||||
@@ -39,15 +40,19 @@ pub struct AppState {
|
||||
///
|
||||
/// Initializes the server by:
|
||||
/// 1. Loading environment variables from `.env` file
|
||||
/// 2. Establishing database connection pool
|
||||
/// 2. Establishing database connection pool to PostgreSQL
|
||||
/// 3. Configuring CORS policy for cross-origin requests
|
||||
/// 4. Starting HTTP server on port 8001
|
||||
/// 4. Creating the router with [`create_router`] containing all endpoints
|
||||
/// 5. Starting HTTP server on port 8001
|
||||
///
|
||||
/// # Server Configuration
|
||||
/// - Binds to `0.0.0.0:8001` (all network interfaces)
|
||||
/// - Allows: GET, POST, PATCH, DELETE methods
|
||||
/// - Allows credentials and custom headers
|
||||
/// - CORS origin configured from environment
|
||||
/// - CORS origin configured from [`Env`]
|
||||
///
|
||||
/// # State Setup
|
||||
/// Creates shared [`AppState`] wrapped in `Arc` and passes to all routes
|
||||
///
|
||||
/// # Panics
|
||||
/// - If environment loading fails
|
||||
@@ -85,6 +90,7 @@ async fn main() {
|
||||
.layer(cors);
|
||||
|
||||
// Start listening for incoming connections
|
||||
let listener = tokio::net::TcpListener::bind("0.0.0.0:8001").await.unwrap();
|
||||
let uri = format!("0.0.0.0:{}", env.backend_port);
|
||||
let listener = tokio::net::TcpListener::bind(&uri).await.unwrap();
|
||||
let _ = axum::serve(listener, app).await;
|
||||
}
|
||||
|
||||
+12
-11
@@ -3,6 +3,7 @@ use serde::{Deserialize, Serialize};
|
||||
/// API response for a ticket with user information.
|
||||
///
|
||||
/// Returned by ticket endpoints. Includes denormalized user data for easier frontend rendering.
|
||||
/// Created via [`TicketCreateScheme`].
|
||||
///
|
||||
/// # Fields
|
||||
/// - `id`: Unique ticket identifier
|
||||
@@ -12,7 +13,7 @@ use serde::{Deserialize, Serialize};
|
||||
/// - `room`: Room number associated with the issue
|
||||
/// - `status`: Current ticket status (e.g., "open", "in_progress", "resolved")
|
||||
/// - `date`: When the ticket was created (UTC timestamp)
|
||||
/// - `user_id`: ID of the user who created the ticket
|
||||
/// - `user_id`: ID of the user who created the ticket (references [`User`])
|
||||
/// - `user_first_name`, `user_last_name`: User's name (denormalized for convenience)
|
||||
///
|
||||
/// # Example
|
||||
@@ -47,7 +48,7 @@ pub struct TicketResponse {
|
||||
/// Complete user record from the database.
|
||||
///
|
||||
/// Contains all user information including the password hash.
|
||||
/// This should NEVER be sent directly to clients - always use `FilteredUser` instead.
|
||||
/// This should NEVER be sent directly to clients - always use [`FilteredUser`] instead.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `id`: Unique user identifier
|
||||
@@ -58,7 +59,7 @@ pub struct TicketResponse {
|
||||
///
|
||||
/// # Security Note
|
||||
/// The `pwd` field contains the password hash and should never be included in API responses.
|
||||
/// Use `filter_user()` to convert to `FilteredUser` for responses.
|
||||
/// Use [`filter_user()`](`crate::handlers::auth::filter_user`) to convert to [`FilteredUser`] for responses.
|
||||
#[derive(Deserialize, Serialize, PartialEq, Debug, Clone, sqlx::FromRow)]
|
||||
pub struct User {
|
||||
pub id: i16,
|
||||
@@ -72,7 +73,7 @@ pub struct User {
|
||||
/// Payload for creating a new ticket.
|
||||
///
|
||||
/// Sent to `/api/tickets/create`. The backend automatically associates it with the
|
||||
/// authenticated user and sets the creation timestamp.
|
||||
/// authenticated user and sets the creation timestamp. Converted to [`TicketResponse`] for the response.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `category`: Ticket category/type
|
||||
@@ -89,7 +90,7 @@ pub struct TicketCreateScheme {
|
||||
|
||||
/// Payload for updating a ticket.
|
||||
///
|
||||
/// Sent to `PATCH /api/tickets/{id}`. Currently only allows status updates.
|
||||
/// Sent to `PATCH /api/tickets/{id}`. Allows updating the ticket [`TicketResponse::status`].
|
||||
/// Only admins can update tickets.
|
||||
///
|
||||
/// # Fields
|
||||
@@ -102,10 +103,10 @@ pub struct TicketUpdateScheme {
|
||||
/// Payload for updating user information.
|
||||
///
|
||||
/// Sent to `PATCH /api/users/{id}`. Allows updating profile and admin status.
|
||||
/// Only admins can update users. Empty password field means no password change.
|
||||
/// Only admins can update [`User`] records. Empty password field means no password change.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `id`: User ID to update
|
||||
/// - `id`: [`User`] ID to update
|
||||
/// - `first_name`, `last_name`: Updated user name
|
||||
/// - `username`: Updated login username
|
||||
/// - `make_admin`: New admin privilege status
|
||||
@@ -123,7 +124,7 @@ pub struct UserUpdateScheme {
|
||||
/// Payload for creating a new user account.
|
||||
///
|
||||
/// Used in both admin registration (`/api/register`) and initial setup (`/api/setup-admin`).
|
||||
/// The password is hashed server-side before storage using Argon2.
|
||||
/// The password is hashed server-side before storage using Argon2. Converted to [`User`] for storage.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `first_name`: User's first name
|
||||
@@ -155,7 +156,7 @@ pub struct LoginScheme {
|
||||
|
||||
/// User information sent to clients, excluding password hashes.
|
||||
///
|
||||
/// This is the safe version of User data that gets returned in API responses.
|
||||
/// This is the safe version of [`User`] data that gets returned in API responses.
|
||||
/// It never includes the password hash or JWT claims. Always use this for responses
|
||||
/// to prevent leaking sensitive data.
|
||||
#[derive(Debug, Clone, Serialize)]
|
||||
@@ -170,10 +171,10 @@ pub struct FilteredUser {
|
||||
/// JWT token claims embedded in the session token.
|
||||
///
|
||||
/// Contains user identification and token validity information.
|
||||
/// Generated during login and verified by middleware on protected routes.
|
||||
/// Generated during login via `encode_token` and verified via `decode_token`.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `sub`: Subject - the user ID as a string
|
||||
/// - `sub`: Subject - the user ID as a string (references [`User`])
|
||||
/// - `issued`: Unix timestamp when token was created
|
||||
/// - `expires`: Unix timestamp when token expires (currently 1 hour from creation)
|
||||
///
|
||||
|
||||
+17
-16
@@ -19,30 +19,31 @@ use crate::{
|
||||
|
||||
/// Creates the complete router with all API endpoints.
|
||||
///
|
||||
/// The router is organized in layers for proper middleware application:
|
||||
/// The router is organized in layers for proper middleware application. Uses [`AppState`]
|
||||
/// for shared application context across all routes.
|
||||
///
|
||||
/// ## Route Layers (from most to least restricted):
|
||||
///
|
||||
/// ### Admin-Only Routes (requires admin privilege + valid token)
|
||||
/// - `GET /api/tickets/{id}` - Get specific ticket details
|
||||
/// - `DELETE /api/tickets/{id}` - Delete a ticket
|
||||
/// - `PATCH /api/tickets/{id}` - Update ticket status
|
||||
/// - `POST /api/register` - Create a new user
|
||||
/// - `GET /api/users` - List all users
|
||||
/// - `GET /api/users/{id}` - Get user details
|
||||
/// - `DELETE /api/users/{id}` - Delete a user
|
||||
/// - `PATCH /api/users/{id}` - Update user details
|
||||
/// - `GET /api/tickets/{id}` - Get specific ticket details (via `get_ticket_by_id`)
|
||||
/// - `DELETE /api/tickets/{id}` - Delete a ticket (via `delete_ticket`)
|
||||
/// - `PATCH /api/tickets/{id}` - Update ticket status (via `edit_ticket`)
|
||||
/// - `POST /api/register` - Create a new user (via `create_user`)
|
||||
/// - `GET /api/users` - List all users (via `get_users`)
|
||||
/// - `GET /api/users/{id}` - Get user details (via `get_user_by_id`)
|
||||
/// - `DELETE /api/users/{id}` - Delete a user (via `delete_user`)
|
||||
/// - `PATCH /api/users/{id}` - Update user details (via `update_user`)
|
||||
///
|
||||
/// ### Protected Routes (requires valid token)
|
||||
/// - `GET /api/tickets` - List all tickets
|
||||
/// - `POST /api/tickets/create` - Create a new ticket
|
||||
/// - `GET /api/logout` - Logout user
|
||||
/// - `GET /api/users/current` - Get current authenticated user
|
||||
/// - `GET /api/tickets` - List all tickets (via `get_tickets`)
|
||||
/// - `POST /api/tickets/create` - Create a new ticket (via `create_ticket`)
|
||||
/// - `GET /api/logout` - Logout user (via `logout`)
|
||||
/// - `GET /api/users/current` - Get current authenticated user (via `get_current_user`)
|
||||
///
|
||||
/// ### Public Routes (no authentication required)
|
||||
/// - `POST /api/login` - User login
|
||||
/// - `GET /api/check-admin` - Check if admin exists (for setup detection)
|
||||
/// - `POST /api/setup-admin` - Create initial admin account (only if no admin exists)
|
||||
/// - `POST /api/login` - User login (via `login`)
|
||||
/// - `GET /api/check-admin` - Check if admin exists (via `check_admin_exists`)
|
||||
/// - `POST /api/setup-admin` - Create initial admin account (via `setup_initial_admin`)
|
||||
///
|
||||
/// # Middleware Stack
|
||||
/// - Admin routes have `validate_admin` middleware
|
||||
|
||||
+1
-1
@@ -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.
|
||||
|
||||
+2
-1
@@ -4,8 +4,9 @@
|
||||
<head>
|
||||
<link data-trunk rel="rust" data-bin="bin" />
|
||||
<link data-trunk rel="scss" href="src/styles/main.scss" />
|
||||
<link data-trunk rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
|
||||
<meta charset="utf-8" />
|
||||
<title>Yew App</title>
|
||||
<title>Ticket System CSG</title>
|
||||
</head>
|
||||
|
||||
<body></body>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
@@ -33,14 +33,14 @@ pub struct ProtectedRouteProps {
|
||||
|
||||
/// A component that protects routes by enforcing authentication and optional administrator privileges.
|
||||
///
|
||||
/// This component fetches the current user's authentication and admin status from the
|
||||
/// `/api/users/current` endpoint upon mounting. Based on the `AuthState` and the
|
||||
/// `admin_page` property, it either renders its children or redirects the user.
|
||||
/// This component uses the backend's validation middleware by fetching the current user's authentication
|
||||
/// and admin status from the `/api/users/current` endpoint (which requires a valid JWT token).
|
||||
/// Based on the [`AuthState`] and the `admin_page` property, it either renders its children or redirects the user.
|
||||
///
|
||||
/// # Behavior
|
||||
/// - **Initial Load**: Displays "Loading..." while checking authentication status.
|
||||
/// - **Initial Load**: Displays "Loading..." while checking authentication status via the backend.
|
||||
/// - **Not Authenticated**: Redirects to the login page (`crate::Route::Login`).
|
||||
/// - **Authenticated**:
|
||||
/// - **Authenticated** (valid JWT token from backend):
|
||||
/// - If `admin_page` is `true`:
|
||||
/// - If the user is an administrator (`is_admin: Some(true)`), it renders `children`.
|
||||
/// - If the user is not an administrator (`is_admin: Some(false)`), it redirects to
|
||||
|
||||
+29
-27
@@ -10,7 +10,9 @@ use yew_router::prelude::*;
|
||||
/// Defines the application's various routes and their corresponding paths.
|
||||
///
|
||||
/// This enum is used by `yew-router` to map URLs to specific components,
|
||||
/// enabling navigation within the single-page application.
|
||||
/// enabling navigation within the single-page application. Each route is protected
|
||||
/// by [`ProtectedRoute`] middleware where appropriate to enforce authentication and authorization.
|
||||
/// See [`switch`] for the routing logic.
|
||||
#[derive(Clone, PartialEq, Routable)]
|
||||
enum Route {
|
||||
/// The application's home page.
|
||||
@@ -65,10 +67,10 @@ pub struct SidebarShellProps {
|
||||
/// A shell component that provides a consistent layout with a sidebar and a main content area.
|
||||
///
|
||||
/// This component is designed to wrap page-specific content, ensuring that the sidebar
|
||||
/// is always present for navigation.
|
||||
/// is always present for navigation. Integrates with [`crate::pages::sidebar::Sidebar`] for navigation.
|
||||
///
|
||||
/// # Components
|
||||
/// - [`sidebar::Sidebar`]: The navigation sidebar component.
|
||||
/// - [`crate::pages::sidebar::Sidebar`]: The navigation sidebar component.
|
||||
/// - Main content area: Renders the `children` passed to this component.
|
||||
///
|
||||
/// # Example
|
||||
@@ -101,11 +103,11 @@ pub struct AdminCheckWrapperProps {
|
||||
///
|
||||
/// This component is used to gate access to pages that should only be accessible before
|
||||
/// system initialization (e.g., login page). It performs an asynchronous check to the
|
||||
/// `/api/check-admin` endpoint to determine system state.
|
||||
/// backend's `/api/check-admin` endpoint (via `crate::handlers::auth::check_admin_exists`) to determine system state.
|
||||
///
|
||||
/// # Behavior
|
||||
/// - **Loading**: Displays "Loading..." while checking admin status
|
||||
/// - **No Admin**: Automatically redirects to `/setup` page to initialize
|
||||
/// - **Loading**: Displays "Loading..." while checking admin status from the backend
|
||||
/// - **No Admin**: Automatically redirects to [`Route::Setup`] page for initialization
|
||||
/// - **Admin Exists**: Renders the wrapped children (e.g., login page)
|
||||
///
|
||||
/// # Example Usage
|
||||
@@ -115,19 +117,9 @@ pub struct AdminCheckWrapperProps {
|
||||
/// </AdminCheckWrapper>
|
||||
/// ```
|
||||
///
|
||||
/// # Implementation Detail
|
||||
/// The check happens in `use_effect_with` on component mount:
|
||||
/// ```ignore
|
||||
/// spawn_local(async move {
|
||||
/// match Request::get("/api/check-admin").send().await {
|
||||
/// Ok(resp) if resp.status() == 200 => {
|
||||
/// let has_admin = data["has_admin"].as_bool().unwrap_or(false);
|
||||
/// admin_exists.set(Some(has_admin));
|
||||
/// }
|
||||
/// _ => admin_exists.set(Some(false))
|
||||
/// }
|
||||
/// });
|
||||
/// ```
|
||||
/// # Backend Integration
|
||||
/// The check queries the backend's `/api/check-admin` endpoint which returns `{"has_admin": bool}`.
|
||||
/// This allows the frontend to determine if initial admin setup is required.
|
||||
#[component(AdminCheckWrapper)]
|
||||
fn admin_check_wrapper(props: &AdminCheckWrapperProps) -> Html {
|
||||
let admin_exists = use_state(|| None::<bool>);
|
||||
@@ -166,18 +158,24 @@ fn admin_check_wrapper(props: &AdminCheckWrapperProps) -> Html {
|
||||
|
||||
/// The main routing logic for the application.
|
||||
///
|
||||
/// This function takes a `Route` enum variant and returns the corresponding HTML
|
||||
/// This function takes a [`Route`] enum variant and returns the corresponding HTML
|
||||
/// content to be rendered. It acts as a central dispatcher for the application's
|
||||
/// navigation.
|
||||
/// navigation and authentication flow.
|
||||
///
|
||||
/// Many routes are wrapped in a [`ProtectedRoute`] to enforce authentication
|
||||
/// and authorization, and in a [`SidebarShell`] to maintain consistent layout.
|
||||
/// Most routes are wrapped in [`ProtectedRoute`] to enforce authentication
|
||||
/// and authorization based on the `admin_page` flag, and in [`SidebarShell`] to maintain consistent layout.
|
||||
/// Login and Setup routes use [`AdminCheckWrapper`] instead to handle pre-authentication states.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `route`: The [`Route`] enum variant representing the current URL path.
|
||||
///
|
||||
/// # Returns
|
||||
/// An `Html` component that should be rendered for the given route.
|
||||
///
|
||||
/// # Route Protection
|
||||
/// - **Admin-required routes** (`admin_page={true}`): Require both authentication and admin privileges
|
||||
/// - **Public routes** (`admin_page={false}`): Require only authentication
|
||||
/// - **Pre-auth routes** (`AdminCheckWrapper`): Used before admin creation or login
|
||||
fn switch(route: Route) -> Html {
|
||||
match route {
|
||||
Route::Home => html! {
|
||||
@@ -259,12 +257,16 @@ fn switch(route: Route) -> Html {
|
||||
/// The root component of the Yew application.
|
||||
///
|
||||
/// This component sets up the application's routing using `yew-router`'s
|
||||
/// [`BrowserRouter`] and [`Switch`] components. All other application content
|
||||
/// is rendered based on the current route.
|
||||
/// `BrowserRouter` and `Switch` components. All other application content
|
||||
/// is rendered based on the current [`Route`] matched by the `switch` function.
|
||||
///
|
||||
/// Uses [`switch`] as the routing dispatcher to handle all route-specific rendering,
|
||||
/// which applies appropriate middleware like [`ProtectedRoute`] and [`AdminCheckWrapper`].
|
||||
///
|
||||
/// # Structure
|
||||
/// - [`BrowserRouter`]: Enables client-side routing.
|
||||
/// - [`Switch`]: Renders components based on the matched [`Route`].
|
||||
/// - `BrowserRouter`: Enables client-side routing.
|
||||
/// - `Switch`: Renders components based on the matched [`Route`].
|
||||
/// - `switch` function: Determines which component to render for each route.
|
||||
#[component(App)]
|
||||
pub fn app() -> Html {
|
||||
html! {
|
||||
|
||||
@@ -3,6 +3,30 @@ use wasm_bindgen_futures::spawn_local;
|
||||
use yew::prelude::*;
|
||||
use yew_router::prelude::*;
|
||||
|
||||
#[macro_export]
|
||||
/// Removes surrounding double quotes from a string.
|
||||
///
|
||||
/// This macro takes an expression that evaluates to a string and returns a new `String`
|
||||
/// with any leading or trailing double quotes removed. It's useful for cleaning up
|
||||
/// string data that might be inadvertently wrapped in quotes, such as JSON string values.
|
||||
///
|
||||
/// # Arguments
|
||||
///
|
||||
/// * `$str`: An expression that can be converted into a string slice (`&str`).
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```rust
|
||||
/// use your_crate::dequote; // Assuming `dequote` is re-exported or in scope
|
||||
///
|
||||
/// let quoted_string = "\"hello world\"";
|
||||
/// let dequoted_string = dequote!(quoted_string);
|
||||
/// assert_eq!(dequoted_string, "hello world");
|
||||
///
|
||||
/// let already_clean = "no quotes";
|
||||
/// let dequoted_clean = dequote!(already_clean);
|
||||
/// assert_eq!(dequoted_clean, "no quotes");
|
||||
/// ```
|
||||
macro_rules! dequote {
|
||||
($str:expr) => {
|
||||
$str.trim_matches('"').to_string()
|
||||
@@ -56,11 +80,15 @@ pub fn home_component() -> Html {
|
||||
}
|
||||
|
||||
html! {
|
||||
<div>
|
||||
<div class="form-container home">
|
||||
<div class="page-header">
|
||||
<h1>{ "Welcome" }</h1>
|
||||
</div>
|
||||
<crate::utilities::TicketCount/>
|
||||
|
||||
<div>
|
||||
<p>{ "You are logged in as: " }</p>
|
||||
<p>{ &*name }</p>
|
||||
<p class="text-muted">{ &*name }</p>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@@ -80,9 +108,12 @@ pub fn home_component() -> Html {
|
||||
pub fn not_found_component() -> Html {
|
||||
let message = "404 Not found";
|
||||
html! {
|
||||
<div>
|
||||
<div class="form-container">
|
||||
<div class="empty-state">
|
||||
<h1>{&message}</h1>
|
||||
<Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
|
||||
<p>{ "The page you are looking for does not exist." }</p>
|
||||
<Link<crate::Route> to={crate::Route::Home}>{ "Back to Home" }</Link<crate::Route>>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@@ -102,10 +133,13 @@ pub fn not_found_component() -> Html {
|
||||
#[component(PermissionDenied)]
|
||||
pub fn denied_component() -> Html {
|
||||
html! {
|
||||
<div>
|
||||
<h1>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</h1>
|
||||
<h3>{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</h3>
|
||||
<Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
|
||||
<div class="form-container">
|
||||
<div class="empty-state">
|
||||
<h1>{ "Access Denied" }</h1>
|
||||
<p>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</p>
|
||||
<p class="text-muted">{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</p>
|
||||
<Link<crate::Route> to={crate::Route::Home}>{ "Back to Home" }</Link<crate::Route>>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ pub struct AdminSetupScheme {
|
||||
/// a form to create the first admin user. Key functionality:
|
||||
///
|
||||
/// - **Admin Check**: On mount, verifies if an admin already exists by calling `/api/check-admin`.
|
||||
/// If an admin is found, the user is redirected to the login page (`crate::Route::Login`).
|
||||
/// If an admin is found, the user is redirected to the login page ([`crate::Route::Login`]).
|
||||
/// - **Form Fields**: Collects `first_name`, `last_name`, `username`, `password`, and `confirm_password`.
|
||||
/// - **Form Validation**:
|
||||
/// - Ensures password fields are not empty.
|
||||
|
||||
@@ -7,6 +7,11 @@ use wasm_bindgen_futures::spawn_local;
|
||||
use yew::prelude::*;
|
||||
use yew_router::prelude::*;
|
||||
|
||||
/// The key used to store and retrieve the sidebar's expansion state in `LocalStorage`.
|
||||
///
|
||||
/// This constant ensures consistency when accessing the stored state across different
|
||||
/// parts of the application. The value associated with this key in `LocalStorage`
|
||||
/// will be a serialized [`SidebarExpandState`] object.
|
||||
const STORAGE_KEY: &str = "sidebar_state";
|
||||
|
||||
/// Represents the expansion state of collapsible menus within the sidebar.
|
||||
|
||||
@@ -287,15 +287,17 @@ pub fn submit_ticket_component() -> Html {
|
||||
let room_valid = (*room).is_some();
|
||||
|
||||
html! {
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "Create Ticket" }</h1>
|
||||
</div>
|
||||
<form {onsubmit}>
|
||||
<label>{ "Betreff:" }
|
||||
<input type="text" value={(*betreff).clone()} oninput={betreff_change}/>
|
||||
</label>
|
||||
<br/>
|
||||
<label>{ "Beschreibung:" }
|
||||
<input type="text" value={(*description).clone()} oninput={description_change}/>
|
||||
<textarea value={(*description).clone()} oninput={description_change}/>
|
||||
</label>
|
||||
<br/>
|
||||
<label>{ "Kategorie:" }
|
||||
<select value={(*category).clone()} onchange={category_change}>
|
||||
<option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
|
||||
@@ -306,33 +308,32 @@ pub fn submit_ticket_component() -> Html {
|
||||
<option value="Sonstiges">{ "Sonstiges" }</option>
|
||||
</select>
|
||||
</label>
|
||||
<br/>
|
||||
<label>{ "Raum:" }
|
||||
<input type="text" value={(*room_input).clone()} oninput={room_change}/>
|
||||
</label>
|
||||
{
|
||||
if !room_valid {
|
||||
html! {
|
||||
<p style="color: red;">{ "Ungültiger oder nicht erlaubter Raum (z. B. 101, K12, D5)" }</p>
|
||||
<p class="alert error">{ "Ungültiger oder nicht erlaubter Raum (z. B. 101, K8, D1)" }</p>
|
||||
}
|
||||
} else {
|
||||
html! {}
|
||||
}
|
||||
}
|
||||
<br/>
|
||||
<button type="submit">{ "Send" }</button>
|
||||
|
||||
<Link<crate::Route> to={crate::Route::AllTickets}>{ "Tickets ansehen" }</Link<crate::Route>>
|
||||
<Link<crate::Route> to={crate::Route::AllTickets}>{ "View All Tickets" }</Link<crate::Route>>
|
||||
|
||||
{
|
||||
if let Some(s) = &*status {
|
||||
html!{ <p>{ s }</p> }
|
||||
html!{ <p class="alert success">{ s }</p> }
|
||||
} else {
|
||||
html!{}
|
||||
}
|
||||
}
|
||||
|
||||
</form>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -664,25 +665,31 @@ pub fn all_tickets_component() -> Html {
|
||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
||||
} else {
|
||||
html! {
|
||||
<ul>
|
||||
{ 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! {
|
||||
<div>
|
||||
<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>
|
||||
<p>{ match t.status.as_str() {
|
||||
"ToDo" => "Zu tun",
|
||||
"InProgress" => "In Bearbeitung",
|
||||
"Completed" => "Erledigt",
|
||||
"Archived" => "Archiviert",
|
||||
_ => "Ungültiger Status"
|
||||
}}</p>
|
||||
</li>
|
||||
|
||||
<div class="page-header">
|
||||
<h1>{ "All Tickets" }</h1>
|
||||
</div>
|
||||
<ul class="ticket-list">
|
||||
{ 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| {
|
||||
let status_class = match t.status.as_str() {
|
||||
"ToDo" => "To-Do",
|
||||
"InProgress" => "InProgress",
|
||||
"Completed" => "Completed",
|
||||
"Archived" => "Archived",
|
||||
_ => "To-Do"
|
||||
};
|
||||
html! {
|
||||
<li key={t.id.to_string()} class={status_class}>
|
||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
|
||||
<p>{ &t.description }</p>
|
||||
</li>
|
||||
}
|
||||
})}
|
||||
<Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
||||
</ul>
|
||||
<div class="ticket-list-actions">
|
||||
<Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -798,24 +805,23 @@ pub fn archived_tickets_component() -> Html {
|
||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
||||
} else {
|
||||
html! {
|
||||
<ul>
|
||||
<div>
|
||||
<div class="page-header">
|
||||
<h1>{ "Archivierte Tickets" }</h1>
|
||||
</div>
|
||||
<ul class="ticket-list">
|
||||
{ for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
|
||||
<div>
|
||||
|
||||
<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>>
|
||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
|
||||
<p>{ &t.description }</p>
|
||||
<p>{ match t.status.as_str() {
|
||||
"ToDo" => "Zu tun",
|
||||
"InProgress" => "In Bearbeitung",
|
||||
"Completed" => "Erledigt",
|
||||
"Archived" => "Archiviert",
|
||||
_ => "Ungültiger Status"
|
||||
}}</p>
|
||||
</li>
|
||||
|
||||
</div>
|
||||
})}
|
||||
</ul>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,6 +102,14 @@ pub struct UserProps {
|
||||
pub id: i16,
|
||||
}
|
||||
|
||||
/// Represents an error response from the API.
|
||||
///
|
||||
/// This struct is used to deserialize error messages received from the backend API.
|
||||
/// It typically contains a human-readable message and an internal status code.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `message`: A `String` containing a description of the error.
|
||||
/// - `_status`: An internal status code or message, often ignored in frontend display.
|
||||
#[derive(Deserialize, Debug)]
|
||||
struct ApiError {
|
||||
message: String,
|
||||
@@ -222,6 +230,10 @@ pub fn register_component() -> Html {
|
||||
};
|
||||
|
||||
html! {
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "Register User" }</h1>
|
||||
</div>
|
||||
<form {onsubmit}>
|
||||
<label>{ "Vorname:" }
|
||||
<input type="text" value={(*first_name).clone()} oninput={fn_change}/>
|
||||
@@ -240,6 +252,7 @@ pub fn register_component() -> Html {
|
||||
</label>
|
||||
<button type="submit">{ "Bestätigen" }</button>
|
||||
</form>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -328,6 +341,11 @@ pub fn login_component() -> Html {
|
||||
};
|
||||
|
||||
html! {
|
||||
<main class="content">
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "Login" }</h1>
|
||||
</div>
|
||||
<form {onsubmit}>
|
||||
<input
|
||||
placeholder="username"
|
||||
@@ -347,8 +365,10 @@ pub fn login_component() -> Html {
|
||||
})}
|
||||
/>
|
||||
<button type="submit" disabled={*loading}>{ if *loading { "Logging in..." } else { "Login" } }</button>
|
||||
if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> }
|
||||
if !error.is_empty() { <p class="alert error">{(*error).clone()}</p> }
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -417,18 +437,37 @@ pub fn all_users_component() -> Html {
|
||||
}
|
||||
|
||||
if *loading {
|
||||
html! {<p>{ "Loading" }</p>}
|
||||
html! {
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "All Users" }</h1>
|
||||
</div>
|
||||
<p>{ "Loading..." }</p>
|
||||
</div>
|
||||
}
|
||||
} else if let Some(e) = &*error {
|
||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
||||
html! {
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "All Users" }</h1>
|
||||
</div>
|
||||
<p class="alert error">{ format!("Error: {}", e) }</p>
|
||||
</div>
|
||||
}
|
||||
} else {
|
||||
html! {
|
||||
<ul>
|
||||
<div class="form-container">
|
||||
<div class="page-header">
|
||||
<h1>{ "All Users" }</h1>
|
||||
</div>
|
||||
<ul class="user-list">
|
||||
{ for users.iter().map(|t| html! {
|
||||
<li key={t.id.to_string()}>
|
||||
<Link<crate::Route> to={crate::Route::UserByID{id: t.id}}><h3>{ format!("{} {}- #{}", t.first_name, t.last_name, t.id) }</h3></Link<crate::Route>>
|
||||
<Link<crate::Route> to={crate::Route::UserByID{id: t.id}}><h3>{ format!("{} {}", t.first_name, t.last_name) }</h3></Link<crate::Route>>
|
||||
</li>
|
||||
})}
|
||||
</ul>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+159
-20
@@ -6,6 +6,7 @@ use serde::Deserialize;
|
||||
use wasm_bindgen_futures::spawn_local;
|
||||
use yew::prelude::*;
|
||||
|
||||
use crate::dequote;
|
||||
use crate::pages::ticket::{ActiveUser, Ticket};
|
||||
|
||||
/// A partial representation of a ticket, containing only the fields necessary for statistical analysis.
|
||||
@@ -20,6 +21,23 @@ use crate::pages::ticket::{ActiveUser, Ticket};
|
||||
struct TicketPartial {
|
||||
date: DateTime<Utc>,
|
||||
room: i16,
|
||||
user_id: i16,
|
||||
}
|
||||
|
||||
/// A partial representation of a user, containing only the fields necessary for statistical analysis.
|
||||
///
|
||||
/// This struct is used to efficiently retrieve and process user data for diagnostics
|
||||
/// without fetching the full user details.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `id`: The unique identifier of the user.
|
||||
/// - `first_name`: The first name of the user.
|
||||
/// - `last_name`: The last name of the user.
|
||||
#[derive(Debug, Deserialize, Clone, PartialEq)]
|
||||
struct UserPartial {
|
||||
id: i16,
|
||||
first_name: String,
|
||||
last_name: String,
|
||||
}
|
||||
|
||||
/// Properties for components that display room-wise ticket totals.
|
||||
@@ -28,12 +46,26 @@ struct TicketPartial {
|
||||
/// for calculating and visualizing ticket distribution per room.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `tickets`: A vector of `TicketPartial` containing ticket data relevant for room totals.
|
||||
/// - `tickets`: A vector of [`TicketPartial`] containing ticket data relevant for room totals.
|
||||
#[derive(Properties, PartialEq)]
|
||||
struct RoomTotalsProps {
|
||||
tickets: Vec<TicketPartial>,
|
||||
}
|
||||
|
||||
/// Properties for components that display user-wise ticket totals.
|
||||
///
|
||||
/// This struct passes a list of partial user data and partial ticket data to a component
|
||||
/// responsible for calculating and visualizing ticket distribution per user.
|
||||
///
|
||||
/// # Fields
|
||||
/// - `users`: A vector of [`UserPartial`] containing user data relevant for user totals.
|
||||
/// - `tickets`: A vector of [`TicketPartial`] containing ticket data relevant for user totals.
|
||||
#[derive(Properties, PartialEq)]
|
||||
struct UserTotalProps {
|
||||
users: Vec<UserPartial>,
|
||||
tickets: Vec<TicketPartial>,
|
||||
}
|
||||
|
||||
/// Converts a `chrono::DateTime<Utc>` object's weekday to a 0-indexed integer.
|
||||
///
|
||||
/// This function maps `chrono::Weekday` values (where Monday is 1, Sunday is 7)
|
||||
@@ -64,7 +96,7 @@ fn weekday_index(dt: &DateTime<Utc>) -> usize {
|
||||
/// the total count of tickets submitted on that day.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `tickets`: A slice of `TicketPartial` items to count.
|
||||
/// - `tickets`: A slice of [`TicketPartial`] items to count.
|
||||
///
|
||||
/// # Returns
|
||||
/// An array `[usize; 7]` with ticket counts for each weekday.
|
||||
@@ -78,12 +110,12 @@ fn count_by_weekday(tickets: &[TicketPartial]) -> [usize; 7] {
|
||||
|
||||
/// Calculates the occurrences of each weekday within the date range covered by the tickets.
|
||||
///
|
||||
/// This function determines the minimum and maximum dates from the provided `TicketPartial`
|
||||
/// This function determines the minimum and maximum dates from the provided [`TicketPartial`]
|
||||
/// slice and then counts how many times each weekday occurs within that inclusive date range.
|
||||
/// This is useful for normalizing ticket counts against the number of available days for each weekday.
|
||||
///
|
||||
/// # Arguments
|
||||
/// - `partials`: A slice of `TicketPartial` items defining the date range.
|
||||
/// - `partials`: A slice of [`TicketPartial`] items defining the date range.
|
||||
///
|
||||
/// # Returns
|
||||
/// An array `[usize; 7]` where each element represents the number of times a
|
||||
@@ -132,7 +164,8 @@ fn day_counts(partials: &[TicketPartial]) -> [usize; 7] {
|
||||
|
||||
/// Converts a numerical room representation back into a human-readable string format.
|
||||
///
|
||||
/// This function is the inverse of the room parsing logic in `SubmitTicket` component.
|
||||
/// This function is the inverse of the room parsing logic in
|
||||
/// [`SubmitTicket`](`crate::pages::ticket::SubmitTicket`) component.
|
||||
/// It converts negative numbers back to "K" prefixed rooms, numbers >= 1000 back to "D" prefixed rooms,
|
||||
/// and other numbers to their string representation.
|
||||
///
|
||||
@@ -287,9 +320,9 @@ pub fn ticket_count_component() -> Html {
|
||||
})
|
||||
.count();
|
||||
html! {
|
||||
<div>
|
||||
<h2>{ "Offene Tickets" }</h2>
|
||||
<h4>{ count }</h4>
|
||||
<div class="open-tickets">
|
||||
<h2 class="left">{ "Offene Tickets" }</h2>
|
||||
<h4 class="ticket_count center">{ count }</h4>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@@ -303,12 +336,12 @@ pub fn ticket_count_component() -> Html {
|
||||
///
|
||||
/// # State
|
||||
/// Uses `use_state` hooks to manage:
|
||||
/// - `tickets`: A vector of `TicketPartial` for statistical analysis.
|
||||
/// - `tickets`: A vector of [`TicketPartial`] for statistical analysis.
|
||||
/// - `error`: Any error message from API calls.
|
||||
/// - `loading`: A boolean indicating if data is being fetched.
|
||||
///
|
||||
/// # Functionality
|
||||
/// - Fetches all tickets (as `TicketPartial`) from `/api/tickets`.
|
||||
/// - Fetches all tickets (as [`TicketPartial`]) from `/api/tickets`.
|
||||
/// - Calculates:
|
||||
/// - `counts`: Number of tickets submitted on each weekday.
|
||||
/// - `occ`: Number of occurrences of each weekday in the ticket date range.
|
||||
@@ -325,11 +358,13 @@ pub fn ticket_count_component() -> Html {
|
||||
#[component(SubmitStats)]
|
||||
pub fn submit_stats_component() -> Html {
|
||||
let tickets = use_state(|| Vec::<TicketPartial>::new());
|
||||
let users = use_state(|| Vec::<UserPartial>::new());
|
||||
let error = use_state(|| None::<String>);
|
||||
let loading = use_state(|| false);
|
||||
|
||||
{
|
||||
let tickets = tickets.clone();
|
||||
let users = users.clone();
|
||||
let error = error.clone();
|
||||
let loading = loading.clone();
|
||||
|
||||
@@ -353,6 +388,24 @@ pub fn submit_stats_component() -> Html {
|
||||
}
|
||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
||||
}
|
||||
|
||||
match Request::get("/api/users").send().await {
|
||||
Ok(response) if response.status() == 200 => {
|
||||
match response.json::<Vec<UserPartial>>().await {
|
||||
Ok(u) => users.set(u),
|
||||
Err(e) => error.set(Some(format!("users parse error: {}", e))),
|
||||
}
|
||||
}
|
||||
Ok(response) => {
|
||||
if let Ok(text) = response.text().await {
|
||||
error.set(Some(text));
|
||||
} else {
|
||||
error.set(Some(format!("users status {}", response.status())));
|
||||
}
|
||||
}
|
||||
Err(err) => error.set(Some(format!("users network error: {}", err))),
|
||||
}
|
||||
|
||||
loading.set(false);
|
||||
});
|
||||
|| ()
|
||||
@@ -414,14 +467,23 @@ pub fn submit_stats_component() -> Html {
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
<div class="diagnostics-row">
|
||||
<div class="diagnostics-column">
|
||||
<h3>{ "Tickets pro Raum" }</h3>
|
||||
<RoomTotalTickets tickets={(*tickets).clone()}/>
|
||||
</div>
|
||||
<div class="diagnostics-column">
|
||||
<h3>{ "Tickets pro Benutzer" }</h3>
|
||||
<UserTotal users={(*users).clone()} tickets={(*tickets).clone()}/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
/// A component that displays the total number of tickets per room.
|
||||
///
|
||||
/// This component takes a list of `TicketPartial` items and calculates the
|
||||
/// This component takes a list of [`TicketPartial`] items and calculates the
|
||||
/// total number of tickets for each room. It then displays these totals
|
||||
/// in a sorted list with a bar chart visualization.
|
||||
///
|
||||
@@ -433,7 +495,7 @@ pub fn submit_stats_component() -> Html {
|
||||
/// - **Sorts Results**: Displays rooms sorted by ticket count in descending order.
|
||||
/// - **Visualizes Data**: Renders a bar chart where the width of each bar is
|
||||
/// proportional to the ticket count for that room, relative to the room with the maximum tickets.
|
||||
/// - **Room Formatting**: Uses the `parse_room` function to display room numbers
|
||||
/// - **Room Formatting**: Uses the [`parse_room`] function to display room numbers
|
||||
/// in a human-readable format.
|
||||
///
|
||||
/// # Example
|
||||
@@ -456,19 +518,96 @@ fn room_total_component(props: &RoomTotalsProps) -> Html {
|
||||
|
||||
html! {
|
||||
<div class="diagnostics-section">
|
||||
<h3>{ "Tickets pro Raum" }</h3>
|
||||
<div class="room-chart">
|
||||
<div class="chart">
|
||||
{ for totals_vec.into_iter().map(|(room, count)| {
|
||||
let label = parse_room(room);
|
||||
let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
|
||||
html! {
|
||||
<div class="room-bar-item">
|
||||
<div class="room-header">
|
||||
<span class="room-label">{ label }</span>
|
||||
<span class="room-count">{ count }</span>
|
||||
<div class="bar-item">
|
||||
<div class="diagnostics-header">
|
||||
<span class="diagnostics-label">{ label }</span>
|
||||
<span class="diagnostics-count">{ count }</span>
|
||||
</div>
|
||||
<div class="room-bar-container">
|
||||
<div class="room-bar" style={format!("width: {}%;", bar_width_percent)}>
|
||||
<div class="bar-container">
|
||||
<div class="bar" style={format!("width: {}%;", bar_width_percent)}>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}) }
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
/// A component that displays the total number of tickets per user.
|
||||
///
|
||||
/// This component takes lists of [`UserPartial`] and [`TicketPartial`] items to calculate
|
||||
/// and display the total number of tickets submitted by each user.
|
||||
/// The results are presented in a sorted list with a bar chart visualization.
|
||||
///
|
||||
/// # Props
|
||||
/// - `users`: A `Vec<UserPartial>` containing partial user data.
|
||||
/// - `tickets`: A `Vec<TicketPartial>` containing partial ticket data for analysis.
|
||||
///
|
||||
/// # Functionality
|
||||
/// - **Maps User Names**: Creates a map from user IDs to their first and last names for display.
|
||||
/// - **Calculates Totals**: Aggregates ticket counts for each user.
|
||||
/// - **Sorts Results**: Displays users sorted by their ticket count in descending order.
|
||||
/// - **Visualizes Data**: Renders a bar chart where the width of each bar is proportional
|
||||
/// to the ticket count for that user, relative to the user with the maximum tickets.
|
||||
/// - **Name Formatting**: Uses the [`dequote!`] macro to clean up user names before display.
|
||||
///
|
||||
/// # Example
|
||||
/// ```rust
|
||||
/// html! {
|
||||
/// <UserTotal users={my_user_partials} tickets={my_ticket_partials} />
|
||||
/// }
|
||||
/// ```
|
||||
#[component(UserTotal)]
|
||||
fn user_total_component(props: &UserTotalProps) -> Html {
|
||||
let name_map: HashMap<i16, (String, String)> = props
|
||||
.users
|
||||
.iter()
|
||||
.map(|u| (u.id, (u.first_name.clone(), u.last_name.clone())))
|
||||
.collect();
|
||||
|
||||
let mut counts: HashMap<i16, usize> = HashMap::new();
|
||||
for t in &props.tickets {
|
||||
*counts.entry(t.user_id).or_insert(0) += 1;
|
||||
}
|
||||
|
||||
let mut totals_vec: Vec<(i16, String, String, usize)> = name_map
|
||||
.into_iter()
|
||||
.map(|(id, (fname, lname))| {
|
||||
let c = counts.get(&id).cloned().unwrap_or(0);
|
||||
(id, fname, lname, c)
|
||||
})
|
||||
.collect();
|
||||
|
||||
totals_vec.sort_by(|a, b| b.3.cmp(&a.3));
|
||||
|
||||
let max_count = totals_vec
|
||||
.iter()
|
||||
.map(|(_, _, _, c)| *c)
|
||||
.max()
|
||||
.unwrap_or(1)
|
||||
.max(1);
|
||||
|
||||
html! {
|
||||
<div class="diagnostics-section">
|
||||
<div class="chart">
|
||||
{ for totals_vec.into_iter().map(|(_id, fname, lname, count)| {
|
||||
let label = format!("{} {}", dequote!(fname), dequote!(lname));
|
||||
let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
|
||||
html! {
|
||||
<div class="bar-item">
|
||||
<div class="diagnostics-header">
|
||||
<span class="diagnostics-label">{ label }</span>
|
||||
<span class="diagnostics-count">{ count }</span>
|
||||
</div>
|
||||
<div class="bar-container">
|
||||
<div class="bar" style={format!("width: {}%;", bar_width_percent)}>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
@use "variables" as *;
|
||||
|
||||
@mixin card {
|
||||
backgroud: #fff;
|
||||
border-radius: &border-radius;
|
||||
box-shadow: 0 1px 3px rgba(0,0,0,0.06);
|
||||
background: $color-container;
|
||||
border-radius: $border-radius;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
padding: $spacing-md;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
.u-hidden { display: none !important; }
|
||||
.u-gap-sm { gap: $spacing-sm; }
|
||||
.text-muted { color: $color-muted; }
|
||||
|
||||
|
||||
@@ -1,8 +1,34 @@
|
||||
$color-bg: #ffffff;
|
||||
// Color Palette (Reference Style)
|
||||
$color-bg: #f0f2f5;
|
||||
$color-bg-dark: #121212;
|
||||
$color-container: #ffffff;
|
||||
$color-container-dark: #333333;
|
||||
$color-sidebar: #0f172a;
|
||||
$color-accent: #2563eb;
|
||||
$color-primary: #2b79c2;
|
||||
$color-primary-hover: #1d5fa0;
|
||||
$color-accent: #2b79c2;
|
||||
$color-muted: #6b7280;
|
||||
$color-text: #111827;
|
||||
$color-text-dark: #e2e2e2;
|
||||
|
||||
// Status Colors
|
||||
$color-status-todo: #ffcccc;
|
||||
$color-status-todo-text: #a00;
|
||||
$color-status-inprogress: #fff3cd;
|
||||
$color-status-inprogress-text: #856404;
|
||||
$color-status-done: #d4edda;
|
||||
$color-status-done-text: #155724;
|
||||
$color-status-archived: #e0e0e0;
|
||||
$color-status-archived-text: #666666;
|
||||
|
||||
// Action Colors
|
||||
$color-logout: #ff4d4d;
|
||||
$color-logout-hover: #e60000;
|
||||
|
||||
// Spacing
|
||||
$spacing-sm: 8px;
|
||||
$spacing-md: 16px;
|
||||
$border-radius: 6px;
|
||||
$spacing-lg: 2rem;
|
||||
$border-radius: 0.5rem;
|
||||
$border-radius-lg: 10px;
|
||||
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.ticket-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
margin-bottom: $spacing-lg;
|
||||
|
||||
li {
|
||||
border-left: 4px solid;
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-radius: $border-radius-lg;
|
||||
background: $color-container;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin-top: 0;
|
||||
margin-bottom: $spacing-md;
|
||||
color: $color-primary;
|
||||
|
||||
a {
|
||||
color: $color-primary;
|
||||
text-decoration: none;
|
||||
transition: color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
color: $color-primary-hover;
|
||||
text-decoration: underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0.3rem 0;
|
||||
}
|
||||
|
||||
&.To-Do {
|
||||
border-left-color: $color-status-todo-text;
|
||||
}
|
||||
|
||||
&.InProgress {
|
||||
border-left-color: $color-status-inprogress-text;
|
||||
}
|
||||
|
||||
&.Completed {
|
||||
border-left-color: $color-status-done-text;
|
||||
}
|
||||
|
||||
&.Archived {
|
||||
border-left-color: $color-status-archived-text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ticket-list-actions {
|
||||
display: flex;
|
||||
gap: $spacing-md;
|
||||
flex-wrap: wrap;
|
||||
margin-top: $spacing-lg;
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: $spacing-md $spacing-lg;
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-radius: $border-radius;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.user-list {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
margin: 0;
|
||||
|
||||
li {
|
||||
h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,14 +8,18 @@
|
||||
}
|
||||
|
||||
.diagnostics-section {
|
||||
background-color: $color-bg;
|
||||
background-color: $color-container;
|
||||
border-radius: $border-radius;
|
||||
padding: $spacing-md;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.06);
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: $color-container-dark;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 0 0 $spacing-md 0;
|
||||
color: #1f2937;
|
||||
margin: 0;
|
||||
color: $color-primary;
|
||||
font-size: 1.1rem;
|
||||
font-weight: 600;
|
||||
}
|
||||
@@ -27,7 +31,13 @@
|
||||
gap: 12px;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: $border-radius;
|
||||
background-color: #f9fafb;
|
||||
background-color: $color-container;
|
||||
margin: 16px 0px;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: $color-container-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
}
|
||||
|
||||
.weekday-bars {
|
||||
@@ -43,6 +53,7 @@
|
||||
.weekday-bar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
flex: 1;
|
||||
min-width: 60px;
|
||||
@@ -50,7 +61,7 @@
|
||||
|
||||
.bar {
|
||||
width: 100%;
|
||||
background-color: $color-accent;
|
||||
background-color: $color-primary;
|
||||
border-radius: 4px 4px 0 0;
|
||||
transition: background-color 0.2s ease;
|
||||
|
||||
@@ -76,8 +87,12 @@
|
||||
.day {
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
color: #1f2937;
|
||||
color: $color-text;
|
||||
margin-bottom: 2px;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
color: $color-text-dark;
|
||||
}
|
||||
}
|
||||
|
||||
.value {
|
||||
@@ -87,51 +102,116 @@
|
||||
}
|
||||
}
|
||||
|
||||
.room-chart {
|
||||
.chart {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
padding: $spacing-md;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: $border-radius;
|
||||
background-color: #f9fafb;
|
||||
background-color: $color-container;
|
||||
width: 100%;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: $color-container-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
}
|
||||
|
||||
.room-bar-item {
|
||||
.bar-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
|
||||
.room-header {
|
||||
.diagnostics-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.room-label {
|
||||
.diagnostics-label {
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
color: #1f2937;
|
||||
color: $color-text;
|
||||
min-width: 50px;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
color: $color-text-dark;
|
||||
}
|
||||
}
|
||||
|
||||
.room-count {
|
||||
.diagnostics-count {
|
||||
font-size: 12px;
|
||||
color: $color-muted;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
.room-bar-container {
|
||||
.bar-container {
|
||||
width: 100%;
|
||||
height: 24px;
|
||||
background-color: #e5e7eb;
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
|
||||
.room-bar {
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: #555;
|
||||
}
|
||||
|
||||
.bar {
|
||||
height: 100%;
|
||||
background-color: #f97316;
|
||||
background-color: $color-primary;
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.diagnostics-row {
|
||||
display: flex;
|
||||
gap: 24px;
|
||||
align-items: flex-start;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.diagnostics-column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
width: 48%;
|
||||
min-width: 280px;
|
||||
}
|
||||
|
||||
.open-tickets{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
padding: 0 1rem;
|
||||
box-sizing: border-box;
|
||||
min-height: 60px;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-shrink: 0;
|
||||
max-width: 30%;
|
||||
|
||||
h2 {
|
||||
margin: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
.center {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
}
|
||||
}
|
||||
|
||||
.home {
|
||||
.ticket_count {
|
||||
font-size: xxx-large;
|
||||
height: 115px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.form-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-lg;
|
||||
margin-bottom: $spacing-lg;
|
||||
|
||||
form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-md;
|
||||
|
||||
label {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-sm;
|
||||
font-weight: 500;
|
||||
color: $color-text;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
color: $color-text-dark;
|
||||
}
|
||||
}
|
||||
|
||||
input, textarea, select {
|
||||
padding: $spacing-md;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: $border-radius;
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 1rem;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: #6b6b6b;
|
||||
color: $color-text-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
border-color: $color-primary;
|
||||
box-shadow: 0 0 0 2px rgba($color-primary, 0.2);
|
||||
}
|
||||
}
|
||||
|
||||
textarea {
|
||||
min-height: 120px;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
button {
|
||||
align-self: flex-start;
|
||||
padding: $spacing-md $spacing-lg;
|
||||
background-color: $color-primary;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: $border-radius;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
|
||||
&:active {
|
||||
transform: scale(0.98);
|
||||
}
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: $spacing-md $spacing-lg;
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-radius: $border-radius;
|
||||
text-align: center;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
align-self: flex-start;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
|
||||
li h3 {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.login-btn {
|
||||
display: inline-block;
|
||||
padding: 12px 400px;
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
border-radius: $border-radius-lg;
|
||||
text-decoration: none;
|
||||
font-weight: bold;
|
||||
font-size: 1rem;
|
||||
cursor: pointer;
|
||||
border: none;
|
||||
transition: all 0.2s ease-in-out;
|
||||
margin-bottom: 15px;
|
||||
|
||||
&:hover {
|
||||
background: $color-primary-hover;
|
||||
transform: scale(1.05);
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
}
|
||||
|
||||
.logout-btn {
|
||||
display: inline-block;
|
||||
padding: 10px 20px;
|
||||
background: $color-logout;
|
||||
color: white;
|
||||
border-radius: $border-radius-lg;
|
||||
text-decoration: none;
|
||||
font-weight: bold;
|
||||
transition: 0.2s ease-in-out;
|
||||
margin-bottom: 20px;
|
||||
|
||||
&:hover {
|
||||
background: $color-logout-hover;
|
||||
transform: scale(1.05);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,272 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.page-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: $spacing-lg;
|
||||
padding-bottom: $spacing-md;
|
||||
border-bottom: 2px solid #e5e7eb;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
border-bottom-color: #555;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0;
|
||||
color: $color-primary;
|
||||
font-size: 1.75rem;
|
||||
}
|
||||
}
|
||||
|
||||
.page-actions {
|
||||
display: flex;
|
||||
gap: $spacing-md;
|
||||
flex-wrap: wrap;
|
||||
|
||||
a, button {
|
||||
display: inline-block;
|
||||
padding: $spacing-md;
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border: none;
|
||||
border-radius: $border-radius;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
input[type="checkbox"] {
|
||||
width: fit-content;
|
||||
}
|
||||
|
||||
.grid-list {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
|
||||
gap: $spacing-lg;
|
||||
margin-top: $spacing-lg;
|
||||
|
||||
.grid-item {
|
||||
background: $color-container;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: $border-radius;
|
||||
padding: $spacing-md;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
transition: box-shadow 0.2s ease, transform 0.2s ease;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
box-shadow: 0 0 15px rgba(0, 0, 0, 0.15);
|
||||
transform: translateY(-2px);
|
||||
}
|
||||
|
||||
h3 {
|
||||
color: $color-primary;
|
||||
margin-top: 0;
|
||||
margin-bottom: $spacing-md;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: $spacing-sm 0;
|
||||
color: $color-muted;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.item-actions {
|
||||
display: flex;
|
||||
gap: $spacing-md;
|
||||
margin-top: $spacing-md;
|
||||
flex-wrap: wrap;
|
||||
|
||||
a, button {
|
||||
flex: 1;
|
||||
min-width: 100px;
|
||||
padding: $spacing-md;
|
||||
border: none;
|
||||
border-radius: $border-radius;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
text-decoration: none;
|
||||
text-align: center;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
a.view, button.view {
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
}
|
||||
|
||||
a.edit, button.edit {
|
||||
background: #f59e0b;
|
||||
color: white;
|
||||
|
||||
&:hover {
|
||||
background-color: #d97706;
|
||||
}
|
||||
}
|
||||
|
||||
a.delete, button.delete {
|
||||
background: $color-logout;
|
||||
color: white;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-logout-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.table-container {
|
||||
overflow-x: auto;
|
||||
margin-top: $spacing-lg;
|
||||
border-radius: $border-radius;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
background: $color-container;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
}
|
||||
|
||||
thead {
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
|
||||
th {
|
||||
padding: $spacing-md;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
border-bottom: 2px solid darken($color-primary, 10%);
|
||||
}
|
||||
}
|
||||
|
||||
tbody {
|
||||
tr {
|
||||
border-bottom: 1px solid #e5e7eb;
|
||||
transition: background-color 0.2s ease;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
border-bottom-color: #555;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: #f9fafb;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: #444;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
padding: $spacing-md;
|
||||
color: $color-text;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
color: $color-text-dark;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.alert {
|
||||
padding: $spacing-md;
|
||||
border-radius: $border-radius;
|
||||
margin-bottom: $spacing-lg;
|
||||
border-left: 4px solid;
|
||||
|
||||
&.success {
|
||||
background: $color-status-done;
|
||||
color: $color-status-done-text;
|
||||
border-left-color: $color-status-done-text;
|
||||
}
|
||||
|
||||
&.error {
|
||||
background: $color-status-todo;
|
||||
color: $color-status-todo-text;
|
||||
border-left-color: $color-status-todo-text;
|
||||
}
|
||||
|
||||
&.warning {
|
||||
background: $color-status-inprogress;
|
||||
color: $color-status-inprogress-text;
|
||||
border-left-color: $color-status-inprogress-text;
|
||||
}
|
||||
|
||||
&.info {
|
||||
background: #dbeafe;
|
||||
color: #1e40af;
|
||||
border-left-color: #1e40af;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: #1e3a8a;
|
||||
color: #93c5fd;
|
||||
border-left-color: #93c5fd;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.loading-spinner {
|
||||
display: inline-block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border: 3px solid #e5e7eb;
|
||||
border-top-color: $color-primary;
|
||||
border-radius: 50%;
|
||||
animation: spin 0.8s linear infinite;
|
||||
|
||||
@keyframes spin {
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
}
|
||||
|
||||
.empty-state {
|
||||
text-align: center;
|
||||
padding: $spacing-lg;
|
||||
color: $color-muted;
|
||||
|
||||
p {
|
||||
font-size: 1.1rem;
|
||||
margin-bottom: $spacing-md;
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: $spacing-md $spacing-lg;
|
||||
background: $color-primary;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-radius: $border-radius;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
@use "../variables" as *;
|
||||
|
||||
.setup-container {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 100vh;
|
||||
background: $color-bg;
|
||||
padding: $spacing-lg;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-bg-dark;
|
||||
}
|
||||
}
|
||||
|
||||
.setup-box {
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
background: $color-container;
|
||||
padding: $spacing-lg;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
}
|
||||
|
||||
h1 {
|
||||
color: $color-primary;
|
||||
text-align: center;
|
||||
margin-top: 0;
|
||||
margin-bottom: $spacing-md;
|
||||
}
|
||||
|
||||
p {
|
||||
text-align: center;
|
||||
color: $color-muted;
|
||||
margin-bottom: $spacing-lg;
|
||||
}
|
||||
}
|
||||
|
||||
.setup-form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-md;
|
||||
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-sm;
|
||||
|
||||
label {
|
||||
font-weight: 500;
|
||||
color: $color-text;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
color: $color-text-dark;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
input {
|
||||
padding: $spacing-md;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: $border-radius;
|
||||
font-family: Arial, sans-serif;
|
||||
font-size: 1rem;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: #6b6b6b;
|
||||
color: $color-text-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
border-color: $color-primary;
|
||||
box-shadow: 0 0 0 2px rgba($color-primary, 0.2);
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
padding: $spacing-md;
|
||||
background-color: $color-primary;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: $border-radius;
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
margin-top: $spacing-md;
|
||||
|
||||
&:hover {
|
||||
background-color: $color-primary-hover;
|
||||
}
|
||||
|
||||
&:active {
|
||||
transform: scale(0.98);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.success-message {
|
||||
background: $color-status-done;
|
||||
color: $color-status-done-text;
|
||||
padding: $spacing-md;
|
||||
border-radius: $border-radius;
|
||||
margin-bottom: $spacing-md;
|
||||
border-left: 4px solid $color-status-done-text;
|
||||
}
|
||||
|
||||
.error-message {
|
||||
background: $color-status-todo;
|
||||
color: $color-status-todo-text;
|
||||
padding: $spacing-md;
|
||||
border-radius: $border-radius;
|
||||
margin-bottom: $spacing-md;
|
||||
border-left: 4px solid $color-status-todo-text;
|
||||
}
|
||||
@@ -17,16 +17,17 @@
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
&:hover { background: rgba(255,255,255,0.04); }
|
||||
border-radius: $border-radius;
|
||||
transition: background 0.2s ease-in-out;
|
||||
&:hover { background: rgba(255,255,255,0.1); }
|
||||
}
|
||||
|
||||
.menu-toggle { background: transparent; border: none; text-align: left; width: 100%; cursor: pointer; }
|
||||
|
||||
.submenu {
|
||||
margin-left: 8px;
|
||||
background: rgba(255,255,255,0.02);
|
||||
border-radius: 4px;
|
||||
background: rgba(255,255,255,0.05);
|
||||
border-radius: $border-radius;
|
||||
padding: 6px;
|
||||
li { padding: 4px 0; }
|
||||
}
|
||||
@@ -38,16 +39,14 @@
|
||||
}
|
||||
|
||||
.logout-button {
|
||||
background: rgba(255,255,255,0.1);
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
color: #fff;
|
||||
border: 1px solid rgba(255,255,255,0.2);
|
||||
border: 1px solid rgba(255, 255, 255, 0.2);
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
width: 100%;
|
||||
cursor: pointer;
|
||||
text-align: left;
|
||||
&:hover { background: rgba(255,255,255,0.15); }
|
||||
&:active { background: rgba(255,255,255,0.2); }
|
||||
}
|
||||
|
||||
&.user { width: 220px; background: darken($color-sidebar, 6%); }
|
||||
|
||||
@@ -1,9 +1,31 @@
|
||||
@use "../mixins" as *;
|
||||
@use "../variables" as *;
|
||||
|
||||
.ticket {
|
||||
border: 1px solid #ccc;
|
||||
padding: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-radius: $border-radius-lg;
|
||||
background: $color-container;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: $color-container-dark;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin-top: 0;
|
||||
color: $color-primary;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0.3rem 0;
|
||||
}
|
||||
}
|
||||
|
||||
.ticket-card {
|
||||
@include card();
|
||||
border-left: 4px solid $color-accent;
|
||||
border-left: 4px solid $color-primary;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-sm;
|
||||
@@ -11,3 +33,48 @@
|
||||
.title { font-weight: 600; }
|
||||
}
|
||||
|
||||
.status {
|
||||
display: inline-block;
|
||||
padding: 4px 10px;
|
||||
border-radius: 8px;
|
||||
font-size: 0.8rem;
|
||||
font-weight: bold;
|
||||
margin-top: 8px;
|
||||
|
||||
&.To-Do {
|
||||
background: $color-status-todo;
|
||||
color: $color-status-todo-text;
|
||||
}
|
||||
|
||||
&.InProgress {
|
||||
background: $color-status-inprogress;
|
||||
color: $color-status-inprogress-text;
|
||||
}
|
||||
|
||||
&.Done {
|
||||
background: $color-status-done;
|
||||
color: $color-status-done-text;
|
||||
}
|
||||
|
||||
&.Completed {
|
||||
background: $color-status-done;
|
||||
color: $color-status-done-text;
|
||||
}
|
||||
|
||||
&.Archived {
|
||||
background: $color-status-archived;
|
||||
color: $color-status-archived-text;
|
||||
}
|
||||
}
|
||||
|
||||
.ticket_count {
|
||||
text-align: center;
|
||||
align-content: center;
|
||||
color: #005f00;
|
||||
border: 2px solid #848484;
|
||||
border-radius: 10px;
|
||||
height: 50px;
|
||||
width: 250px;
|
||||
margin: 0;
|
||||
font-size: xx-large;
|
||||
}
|
||||
|
||||
@@ -3,36 +3,173 @@
|
||||
@use "utilities";
|
||||
@use "components/sidebar";
|
||||
@use "components/tickets";
|
||||
@use "components/alltickets";
|
||||
@use "components/allusers";
|
||||
@use "components/forms";
|
||||
@use "components/login";
|
||||
@use "components/diagnostics";
|
||||
@use "components/pages";
|
||||
@use "components/setup";
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
body {
|
||||
background: variables.$color-bg;
|
||||
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial;
|
||||
color: #111827;
|
||||
font-family: Arial, sans-serif;
|
||||
color: variables.$color-text;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: variables.$color-bg-dark;
|
||||
color: variables.$color-text-dark;
|
||||
}
|
||||
}
|
||||
|
||||
input, textarea, select {
|
||||
width: 100%;
|
||||
padding: variables.$spacing-md;
|
||||
font-size: 1rem;
|
||||
border-radius: variables.$border-radius;
|
||||
border: 1px solid #ccc;
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 15px;
|
||||
font-family: Arial, sans-serif;
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background-color: #6b6b6b;
|
||||
color: variables.$color-text-dark;
|
||||
border-color: #555;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
padding: variables.$spacing-md;
|
||||
font-size: 1rem;
|
||||
border-radius: variables.$border-radius;
|
||||
background-color: variables.$color-primary;
|
||||
color: white;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
margin-bottom: 15px;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
font-family: Arial, sans-serif;
|
||||
font-weight: bold;
|
||||
|
||||
&:hover {
|
||||
background-color: variables.$color-primary-hover;
|
||||
}
|
||||
}
|
||||
|
||||
form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: variables.$spacing-md;
|
||||
|
||||
label {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: variables.$spacing-sm;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline-block;
|
||||
padding: variables.$spacing-md;
|
||||
background: variables.$color-primary;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
border-radius: variables.$border-radius;
|
||||
text-align: center;
|
||||
transition: background-color 0.2s ease-in-out;
|
||||
|
||||
&:hover {
|
||||
background-color: variables.$color-primary-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 900px;
|
||||
margin: auto;
|
||||
background: variables.$color-container;
|
||||
padding: variables.$spacing-lg;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: variables.$color-container-dark;
|
||||
}
|
||||
}
|
||||
|
||||
.header-with-image {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.header-with-image img {
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
.admin { display: flex; }
|
||||
.content { flex: 1; padding: variables.$spacing-md; }
|
||||
|
||||
.layout {
|
||||
display: flex;
|
||||
min-height: 100vh;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
width: 260px;
|
||||
flex-shrink: 0;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
height: 100vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-left: 260px;
|
||||
padding: variables.$spacing-lg;
|
||||
|
||||
> :first-child {
|
||||
max-width: 900px;
|
||||
margin: 0 auto;
|
||||
background: variables.$color-container;
|
||||
padding: variables.$spacing-lg;
|
||||
border-radius: 1rem;
|
||||
box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
background: variables.$color-container-dark;
|
||||
}
|
||||
}
|
||||
|
||||
h1, h2, h3 {
|
||||
color: variables.$color-primary;
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.sidebar { position: fixed; left: -100%; transition: left .2s; }
|
||||
.sidebar.open { left: 0; }
|
||||
.content { margin-left: 0; }
|
||||
.sidebar {
|
||||
position: fixed;
|
||||
left: -260px;
|
||||
transition: left .3s ease-in-out;
|
||||
z-index: 1000;
|
||||
}
|
||||
.sidebar.open {
|
||||
left: 0;
|
||||
}
|
||||
.content {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user