Compare commits

11 Commits

18 changed files with 302 additions and 154 deletions

View File

@@ -7,5 +7,8 @@
"/register": {"file": "static/html/register.html", "permission": 0}, "/register": {"file": "static/html/register.html", "permission": 0},
"/logout": {"file": "static/html/logout.html", "permission": 0}, "/logout": {"file": "static/html/logout.html", "permission": 0},
"/unauthorised": {"file": "static/html/unauthorised.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}
} }

View File

@@ -288,9 +288,10 @@ async fn get_admin(
if !authorised { if !authorised {
return get_page(req, "/unauthorised", db).await; return get_page(req, "/unauthorised", db).await;
} }
match path { if path.starts_with("/admin/data") {
"/admin" => get_page(req, path, db).await, let path = path.strip_prefix("/admin/data").unwrap();
"/admin/users" => { match path {
"/users" => {
let pool = db.clone().lock().unwrap().clone(); let pool = db.clone().lock().unwrap().clone();
let users = sqlx::query!(r#"SELECT id, username, permissions FROM users"#) let users = sqlx::query!(r#"SELECT id, username, permissions FROM users"#)
.fetch_all(&pool) .fetch_all(&pool)
@@ -303,7 +304,7 @@ async fn get_admin(
let stringed = serde_json::to_string(&users).unwrap_or("".to_string()); let stringed = serde_json::to_string(&users).unwrap_or("".to_string());
Ok(Response::builder().body(Body::new(stringed)).unwrap()) Ok(Response::builder().body(Body::new(stringed)).unwrap())
} }
"/admin/players" => { "/players" => {
let pool = db.clone().lock().unwrap().clone(); let pool = db.clone().lock().unwrap().clone();
let players = sqlx::query_as!(Player, r#"SELECT id, name FROM players"#) let players = sqlx::query_as!(Player, r#"SELECT id, name FROM players"#)
.fetch_all(&pool) .fetch_all(&pool)
@@ -312,7 +313,7 @@ async fn get_admin(
let stringed = serde_json::to_string(&players).unwrap_or("".to_string()); let stringed = serde_json::to_string(&players).unwrap_or("".to_string());
Ok(Response::builder().body(Body::new(stringed)).unwrap()) Ok(Response::builder().body(Body::new(stringed)).unwrap())
} }
"/admin/votes" => { "/votes" => {
let pool = db.clone().lock().unwrap().clone(); let pool = db.clone().lock().unwrap().clone();
let votes = sqlx::query_as!(Vote, r#"SELECT * FROM votes"#) let votes = sqlx::query_as!(Vote, r#"SELECT * FROM votes"#)
.fetch_all(&pool) .fetch_all(&pool)
@@ -322,7 +323,9 @@ async fn get_admin(
Ok(Response::builder().body(Body::new(stringed)).unwrap()) Ok(Response::builder().body(Body::new(stringed)).unwrap())
} }
_ => not_found().await, _ => not_found().await,
} }}
else if path.starts_with("/admin") {get_page(req, path, db).await}
else {not_found().await}
} }
async fn post(req: Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Result<Response<Body>, Error> { async fn post(req: Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Result<Response<Body>, Error> {

View File

@@ -26,6 +26,8 @@ body {
} }
.app { .app {
overflow-y: scroll;
overflow-x: hidden;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
@@ -34,8 +36,10 @@ body {
border-radius: 12px; border-radius: 12px;
width: calc(100dvw - 40px); width: calc(100dvw - 40px);
max-width: 500px; max-width: 500px;
max-height: calc(100dvh - 100px);
height: fit-content; height: fit-content;
padding: 10px; padding: 10px;
margin-top: 35px;
} }
.app > h1 { .app > h1 {
@@ -85,3 +89,8 @@ body {
text-align: center; text-align: center;
color: white; color: white;
} }
.inline {
width: fit-content;
color: white;
}

View File

@@ -35,6 +35,7 @@ body {
.app > p { .app > p {
color: white; color: white;
line-break: strict; line-break: strict;
white-space: pre-line;
} }
.app > h1 { .app > h1 {

View File

@@ -6,25 +6,22 @@
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<base href="/" target="_top"> <base href="/" target="_top">
<script src="static/js/admin.js" defer="defer"></script>
<title>Administration</title> <title>Administration</title>
<style>
a {
margin: 2px;
padding: 10px;
border: 1px solid black;
width: min-content;
}
</style>
</head> </head>
<body> <body>
<div> <h1>Admin Panel</h1>
<h1>Users</h1> <div style="display:flex; flex-flow: column;">
<p>id, username, permission</p> <a href="admin/votes">Votes</a>
<div id="users"></div> <a href="admin/players">Players</a>
</div> <a href="admin/users">Users</a>
<div>
<h1>Players</h1>
<p>id, name</p>
<div id="players"></div>
</div>
<div>
<h1>Votes</h1>
<h3 id="votes_number"></h3>
<p>id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason</p>
<div id="votes"></div>
</div> </div>
</body> </body>
</html> </html>

View File

@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<base href="/" target="_top">
<script src="static/js/admin_players.js" defer="defer"></script>
<title>Admin - Players</title>
</head>
<body>
<div>
<h1>Players</h1>
<p>id, name</p>
<div id="players"></div>
</div>
</body>
</html>

View File

@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<base href="/" target="_top">
<script src="static/js/admin_users.js" defer="defer"></script>
<title>Admin - Users</title>
</head>
<body>
<div>
<h1>Users</h1>
<p>id, username, permission</p>
<div id="users"></div>
</div>
</body>
</html>

View File

@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<base href="/" target="_top">
<script src="static/js/admin_votes.js" defer="defer"></script>
<title>Admin - Votes</title>
</head>
<body>
<div>
<h1>Votes</h1>
<h3 id="votes_number"></h3>
<p>id, submit_date, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason</p>
<div id="votes"></div>
</div>
</body>
</html>

View File

@@ -23,6 +23,10 @@
<br> <br>
<input id="password" type="password"> <input id="password" type="password">
<br> <br>
<div>
<label class="inline" for="showPassword">Montrer le mot de passe?</label>
<input id="showPassword" type="checkbox">
</div>
<button id="connect">Se connecter</button> <button id="connect">Se connecter</button>
</div> </div>
<p>Tu n'as pas de compte?</p> <p>Tu n'as pas de compte?</p>

View File

@@ -24,6 +24,11 @@
<label for="password">Mot de passe:</label> <label for="password">Mot de passe:</label>
<br> <br>
<input id="password" type="password"> <input id="password" type="password">
<br>
<div>
<label class="inline" for="showPassword">Montrer le mot de passe?</label>
<input id="showPassword" type="checkbox">
</div>
<p class="error" id="passwordNotice">Le mot de passe doit contenir plus de 8 caractères et doit contenir au minimum: <p class="error" id="passwordNotice">Le mot de passe doit contenir plus de 8 caractères et doit contenir au minimum:
<br> <br>
1 Majuscule 1 Majuscule
@@ -37,6 +42,10 @@
<label for="passwordConfirm">Confirmer le mot de passe:</label> <label for="passwordConfirm">Confirmer le mot de passe:</label>
<br> <br>
<input id="passwordConfirm" type="password"> <input id="passwordConfirm" type="password">
<div>
<label class="inline" for="showConfirmPassword">Montrer le mot de passe?</label>
<input id="showConfirmPassword" type="checkbox">
</div>
<p class="error" id="passwordConfirmNotice">Les mots de passe doivent être les mêmes.</p> <p class="error" id="passwordConfirmNotice">Les mots de passe doivent être les mêmes.</p>
<button id="register">Créer un compte.</button> <button id="register">Créer un compte.</button>
</div> </div>

View File

@@ -1,123 +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("input");
plus_reason.value = vote["plus_reason"];
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("input");
minus_reason.value = vote["minus_reason"];
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();

View File

@@ -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();

32
static/js/admin_users.js Normal file
View File

@@ -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();

66
static/js/admin_votes.js Normal file
View File

@@ -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();

View File

@@ -1,6 +1,7 @@
async function login() { async function login() {
let username = document.getElementById("username").value; let username = document.getElementById("username").value;
let password = document.getElementById("password").value; let password = document.getElementById("password").value;
let code = await fetch("/login", let code = await fetch("/login",
{method: "POST", body: JSON.stringify({"username": username, "password": password})}) {method: "POST", body: JSON.stringify({"username": username, "password": password})})
.then(r => { .then(r => {
@@ -13,6 +14,15 @@ async function login() {
} }
let button = document.getElementById("connect"); let button = document.getElementById("connect");
let showPassword = document.getElementById("showPassword");
showPassword.addEventListener("click", () => {
let password = document.getElementById("password");
if (showPassword.checked) {
password.type = "text";
} else {
password.type = "password";
}
})
button.addEventListener("click", () => { button.addEventListener("click", () => {
let _ = login(); let _ = login();
}) })

View File

@@ -56,3 +56,23 @@ passwordConfirm.addEventListener("input", () => {
document.getElementById("passwordConfirmNotice").className = "error"; document.getElementById("passwordConfirmNotice").className = "error";
} }
}) })
let showPassword = document.getElementById("showPassword");
let showConfirmPassword = document.getElementById("showConfirmPassword");
showPassword.addEventListener("click", () => {
let password = document.getElementById("password");
if (showPassword.checked) {
password.type = "text";
} else {
password.type = "password";
}
})
showConfirmPassword.addEventListener("click", () => {
let password = document.getElementById("passwordConfirm");
if (showConfirmPassword.checked) {
password.type = "text";
} else {
password.type = "password";
}
})

View File

@@ -36,12 +36,17 @@ function show_plus(id, votes, players) {
minus.addEventListener("click", () => {show_minus(id, votes, players)}) minus.addEventListener("click", () => {show_minus(id, votes, players)})
minus.className = "right"; minus.className = "right";
let prev = document.createElement("button");
prev.textContent = "Vote précédent";
prev.addEventListener("click", () => {show_plus(id-1, votes, players)});
prev.className = "left";
const p = document.createElement("h2"); const p = document.createElement("h2");
if (nickname === "") { if (nickname === "") {
p.innerHTML = `${player}`; p.innerHTML = `${player}`;
} }
else { else {
p.innerHTML = `${nickname} (${player})` p.innerHTML = `${nickname} (${player})`;
} }
const r = document.createElement("p"); const r = document.createElement("p");
@@ -52,7 +57,10 @@ function show_plus(id, votes, players) {
const buttons = document.createElement("div"); const buttons = document.createElement("div");
buttons.className = "buttons"; buttons.className = "buttons";
buttons.append(minus) if (id-1>=0) {
buttons.append(prev);
}
buttons.append(minus);
app.append(head, p, r, buttons); app.append(head, p, r, buttons);
} }
@@ -84,12 +92,17 @@ function show_minus(id, votes, players) {
}) })
next.className = "right"; next.className = "right";
let prev = document.createElement("button");
prev.textContent = "Vote précédent";
prev.addEventListener("click", () => {show_plus(id-1, votes, players)});
prev.className = "left";
const p = document.createElement("h2"); const p = document.createElement("h2");
if (nickname === "") { if (nickname === "") {
p.innerHTML = `${player}`; p.innerHTML = `${player}`;
} }
else { else {
p.innerHTML = `${nickname} (${player})` p.innerHTML = `${nickname} (${player})`;
} }
const r = document.createElement("p"); const r = document.createElement("p");
@@ -100,7 +113,10 @@ function show_minus(id, votes, players) {
const buttons = document.createElement("div"); const buttons = document.createElement("div");
buttons.className = "buttons"; buttons.className = "buttons";
buttons.append(next) if (id-1>=0) {
buttons.append(prev);
}
buttons.append(next);
app.append(head, p, r, buttons); app.append(head, p, r, buttons);
} }
@@ -137,7 +153,7 @@ async function show_results(players) {
app.append(place); app.append(place);
} }
const result = document.createElement("h3"); const result = document.createElement("h3");
result.textContent = `${player} avec ${p[1]} votes!`; result.textContent = `${player} avec ${p[1]} vote${p[1] > 1? 's' : ''}!`;
app.append(result); app.append(result);
} }
const sep = document.createElement("hr"); const sep = document.createElement("hr");
@@ -164,7 +180,7 @@ async function show_results(players) {
app.append(place); app.append(place);
} }
const result = document.createElement("h3"); const result = document.createElement("h3");
result.textContent = `${player} avec ${score} votes!`; result.textContent = `${player} avec ${score} vote${score > 1 ?'s': ''}!`;
app.append(result); app.append(result);
} }
} }