diff --git a/routes.json b/routes.json index d6b6395..e97df18 100644 --- a/routes.json +++ b/routes.json @@ -7,5 +7,8 @@ "/register": {"file": "static/html/register.html", "permission": 0}, "/logout": {"file": "static/html/logout.html", "permission": 0}, "/unauthorised": {"file": "static/html/unauthorised.html", "permission": 0}, - "/admin" : {"file": "static/html/admin.html", "permission": 3} + "/admin" : {"file": "static/html/admin.html", "permission": 3}, + "/admin/votes" : {"file": "static/html/admin_votes.html", "permission": 3}, + "/admin/players" : {"file": "static/html/admin_players.html", "permission": 3}, + "/admin/users" : {"file": "static/html/admin_users.html", "permission": 3} } \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 429834e..7f77211 100644 --- a/src/main.rs +++ b/src/main.rs @@ -288,9 +288,10 @@ async fn get_admin( if !authorised { return get_page(req, "/unauthorised", db).await; } - match path { - "/admin" => get_page(req, path, db).await, - "/admin/users" => { + if path.starts_with("/admin/data") { + let path = path.strip_prefix("/admin/data").unwrap(); + match path { + "/users" => { let pool = db.clone().lock().unwrap().clone(); let users = sqlx::query!(r#"SELECT id, username, permissions FROM users"#) .fetch_all(&pool) @@ -303,7 +304,7 @@ async fn get_admin( let stringed = serde_json::to_string(&users).unwrap_or("".to_string()); Ok(Response::builder().body(Body::new(stringed)).unwrap()) } - "/admin/players" => { + "/players" => { let pool = db.clone().lock().unwrap().clone(); let players = sqlx::query_as!(Player, r#"SELECT id, name FROM players"#) .fetch_all(&pool) @@ -312,7 +313,7 @@ async fn get_admin( let stringed = serde_json::to_string(&players).unwrap_or("".to_string()); Ok(Response::builder().body(Body::new(stringed)).unwrap()) } - "/admin/votes" => { + "/votes" => { let pool = db.clone().lock().unwrap().clone(); let votes = sqlx::query_as!(Vote, r#"SELECT * FROM votes"#) .fetch_all(&pool) @@ -322,7 +323,9 @@ async fn get_admin( Ok(Response::builder().body(Body::new(stringed)).unwrap()) } _ => not_found().await, - } + }} + else if path.starts_with("/admin") {get_page(req, path, db).await} + else {not_found().await} } async fn post(req: Request, db: Arc>) -> Result, Error> { diff --git a/static/html/admin.html b/static/html/admin.html index 7ca45c8..9bce21e 100644 --- a/static/html/admin.html +++ b/static/html/admin.html @@ -6,25 +6,22 @@ content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> - Administration + -
-

Users

-

id, username, permission

-
-
-
-

Players

-

id, name

-
-
-
-

Votes

-

-

id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason

-
+

Admin Panel

+
+ Votes + Players + Users
\ No newline at end of file diff --git a/static/html/admin_players.html b/static/html/admin_players.html new file mode 100644 index 0000000..1b6fa22 --- /dev/null +++ b/static/html/admin_players.html @@ -0,0 +1,19 @@ + + + + + + + + + Admin - Players + + +
+

Players

+

id, name

+
+
+ + \ No newline at end of file diff --git a/static/html/admin_users.html b/static/html/admin_users.html new file mode 100644 index 0000000..63e285a --- /dev/null +++ b/static/html/admin_users.html @@ -0,0 +1,19 @@ + + + + + + + + + Admin - Users + + +
+

Users

+

id, username, permission

+
+
+ + \ No newline at end of file diff --git a/static/html/admin_votes.html b/static/html/admin_votes.html new file mode 100644 index 0000000..9780a5c --- /dev/null +++ b/static/html/admin_votes.html @@ -0,0 +1,20 @@ + + + + + + + + + Admin - Votes + + +
+

Votes

+

+

id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason

+
+
+ + \ No newline at end of file diff --git a/static/js/admin.js b/static/js/admin.js deleted file mode 100644 index e02ab3a..0000000 --- a/static/js/admin.js +++ /dev/null @@ -1,133 +0,0 @@ -async function run() { - let users = await fetch("/admin/users").then(r => r.json()); - - let usersDiv = document.getElementById("users"); - for (let i = 0; i < users.length; i++) { - let item = document.createElement("div"); - let id = document.createElement("p"); - let username = document.createElement("input"); - let permissions = document.createElement("input"); - let edit = document.createElement("button"); - let del = document.createElement("button"); - edit.textContent = "Edit"; - del.textContent = "Delete"; - id.textContent = users[i][0]; - username.value = users[i][1]; - permissions.value = users[i][2]; - item.style.display = "flex"; - item.append(id, username, permissions, edit, del); - usersDiv.appendChild(item); - edit.addEventListener("click", async () => { - await fetch("/admin/edit/user", { method: "POST", body: JSON.stringify({ "id": users[i][0], "username": username.value, "permissions": parseInt(permissions.value) }) }); - window.location.reload(); - }) - del.addEventListener("click", async () => { - await fetch("/admin/delete/user", { method: "POST", body: JSON.stringify({ "id": users[i][0] }) }); - window.location.reload(); - }) - } - - let players = await fetch("/admin/players").then(r => r.json()); - - let playersDiv = document.getElementById("players"); - for (let i = 0; i < players.length; i++) { - let item = document.createElement("div"); - let id = document.createElement("p"); - let name = document.createElement("input"); - let edit = document.createElement("button"); - let del = document.createElement("button"); - edit.textContent = "Edit"; - del.textContent = "Delete"; - id.textContent = players[i]["id"]; - name.value = players[i]["name"]; - item.style.display = "flex"; - item.append(id, name, edit, del); - playersDiv.appendChild(item); - edit.addEventListener("click", async () => { - await fetch("/admin/edit/player", { method: "POST", body: JSON.stringify({ "id": players[i]["id"], "name": name.value }) }); - window.location.reload(); - }) - del.addEventListener("click", async () => { - await fetch("/admin/delete/player", { method: "POST", body: JSON.stringify({ "id": players[i]["id"] }) }); - window.location.reload(); - }) - } - let newPlayer = document.createElement("button"); - newPlayer.textContent = "Add Player"; - newPlayer.addEventListener("click", () => { - let item = document.createElement("div"); - let name = document.createElement("input"); - let save = document.createElement("button"); - save.textContent = "Save"; - item.append(name, save); - playersDiv.appendChild(item); - save.addEventListener("click", async () => { - await fetch("/admin/new/player", { method: "POST", body: JSON.stringify({ "name": name.value }) }) - window.location.reload(); - }) - }) - playersDiv.parentNode.append(newPlayer); - - let votes = await fetch("/admin/votes").then(r => r.json()); - let today = document.getElementById("votes_number"); - let count = await fetch("/data/votes").then(r => r.json()); - today.textContent = `Aujourd'hui il y a ${count.length} votes`; - let votesDiv = document.getElementById("votes"); - - for (let i = 0; i < votes.length; i++) { - let vote = votes[i]; - let item = document.createElement("div"); - item.style.display = "flex"; - let id = document.createElement("p"); - id.textContent = vote["id"]; - let submit_date = document.createElement("input"); - submit_date.value = vote["submit_date"]; - let plus_id = document.createElement("input"); - plus_id.type = "number"; - plus_id.value = vote["plus_player_id"]; - let plus_nickname = document.createElement("input"); - plus_nickname.value = vote["plus_nickname"]; - let plus_reason = document.createElement("textarea"); - plus_reason.value = vote["plus_reason"]; - plus_reason.style.width = "500px"; - plus_reason.style.height = "100px"; - plus_reason.style.whiteSpace = "pre-line"; - let minus_id = document.createElement("input"); - minus_id.type = "number"; - minus_id.value = vote["minus_player_id"]; - let minus_nickname = document.createElement("input"); - minus_nickname.value = vote["minus_nickname"]; - let minus_reason = document.createElement("textarea"); - minus_reason.value = vote["minus_reason"]; - minus_reason.style.whiteSpace = "pre-line"; - minus_reason.style.width = "500px"; - minus_reason.style.height = "100px"; - let edit = document.createElement("button"); - edit.textContent = "Edit"; - let del = document.createElement("button"); - del.textContent = "Delete"; - item.append(id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason, edit, del); - votesDiv.append(item); - edit.addEventListener("click", async () => { - await fetch("/admin/edit/vote", { - method: "POST", body: JSON.stringify({ - "id": votes[i]["id"], - "submit_date": submit_date.value, - "plus_player_id": parseInt(plus_id.value), - "plus_nickname": plus_nickname.value, - "plus_reason": plus_reason.value, - "minus_player_id": parseInt(minus_id.value), - "minus_nickname": minus_nickname.value, - "minus_reason": minus_reason.value - }) - }); - window.location.reload(); - }) - del.addEventListener("click", async () => { - await fetch("/admin/delete/vote", { method: "POST", body: JSON.stringify({ "id": votes[i]["id"] }) }); - window.location.reload(); - }) - } -} - -let _ = run(); diff --git a/static/js/admin_players.js b/static/js/admin_players.js new file mode 100644 index 0000000..6c0cdc6 --- /dev/null +++ b/static/js/admin_players.js @@ -0,0 +1,43 @@ +async function run() {let players = await fetch("/admin/data/players").then(r => r.json()); + let playersDiv = document.getElementById("players"); + for (let i = 0; i < players.length; i++) { + let item = document.createElement("div"); + let id = document.createElement("p"); + let name = document.createElement("input"); + let edit = document.createElement("button"); + let del = document.createElement("button"); + edit.textContent = "Edit"; + del.textContent = "Delete"; + id.textContent = players[i]["id"]; + name.value = players[i]["name"]; + item.style.display = "flex"; + item.append(id, name, edit, del); + playersDiv.appendChild(item); + edit.addEventListener("click", async () => { + await fetch("/admin/edit/player", { method: "POST", body: JSON.stringify({ "id": players[i]["id"], "name": name.value }) }); + window.location.reload(); + }) + del.addEventListener("click", async () => { + if (confirm("Delete item?")) { + await fetch("/admin/delete/player", { method: "POST", body: JSON.stringify({ "id": players[i]["id"] }) }); + window.location.reload();} + }) + } + let newPlayer = document.createElement("button"); + newPlayer.textContent = "Add Player"; + newPlayer.addEventListener("click", () => { + let item = document.createElement("div"); + let name = document.createElement("input"); + let save = document.createElement("button"); + save.textContent = "Save"; + item.append(name, save); + playersDiv.appendChild(item); + save.addEventListener("click", async () => { + await fetch("/admin/new/player", { method: "POST", body: JSON.stringify({ "name": name.value }) }) + window.location.reload(); + }) + }) + playersDiv.parentNode.append(newPlayer); +} + +let _ = run(); \ No newline at end of file diff --git a/static/js/admin_users.js b/static/js/admin_users.js new file mode 100644 index 0000000..6eda305 --- /dev/null +++ b/static/js/admin_users.js @@ -0,0 +1,32 @@ +async function run() { + let users = await fetch("/admin/data/users").then(r => r.json()); + + let usersDiv = document.getElementById("users"); + for (let i = 0; i < users.length; i++) { + let item = document.createElement("div"); + let id = document.createElement("p"); + let username = document.createElement("input"); + let permissions = document.createElement("input"); + let edit = document.createElement("button"); + let del = document.createElement("button"); + edit.textContent = "Edit"; + del.textContent = "Delete"; + id.textContent = users[i][0]; + username.value = users[i][1]; + permissions.value = users[i][2]; + item.style.display = "flex"; + item.append(id, username, permissions, edit, del); + usersDiv.appendChild(item); + edit.addEventListener("click", async () => { + await fetch("/admin/edit/user", { method: "POST", body: JSON.stringify({ "id": users[i][0], "username": username.value, "permissions": parseInt(permissions.value) }) }); + window.location.reload(); + }) + del.addEventListener("click", async () => { + if (confirm("Delete item?")) { + await fetch("/admin/delete/user", { method: "POST", body: JSON.stringify({ "id": users[i][0] }) }); + window.location.reload();} + }) + } +} + +let _ = run(); diff --git a/static/js/admin_votes.js b/static/js/admin_votes.js new file mode 100644 index 0000000..ddfa7c3 --- /dev/null +++ b/static/js/admin_votes.js @@ -0,0 +1,66 @@ +async function run() { + let votes = await fetch("/admin/data/votes").then(r => r.json()); + let today = document.getElementById("votes_number"); + let count = await fetch("/data/votes").then(r => r.json()); + today.textContent = `Aujourd'hui il y a ${count.length} votes`; + let votesDiv = document.getElementById("votes"); + + for (let i = 0; i < votes.length; i++) { + let vote = votes[i]; + let item = document.createElement("div"); + item.style.display = "flex"; + let id = document.createElement("p"); + id.textContent = vote["id"]; + let submit_date = document.createElement("input"); + submit_date.value = vote["submit_date"]; + let plus_id = document.createElement("input"); + plus_id.type = "number"; + plus_id.value = vote["plus_player_id"]; + let plus_nickname = document.createElement("input"); + plus_nickname.value = vote["plus_nickname"]; + let plus_reason = document.createElement("textarea"); + plus_reason.value = vote["plus_reason"]; + plus_reason.style.width = "500px"; + plus_reason.style.height = "100px"; + plus_reason.style.whiteSpace = "pre-line"; + let minus_id = document.createElement("input"); + minus_id.type = "number"; + minus_id.value = vote["minus_player_id"]; + let minus_nickname = document.createElement("input"); + minus_nickname.value = vote["minus_nickname"]; + let minus_reason = document.createElement("textarea"); + minus_reason.value = vote["minus_reason"]; + minus_reason.style.whiteSpace = "pre-line"; + minus_reason.style.width = "500px"; + minus_reason.style.height = "100px"; + let edit = document.createElement("button"); + edit.textContent = "Edit"; + let del = document.createElement("button"); + del.textContent = "Delete"; + item.append(id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason, edit, del); + votesDiv.append(item); + edit.addEventListener("click", async () => { + await fetch("/admin/edit/vote", { + method: "POST", body: JSON.stringify({ + "id": votes[i]["id"], + "submit_date": submit_date.value, + "plus_player_id": parseInt(plus_id.value), + "plus_nickname": plus_nickname.value, + "plus_reason": plus_reason.value, + "minus_player_id": parseInt(minus_id.value), + "minus_nickname": minus_nickname.value, + "minus_reason": minus_reason.value + }) + }); + window.location.reload(); + }) + del.addEventListener("click", async () => { + if (confirm("Delete item?")) { + await fetch("/admin/delete/vote", { method: "POST", body: JSON.stringify({ "id": votes[i]["id"] }) }); + window.location.reload(); + } + }) + } +} + +let _ = run(); \ No newline at end of file