Compare commits
46
Commits
Silas
..
styles-nino
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b26155118 | ||
|
|
a653bf3f45 | ||
|
|
fb30d4ab83 | ||
|
|
26384d2849 | ||
|
|
bec2a8a451 | ||
|
|
f96db06a33 | ||
|
|
6ef50d06aa | ||
|
|
04b9ef8f9e | ||
|
|
778c112dd4 | ||
|
|
b9354f77b6 | ||
|
|
6e836d9260 | ||
|
|
e096b9144b | ||
|
|
74a573e38e | ||
|
|
7f8afe1938 | ||
|
|
e070d36af9 | ||
|
|
d3d0e9b83c | ||
|
|
3000bb0e5d | ||
|
|
e2cfb61caa | ||
|
|
d1576ae8fa | ||
|
|
8287bea240 | ||
|
|
663f61fa34 | ||
|
|
50c79231bb | ||
|
|
6950ec1c36 | ||
|
|
9402344f77 | ||
|
|
2b9aa03932 | ||
|
|
42f2d33a58 | ||
|
|
8de96aea11 | ||
|
|
edb19c5569 | ||
|
|
a75de3dbef | ||
|
|
d27a76ccc7 | ||
|
|
721e43c380 | ||
|
|
0db9b76cad | ||
|
|
7f4237a6b7 | ||
|
|
d029c5a347 | ||
|
|
b1869595ac | ||
|
|
0d4a6c4711 | ||
|
|
726a581a9e | ||
|
|
e99026e3d6 | ||
|
|
b25e045b99 | ||
|
|
99c5aa613c | ||
|
|
cf24d6156c | ||
|
|
de2199e1c3 | ||
|
|
5199300856 | ||
|
|
289f83df3b | ||
|
|
928ca1de11 | ||
|
|
10de47b911 |
+1
-1
@@ -21,9 +21,9 @@ frontend/node_modules/
|
|||||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
# 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.
|
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||||
.idea/
|
.idea/
|
||||||
|
.antigravitycli/
|
||||||
|
|
||||||
|
|
||||||
# Added by cargo
|
# Added by cargo
|
||||||
|
|
||||||
/target
|
/target
|
||||||
.antigravitycli/
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ pub fn encode_token(header: &Header, id: String, key: &EncodingKey) -> String {
|
|||||||
expires: expires as usize,
|
expires: expires as usize,
|
||||||
};
|
};
|
||||||
let token = encode(header, &claims, key);
|
let token = encode(header, &claims, key);
|
||||||
return token.expect("token return failed");
|
token.expect("token return failed")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Decodes and validates a JSON Web Token (JWT).
|
/// Decodes and validates a JSON Web Token (JWT).
|
||||||
@@ -77,5 +77,5 @@ pub fn decode_token(token: String, key: &DecodingKey) -> Result<Claims, (StatusC
|
|||||||
(StatusCode::UNAUTHORIZED, Json(error))
|
(StatusCode::UNAUTHORIZED, Json(error))
|
||||||
})?
|
})?
|
||||||
.claims;
|
.claims;
|
||||||
return Ok(claims);
|
Ok(claims)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,13 +48,7 @@ pub async fn validate_token(
|
|||||||
.headers()
|
.headers()
|
||||||
.get(header::AUTHORIZATION)
|
.get(header::AUTHORIZATION)
|
||||||
.and_then(|header| header.to_str().ok())
|
.and_then(|header| header.to_str().ok())
|
||||||
.and_then(|value| {
|
.and_then(|value| value.strip_prefix("Bearer ").map(|s| s.to_owned()))
|
||||||
if value.starts_with("Bearer ") {
|
|
||||||
Some(value[7..].to_owned())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let token = token.ok_or_else(|| {
|
let token = token.ok_or_else(|| {
|
||||||
@@ -77,7 +71,7 @@ pub async fn validate_token(
|
|||||||
(status, Json(error))
|
(status, Json(error))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let uuid = (&claims.sub).parse::<i16>().map_err(|_| {
|
let uuid = claims.sub.parse::<i16>().map_err(|_| {
|
||||||
let error = json!({
|
let error = json!({
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"message": "Invalid user id"
|
"message": "Invalid user id"
|
||||||
@@ -143,13 +137,7 @@ pub async fn validate_admin(
|
|||||||
.headers()
|
.headers()
|
||||||
.get(header::AUTHORIZATION)
|
.get(header::AUTHORIZATION)
|
||||||
.and_then(|header| header.to_str().ok())
|
.and_then(|header| header.to_str().ok())
|
||||||
.and_then(|value| {
|
.and_then(|value| value.strip_prefix("Bearer ").map(|s| s.to_owned()))
|
||||||
if value.starts_with("Bearer ") {
|
|
||||||
Some(value[7..].to_owned())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let token = token.ok_or_else(|| {
|
let token = token.ok_or_else(|| {
|
||||||
@@ -172,7 +160,7 @@ pub async fn validate_admin(
|
|||||||
(status, Json(error))
|
(status, Json(error))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let uuid = (&claims.sub).parse::<i16>().map_err(|_| {
|
let uuid = claims.sub.parse::<i16>().map_err(|_| {
|
||||||
let error = json!({
|
let error = json!({
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"message": "Invalid user id"
|
"message": "Invalid user id"
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ pub struct Env {
|
|||||||
pub token_secret: String,
|
pub token_secret: String,
|
||||||
/// Frontend origin URL for CORS policy
|
/// Frontend origin URL for CORS policy
|
||||||
pub origin: String,
|
pub origin: String,
|
||||||
|
/// Backend port number
|
||||||
|
pub backend_port: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Env {
|
impl Env {
|
||||||
@@ -45,10 +47,12 @@ impl Env {
|
|||||||
let db_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
|
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 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 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 {
|
Env {
|
||||||
db_url,
|
db_url,
|
||||||
token_secret,
|
token_secret,
|
||||||
origin,
|
origin,
|
||||||
|
backend_port,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ pub async fn create_user(
|
|||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
if let Some(_) = exist_check {
|
if exist_check.is_some() {
|
||||||
return Err((
|
return Err((
|
||||||
StatusCode::BAD_REQUEST,
|
StatusCode::BAD_REQUEST,
|
||||||
Json(json!({"status": "error", "message": "user already exists"})),
|
Json(json!({"status": "error", "message": "user already exists"})),
|
||||||
@@ -90,10 +90,10 @@ pub async fn create_user(
|
|||||||
})?;
|
})?;
|
||||||
|
|
||||||
if user.rows_affected() < 1 {
|
if user.rows_affected() < 1 {
|
||||||
return Err((
|
Err((
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
Json(json!({"status": "error", "message": "Error creating user"})),
|
Json(json!({"status": "error", "message": "Error creating user"})),
|
||||||
));
|
))
|
||||||
} else {
|
} else {
|
||||||
Ok(Json(json!({"status": "success", "result": "User created"})))
|
Ok(Json(json!({"status": "success", "result": "User created"})))
|
||||||
}
|
}
|
||||||
@@ -145,19 +145,19 @@ pub async fn login(
|
|||||||
.ok_or_else(|| {
|
.ok_or_else(|| {
|
||||||
(
|
(
|
||||||
StatusCode::BAD_REQUEST,
|
StatusCode::BAD_REQUEST,
|
||||||
Json(json!({"status": "error", "message": "Invalid username"})),
|
Json(json!({"status": "error", "message": "Ungültiger Benutzername"})),
|
||||||
)
|
)
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let pwd_hash = PasswordHash::new(&user.pwd);
|
let pwd_hash = PasswordHash::new(&user.pwd);
|
||||||
let valid_pwd = Argon2::default()
|
let valid_pwd = Argon2::default()
|
||||||
.verify_password(&request.pwd.as_bytes(), &pwd_hash.unwrap())
|
.verify_password(request.pwd.as_bytes(), &pwd_hash.unwrap())
|
||||||
.is_ok();
|
.is_ok();
|
||||||
|
|
||||||
if !valid_pwd {
|
if !valid_pwd {
|
||||||
let error_response = serde_json::json!({
|
let error_response = serde_json::json!({
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"message": "Invalid password"
|
"message": "Ungültiges passwort"
|
||||||
});
|
});
|
||||||
return Err((StatusCode::BAD_REQUEST, Json(error_response)));
|
return Err((StatusCode::BAD_REQUEST, Json(error_response)));
|
||||||
}
|
}
|
||||||
@@ -338,10 +338,7 @@ pub async fn get_users(
|
|||||||
(StatusCode::INTERNAL_SERVER_ERROR, Json(error))
|
(StatusCode::INTERNAL_SERVER_ERROR, Json(error))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let response = users
|
let response = users.iter().map(filter_user).collect::<Vec<FilteredUser>>();
|
||||||
.iter()
|
|
||||||
.map(|user| filter_user(&user))
|
|
||||||
.collect::<Vec<FilteredUser>>();
|
|
||||||
let json_respnse = json!(response);
|
let json_respnse = json!(response);
|
||||||
Ok(Json(json_respnse))
|
Ok(Json(json_respnse))
|
||||||
}
|
}
|
||||||
@@ -372,22 +369,20 @@ pub async fn get_user_by_id(
|
|||||||
match query {
|
match query {
|
||||||
Ok(user) => {
|
Ok(user) => {
|
||||||
let response = serde_json::json!(filter_user(&user));
|
let response = serde_json::json!(filter_user(&user));
|
||||||
return Ok(Json(response));
|
Ok(Json(response))
|
||||||
}
|
}
|
||||||
Err(sqlx::Error::RowNotFound) => {
|
Err(sqlx::Error::RowNotFound) => {
|
||||||
let error_response = serde_json::json!({
|
let error_response = serde_json::json!({
|
||||||
"status": "fail",
|
"status": "fail",
|
||||||
"message": format!("User with ID {} not found", id)
|
"message": format!("User with ID {} not found", id)
|
||||||
});
|
});
|
||||||
return Err((StatusCode::NOT_FOUND, Json(error_response)));
|
Err((StatusCode::NOT_FOUND, Json(error_response)))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => Err((
|
||||||
return Err((
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
||||||
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
)),
|
||||||
));
|
}
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Updates an existing user's information.
|
/// Updates an existing user's information.
|
||||||
@@ -415,39 +410,28 @@ pub async fn update_user(
|
|||||||
State(data): State<Arc<AppState>>,
|
State(data): State<Arc<AppState>>,
|
||||||
Json(body): Json<UserUpdateScheme>,
|
Json(body): Json<UserUpdateScheme>,
|
||||||
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
||||||
let update_result = if !body.new_pwd.is_empty() {
|
let argon = Argon2::default();
|
||||||
let argon = Argon2::default();
|
let salt = SaltString::generate(&mut OsRng);
|
||||||
let salt = SaltString::generate(&mut OsRng);
|
let hashed_pwd = match argon.hash_password(body.new_pwd.clone().as_bytes(), &salt) {
|
||||||
let hashed_pwd = match argon.hash_password(body.new_pwd.clone().as_bytes(), &salt) {
|
Ok(h) => h.to_string(),
|
||||||
Ok(h) => h.to_string(),
|
Err(e) => panic!("Error hashing {:}", e),
|
||||||
Err(e) => panic!("Error hashing {:}", e),
|
};
|
||||||
};
|
|
||||||
|
|
||||||
sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, pwd = $4, is_admin = $5 WHERE id = $6"#)
|
let update_result = sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, pwd = $4, is_admin = $5 WHERE id = $6"#)
|
||||||
.bind(body.first_name.to_owned())
|
.bind(body.first_name.to_owned())
|
||||||
.bind(body.last_name.to_owned())
|
.bind(body.last_name.to_owned())
|
||||||
.bind(body.username.to_owned())
|
.bind(body.username.to_owned())
|
||||||
.bind(hashed_pwd)
|
.bind(&hashed_pwd)
|
||||||
.bind(body.make_admin.to_owned())
|
.bind(body.make_admin.to_owned())
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.execute(&data.db)
|
.execute(&data.db)
|
||||||
.await
|
.await
|
||||||
} else {
|
.map_err(|e| {
|
||||||
sqlx::query(r#"UPDATE users SET first_name = $1, last_name = $2, username = $3, is_admin = $4 WHERE id = $5"#)
|
(
|
||||||
.bind(body.first_name.to_owned())
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
.bind(body.last_name.to_owned())
|
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
||||||
.bind(body.username.to_owned())
|
)
|
||||||
.bind(body.make_admin.to_owned())
|
})?;
|
||||||
.bind(id)
|
|
||||||
.execute(&data.db)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
.map_err(|e| {
|
|
||||||
(
|
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
|
||||||
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
if update_result.rows_affected() == 0 {
|
if update_result.rows_affected() == 0 {
|
||||||
let error_response = serde_json::json!({
|
let error_response = serde_json::json!({
|
||||||
@@ -583,10 +567,10 @@ pub async fn setup_initial_admin(
|
|||||||
})?;
|
})?;
|
||||||
|
|
||||||
if user.rows_affected() < 1 {
|
if user.rows_affected() < 1 {
|
||||||
return Err((
|
Err((
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
Json(json!({"status": "error", "message": "Error creating admin user"})),
|
Json(json!({"status": "error", "message": "Error creating admin user"})),
|
||||||
));
|
))
|
||||||
} else {
|
} else {
|
||||||
Ok(Json(
|
Ok(Json(
|
||||||
json!({"status": "success", "result": "Admin user created"}),
|
json!({"status": "success", "result": "Admin user created"}),
|
||||||
@@ -627,6 +611,6 @@ pub fn filter_user(user: &User) -> FilteredUser {
|
|||||||
first_name: user.first_name.clone(),
|
first_name: user.first_name.clone(),
|
||||||
last_name: user.last_name.clone(),
|
last_name: user.last_name.clone(),
|
||||||
username: user.username.clone(),
|
username: user.username.clone(),
|
||||||
is_admin: user.is_admin.clone(),
|
is_admin: user.is_admin,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -230,22 +230,22 @@ pub async fn get_ticket_by_id(
|
|||||||
user_last_name: row.get("last_name"),
|
user_last_name: row.get("last_name"),
|
||||||
};
|
};
|
||||||
let response = serde_json::json!(ticket_response);
|
let response = serde_json::json!(ticket_response);
|
||||||
return Ok(Json(response));
|
Ok(Json(response))
|
||||||
}
|
}
|
||||||
Err(sqlx::Error::RowNotFound) => {
|
Err(sqlx::Error::RowNotFound) => {
|
||||||
let error_response = serde_json::json!({
|
let error_response = serde_json::json!({
|
||||||
"status": "fail",
|
"status": "fail",
|
||||||
"message": format!("Ticket with ID {} not found", id)
|
"message": format!("Ticket with ID {} not found", id)
|
||||||
});
|
});
|
||||||
return Err((StatusCode::NOT_FOUND, Json(error_response)));
|
Err((StatusCode::NOT_FOUND, Json(error_response)))
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return Err((
|
Err((
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
Json(json!({"status": "error", "message": format!("{:?}", e)})),
|
||||||
));
|
))
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Updates a ticket's status.
|
/// Updates a ticket's status.
|
||||||
|
|||||||
+3
-2
@@ -64,7 +64,7 @@ async fn main() {
|
|||||||
let database_url = &env.db_url;
|
let database_url = &env.db_url;
|
||||||
|
|
||||||
// Establish connection pool to PostgreSQL
|
// Establish connection pool to PostgreSQL
|
||||||
let pool = match PgPoolOptions::new().connect(&database_url).await {
|
let pool = match PgPoolOptions::new().connect(database_url).await {
|
||||||
Ok(pool) => {
|
Ok(pool) => {
|
||||||
println!("Database connection successful");
|
println!("Database connection successful");
|
||||||
pool
|
pool
|
||||||
@@ -90,6 +90,7 @@ async fn main() {
|
|||||||
.layer(cors);
|
.layer(cors);
|
||||||
|
|
||||||
// Start listening for incoming connections
|
// 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;
|
let _ = axum::serve(listener, app).await;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- POSTGRES_PASSWORD=tickets
|
- POSTGRES_PASSWORD=tickets
|
||||||
volumes:
|
volumes:
|
||||||
- pg_data:/var/lib/postregsql/pg_data
|
- pg_data:/var/lib/postgresql/pg_data
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
pg_data:
|
pg_data:
|
||||||
|
|||||||
+2
-1
@@ -16,7 +16,8 @@ serde = { workspace = true }
|
|||||||
wasm-bindgen-futures = "0.4.70"
|
wasm-bindgen-futures = "0.4.70"
|
||||||
web-sys = { version = "0.3.95", features = [
|
web-sys = { version = "0.3.95", features = [
|
||||||
"Window","Document","Request","Response","Headers", "HtmlSelectElement", "RequestCredentials",
|
"Window","Document","Request","Response","Headers", "HtmlSelectElement", "RequestCredentials",
|
||||||
"SubmitEvent","InputEvent","HtmlInputElement","Event", "HtmlFormElement", "MouseEvent"
|
"SubmitEvent","InputEvent","HtmlInputElement","Event", "HtmlFormElement", "MouseEvent",
|
||||||
|
"Element", "MediaQueryList", "DomTokenList"
|
||||||
] }
|
] }
|
||||||
gloo-net = "0.7.0"
|
gloo-net = "0.7.0"
|
||||||
gloo-storage = "0.4.0"
|
gloo-storage = "0.4.0"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[serve]
|
[serve]
|
||||||
# The address to serve on LAN.
|
# 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.
|
# The address to serve on WAN.
|
||||||
# address = "0.0.0.0"
|
# address = "0.0.0.0"
|
||||||
# The port to serve on.
|
# The port to serve on.
|
||||||
|
|||||||
+1
-2
@@ -5,9 +5,8 @@
|
|||||||
<link data-trunk rel="rust" data-bin="bin" />
|
<link data-trunk rel="rust" data-bin="bin" />
|
||||||
<link data-trunk rel="scss" href="src/styles/main.scss" />
|
<link data-trunk rel="scss" href="src/styles/main.scss" />
|
||||||
<link data-trunk rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
|
<link data-trunk rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
|
||||||
<link data-trunk rel="copy-dir" href="src/assets" />
|
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title>Yew App</title>
|
<title>Ticket System CSG</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body></body>
|
<body></body>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
@@ -109,7 +109,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
|
|||||||
AuthState {
|
AuthState {
|
||||||
is_authenticated: None,
|
is_authenticated: None,
|
||||||
..
|
..
|
||||||
} => html! { <div>{ "Loading..." } </div> },
|
} => html! { <div>{ "Lade..." } </div> },
|
||||||
AuthState {
|
AuthState {
|
||||||
is_authenticated: Some(false),
|
is_authenticated: Some(false),
|
||||||
..
|
..
|
||||||
@@ -126,7 +126,7 @@ pub fn protected_route(props: &ProtectedRouteProps) -> Html {
|
|||||||
Some(false) => {
|
Some(false) => {
|
||||||
html! { <Redirect<crate::Route> to={crate::Route::PermissionDenied}/> }
|
html! { <Redirect<crate::Route> to={crate::Route::PermissionDenied}/> }
|
||||||
}
|
}
|
||||||
None => html! { <div>{ "Checking permissions..." }</div> },
|
None => html! { <div>{ "Berechtigungen werden geprüft..." }</div> },
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
props.children.clone().into()
|
props.children.clone().into()
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
use gloo_storage::{LocalStorage, Storage};
|
||||||
|
use web_sys::window;
|
||||||
|
use yew::prelude::*;
|
||||||
|
|
||||||
|
/// A persistent, floating toggle button to switch the user interface theme between Dark Mode and Light Mode.
|
||||||
|
///
|
||||||
|
/// # Functionality
|
||||||
|
/// 1. **System Preference Check**: If the user hasn't explicitly set a preference, detects the operating system theme
|
||||||
|
/// preference using browser `match_media("(prefers-color-scheme: dark)")` query.
|
||||||
|
/// 2. **Session Persistence**: Caches the selected theme choice under the `"dark-mode"` key in the browser's `LocalStorage`
|
||||||
|
/// so that user preferences persist across page reloads.
|
||||||
|
/// 3. **Dynamic Style Swapping**: Injects or removes the `.theme-dark` / `.theme-light` classes directly on the document
|
||||||
|
/// `body` element, triggering the theme change via globally defined CSS variables.
|
||||||
|
#[function_component(DarkModeToggle)]
|
||||||
|
pub fn dark_mode_toggle() -> Html {
|
||||||
|
// 1. Initialize state from LocalStorage or system preference
|
||||||
|
let is_dark = use_state(|| {
|
||||||
|
LocalStorage::get::<bool>("dark-mode").unwrap_or_else(|_| {
|
||||||
|
// Fallback to system preference if not set
|
||||||
|
window()
|
||||||
|
.and_then(|w| w.match_media("(prefers-color-scheme: dark)").ok().flatten())
|
||||||
|
.map(|m| m.matches())
|
||||||
|
.unwrap_or(false)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. Synchronize the class on the body when the state changes
|
||||||
|
{
|
||||||
|
let is_dark = is_dark.clone();
|
||||||
|
use_effect_with(is_dark, |is_dark| {
|
||||||
|
if let Some(win) = window() {
|
||||||
|
if let Some(doc) = win.document() {
|
||||||
|
if let Some(body) = doc.body() {
|
||||||
|
if **is_dark {
|
||||||
|
let _ = body.class_list().add_1("theme-dark");
|
||||||
|
let _ = body.class_list().remove_1("theme-light");
|
||||||
|
let _ = LocalStorage::set("dark-mode", true);
|
||||||
|
} else {
|
||||||
|
let _ = body.class_list().add_1("theme-light");
|
||||||
|
let _ = body.class_list().remove_1("theme-dark");
|
||||||
|
let _ = LocalStorage::set("dark-mode", false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|| ()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Toggle action
|
||||||
|
let onclick = {
|
||||||
|
let is_dark = is_dark.clone();
|
||||||
|
Callback::from(move |_| {
|
||||||
|
is_dark.set(!*is_dark);
|
||||||
|
})
|
||||||
|
};
|
||||||
|
|
||||||
|
html! {
|
||||||
|
<button class="dark-mode-toggle" {onclick}>
|
||||||
|
if *is_dark {
|
||||||
|
// Sun Icon for switching to light mode
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<circle cx="12" cy="12" r="4"/>
|
||||||
|
<path d="M12 2v2M12 20v2M4.93 4.93l1.41 1.41M17.66 17.66l1.41 1.41M2 12h2M20 12h2M6.34 17.66l-1.41 1.41M19.07 4.93l-1.41 1.41"/>
|
||||||
|
</svg>
|
||||||
|
} else {
|
||||||
|
// Moon Icon for switching to dark mode
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<path d="M12 3a6 6 0 0 0 9 9 9 9 0 1 1-9-9Z"/>
|
||||||
|
</svg>
|
||||||
|
}
|
||||||
|
</button>
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-4
@@ -1,5 +1,6 @@
|
|||||||
mod auth;
|
mod auth;
|
||||||
mod pages;
|
mod pages;
|
||||||
|
mod dark_mode;
|
||||||
use crate::auth::ProtectedRoute;
|
use crate::auth::ProtectedRoute;
|
||||||
use crate::pages::*;
|
use crate::pages::*;
|
||||||
use gloo_net::http::Request;
|
use gloo_net::http::Request;
|
||||||
@@ -137,7 +138,6 @@ fn sidebar_shell(props: &SidebarShellProps) -> Html {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Props for the AdminCheckWrapper component.
|
/// Props for the AdminCheckWrapper component.
|
||||||
#[derive(Properties, PartialEq)]
|
#[derive(Properties, PartialEq)]
|
||||||
pub struct AdminCheckWrapperProps {
|
pub struct AdminCheckWrapperProps {
|
||||||
@@ -192,10 +192,10 @@ fn admin_check_wrapper(props: &AdminCheckWrapperProps) -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
match *admin_exists {
|
match *admin_exists {
|
||||||
None => html! { <div>{ "Loading..." }</div> },
|
None => html! { <div>{ "Lade..." }</div> },
|
||||||
Some(false) => {
|
Some(false) => {
|
||||||
navigator.push(&Route::Setup);
|
navigator.push(&Route::Setup);
|
||||||
html! { <div>{ "Redirecting to setup..." }</div> }
|
html! { <div>{ "Leite weiter zur Einrichtung..." }</div> }
|
||||||
}
|
}
|
||||||
Some(true) => props.children.clone().into(),
|
Some(true) => props.children.clone().into(),
|
||||||
}
|
}
|
||||||
@@ -316,7 +316,7 @@ fn switch(route: Route) -> Html {
|
|||||||
pub fn app() -> Html {
|
pub fn app() -> Html {
|
||||||
html! {
|
html! {
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<basic_pages::Icon/>
|
<dark_mode::DarkModeToggle />
|
||||||
<Switch<Route> render={switch} />
|
<Switch<Route> render={switch} />
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ use wasm_bindgen_futures::spawn_local;
|
|||||||
use yew::prelude::*;
|
use yew::prelude::*;
|
||||||
use yew_router::prelude::*;
|
use yew_router::prelude::*;
|
||||||
|
|
||||||
|
#[macro_export]
|
||||||
/// Removes surrounding double quotes from a string.
|
/// Removes surrounding double quotes from a string.
|
||||||
///
|
///
|
||||||
/// This macro takes an expression that evaluates to a string and returns a new `String`
|
/// This macro takes an expression that evaluates to a string and returns a new `String`
|
||||||
@@ -71,7 +72,7 @@ pub fn home_component() -> Html {
|
|||||||
);
|
);
|
||||||
name.set(name_value);
|
name.set(name_value);
|
||||||
}
|
}
|
||||||
_ => name.set("Unknown".to_string()),
|
_ => name.set("Unbekannt".to_string()),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
@@ -79,11 +80,15 @@ pub fn home_component() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<div class="rundbg">
|
<div class="form-container home">
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>{ "Willkommen" }</h1>
|
||||||
|
</div>
|
||||||
<crate::utilities::TicketCount/>
|
<crate::utilities::TicketCount/>
|
||||||
|
<div>
|
||||||
<p>{ "You are logged in as: " }</p>
|
<p>{ "Sie sind angemeldet als: " }</p>
|
||||||
<p>{ &*name }</p>
|
<p class="text-muted">{ &*name }</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -101,11 +106,14 @@ pub fn home_component() -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(NotFound)]
|
#[component(NotFound)]
|
||||||
pub fn not_found_component() -> Html {
|
pub fn not_found_component() -> Html {
|
||||||
let message = "404 Not found";
|
let message = "404 Nicht gefunden";
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div class="form-container">
|
||||||
<h1>{&message}</h1>
|
<div class="empty-state">
|
||||||
<Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
|
<h1>{&message}</h1>
|
||||||
|
<p>{ "Die von Ihnen gesuchte Seite existiert nicht." }</p>
|
||||||
|
<Link<crate::Route> to={crate::Route::Home}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -125,17 +133,13 @@ pub fn not_found_component() -> Html {
|
|||||||
#[component(PermissionDenied)]
|
#[component(PermissionDenied)]
|
||||||
pub fn denied_component() -> Html {
|
pub fn denied_component() -> Html {
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div class="form-container">
|
||||||
<h1>{ "Sie haben nicht die benötigten Rechte um diese Seite aufzurufen" }</h1>
|
<div class="empty-state">
|
||||||
<h3>{ "Wenn sie denken, dass dies ein Fehler ist kontaktieren sie Herrn Winter" }</h3>
|
<h1>{ "Zugriff verweigert" }</h1>
|
||||||
<Link<crate::Route> to={crate::Route::Home}>{ "Zurück zum Start" }</Link<crate::Route>>
|
<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}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component(Icon)]
|
|
||||||
pub fn icon_component() -> Html {
|
|
||||||
html! {
|
|
||||||
<img src="assets/csg.png" class="csg-icon" />
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
+20
-20
@@ -67,7 +67,7 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
let username = use_state(|| "".to_string());
|
let username = use_state(|| "".to_string());
|
||||||
let pwd = use_state(|| "".to_string());
|
let pwd = use_state(|| "".to_string());
|
||||||
let pwd_confirm = use_state(|| "".to_string());
|
let pwd_confirm = use_state(|| "".to_string());
|
||||||
let error = use_state(|| String::new());
|
let error = use_state(String::new);
|
||||||
let success = use_state(|| false);
|
let success = use_state(|| false);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
let admin_check_done = use_state(|| false);
|
let admin_check_done = use_state(|| false);
|
||||||
@@ -103,7 +103,7 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !*admin_check_done {
|
if !*admin_check_done {
|
||||||
return html! { <div>{ "Checking..." }</div> };
|
return html! { <div>{ "Wird überprüft..." }</div> };
|
||||||
}
|
}
|
||||||
|
|
||||||
let onsubmit = {
|
let onsubmit = {
|
||||||
@@ -121,17 +121,17 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
|
|
||||||
if (*pwd).is_empty() || (*pwd_confirm).is_empty() {
|
if (*pwd).is_empty() || (*pwd_confirm).is_empty() {
|
||||||
error.set("Password fields cannot be empty".to_string());
|
error.set("Passwortfelder dürfen nicht leer sein".to_string());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if *pwd != *pwd_confirm {
|
if *pwd != *pwd_confirm {
|
||||||
error.set("Passwords do not match".to_string());
|
error.set("Passwörter stimmen nicht überein".to_string());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (*username).is_empty() {
|
if (*username).is_empty() {
|
||||||
error.set("Username cannot be empty".to_string());
|
error.set("Benutzername darf nicht leer sein".to_string());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
let text = r.text().await.unwrap_or_else(|_| "unknown".into());
|
let text = r.text().await.unwrap_or_else(|_| "unknown".into());
|
||||||
error.set(format!("HTTP {}: {}", r.status(), text));
|
error.set(format!("HTTP {}: {}", r.status(), text));
|
||||||
}
|
}
|
||||||
Err(err) => error.set(format!("Network error: {}", err)),
|
Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
@@ -184,16 +184,16 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
html! {
|
html! {
|
||||||
<div class="setup-container">
|
<div class="setup-container">
|
||||||
<div class="setup-box">
|
<div class="setup-box">
|
||||||
<h1>{ "Initial Admin Setup" }</h1>
|
<h1>{ "Erstmalige Admin-Einrichtung" }</h1>
|
||||||
<p>{ "Create your first administrator account" }</p>
|
<p>{ "Erstellen Sie Ihr erstes Administrator-Konto" }</p>
|
||||||
|
|
||||||
<form {onsubmit} class="setup-form">
|
<form {onsubmit} class="setup-form">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="first_name">{ "First Name:" }
|
<label for="first_name">{ "Vorname:" }
|
||||||
<input
|
<input
|
||||||
id="first_name"
|
id="first_name"
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="First name"
|
placeholder="Vorname"
|
||||||
value={(*first_name).clone()}
|
value={(*first_name).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
@@ -204,11 +204,11 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="last_name">{ "Last Name:" }
|
<label for="last_name">{ "Nachname:" }
|
||||||
<input
|
<input
|
||||||
id="last_name"
|
id="last_name"
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Last name"
|
placeholder="Nachname"
|
||||||
value={(*last_name).clone()}
|
value={(*last_name).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
@@ -219,11 +219,11 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="username">{ "Username:" }
|
<label for="username">{ "Benutzername:" }
|
||||||
<input
|
<input
|
||||||
id="username"
|
id="username"
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Username"
|
placeholder="Benutzername"
|
||||||
value={(*username).clone()}
|
value={(*username).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
@@ -234,11 +234,11 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="password">{ "Password:" }
|
<label for="password">{ "Passwort:" }
|
||||||
<input
|
<input
|
||||||
id="password"
|
id="password"
|
||||||
type="password"
|
type="password"
|
||||||
placeholder="Password"
|
placeholder="Passwort"
|
||||||
value={(*pwd).clone()}
|
value={(*pwd).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
@@ -249,11 +249,11 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="pwd_confirm">{ "Confirm Password:" }
|
<label for="pwd_confirm">{ "Passwort bestätigen:" }
|
||||||
<input
|
<input
|
||||||
id="pwd_confirm"
|
id="pwd_confirm"
|
||||||
type="password"
|
type="password"
|
||||||
placeholder="Confirm password"
|
placeholder="Passwort bestätigen"
|
||||||
value={(*pwd_confirm).clone()}
|
value={(*pwd_confirm).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
@@ -264,7 +264,7 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button type="submit" disabled={*loading} class="submit-btn">
|
<button type="submit" disabled={*loading} class="submit-btn">
|
||||||
{ if *loading { "Creating..." } else { "Create Admin Account" } }
|
{ if *loading { "Wird erstellt..." } else { "Admin-Konto erstellen" } }
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
if !error.is_empty() {
|
if !error.is_empty() {
|
||||||
@@ -272,7 +272,7 @@ pub fn initial_admin_setup() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *success {
|
if *success {
|
||||||
<p class="success-message" style="color:green">{ "Admin account created successfully! Redirecting to login..." }</p>
|
<p class="success-message" style="color:green">{ "Admin-Konto erfolgreich erstellt! Weiterleitung zum Login..." }</p>
|
||||||
}
|
}
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -234,10 +234,10 @@ pub fn ticket_menu() -> Html {
|
|||||||
html! {
|
html! {
|
||||||
<ul class="submenu" role="menu">
|
<ul class="submenu" role="menu">
|
||||||
<li role="none">
|
<li role="none">
|
||||||
<Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Submit Ticket" }</span></Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::Ticket}><span role="menuitem">{ "Ticket erstellen" }</span></Link<crate::Route>>
|
||||||
</li>
|
</li>
|
||||||
<li role="none">
|
<li role="none">
|
||||||
<Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "View Tickets" }</span></Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::AllTickets}><span role="menuitem">{ "Tickets anzeigen" }</span></Link<crate::Route>>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
}
|
}
|
||||||
@@ -289,7 +289,7 @@ pub fn users_menu() -> Html {
|
|||||||
onclick={on_toggle}
|
onclick={on_toggle}
|
||||||
aria-expanded={open.to_string()}
|
aria-expanded={open.to_string()}
|
||||||
>
|
>
|
||||||
{ "Users" }
|
{ "Benutzer" }
|
||||||
{ if open { " ▾" } else { " ▸" } }
|
{ if open { " ▾" } else { " ▸" } }
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
@@ -298,10 +298,10 @@ pub fn users_menu() -> Html {
|
|||||||
html! {
|
html! {
|
||||||
<ul class="submenu" role="menu">
|
<ul class="submenu" role="menu">
|
||||||
<li role="none">
|
<li role="none">
|
||||||
<Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Create User" }</span></Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::Register}><span role="menuitem">{ "Benutzer erstellen" }</span></Link<crate::Route>>
|
||||||
</li>
|
</li>
|
||||||
<li role="none">
|
<li role="none">
|
||||||
<Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "View Users" }</span></Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::AllUsers}><span role="menuitem">{ "Benutzer anzeigen" }</span></Link<crate::Route>>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
}
|
}
|
||||||
|
|||||||
+146
-155
@@ -180,7 +180,7 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
Callback::from(move |e: SubmitEvent| {
|
Callback::from(move |e: SubmitEvent| {
|
||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
if room.is_none() {
|
if room.is_none() {
|
||||||
status.set(Some("Invalid room".into()));
|
status.set(Some("Ungültiger Raum".into()));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let category = (*category).clone();
|
let category = (*category).clone();
|
||||||
@@ -188,7 +188,7 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
let description = (*description).clone();
|
let description = (*description).clone();
|
||||||
let room = room.unwrap();
|
let room = room.unwrap();
|
||||||
if !valid_rooms.contains(&room) {
|
if !valid_rooms.contains(&room) {
|
||||||
status.set(Some("Room not allowed".into()));
|
status.set(Some("Raum nicht erlaubt".into()));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let status = status.clone();
|
let status = status.clone();
|
||||||
@@ -208,9 +208,11 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
.expect("Failed to build request");
|
.expect("Failed to build request");
|
||||||
|
|
||||||
match request.send().await {
|
match request.send().await {
|
||||||
Ok(response) if response.status() == 200 => status.set(Some("Success".into())),
|
Ok(response) if response.status() == 200 => {
|
||||||
Ok(response) => status.set(Some(format!("Error: {}", response.status()))),
|
status.set(Some("Erfolgreich".into()))
|
||||||
Err(err) => status.set(Some(format!("Network error: {}", err))),
|
}
|
||||||
|
Ok(response) => status.set(Some(format!("Fehler: {}", response.status()))),
|
||||||
|
Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
@@ -265,10 +267,7 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
Err(_) => None,
|
Err(_) => None,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
match raw_trim.parse::<i16>() {
|
raw_trim.parse::<i16>().ok()
|
||||||
Ok(n) => Some(n),
|
|
||||||
Err(_) => None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -287,52 +286,53 @@ pub fn submit_ticket_component() -> Html {
|
|||||||
let room_valid = (*room).is_some();
|
let room_valid = (*room).is_some();
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<form class="rundbg" {onsubmit}>
|
<div class="form-container">
|
||||||
<label>{ "Betreff:" }
|
<div class="page-header">
|
||||||
<input type="text" value={(*betreff).clone()} oninput={betreff_change}/>
|
<h1>{ "Ticket erstellen" }</h1>
|
||||||
</label>
|
</div>
|
||||||
<br/>
|
<form {onsubmit}>
|
||||||
<label>{ "Beschreibung:" }
|
<label>{ "Betreff:" }
|
||||||
<input type="text" value={(*description).clone()} oninput={description_change}/>
|
<input type="text" value={(*betreff).clone()} oninput={betreff_change}/>
|
||||||
</label>
|
</label>
|
||||||
<br/>
|
<label>{ "Beschreibung:" }
|
||||||
<label>{ "Kategorie:" }
|
<textarea value={(*description).clone()} oninput={description_change}/>
|
||||||
<select value={(*category).clone()} onchange={category_change}>
|
</label>
|
||||||
<option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
|
<label>{ "Kategorie:" }
|
||||||
<option value="Internet">{ "Internet" }</option>
|
<select value={(*category).clone()} onchange={category_change}>
|
||||||
<option value="iPad Koffer">{ "iPad Koffer" }</option>
|
<option value="Whiteboard Beamer">{ "Whiteboard Beamer" }</option>
|
||||||
<option value="Apple TV">{ "Apple TV" }</option>
|
<option value="Internet">{ "Internet" }</option>
|
||||||
<option value="Docu Cam">{ "Dokumenten Kamera" }</option>
|
<option value="iPad Koffer">{ "iPad Koffer" }</option>
|
||||||
<option value="Sonstiges">{ "Sonstiges" }</option>
|
<option value="Apple TV" selected=true>{ "Apple TV" }</option>
|
||||||
</select>
|
<option value="Docu Cam">{ "Dokumenten Kamera" }</option>
|
||||||
</label>
|
<option value="Sonstiges">{ "Sonstiges" }</option>
|
||||||
<br/>
|
</select>
|
||||||
<label>{ "Raum:" }
|
</label>
|
||||||
<input type="text" value={(*room_input).clone()} oninput={room_change}/>
|
<label>{ "Raum:" }
|
||||||
</label>
|
<input type="text" value={(*room_input).clone()} oninput={room_change}/>
|
||||||
{
|
</label>
|
||||||
if !room_valid {
|
{
|
||||||
html! {
|
if !room_valid {
|
||||||
<p class="warning" >{ "Ungültiger / nicht erlaubter Raum (z. B. 101, K12, D5)" }</p>
|
html! {
|
||||||
|
<p class="alert error">{ "Ungültiger oder nicht erlaubter Raum (z. B. 101, K8, D1)" }</p>
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
html! {}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
html! {}
|
|
||||||
}
|
}
|
||||||
}
|
<button type="submit">{ "Absenden" }</button>
|
||||||
<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}>{ "Alle Tickets anzeigen" }</Link<crate::Route>>
|
||||||
|
|
||||||
{
|
{
|
||||||
if let Some(s) = &*status {
|
if let Some(s) = &*status {
|
||||||
html!{ <p>{ s }</p> }
|
html!{ <p class="alert success">{ s }</p> }
|
||||||
} else {
|
} else {
|
||||||
html!{}
|
html!{}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -396,7 +396,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
if status == 200 {
|
if status == 200 {
|
||||||
match response.json::<Ticket>().await {
|
match response.json::<Ticket>().await {
|
||||||
Ok(t) => ticket.set(Some(t)),
|
Ok(t) => ticket.set(Some(t)),
|
||||||
Err(err) => error.set(Some(format!("Parse error: {}", err))),
|
Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
match response.json::<ApiError>().await {
|
match response.json::<ApiError>().await {
|
||||||
@@ -405,13 +405,13 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
if let Ok(text) = response.text().await {
|
if let Ok(text) = response.text().await {
|
||||||
error.set(Some(text));
|
error.set(Some(text));
|
||||||
} else {
|
} else {
|
||||||
error.set(Some(format!("Server error: {}", status)));
|
error.set(Some(format!("Server-Fehler: {}", status)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
loading.set(false);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
@@ -420,7 +420,6 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
}
|
}
|
||||||
let onsubmit = {
|
let onsubmit = {
|
||||||
let status = status.clone();
|
let status = status.clone();
|
||||||
let id = id.clone();
|
|
||||||
let error = error.clone();
|
let error = error.clone();
|
||||||
|
|
||||||
Callback::from(move |e: SubmitEvent| {
|
Callback::from(move |e: SubmitEvent| {
|
||||||
@@ -436,7 +435,6 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
.unwrap_or_else(|| (*status).clone());
|
.unwrap_or_else(|| (*status).clone());
|
||||||
status.set(new_status.clone());
|
status.set(new_status.clone());
|
||||||
|
|
||||||
let id = id.clone();
|
|
||||||
let error = error.clone();
|
let error = error.clone();
|
||||||
|
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
@@ -448,9 +446,11 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
.expect("Failed to construct request");
|
.expect("Failed to construct request");
|
||||||
|
|
||||||
match request.send().await {
|
match request.send().await {
|
||||||
Ok(response) if response.status() == 200 => error.set(Some("Success".into())),
|
Ok(response) if response.status() == 200 => {
|
||||||
Ok(response) => error.set(Some(format!("Error: {}", response.status()))),
|
error.set(Some("Erfolgreich".into()))
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
}
|
||||||
|
Ok(response) => error.set(Some(format!("Fehler: {}", response.status()))),
|
||||||
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
@@ -463,7 +463,6 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
let deleting = deleting.clone();
|
let deleting = deleting.clone();
|
||||||
let delete_error = delete_error.clone();
|
let delete_error = delete_error.clone();
|
||||||
let ticket_state = ticket.clone();
|
let ticket_state = ticket.clone();
|
||||||
let id = id;
|
|
||||||
|
|
||||||
Callback::from(move |e: MouseEvent| {
|
Callback::from(move |e: MouseEvent| {
|
||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
@@ -492,10 +491,10 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
ticket_state.set(None); // clears the shown item
|
ticket_state.set(None); // clears the shown item
|
||||||
}
|
}
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
|
let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
|
||||||
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
||||||
}
|
}
|
||||||
Err(err) => delete_error.set(Some(format!("Network error: {}", err))),
|
Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
deleting.set(false);
|
deleting.set(false);
|
||||||
});
|
});
|
||||||
@@ -503,9 +502,9 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {<p>{ "Lade..." }</p>}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
|
||||||
} else if let Some(t) = &*ticket {
|
} else if let Some(t) = &*ticket {
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div>
|
||||||
@@ -538,18 +537,18 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
<button type="submit">{ "Aktualisieren" }</button>
|
<button type="submit">{ "Aktualisieren" }</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<button onclick={ondelete} disabled={*deleting}>
|
<button onclick={ondelete} disabled={*deleting} class="delete">
|
||||||
{if *deleting {"Löschen..."} else {"Löschen"}}
|
{if *deleting {"Löschen..."} else {"Löschen"}}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Link<crate::Route> to={crate::Route::AllTickets}>{ "Zurück zur Ticketübersicht" }</Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::AllTickets} classes="return-to">{ "Zurück zur Ticketübersicht" }</Link<crate::Route>>
|
||||||
if let Some(err) = &*delete_error {
|
if let Some(err) = &*delete_error {
|
||||||
<p style="color:red">{ err.clone() }</p>
|
<p class="alert error">{ err.clone() }</p>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
html! { <p>{ "No ticket found." }</p> }
|
html! { <p>{ "Kein Ticket gefunden." }</p> }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -588,7 +587,7 @@ pub fn ticket_by_id_component(props: &TicketProps) -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(AllTickets)]
|
#[component(AllTickets)]
|
||||||
pub fn all_tickets_component() -> Html {
|
pub fn all_tickets_component() -> Html {
|
||||||
let tickets = use_state(|| Vec::<Ticket>::new());
|
let tickets = use_state(Vec::<Ticket>::new);
|
||||||
let error = use_state(|| None::<String>);
|
let error = use_state(|| None::<String>);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
let user = use_state(|| ActiveUser {
|
let user = use_state(|| ActiveUser {
|
||||||
@@ -604,22 +603,22 @@ pub fn all_tickets_component() -> Html {
|
|||||||
use_effect_with((), move |_| {
|
use_effect_with((), move |_| {
|
||||||
loading.set(true);
|
loading.set(true);
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let url = format!("/api/tickets");
|
let url = "/api/tickets".to_string();
|
||||||
match Request::get(&url).send().await {
|
match Request::get(&url).send().await {
|
||||||
Ok(response) if response.status() == 200 => {
|
Ok(response) if response.status() == 200 => {
|
||||||
match response.json::<Vec<Ticket>>().await {
|
match response.json::<Vec<Ticket>>().await {
|
||||||
Ok(t) => tickets.set(t),
|
Ok(t) => tickets.set(t),
|
||||||
Err(e) => error.set(Some(format!("parse error: {}", e))),
|
Err(e) => error.set(Some(format!("Parser-Fehler: {}", e))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if let Ok(text) = response.text().await {
|
if let Ok(text) = response.text().await {
|
||||||
error.set(Some(text));
|
error.set(Some(text));
|
||||||
} else {
|
} else {
|
||||||
error.set(Some(format!("status {}", response.status())));
|
error.set(Some(format!("Status {}", response.status())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
loading.set(false);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
@@ -636,22 +635,20 @@ pub fn all_tickets_component() -> Html {
|
|||||||
.credentials(web_sys::RequestCredentials::Include)
|
.credentials(web_sys::RequestCredentials::Include)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
|
&& response.status() == 200
|
||||||
|
&& let Ok(json) = response.json::<serde_json::Value>().await
|
||||||
{
|
{
|
||||||
if response.status() == 200 {
|
let id = json
|
||||||
if let Ok(json) = response.json::<serde_json::Value>().await {
|
.get("data")
|
||||||
let id = json
|
.and_then(|d| d.get("id"))
|
||||||
.get("data")
|
.and_then(|v| v.as_i64())
|
||||||
.and_then(|d| d.get("id"))
|
.and_then(|n| i16::try_from(n).ok());
|
||||||
.and_then(|v| v.as_i64())
|
let is_admin = json
|
||||||
.and_then(|n| i16::try_from(n).ok());
|
.get("data")
|
||||||
let is_admin = json
|
.and_then(|d| d.get("is_admin"))
|
||||||
.get("data")
|
.and_then(|v| v.as_bool())
|
||||||
.and_then(|d| d.get("is_admin"))
|
.unwrap_or(false);
|
||||||
.and_then(|v| v.as_bool())
|
user.set(ActiveUser { id, is_admin });
|
||||||
.unwrap_or(false);
|
|
||||||
user.set(ActiveUser { id, is_admin });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
@@ -659,39 +656,36 @@ pub fn all_tickets_component() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {<p>{ "Lade..." }</p>}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
|
||||||
} else {
|
} else {
|
||||||
html! {
|
html! {
|
||||||
<ul class= "postits">
|
<div>
|
||||||
{ 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| {
|
<div class="page-header">
|
||||||
let status_class = match t.status.as_str() {
|
<h1>{ "Alle Tickets" }</h1>
|
||||||
"ToDo" => "To-Do",
|
</div>
|
||||||
"InProgress" => "InProgress",
|
<ul class="ticket-list">
|
||||||
"Completed" => "Completed",
|
{ 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| {
|
||||||
"Archived" => "Archived",
|
let status_class = match t.status.as_str() {
|
||||||
_ => "To-Do"
|
"ToDo" => "To-Do",
|
||||||
};
|
"InProgress" => "InProgress",
|
||||||
html! {
|
"Completed" => "Completed",
|
||||||
<div class={classes!{status_class, "listbox"}}>
|
"Archived" => "Archived",
|
||||||
<li key={t.id.to_string()}>
|
_ => "To-Do"
|
||||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
|
};
|
||||||
<p>{ &t.description }</p>
|
html! {
|
||||||
<p>{ match t.status.as_str() {
|
<li key={t.id.to_string()} class={status_class}>
|
||||||
"ToDo" => "Zu tun",
|
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
|
||||||
"InProgress" => "In Bearbeitung",
|
<p>{ &t.description }</p>
|
||||||
"Completed" => "Erledigt",
|
</li>
|
||||||
"Archived" => "Archiviert",
|
}
|
||||||
_ => "Ungültiger Status"
|
})}
|
||||||
}}</p>
|
</ul>
|
||||||
</li>
|
<div class="ticket-list-actions">
|
||||||
|
<Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
||||||
</div>
|
</div>
|
||||||
}})}
|
</div>
|
||||||
|
|
||||||
<Link<crate::Route> to={crate::Route::Ticket}>{ "Zurück zur Startseite" }</Link<crate::Route>>
|
|
||||||
</ul>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -731,7 +725,7 @@ pub fn all_tickets_component() -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(ArchivedTickets)]
|
#[component(ArchivedTickets)]
|
||||||
pub fn archived_tickets_component() -> Html {
|
pub fn archived_tickets_component() -> Html {
|
||||||
let tickets = use_state(|| Vec::<Ticket>::new());
|
let tickets = use_state(Vec::<Ticket>::new);
|
||||||
let error = use_state(|| None::<String>);
|
let error = use_state(|| None::<String>);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
let user = use_state(|| ActiveUser {
|
let user = use_state(|| ActiveUser {
|
||||||
@@ -747,22 +741,22 @@ pub fn archived_tickets_component() -> Html {
|
|||||||
use_effect_with((), move |_| {
|
use_effect_with((), move |_| {
|
||||||
loading.set(true);
|
loading.set(true);
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let url = format!("/api/tickets");
|
let url = "/api/tickets".to_string();
|
||||||
match Request::get(&url).send().await {
|
match Request::get(&url).send().await {
|
||||||
Ok(response) if response.status() == 200 => {
|
Ok(response) if response.status() == 200 => {
|
||||||
match response.json::<Vec<Ticket>>().await {
|
match response.json::<Vec<Ticket>>().await {
|
||||||
Ok(t) => tickets.set(t),
|
Ok(t) => tickets.set(t),
|
||||||
Err(e) => error.set(Some(format!("parse error: {}", e))),
|
Err(e) => error.set(Some(format!("Parser-Fehler: {}", e))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if let Ok(text) = response.text().await {
|
if let Ok(text) = response.text().await {
|
||||||
error.set(Some(text));
|
error.set(Some(text));
|
||||||
} else {
|
} else {
|
||||||
error.set(Some(format!("status {}", response.status())));
|
error.set(Some(format!("Status {}", response.status())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
loading.set(false);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
@@ -779,22 +773,20 @@ pub fn archived_tickets_component() -> Html {
|
|||||||
.credentials(web_sys::RequestCredentials::Include)
|
.credentials(web_sys::RequestCredentials::Include)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
|
&& response.status() == 200
|
||||||
|
&& let Ok(json) = response.json::<serde_json::Value>().await
|
||||||
{
|
{
|
||||||
if response.status() == 200 {
|
let id = json
|
||||||
if let Ok(json) = response.json::<serde_json::Value>().await {
|
.get("data")
|
||||||
let id = json
|
.and_then(|d| d.get("id"))
|
||||||
.get("data")
|
.and_then(|v| v.as_i64())
|
||||||
.and_then(|d| d.get("id"))
|
.and_then(|n| i16::try_from(n).ok());
|
||||||
.and_then(|v| v.as_i64())
|
let is_admin = json
|
||||||
.and_then(|n| i16::try_from(n).ok());
|
.get("data")
|
||||||
let is_admin = json
|
.and_then(|d| d.get("is_admin"))
|
||||||
.get("data")
|
.and_then(|v| v.as_bool())
|
||||||
.and_then(|d| d.get("is_admin"))
|
.unwrap_or(false);
|
||||||
.and_then(|v| v.as_bool())
|
user.set(ActiveUser { id, is_admin });
|
||||||
.unwrap_or(false);
|
|
||||||
user.set(ActiveUser { id, is_admin });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
@@ -802,29 +794,28 @@ pub fn archived_tickets_component() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {<p>{ "Lade..." }</p>}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
|
||||||
} else {
|
} else {
|
||||||
html! {
|
html! {
|
||||||
<ul class="postits">
|
<div>
|
||||||
{ 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 class="page-header">
|
||||||
<div class="listbox">
|
<h1>{ "Archivierte Tickets" }</h1>
|
||||||
<li key={t.id.to_string()}>
|
</div>
|
||||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
|
<ul class="ticket-list">
|
||||||
<p>{ &t.description }</p>
|
{ 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! {
|
||||||
<p>{ match t.status.as_str() {
|
<div>
|
||||||
"ToDo" => "Zu tun",
|
|
||||||
"InProgress" => "In Bearbeitung",
|
|
||||||
"Completed" => "Erledigt",
|
|
||||||
"Archived" => "Archiviert",
|
|
||||||
_ => "Ungültiger Status"
|
|
||||||
}}</p>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
</div>
|
<li key={t.id.to_string()}>
|
||||||
})}
|
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{}", t.betreff) }</h3></Link<crate::Route>>
|
||||||
</ul>
|
<p>{ &t.description }</p>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+118
-88
@@ -1,3 +1,4 @@
|
|||||||
|
use crate::dequote;
|
||||||
use gloo_net::http::Request;
|
use gloo_net::http::Request;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use wasm_bindgen_futures::spawn_local;
|
use wasm_bindgen_futures::spawn_local;
|
||||||
@@ -181,9 +182,11 @@ pub fn register_component() -> Html {
|
|||||||
.expect("Error building request");
|
.expect("Error building request");
|
||||||
|
|
||||||
match request.send().await {
|
match request.send().await {
|
||||||
Ok(response) if response.status() == 200 => status.set(Some("Success".into())),
|
Ok(response) if response.status() == 200 => {
|
||||||
Ok(response) => status.set(Some(format!("Error: {}", response.status()))),
|
status.set(Some("Erfolgreich".into()))
|
||||||
Err(err) => status.set(Some(format!("Network error: {}", err))),
|
}
|
||||||
|
Ok(response) => status.set(Some(format!("Fehler: {}", response.status()))),
|
||||||
|
Err(err) => status.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
@@ -230,24 +233,29 @@ pub fn register_component() -> Html {
|
|||||||
};
|
};
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<form {onsubmit} class="rundbg">
|
<div class="form-container">
|
||||||
<label>{ "Vorname:" }
|
<div class="page-header">
|
||||||
<input type="text" value={(*first_name).clone()} oninput={fn_change}/>
|
<h1>{ "Benutzer registrieren" }</h1>
|
||||||
</label>
|
</div>
|
||||||
<label>{ "Nachname:" }
|
<form {onsubmit}>
|
||||||
<input type="text" value={(*last_name).clone()} oninput={ln_change}/>
|
<label>{ "Vorname:" }
|
||||||
</label>
|
<input type="text" value={(*first_name).clone()} oninput={fn_change}/>
|
||||||
<label>{ "Benutzername:" }
|
</label>
|
||||||
<input type="text" value={(*username).clone()} oninput={un_change}/>
|
<label>{ "Nachname:" }
|
||||||
</label>
|
<input type="text" value={(*last_name).clone()} oninput={ln_change}/>
|
||||||
<label>{ "Admin:" }
|
</label>
|
||||||
<input type="checkbox" checked={*is_admin} onchange={admin_change}/>
|
<label>{ "Benutzername:" }
|
||||||
</label>
|
<input type="text" value={(*username).clone()} oninput={un_change}/>
|
||||||
<label>{ "Password:" }
|
</label>
|
||||||
<input type="password" value={(*pwd).clone()} oninput={pwd_change}/>
|
<label>{ "Admin:" }
|
||||||
</label>
|
<input type="checkbox" checked={*is_admin} onchange={admin_change}/>
|
||||||
<button type="submit">{ "Bestätigen" }</button>
|
</label>
|
||||||
</form>
|
<label>{ "Passwort:" }
|
||||||
|
<input type="password" value={(*pwd).clone()} oninput={pwd_change}/>
|
||||||
|
</label>
|
||||||
|
<button type="submit">{ "Bestätigen" }</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,7 +290,7 @@ pub fn login_component() -> Html {
|
|||||||
let username = use_state(|| "".to_string());
|
let username = use_state(|| "".to_string());
|
||||||
let pwd = use_state(|| "".to_string());
|
let pwd = use_state(|| "".to_string());
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
let error = use_state(|| String::new());
|
let error = use_state(String::new);
|
||||||
let success = use_state(|| false);
|
let success = use_state(|| false);
|
||||||
let navigator = use_navigator().unwrap();
|
let navigator = use_navigator().unwrap();
|
||||||
|
|
||||||
@@ -326,40 +334,45 @@ pub fn login_component() -> Html {
|
|||||||
navigator.push(&crate::Route::Home);
|
navigator.push(&crate::Route::Home);
|
||||||
}
|
}
|
||||||
Ok(r) => {
|
Ok(r) => {
|
||||||
let text = r.text().await.unwrap_or_else(|_| "unknown".into());
|
let text: serde_json::Value =
|
||||||
error.set(format!("HTTP {}: {}", r.status(), text));
|
r.json().await.unwrap_or_else(|_| "unbekannt".into());
|
||||||
|
error.set(dequote!(format!("{}", text["message"].to_string())));
|
||||||
}
|
}
|
||||||
Err(err) => error.set(format!("Network error: {}", err)),
|
Err(err) => error.set(format!("Netzwerkfehler: {}", err)),
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<main class="content login">
|
||||||
<h1 class="headline">{ "Anmeldung" }</h1>
|
<div class="form-container">
|
||||||
<form {onsubmit} class="rundbg login">
|
<div class="page-header">
|
||||||
<input
|
<h1>{ "Anmelden" }</h1>
|
||||||
placeholder="username"
|
</div>
|
||||||
value={(*username).clone()}
|
<form {onsubmit}>
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
<input
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
placeholder="Benutzername"
|
||||||
username.set(input.value());
|
value={(*username).clone()}
|
||||||
})}
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
/>
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
<input
|
username.set(input.value());
|
||||||
type="password"
|
})}
|
||||||
placeholder="password"
|
/>
|
||||||
value={(*pwd).clone()}
|
<input
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
type="password"
|
||||||
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
placeholder="Passwort"
|
||||||
pwd.set(input.value());
|
value={(*pwd).clone()}
|
||||||
})}
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
/>
|
let input: web_sys::HtmlInputElement = e.target_unchecked_into();
|
||||||
<button type="submit" disabled={*loading}>{ if *loading { "Logging in..." } else { "Login" } }</button>
|
pwd.set(input.value());
|
||||||
if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> }
|
})}
|
||||||
</form>
|
/>
|
||||||
</div>
|
<button type="submit" disabled={*loading}>{ if *loading { "Wird angemeldet..." } else { "Anmelden" } }</button>
|
||||||
|
if !error.is_empty() { <p class="alert error">{(*error).clone()}</p> }
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -392,7 +405,7 @@ pub fn login_component() -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(AllUsers)]
|
#[component(AllUsers)]
|
||||||
pub fn all_users_component() -> Html {
|
pub fn all_users_component() -> Html {
|
||||||
let users = use_state(|| Vec::<FilteredUser>::new());
|
let users = use_state(Vec::<FilteredUser>::new);
|
||||||
let error = use_state(|| None::<String>);
|
let error = use_state(|| None::<String>);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
|
|
||||||
@@ -404,22 +417,22 @@ pub fn all_users_component() -> Html {
|
|||||||
use_effect_with((), move |_| {
|
use_effect_with((), move |_| {
|
||||||
loading.set(true);
|
loading.set(true);
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let url = format!("/api/users");
|
let url = "/api/users".to_string();
|
||||||
match Request::get(&url).send().await {
|
match Request::get(&url).send().await {
|
||||||
Ok(response) if response.status() == 200 => {
|
Ok(response) if response.status() == 200 => {
|
||||||
match response.json::<Vec<FilteredUser>>().await {
|
match response.json::<Vec<FilteredUser>>().await {
|
||||||
Ok(u) => users.set(u),
|
Ok(u) => users.set(u),
|
||||||
Err(err) => error.set(Some(format!("Parse error: {}", err))),
|
Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if let Ok(text) = response.text().await {
|
if let Ok(text) = response.text().await {
|
||||||
error.set(Some(text));
|
error.set(Some(text));
|
||||||
} else {
|
} else {
|
||||||
error.set(Some(format!("status {}", response.status())));
|
error.set(Some(format!("Status {}", response.status())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
loading.set(false);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
@@ -428,18 +441,37 @@ pub fn all_users_component() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {
|
||||||
|
<div class="form-container">
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>{ "Alle Benutzer" }</h1>
|
||||||
|
</div>
|
||||||
|
<p>{ "Lade..." }</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! {
|
||||||
|
<div class="form-container">
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>{ "Alle Benutzer" }</h1>
|
||||||
|
</div>
|
||||||
|
<p class="alert error">{ format!("Fehler: {}", e) }</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
html! {
|
html! {
|
||||||
<ul class="postits">
|
<div class="form-container">
|
||||||
{ for users.iter().map(|t| html! {
|
<div class="page-header">
|
||||||
<li key={t.id.to_string()} class="listbox">
|
<h1>{ "Alle Benutzer" }</h1>
|
||||||
<Link<crate::Route> to={crate::Route::UserByID{id: t.id}}><h3>{ format!("{} {}- #{}", t.first_name, t.last_name, t.id) }</h3></Link<crate::Route>>
|
</div>
|
||||||
</li>
|
<ul class="user-list">
|
||||||
})}
|
{ for users.iter().map(|t| html! {
|
||||||
</ul>
|
<li key={t.id.to_string()}>
|
||||||
|
<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>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -507,7 +539,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
if status == 200 {
|
if status == 200 {
|
||||||
match response.json::<FilteredUser>().await {
|
match response.json::<FilteredUser>().await {
|
||||||
Ok(u) => user.set(Some(u)),
|
Ok(u) => user.set(Some(u)),
|
||||||
Err(err) => error.set(Some(format!("Parse error: {}", err))),
|
Err(err) => error.set(Some(format!("Parser-Fehler: {}", err))),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
match response.json::<ApiError>().await {
|
match response.json::<ApiError>().await {
|
||||||
@@ -516,13 +548,13 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
if let Ok(text) = response.text().await {
|
if let Ok(text) = response.text().await {
|
||||||
error.set(Some(text));
|
error.set(Some(text));
|
||||||
} else {
|
} else {
|
||||||
error.set(Some(format!("Server error: {}", status)));
|
error.set(Some(format!("Server-Fehler: {}", status)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
Err(err) => error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
loading.set(false);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
@@ -534,7 +566,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
let last_name = use_state(|| "".to_string());
|
let last_name = use_state(|| "".to_string());
|
||||||
let username = use_state(|| "".to_string());
|
let username = use_state(|| "".to_string());
|
||||||
let make_admin = use_state(|| false);
|
let make_admin = use_state(|| false);
|
||||||
let new_pwd = use_state(|| String::new());
|
let new_pwd = use_state(String::new);
|
||||||
let saving = use_state(|| false);
|
let saving = use_state(|| false);
|
||||||
let save_error = use_state(|| None::<String>);
|
let save_error = use_state(|| None::<String>);
|
||||||
let save_success = use_state(|| false);
|
let save_success = use_state(|| false);
|
||||||
@@ -574,7 +606,6 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
let last_name = (*last_name).clone();
|
let last_name = (*last_name).clone();
|
||||||
let username = (*username).clone();
|
let username = (*username).clone();
|
||||||
let make_admin = *make_admin;
|
let make_admin = *make_admin;
|
||||||
let new_pwd_state = new_pwd.clone();
|
|
||||||
let new_pwd = (*new_pwd).clone();
|
let new_pwd = (*new_pwd).clone();
|
||||||
|
|
||||||
saving.set(true);
|
saving.set(true);
|
||||||
@@ -585,11 +616,10 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
let save_error = save_error.clone();
|
let save_error = save_error.clone();
|
||||||
let save_success = save_success.clone();
|
let save_success = save_success.clone();
|
||||||
let user_state = user_state.clone();
|
let user_state = user_state.clone();
|
||||||
let id = id;
|
|
||||||
|
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let payload = UserUpdateScheme {
|
let payload = UserUpdateScheme {
|
||||||
id: id,
|
id,
|
||||||
first_name,
|
first_name,
|
||||||
last_name,
|
last_name,
|
||||||
username,
|
username,
|
||||||
@@ -609,14 +639,13 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
if let Ok(updated) = resp.json::<FilteredUser>().await {
|
if let Ok(updated) = resp.json::<FilteredUser>().await {
|
||||||
user_state.set(Some(updated));
|
user_state.set(Some(updated));
|
||||||
}
|
}
|
||||||
new_pwd_state.set(String::new());
|
|
||||||
save_success.set(true);
|
save_success.set(true);
|
||||||
}
|
}
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
|
let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
|
||||||
save_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
save_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
||||||
}
|
}
|
||||||
Err(err) => save_error.set(Some(format!("Network error: {}", err))),
|
Err(err) => save_error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
saving.set(false);
|
saving.set(false);
|
||||||
});
|
});
|
||||||
@@ -630,15 +659,16 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
let deleting = deleting.clone();
|
let deleting = deleting.clone();
|
||||||
let delete_error = delete_error.clone();
|
let delete_error = delete_error.clone();
|
||||||
let user_state = user.clone(); // or ticket
|
let user_state = user.clone(); // or ticket
|
||||||
let id = id;
|
|
||||||
|
|
||||||
Callback::from(move |e: MouseEvent| {
|
Callback::from(move |e: MouseEvent| {
|
||||||
e.prevent_default();
|
e.prevent_default();
|
||||||
// confirm
|
// confirm
|
||||||
if !web_sys::window()
|
if !web_sys::window()
|
||||||
.and_then(|w| {
|
.and_then(|w| {
|
||||||
w.confirm_with_message("Are you sure you want to delete this item?")
|
w.confirm_with_message(
|
||||||
.ok()
|
"Sind Sie sicher, dass Sie dieses Element löschen möchten?",
|
||||||
|
)
|
||||||
|
.ok()
|
||||||
})
|
})
|
||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
{
|
{
|
||||||
@@ -662,10 +692,10 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
user_state.set(None); // clears the shown item
|
user_state.set(None); // clears the shown item
|
||||||
}
|
}
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
let txt = resp.text().await.unwrap_or_else(|_| "Unknown".into());
|
let txt = resp.text().await.unwrap_or_else(|_| "unbekannt".into());
|
||||||
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
delete_error.set(Some(format!("HTTP {}: {}", resp.status(), txt)));
|
||||||
}
|
}
|
||||||
Err(err) => delete_error.set(Some(format!("Network error: {}", err))),
|
Err(err) => delete_error.set(Some(format!("Netzwerkfehler: {}", err))),
|
||||||
}
|
}
|
||||||
deleting.set(false);
|
deleting.set(false);
|
||||||
});
|
});
|
||||||
@@ -673,9 +703,9 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {<p>{ "Lade..." }</p>}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p class="alert error">{ format!("Fehler: {}", e) }</p> }
|
||||||
} else if let Some(u) = &*user {
|
} else if let Some(u) = &*user {
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div>
|
||||||
@@ -686,7 +716,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
<p><strong>{ "Ist Admin: " }</strong>{ u.is_admin }</p>
|
<p><strong>{ "Ist Admin: " }</strong>{ u.is_admin }</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>{ format!("User #{}", u.id) }</h1>
|
<h1>{ format!("Benutzer #{}", u.id) }</h1>
|
||||||
<form onsubmit={onsubmit}>
|
<form onsubmit={onsubmit}>
|
||||||
<div>
|
<div>
|
||||||
<label>{ "Vorname" }
|
<label>{ "Vorname" }
|
||||||
@@ -730,7 +760,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label>{ "Neues Passwort (leer = unchanged)" }
|
<label>{ "Neues Passwort (leer = unverändert)" }
|
||||||
<input name="new_pwd" type="password"
|
<input name="new_pwd" type="password"
|
||||||
value={(*new_pwd).clone()}
|
value={(*new_pwd).clone()}
|
||||||
oninput={Callback::from(move |e: InputEvent| {
|
oninput={Callback::from(move |e: InputEvent| {
|
||||||
@@ -743,24 +773,24 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
|||||||
|
|
||||||
<button type="submit" disabled={*saving}>{ if *saving { "Speichern..." } else { "Speichern" } }</button>
|
<button type="submit" disabled={*saving}>{ if *saving { "Speichern..." } else { "Speichern" } }</button>
|
||||||
if *save_success {
|
if *save_success {
|
||||||
<p style="color:green">{ "Updated successfully" }</p>
|
<p class="alert success">{ "Erfolgreich aktualisiert" }</p>
|
||||||
}
|
}
|
||||||
if let Some(err) = &*save_error {
|
if let Some(err) = &*save_error {
|
||||||
<p style="color:red">{ err.clone() }</p>
|
<p class="alert error">{ err.clone() }</p>
|
||||||
}
|
}
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<button onclick={ondelete} disabled={*deleting}>
|
<button onclick={ondelete} disabled={*deleting} class="delete">
|
||||||
{if *deleting {"Löschen..."} else {"Löschen"}}
|
{if *deleting {"Löschen..."} else {"Löschen"}}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Link<crate::Route> to={crate::Route::AllUsers}>{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::AllUsers} classes="return-to">{ "Zurück zur Benutzerübersicht" }</Link<crate::Route>>
|
||||||
if let Some(err) = &*delete_error {
|
if let Some(err) = &*delete_error {
|
||||||
<p style="color:red">{ err.clone() }</p>
|
<p class="alert error">{ err.clone() }</p>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
html! { <p>{ "No ticket found." }</p> }
|
html! { <p>{ "Kein Benutzer gefunden." }</p> }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+174
-41
@@ -6,6 +6,7 @@ use serde::Deserialize;
|
|||||||
use wasm_bindgen_futures::spawn_local;
|
use wasm_bindgen_futures::spawn_local;
|
||||||
use yew::prelude::*;
|
use yew::prelude::*;
|
||||||
|
|
||||||
|
use crate::dequote;
|
||||||
use crate::pages::ticket::{ActiveUser, Ticket};
|
use crate::pages::ticket::{ActiveUser, Ticket};
|
||||||
|
|
||||||
/// A partial representation of a ticket, containing only the fields necessary for statistical analysis.
|
/// 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 {
|
struct TicketPartial {
|
||||||
date: DateTime<Utc>,
|
date: DateTime<Utc>,
|
||||||
room: i16,
|
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.
|
/// Properties for components that display room-wise ticket totals.
|
||||||
@@ -34,6 +52,20 @@ struct RoomTotalsProps {
|
|||||||
tickets: Vec<TicketPartial>,
|
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.
|
/// 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)
|
/// This function maps `chrono::Weekday` values (where Monday is 1, Sunday is 7)
|
||||||
@@ -124,7 +156,7 @@ fn day_counts(partials: &[TicketPartial]) -> [usize; 7] {
|
|||||||
chrono::Weekday::Sun => 6,
|
chrono::Weekday::Sun => 6,
|
||||||
};
|
};
|
||||||
occ[idx] += 1;
|
occ[idx] += 1;
|
||||||
current = current + chrono::Duration::days(1);
|
current += chrono::Duration::days(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
occ
|
occ
|
||||||
@@ -204,7 +236,7 @@ pub fn diagnostics_component() -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(TicketCount)]
|
#[component(TicketCount)]
|
||||||
pub fn ticket_count_component() -> Html {
|
pub fn ticket_count_component() -> Html {
|
||||||
let tickets = use_state(|| Vec::<Ticket>::new());
|
let tickets = use_state(Vec::<Ticket>::new);
|
||||||
let error = use_state(|| None::<String>);
|
let error = use_state(|| None::<String>);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
let user = use_state(|| ActiveUser {
|
let user = use_state(|| ActiveUser {
|
||||||
@@ -220,7 +252,7 @@ pub fn ticket_count_component() -> Html {
|
|||||||
use_effect_with((), move |_| {
|
use_effect_with((), move |_| {
|
||||||
loading.set(true);
|
loading.set(true);
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let url = format!("/api/tickets");
|
let url = "/api/tickets".to_string();
|
||||||
match Request::get(&url).send().await {
|
match Request::get(&url).send().await {
|
||||||
Ok(response) if response.status() == 200 => {
|
Ok(response) if response.status() == 200 => {
|
||||||
match response.json::<Vec<Ticket>>().await {
|
match response.json::<Vec<Ticket>>().await {
|
||||||
@@ -252,22 +284,20 @@ pub fn ticket_count_component() -> Html {
|
|||||||
.credentials(web_sys::RequestCredentials::Include)
|
.credentials(web_sys::RequestCredentials::Include)
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
|
&& response.status() == 200
|
||||||
|
&& let Ok(json) = response.json::<serde_json::Value>().await
|
||||||
{
|
{
|
||||||
if response.status() == 200 {
|
let id = json
|
||||||
if let Ok(json) = response.json::<serde_json::Value>().await {
|
.get("data")
|
||||||
let id = json
|
.and_then(|d| d.get("id"))
|
||||||
.get("data")
|
.and_then(|v| v.as_i64())
|
||||||
.and_then(|d| d.get("id"))
|
.and_then(|n| i16::try_from(n).ok());
|
||||||
.and_then(|v| v.as_i64())
|
let is_admin = json
|
||||||
.and_then(|n| i16::try_from(n).ok());
|
.get("data")
|
||||||
let is_admin = json
|
.and_then(|d| d.get("is_admin"))
|
||||||
.get("data")
|
.and_then(|v| v.as_bool())
|
||||||
.and_then(|d| d.get("is_admin"))
|
.unwrap_or(false);
|
||||||
.and_then(|v| v.as_bool())
|
user.set(ActiveUser { id, is_admin });
|
||||||
.unwrap_or(false);
|
|
||||||
user.set(ActiveUser { id, is_admin });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
@@ -275,22 +305,19 @@ pub fn ticket_count_component() -> Html {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if *loading {
|
if *loading {
|
||||||
html! {<p>{ "Loading" }</p>}
|
html! {<p>{ "Lade..." }</p>}
|
||||||
} else if let Some(e) = &*error {
|
} else if let Some(e) = &*error {
|
||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p>{ format!("Fehler: {}", e) }</p> }
|
||||||
} else {
|
} else {
|
||||||
let status_conditions = |t: &Ticket| t.status == "ToDo" || t.status == "InProgress";
|
let status_conditions = |t: &Ticket| t.status == "ToDo" || t.status == "InProgress";
|
||||||
let count = tickets
|
let count = tickets
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|t| {
|
.filter(|t| status_conditions(t) && (user.is_admin || (user.id == Some(t.user_id))))
|
||||||
status_conditions(t)
|
|
||||||
&& (user.is_admin || user.id.map_or(false, |uid| t.user_id == uid))
|
|
||||||
})
|
|
||||||
.count();
|
.count();
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div class="open-tickets">
|
||||||
<h2>{ "Offene Tickets" }</h2>
|
<h2 class="left">{ "Offene Tickets" }</h2>
|
||||||
<h4>{ count }</h4>
|
<h4 class="ticket_count center">{ count }</h4>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -325,12 +352,14 @@ pub fn ticket_count_component() -> Html {
|
|||||||
/// ```
|
/// ```
|
||||||
#[component(SubmitStats)]
|
#[component(SubmitStats)]
|
||||||
pub fn submit_stats_component() -> Html {
|
pub fn submit_stats_component() -> Html {
|
||||||
let tickets = use_state(|| Vec::<TicketPartial>::new());
|
let tickets = use_state(Vec::<TicketPartial>::new);
|
||||||
|
let users = use_state(Vec::<UserPartial>::new);
|
||||||
let error = use_state(|| None::<String>);
|
let error = use_state(|| None::<String>);
|
||||||
let loading = use_state(|| false);
|
let loading = use_state(|| false);
|
||||||
|
|
||||||
{
|
{
|
||||||
let tickets = tickets.clone();
|
let tickets = tickets.clone();
|
||||||
|
let users = users.clone();
|
||||||
let error = error.clone();
|
let error = error.clone();
|
||||||
let loading = loading.clone();
|
let loading = loading.clone();
|
||||||
|
|
||||||
@@ -354,6 +383,24 @@ pub fn submit_stats_component() -> Html {
|
|||||||
}
|
}
|
||||||
Err(err) => error.set(Some(format!("Network error: {}", err))),
|
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);
|
loading.set(false);
|
||||||
});
|
});
|
||||||
|| ()
|
|| ()
|
||||||
@@ -372,7 +419,7 @@ pub fn submit_stats_component() -> Html {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let weekdays = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
|
let weekdays = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"];
|
||||||
let (max_idx, _max_val) = counts
|
let (max_idx, _max_val) = counts
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.enumerate()
|
||||||
@@ -383,12 +430,12 @@ pub fn submit_stats_component() -> Html {
|
|||||||
html! {
|
html! {
|
||||||
<div class="diagnostics-section">
|
<div class="diagnostics-section">
|
||||||
if *loading {
|
if *loading {
|
||||||
<p>{ "Loading..." }</p>
|
<p>{ "Lade..." }</p>
|
||||||
}
|
}
|
||||||
if let Some(e) = &*error {
|
if let Some(e) = &*error {
|
||||||
<p style="color: red;">{ e.clone() }</p>
|
<p class="alert error">{ e.clone() }</p>
|
||||||
}
|
}
|
||||||
<h3>{ "Tickets per weekday" }</h3>
|
<h3>{ "Tickets pro Wochentag" }</h3>
|
||||||
<div class="weekday-chart">
|
<div class="weekday-chart">
|
||||||
<div class="weekday-bars">
|
<div class="weekday-bars">
|
||||||
{ for (0..7).map(|i| {
|
{ for (0..7).map(|i| {
|
||||||
@@ -415,7 +462,16 @@ pub fn submit_stats_component() -> Html {
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<RoomTotalTickets tickets={(*tickets).clone()}/>
|
<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>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -457,19 +513,96 @@ fn room_total_component(props: &RoomTotalsProps) -> Html {
|
|||||||
|
|
||||||
html! {
|
html! {
|
||||||
<div class="diagnostics-section">
|
<div class="diagnostics-section">
|
||||||
<h3>{ "Tickets pro Raum" }</h3>
|
<div class="chart">
|
||||||
<div class="room-chart">
|
|
||||||
{ for totals_vec.into_iter().map(|(room, count)| {
|
{ for totals_vec.into_iter().map(|(room, count)| {
|
||||||
let label = parse_room(room);
|
let label = parse_room(room);
|
||||||
let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
|
let bar_width_percent = (count as f64 / max_count as f64) * 100.0;
|
||||||
html! {
|
html! {
|
||||||
<div class="room-bar-item">
|
<div class="bar-item">
|
||||||
<div class="room-header">
|
<div class="diagnostics-header">
|
||||||
<span class="room-label">{ label }</span>
|
<span class="diagnostics-label">{ label }</span>
|
||||||
<span class="room-count">{ count }</span>
|
<span class="diagnostics-count">{ count }</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="room-bar-container">
|
<div class="bar-container">
|
||||||
<div class="room-bar" style={format!("width: {}%;", bar_width_percent)}>
|
<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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
@use "variables" as *;
|
@use "variables" as *;
|
||||||
|
|
||||||
@mixin card {
|
@mixin card {
|
||||||
backgroud: #fff;
|
background: $color-container;
|
||||||
border-radius: &border-radius;
|
border-radius: $border-radius;
|
||||||
box-shadow: 0 1px 3px rgba(0,0,0,0.06);
|
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||||
padding: $spacing-md;
|
padding: $spacing-md;
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
background: $color-container-dark;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,4 +3,3 @@
|
|||||||
.u-hidden { display: none !important; }
|
.u-hidden { display: none !important; }
|
||||||
.u-gap-sm { gap: $spacing-sm; }
|
.u-gap-sm { gap: $spacing-sm; }
|
||||||
.text-muted { color: $color-muted; }
|
.text-muted { color: $color-muted; }
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +1,34 @@
|
|||||||
:root{
|
// Color Palette (Reference Style)
|
||||||
$color-bg: #ffffff;
|
$color-bg: var(--color-bg);
|
||||||
$color-sidebar: #570000;
|
$color-bg-dark: var(--color-bg-dark);
|
||||||
$color-accent: #2563eb;
|
$color-container: var(--color-container);
|
||||||
$color-muted: #6b7280;
|
$color-container-dark: var(--color-container-dark);
|
||||||
$spacing-sm: 8px;
|
$color-sidebar: #0f172a;
|
||||||
$spacing-md: 16px;
|
$color-primary: #2b79c2;
|
||||||
$border-radius: 6px;
|
$color-primary-hover: #1d5fa0;
|
||||||
$rundbgbackgroundcolor: #a0a0a0
|
$color-accent: #2b79c2;
|
||||||
}
|
$color-muted: #6b7280;
|
||||||
|
$color-text: var(--color-text);
|
||||||
|
$color-text-dark: var(--color-text-dark);
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
// Status Colors
|
||||||
:root {
|
$color-status-todo: #ffcccc;
|
||||||
$color-bg: #000000;
|
$color-status-todo-text: #a00;
|
||||||
$color-sidebar: #f3ff73;
|
$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;
|
||||||
|
$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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
:root {
|
||||||
|
--color-bg: #f0f2f5;
|
||||||
|
--color-bg-dark: #121212;
|
||||||
|
--color-container: #ffffff;
|
||||||
|
--color-container-dark: #333333;
|
||||||
|
--color-text: #111827;
|
||||||
|
--color-text-dark: #e2e2e2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Automatically respect standard media query if no override is set
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
:root {
|
||||||
|
--color-bg: #121212;
|
||||||
|
--color-container: #333333;
|
||||||
|
--color-text: #e2e2e2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Force Light Mode overrides
|
||||||
|
body.theme-light {
|
||||||
|
--color-bg: #f0f2f5;
|
||||||
|
--color-bg-dark: #f0f2f5;
|
||||||
|
--color-container: #ffffff;
|
||||||
|
--color-container-dark: #ffffff;
|
||||||
|
--color-text: #111827;
|
||||||
|
--color-text-dark: #111827;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Force Dark Mode overrides
|
||||||
|
body.theme-dark {
|
||||||
|
--color-bg: #121212;
|
||||||
|
--color-bg-dark: #121212;
|
||||||
|
--color-container: #333333;
|
||||||
|
--color-container-dark: #333333;
|
||||||
|
--color-text: #e2e2e2;
|
||||||
|
--color-text-dark: #e2e2e2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fixed positioning ensures NO other component's layout is ever altered
|
||||||
|
.dark-mode-toggle {
|
||||||
|
position: fixed;
|
||||||
|
top: 1rem;
|
||||||
|
right: 1rem;
|
||||||
|
z-index: 9999;
|
||||||
|
width: 55px;
|
||||||
|
height: 55px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 1px solid rgba(128, 128, 128, 0.2);
|
||||||
|
background-color: var(--color-container);
|
||||||
|
color: var(--color-text);
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s ease-in-out;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
svg {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
stroke: var(--color-text);
|
||||||
|
transition: stroke 0.2s ease-in-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
box-shadow: 0 6px 16px rgba(0, 0, 0, 0.15);
|
||||||
|
background-color: var(--color-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
&:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,14 +8,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.diagnostics-section {
|
.diagnostics-section {
|
||||||
background-color: $color-bg;
|
background-color: $color-container;
|
||||||
border-radius: $border-radius;
|
border-radius: $border-radius;
|
||||||
padding: $spacing-md;
|
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 {
|
h3 {
|
||||||
margin: 0 0 $spacing-md 0;
|
margin: 0;
|
||||||
color: #1f2937;
|
color: $color-primary;
|
||||||
font-size: 1.1rem;
|
font-size: 1.1rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
@@ -27,7 +31,13 @@
|
|||||||
gap: 12px;
|
gap: 12px;
|
||||||
border: 1px solid #e5e7eb;
|
border: 1px solid #e5e7eb;
|
||||||
border-radius: $border-radius;
|
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 {
|
.weekday-bars {
|
||||||
@@ -43,6 +53,7 @@
|
|||||||
.weekday-bar {
|
.weekday-bar {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
justify-content: flex-end;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 60px;
|
min-width: 60px;
|
||||||
@@ -50,7 +61,7 @@
|
|||||||
|
|
||||||
.bar {
|
.bar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background-color: $color-accent;
|
background-color: $color-primary;
|
||||||
border-radius: 4px 4px 0 0;
|
border-radius: 4px 4px 0 0;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
|
|
||||||
@@ -76,8 +87,12 @@
|
|||||||
.day {
|
.day {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: #1f2937;
|
color: $color-text;
|
||||||
margin-bottom: 2px;
|
margin-bottom: 2px;
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
color: $color-text-dark;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.value {
|
.value {
|
||||||
@@ -87,51 +102,116 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.room-chart {
|
.chart {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 12px;
|
gap: 12px;
|
||||||
padding: $spacing-md;
|
padding: $spacing-md;
|
||||||
border: 1px solid #e5e7eb;
|
border: 1px solid #e5e7eb;
|
||||||
border-radius: $border-radius;
|
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;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
|
|
||||||
.room-header {
|
.diagnostics-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
.room-label {
|
.diagnostics-label {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #1f2937;
|
color: $color-text;
|
||||||
min-width: 50px;
|
min-width: 50px;
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
color: $color-text-dark;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.room-count {
|
.diagnostics-count {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: $color-muted;
|
color: $color-muted;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.room-bar-container {
|
.bar-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 24px;
|
height: 24px;
|
||||||
background-color: #e5e7eb;
|
background-color: #e5e7eb;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.room-bar {
|
@media (prefers-color-scheme: dark) {
|
||||||
|
background-color: #555;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bar {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-color: #570000;
|
background-color: $color-primary;
|
||||||
transition: width 0.3s ease;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
.headline {
|
|
||||||
font-size: 40px;
|
|
||||||
font-weight: bold;
|
|
||||||
text-align: center;
|
|
||||||
color: #570000;
|
|
||||||
margin-top: 150px;
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
.csg-icon {
|
|
||||||
position: fixed;
|
|
||||||
top: 1rem;
|
|
||||||
right: 1rem;
|
|
||||||
z-index: 9999;
|
|
||||||
width: auto;
|
|
||||||
height: auto;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 0;
|
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
max-width: 60px;
|
|
||||||
|
|
||||||
img {
|
|
||||||
width: 100%;
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
width: auto;
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
@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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.content.login {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,294 @@
|
|||||||
|
@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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.return-to {
|
||||||
|
display: block;
|
||||||
|
padding: 16px 2rem;
|
||||||
|
background: #2b79c2;
|
||||||
|
background-color: rgb(43, 121, 194);
|
||||||
|
color: white;
|
||||||
|
text-decoration: none;
|
||||||
|
text-align: center;
|
||||||
|
border-radius: 0.5rem;
|
||||||
|
transition: background-color 0.2s ease-in-out;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: #1d5fa0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.delete {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -171,3 +171,4 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,59 +1,80 @@
|
|||||||
@use "../mixins" as *;
|
@use "../mixins" as *;
|
||||||
@use "../variables" 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 {
|
.ticket-card {
|
||||||
@include card();
|
@include card();
|
||||||
border-left: 4px solid $color-accent;
|
border-left: 4px solid $color-primary;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: $spacing-sm;
|
gap: $spacing-sm;
|
||||||
|
|
||||||
.meta { color: $color-muted; font-size: 0.9rem; }
|
.meta { color: $color-muted; font-size: 0.9rem; }
|
||||||
.title { font-weight: 600; }
|
.title { font-weight: 600; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.listbox {
|
.status {
|
||||||
max-width: auto;
|
display: inline-block;
|
||||||
margin:0 0;
|
padding: 4px 10px;
|
||||||
background-color: #90ff82;
|
border-radius: 8px;
|
||||||
background-color: $rundbgbackgroundcolor;
|
font-size: 0.8rem;
|
||||||
padding-bottom: 96px;
|
font-weight: bold;
|
||||||
color: white;
|
margin-top: 8px;
|
||||||
padding-left: 32px;
|
|
||||||
padding-right: 32px;
|
|
||||||
padding-top: 96px;
|
|
||||||
border-radius: 20px;
|
|
||||||
border-color: #000000;
|
|
||||||
border-style: double;
|
|
||||||
box-shadow: 10px 10px 10px rgba(43, 43, 43, 0.8);
|
|
||||||
font-size: 26px;
|
|
||||||
list-style-type: none;
|
|
||||||
|
|
||||||
|
|
||||||
&.To-Do {
|
&.To-Do {
|
||||||
background-color: #b1003b;
|
background: $color-status-todo;
|
||||||
|
color: $color-status-todo-text;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.InProgress {
|
&.InProgress {
|
||||||
background-color: #fff385;
|
background: $color-status-inprogress;
|
||||||
|
color: $color-status-inprogress-text;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.Done {
|
||||||
|
background: $color-status-done;
|
||||||
|
color: $color-status-done-text;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.Completed {
|
&.Completed {
|
||||||
background-color: #90ff82;
|
background: $color-status-done;
|
||||||
|
color: $color-status-done-text;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.Archived {
|
&.Archived {
|
||||||
background-color: #af69ee;
|
background: $color-status-archived;
|
||||||
|
color: $color-status-archived-text;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.postits {
|
.ticket_count {
|
||||||
display: grid;
|
text-align: center;
|
||||||
grid-template-columns: auto auto auto;
|
align-content: center;
|
||||||
gap: 8px;
|
color: #005f00;
|
||||||
margin-top: 96px;
|
border: 2px solid #848484;
|
||||||
}
|
border-radius: 10px;
|
||||||
.warning {
|
height: 50px;
|
||||||
color: #570000;
|
width: 250px;
|
||||||
|
margin: 0;
|
||||||
|
font-size: xx-large;
|
||||||
}
|
}
|
||||||
|
|||||||
+130
-89
@@ -3,39 +3,126 @@
|
|||||||
@use "utilities";
|
@use "utilities";
|
||||||
@use "components/sidebar";
|
@use "components/sidebar";
|
||||||
@use "components/tickets";
|
@use "components/tickets";
|
||||||
|
@use "components/alltickets";
|
||||||
|
@use "components/allusers";
|
||||||
|
@use "components/forms";
|
||||||
|
@use "components/login";
|
||||||
@use "components/diagnostics";
|
@use "components/diagnostics";
|
||||||
@use "components/frontpage";
|
@use "components/pages";
|
||||||
@use "components/home";
|
@use "components/setup";
|
||||||
@use "components/icon";
|
@use "components/dark_mode";
|
||||||
|
|
||||||
:root {
|
* {
|
||||||
--color-bg: #ffffff;
|
box-sizing: border-box;
|
||||||
--color-container: #ffffff;
|
|
||||||
--color-text: #111827;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
:root {
|
|
||||||
--color-bg: #121212;
|
|
||||||
--color-container: #333333;
|
|
||||||
--color-text: #e2e2e2;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
background: variables.$color-bg;
|
background: variables.$color-bg;
|
||||||
font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial;
|
font-family: Arial, sans-serif;
|
||||||
color: #111827;
|
color: variables.$color-text;
|
||||||
margin: 0;
|
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; }
|
.admin { display: flex; }
|
||||||
|
|
||||||
.layout {
|
.layout {
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 100vh;
|
min-height: 100vh;
|
||||||
overflow: hidden;
|
margin: 0;
|
||||||
box-sizing: border-box;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar {
|
.sidebar {
|
||||||
@@ -46,90 +133,44 @@ body {
|
|||||||
top: 0;
|
top: 0;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
margin-left: 260px;
|
margin-left: 260px;
|
||||||
height: 100%;
|
padding: variables.$spacing-lg;
|
||||||
overflow-y: auto;
|
|
||||||
padding: variables.$spacing-md;
|
> :first-child {
|
||||||
box-sizing: border-box;
|
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) {
|
@media (max-width: 768px) {
|
||||||
.sidebar {
|
.sidebar {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
left: -260px;
|
left: -260px;
|
||||||
transition: left .3s ease-in-out;
|
transition: left .3s ease-in-out;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
height: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
.sidebar.open { left: 0; }
|
.sidebar.open {
|
||||||
.content { margin-left: 0; padding: variables.$spacing-md; box-sizing: border-box; }
|
left: 0;
|
||||||
}
|
|
||||||
|
|
||||||
.rundbg {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
flex-direction: column;
|
|
||||||
max-width: 40%;
|
|
||||||
margin: 0 auto;
|
|
||||||
background-color: variables.$rundbgbackgroundcolor;
|
|
||||||
padding-bottom: 96px;
|
|
||||||
padding-left: 32px;
|
|
||||||
padding-right: 32px;
|
|
||||||
padding-top: 96px;
|
|
||||||
border-radius: 20px;
|
|
||||||
gap: 8px;
|
|
||||||
border-color: #000000;
|
|
||||||
border-style: double;
|
|
||||||
box-shadow: 20px 20px 10px rgb(43, 43, 43);
|
|
||||||
font-size: 26px;
|
|
||||||
|
|
||||||
label {
|
|
||||||
display: block;
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
.content {
|
||||||
input, select, button, a {
|
margin-left: 0;
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
padding: 16px;
|
|
||||||
font-size: 1.8rem;
|
|
||||||
background-color: #f0f0f0;
|
|
||||||
box-shadow: #6d6d6d;
|
|
||||||
box-shadow: 6px 6px 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type="checkbox"] {
|
|
||||||
width: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
margin: 16px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: #000000;
|
|
||||||
text-align: center;
|
|
||||||
border-style: dashed;
|
|
||||||
}
|
|
||||||
|
|
||||||
&.login {
|
|
||||||
margin-top: 96px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.setup-form input {
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user