Compare commits
16
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 TheDiluTek
|
dfb031949b | ||
|
TheDiluTek
|
b030e133a2 | ||
 schn33fuchs
|
810d554cb9 | ||
|
TheDiluTek
|
2e6bd2a781 | ||
|
schn33fuchs
|
390630886e | ||
|
schn33fuchs
|
0ee20e2833 | ||
|
schn33fuchs
|
b7f8df624c | ||
|
schn33fuchs
|
8a9c9efbcc | ||
|
schn33fuchs
|
c31375573f | ||
|
TheDiluTek
|
b2daed8e99 | ||
|
TheDiluTek
|
076bd6c545 | ||
|
TheDiluTek
|
a42897de9f | ||
|
TheDiluTek
|
3154e3de44 | ||
|
schn33fuchs
|
bf0197adae | ||
|
schn33fuchs
|
c6a4a24fb6 | ||
|
schn33fuchs
|
52387f7333 |
+2
-1
@@ -20,9 +20,10 @@ frontend/node_modules/
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
# and can be added to the global gitignore or merged into this file. For a more nuclear
|
||||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
.idea/
|
||||
|
||||
|
||||
# Added by cargo
|
||||
|
||||
/target
|
||||
.antigravitycli/
|
||||
|
||||
@@ -275,7 +275,7 @@ pub async fn get_current_user(
|
||||
/// - `404 Not Found` if user doesn't exist
|
||||
/// - `500 Internal Server Error` if database error occurs
|
||||
pub async fn delete_user(
|
||||
Path(id): Path<i32>,
|
||||
Path(id): Path<i16>,
|
||||
State(data): State<Arc<AppState>>,
|
||||
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
||||
let query = sqlx::query(r#"DELETE FROM users WHERE id = $1"#)
|
||||
@@ -414,10 +414,11 @@ pub async fn get_user_by_id(
|
||||
/// - Passwords are hashed using Argon2 before storage.
|
||||
/// - This endpoint typically requires admin privileges (enforced by middleware).
|
||||
pub async fn update_user(
|
||||
Path(id): Path<i32>,
|
||||
Path(id): Path<i16>,
|
||||
State(data): State<Arc<AppState>>,
|
||||
Json(body): Json<UserUpdateScheme>,
|
||||
) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
|
||||
let update_result = if !body.new_pwd.is_empty() {
|
||||
let argon = Argon2::default();
|
||||
let salt = SaltString::generate(&mut OsRng);
|
||||
let hashed_pwd = match argon.hash_password(body.new_pwd.clone().as_bytes(), &salt) {
|
||||
@@ -425,15 +426,25 @@ pub async fn update_user(
|
||||
Err(e) => panic!("Error hashing {:}", e),
|
||||
};
|
||||
|
||||
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"#)
|
||||
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.last_name.to_owned())
|
||||
.bind(body.username.to_owned())
|
||||
.bind(&hashed_pwd)
|
||||
.bind(hashed_pwd)
|
||||
.bind(body.make_admin.to_owned())
|
||||
.bind(id)
|
||||
.execute(&data.db)
|
||||
.await
|
||||
} else {
|
||||
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())
|
||||
.bind(body.last_name.to_owned())
|
||||
.bind(body.username.to_owned())
|
||||
.bind(body.make_admin.to_owned())
|
||||
.bind(id)
|
||||
.execute(&data.db)
|
||||
.await
|
||||
}
|
||||
.map_err(|e| {
|
||||
(
|
||||
StatusCode::INTERNAL_SERVER_ERROR,
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
<head>
|
||||
<link data-trunk rel="rust" data-bin="bin" />
|
||||
<link data-trunk rel="scss" href="src/styles/main.scss" />
|
||||
<link data-trunk rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
|
||||
<link data-trunk rel="copy-dir" href="src/assets" />
|
||||
<meta charset="utf-8" />
|
||||
<title>Yew App</title>
|
||||
</head>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
@@ -269,6 +269,7 @@ fn switch(route: Route) -> Html {
|
||||
pub fn app() -> Html {
|
||||
html! {
|
||||
<BrowserRouter>
|
||||
<basic_pages::Icon/>
|
||||
<Switch<Route> render={switch} />
|
||||
</BrowserRouter>
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ pub fn home_component() -> Html {
|
||||
}
|
||||
|
||||
html! {
|
||||
<div>
|
||||
<div class="rundbg">
|
||||
<crate::utilities::TicketCount/>
|
||||
|
||||
<p>{ "You are logged in as: " }</p>
|
||||
@@ -109,3 +109,10 @@ pub fn denied_component() -> Html {
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
#[component(Icon)]
|
||||
pub fn icon_component() -> Html {
|
||||
html! {
|
||||
<img src="assets/csg.png" class="csg-icon" />
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,6 +169,16 @@ pub fn submit_ticket_component() -> Html {
|
||||
|
||||
let valid_rooms: HashSet<i16> = VALID_ROOMS.iter().copied().collect();
|
||||
|
||||
{
|
||||
let message = "Bevor sie zum Support weitergeleitet werden prüfen sie ob: \r\n - Ob das Problem durch Neustarten gelößt wird \r\n - Ob sie die richtigen Anmeldedaten genutzt habem \r\n - Alle notwendigen Kabel eingesteckt sind".to_string();
|
||||
use_effect(move || {
|
||||
if let Some(win) = web_sys::window() {
|
||||
let _ = win.alert_with_message(&message);
|
||||
}
|
||||
|| ()
|
||||
});
|
||||
}
|
||||
|
||||
let onsubmit = {
|
||||
let category = category.clone();
|
||||
let betreff = betreff.clone();
|
||||
@@ -287,7 +297,7 @@ pub fn submit_ticket_component() -> Html {
|
||||
let room_valid = (*room).is_some();
|
||||
|
||||
html! {
|
||||
<form {onsubmit}>
|
||||
<form class="rundbg" {onsubmit}>
|
||||
<label>{ "Betreff:" }
|
||||
<input type="text" value={(*betreff).clone()} oninput={betreff_change}/>
|
||||
</label>
|
||||
@@ -664,9 +674,9 @@ pub fn all_tickets_component() -> Html {
|
||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
||||
} else {
|
||||
html! {
|
||||
<ul>
|
||||
<ul class= "postits">
|
||||
{ for tickets.iter().filter(|t| t.status != "Archived" && (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
|
||||
<div>
|
||||
<div class="ticketbox">
|
||||
<li key={t.id.to_string()}>
|
||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
|
||||
<p>{ &t.description }</p>
|
||||
|
||||
@@ -328,7 +328,9 @@ pub fn login_component() -> Html {
|
||||
};
|
||||
|
||||
html! {
|
||||
<form {onsubmit}>
|
||||
<div>
|
||||
<h1 class="headline">{ "Anmeldung" }</h1>
|
||||
<form {onsubmit} class="rundbg">
|
||||
<input
|
||||
placeholder="username"
|
||||
value={(*username).clone()}
|
||||
@@ -349,6 +351,7 @@ pub fn login_component() -> Html {
|
||||
<button type="submit" disabled={*loading}>{ if *loading { "Logging in..." } else { "Login" } }</button>
|
||||
if !error.is_empty() { <p style="color:red">{(*error).clone()}</p> }
|
||||
</form>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -563,6 +566,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
||||
let last_name = (*last_name).clone();
|
||||
let username = (*username).clone();
|
||||
let make_admin = *make_admin;
|
||||
let new_pwd_state = new_pwd.clone();
|
||||
let new_pwd = (*new_pwd).clone();
|
||||
|
||||
saving.set(true);
|
||||
@@ -597,6 +601,7 @@ pub fn user_by_id_component(props: &UserProps) -> Html {
|
||||
if let Ok(updated) = resp.json::<FilteredUser>().await {
|
||||
user_state.set(Some(updated));
|
||||
}
|
||||
new_pwd_state.set(String::new());
|
||||
save_success.set(true);
|
||||
}
|
||||
Ok(resp) => {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
$color-bg: #ffffff;
|
||||
$color-sidebar: #0f172a;
|
||||
$color-sidebar: #570000;
|
||||
$color-accent: #2563eb;
|
||||
$color-muted: #6b7280;
|
||||
$spacing-sm: 8px;
|
||||
$spacing-md: 16px;
|
||||
$border-radius: 6px;
|
||||
|
||||
$rundbgbackgroundcolor: #a0a0a0;
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
|
||||
.room-bar {
|
||||
height: 100%;
|
||||
background-color: #f97316;
|
||||
background-color: #570000;
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
.headline {
|
||||
font-size: 40px;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
color: #570000;
|
||||
margin-top: 150px;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
.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;
|
||||
|
||||
img {
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
@@ -4,24 +4,26 @@
|
||||
.sidebar {
|
||||
width: 260px;
|
||||
background: $color-sidebar;
|
||||
color: #fff;
|
||||
color: #fffefe;
|
||||
min-height: 100%;
|
||||
padding: $spacing-md;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
|
||||
|
||||
ul { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: $spacing-sm; flex: 1; }
|
||||
|
||||
a, .menu-toggle {
|
||||
color: #fff;
|
||||
color: #ffffff;
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
&:hover { background: rgba(255,255,255,0.04); }
|
||||
&:hover { background: rgba(158, 45, 1, 0.842); }
|
||||
}
|
||||
|
||||
.menu-toggle { background: transparent; border: none; text-align: left; width: 100%; cursor: pointer; }
|
||||
.menu-toggle { background: #ff5a316c; border: none; text-align: left; width: 100%; cursor: pointer; }
|
||||
|
||||
.submenu {
|
||||
margin-left: 8px;
|
||||
@@ -38,9 +40,9 @@
|
||||
}
|
||||
|
||||
.logout-button {
|
||||
background: rgba(255,255,255,0.1);
|
||||
color: #fff;
|
||||
border: 1px solid rgba(255,255,255,0.2);
|
||||
background: rgba(255, 93, 43, 0.527);
|
||||
color: #ffffff;
|
||||
border: 1px solid rgba(255, 255, 255, 0.801);
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
width: 100%;
|
||||
|
||||
@@ -7,7 +7,31 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: $spacing-sm;
|
||||
|
||||
.meta { color: $color-muted; font-size: 0.9rem; }
|
||||
.title { font-weight: 600; }
|
||||
|
||||
}
|
||||
|
||||
.ticketbox {
|
||||
max-width: auto;
|
||||
margin:0 0;
|
||||
margin-top: 96px;
|
||||
background-color: #ffec3f;
|
||||
padding-bottom: 96px;
|
||||
padding-left: 32px;
|
||||
padding-right: 32px;
|
||||
padding-top: 96px;
|
||||
border-radius: 20px;
|
||||
border-color: #000000;
|
||||
border-style: double;
|
||||
box-shadow: 20px 20px 10px;
|
||||
box-shadow: rgb(43, 43, 43);
|
||||
font-size: 26px;
|
||||
}
|
||||
|
||||
.postits {
|
||||
display: grid;
|
||||
grid-template-columns: auto auto auto;
|
||||
gap: 8px;
|
||||
}
|
||||
@@ -4,6 +4,9 @@
|
||||
@use "components/sidebar";
|
||||
@use "components/tickets";
|
||||
@use "components/diagnostics";
|
||||
@use "components/frontpage";
|
||||
@use "components/home";
|
||||
@use "components/icon";
|
||||
|
||||
body {
|
||||
background: variables.$color-bg;
|
||||
@@ -36,3 +39,40 @@ body {
|
||||
.content { margin-left: 0; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
.rundbg {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
max-width: 40%;
|
||||
margin:0 auto;
|
||||
margin-top: 96px;
|
||||
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;
|
||||
box-shadow: rgb(43, 43, 43);
|
||||
font-size: 26px;
|
||||
|
||||
|
||||
input, button {
|
||||
padding: 16px;
|
||||
font-size: 1.8rem;
|
||||
background-color: #f0f0f0;
|
||||
box-shadow: #6d6d6d;
|
||||
box-shadow: 6px 6px 8px
|
||||
|
||||
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 16px 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user