admin panel change into subsequent pages

Results page back button + typo fix when only one vote.
Update static/js/admin.js
2024-10-23 15:39:30 +02:00 · 2024-10-19 12:33:23 +02:00 · 2024-10-08 13:31:34 +02:00 · 2024-10-08 13:29:16 +02:00 · 2024-10-08 13:27:00 +02:00 · 2024-10-05 17:42:07 +02:00
20 changed files with 355 additions and 230 deletions
--- 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}
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ use argon2::{
    Argon2,
 };
 use bytes::{Buf, Bytes};
-use chrono::{DateTime, Days, Utc};
+use chrono::{DateTime, Days, NaiveTime, Utc};
 #[cfg(target_os = "linux")]
 use daemonize::Daemonize;
 use http_body_util::{BodyExt, Full};
@@ -66,9 +66,10 @@ struct Player {
    name: String,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 struct Vote {
-    id: i64,
+    id: Option<i64>,
+    submit_date: Option<String>,
    plus_player_id: i64,
    plus_nickname: String,
    plus_reason: String,
@@ -100,9 +101,9 @@ async fn service(
    req: Request<Incoming>,
    db: Arc<Mutex<SqlitePool>>,
 ) -> Result<Response<Body>, Error> {
-    match req.method() {
-        &Method::GET => get(req, db).await,
-        &Method::POST => post(req, db).await,
+    match *req.method() {
+        Method::GET => get(req, db).await,
+        Method::POST => post(req, db).await,
        _ => Ok(Response::builder()
            .status(StatusCode::IM_A_TEAPOT)
            .body(Body::Empty)
@@ -224,17 +225,13 @@ async fn get_data(
            let mut plus_results: HashMap<i64, i64> = HashMap::new();
            let mut minus_results: HashMap<i64, i64> = HashMap::new();

-            let _ = ids.iter().for_each(|x| {
+            ids.iter().for_each(|x| {
                let plus_id = x.0;
-                if !plus_results.contains_key(&plus_id) {
-                    plus_results.insert(plus_id, 0);
-                }
+                plus_results.entry(plus_id).or_insert(0);
                *plus_results.get_mut(&plus_id).unwrap() += 1;

                let minus_id = x.1;
-                if !minus_results.contains_key(&minus_id) {
-                    minus_results.insert(minus_id, 0);
-                }
+                minus_results.entry(minus_id).or_insert(0);
                *minus_results.get_mut(&minus_id).unwrap() += 1;
            });

@@ -260,11 +257,10 @@ async fn get_votes(req: &Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Vec<V
    let date = match headers.get("Date-to-fetch") {
        Some(date) => {
            let date = date.to_str().unwrap();
-            let parsed_date = date.parse::<i64>();
-            if parsed_date.is_err() {
-                None
+            if let Ok(parsed_date) = date.parse::<i64>() {
+                DateTime::from_timestamp_millis(parsed_date)
            } else {
-                DateTime::from_timestamp_millis(parsed_date.unwrap())
+                None
            }
        }
        None => Some(DateTime::from(SystemTime::now())),
@@ -273,25 +269,14 @@ async fn get_votes(req: &Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Vec<V
        return Vec::new();
    }
    let formatted_date = format!("{}", date.unwrap().format("%d/%m/%Y"));
-    let items = sqlx::query!(
+    sqlx::query_as!(
+        Vote,
        r#"SELECT * FROM votes WHERE submit_date = ?1 ORDER BY id"#,
        formatted_date
    )
    .fetch_all(&pool)
    .await
-    .unwrap();
-    items
-        .iter()
-        .map(|x| Vote {
-            id: x.id,
-            plus_player_id: x.plus_player_id,
-            plus_nickname: x.plus_nickname.clone(),
-            plus_reason: x.plus_reason.clone(),
-            minus_player_id: x.minus_player_id,
-            minus_nickname: x.minus_nickname.clone(),
-            minus_reason: x.minus_reason.clone(),
-        })
-        .collect()
+    .unwrap()
 }

 async fn get_admin(
@@ -301,11 +286,12 @@ async fn get_admin(
 ) -> Result<Response<Body>, Error> {
    let authorised = is_authorised(req, db.clone(), 3).await;
    if !authorised {
-        return get_page(&req, "/unauthorised", db).await;
+        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)
@@ -318,45 +304,28 @@ 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!(r#"SELECT id, name FROM players"#)
+            let players = sqlx::query_as!(Player, r#"SELECT id, name FROM players"#)
                .fetch_all(&pool)
                .await
                .unwrap();
-            let players: Vec<Player> = players
-                .iter()
-                .map(|x| Player {
-                    id: x.id,
-                    name: x.name.clone(),
-                })
-                .collect();
            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!(r#"SELECT * FROM votes"#)
+            let votes = sqlx::query_as!(Vote, r#"SELECT * FROM votes"#)
                .fetch_all(&pool)
                .await
                .unwrap();
-            let votes: Vec<Vote> = votes
-                .iter()
-                .map(|x| Vote {
-                    id: x.id,
-                    plus_player_id: x.plus_player_id,
-                    plus_nickname: x.plus_nickname.clone(),
-                    plus_reason: x.plus_reason.clone(),
-                    minus_player_id: x.minus_player_id,
-                    minus_nickname: x.minus_nickname.clone(),
-                    minus_reason: x.minus_reason.clone(),
-                })
-                .collect();
            let stringed = serde_json::to_string(&votes).unwrap_or("".to_string());
            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<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Result<Response<Body>, Error> {
@@ -402,7 +371,21 @@ async fn post_vote(
            .body(Body::Empty)
            .unwrap());
    }
-    ok().await
+    let date: DateTime<Utc> = DateTime::from(SystemTime::now());
+    let date = date.checked_add_days(Days::new(1)).unwrap();
+    let date = date
+        .with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap())
+        .unwrap();
+    Ok(Response::builder()
+        .header(
+            SET_COOKIE,
+            format!(
+                "hasvoted=true; Expires={}; Secure; SameSite=Strict",
+                date.to_rfc2822()
+            ),
+        )
+        .body(Body::Empty)
+        .unwrap())
 }

 async fn post_player(
@@ -550,16 +533,21 @@ async fn post_admin(
        },
        "/admin/edit/vote" => match req_json::<Vote>(req).await {
            Some(vote) => {
+                if vote.id.is_none() || vote.submit_date.is_none() {
+                    return bad_request().await;
+                }
                let pool = db.clone().lock().unwrap().clone();
                let _ = sqlx::query!(
                    r#"UPDATE votes
-                    SET plus_player_id = ?1,
-                    plus_nickname = ?2,
-                    plus_reason = ?3,
-                    minus_player_id = ?4,
-                    minus_nickname = ?5,
-                    minus_reason = ?6
-                    WHERE id = ?7"#,
+                    SET submit_date = ?1,
+                    plus_player_id = ?2,
+                    plus_nickname = ?3,
+                    plus_reason = ?4,
+                    minus_player_id = ?5,
+                    minus_nickname = ?6,
+                    minus_reason = ?7
+                    WHERE id = ?8"#,
+                    vote.submit_date,
                    vote.plus_player_id,
                    vote.plus_nickname,
                    vote.plus_reason,
@@ -589,7 +577,7 @@ async fn post_admin(
                ok().await
            }
            _ => bad_request().await,
-        }
+        },
        _ => bad_request().await,
    }
 }
@@ -749,14 +737,11 @@ async fn is_authorised(req: &Request<Incoming>, db: Arc<Mutex<SqlitePool>>, leve
            let perm = user.permissions as u8;
            perm >= level
        }
-        _ => match level {
-            0 => true,
-            _ => false,
-        },
+        _ => matches!(level, 0),
    }
 }

-fn check_username(username: &String) -> bool {
+fn check_username(username: &str) -> bool {
    if username.len() > 21 {
        return false;
    }
@@ -768,7 +753,7 @@ fn check_username(username: &String) -> bool {
    true
 }

-fn check_password(password: &String) -> bool {
+fn check_password(password: &str) -> bool {
    // one symbol, 10 chars min, one capital letter, one number
    if password.len() < 10 {
        return false;
--- a/static/css/login.css
+++ b/static/css/login.css
@@ -26,6 +26,8 @@ body {
 }

 .app {
+    overflow-y: scroll;
+    overflow-x: hidden;
    position: absolute;
    top: 50%;
    left: 50%;
@@ -34,8 +36,10 @@ body {
    border-radius: 12px;
    width: calc(100dvw - 40px);
    max-width: 500px;
+    max-height: calc(100dvh - 100px);
    height: fit-content;
    padding: 10px;
+    margin-top: 35px;
 }

 .app > h1 {
@@ -84,4 +88,9 @@ body {
    display: flow;
    text-align: center;
    color: white;
-}
+}
+
+.inline {
+    width: fit-content;
+    color: white;
+}
--- a/static/css/register.css
+++ b/static/css/register.css
@@ -4,4 +4,4 @@

 .ok {
    color: green;
-}
+}
--- a/static/css/results.css
+++ b/static/css/results.css
@@ -35,6 +35,7 @@ body {
 .app > p {
    color: white;
    line-break: strict;
+    white-space: pre-line;
 }

 .app > h1 {
--- 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">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <base href="/" target="_top">
-    <script src="static/js/admin.js" defer="defer"></script>
    <title>Administration</title>
+    <style>
+        a {
+            margin: 2px;
+            padding: 10px;
+            border: 1px solid black;
+            width: min-content;
+        }
+    </style>
 </head>
 <body>
-    <div>
-        <h1>Users</h1>
-        <p>id, username, permission</p>
-        <div id="users"></div>
-    </div>
-    <div>
-        <h1>Players</h1>
-        <p>id, name</p>
-        <div id="players"></div>
-    </div>
-    <div>
-        <h1>Votes</h1>
-        <h3 id="votes_number"></h3>
-        <p>id, plus_id, plus_nickname, plus_reason, minus_id, minus_nickname, minus_reason</p>
-        <div id="votes"></div>
+    <h1>Admin Panel</h1>
+    <div style="display:flex; flex-flow: column;">
+        <a href="admin/votes">Votes</a>
+        <a href="admin/players">Players</a>
+        <a href="admin/users">Users</a>
    </div>
 </body>
 </html>
--- a/static/html/admin_players.html
+++ b/static/html/admin_players.html
@@ -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>
--- a/static/html/admin_users.html
+++ b/static/html/admin_users.html
@@ -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>
--- a/static/html/admin_votes.html
+++ b/static/html/admin_votes.html
@@ -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>
--- a/static/html/index.html
+++ b/static/html/index.html
@@ -11,7 +11,6 @@
    <link rel="stylesheet" href="static/css/index.css">
 </head>
 <body>
-    <a href="/login" class="login" id="login">Se connecter</a>
    <div id="app" class="app">
        <h1 id="app_title">Vote +</h1>
        <label for="player_id">Pour qui votes tu?</label>
@@ -37,5 +36,6 @@
        <a href="/results">Résultats</a>
        <a href="/archives">Archives</a>
    </div>
+    <a href="/login" class="login" id="login">Se connecter</a>
 </body>
 </html>
--- a/static/html/login.html
+++ b/static/html/login.html
@@ -23,6 +23,10 @@
            <br>
            <input id="password" type="password">
            <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>
        </div>
        <p>Tu n'as pas de compte?</p>
--- a/static/html/register.html
+++ b/static/html/register.html
@@ -24,6 +24,11 @@
        <label for="password">Mot de passe:</label>
        <br>
        <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:
            <br>
            1 Majuscule
@@ -37,6 +42,10 @@
        <label for="passwordConfirm">Confirmer le mot de passe:</label>
        <br>
        <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>
        <button id="register">Créer un compte.</button>
    </div>
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -1,120 +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 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,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"],
-                "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();
--- a/static/js/admin_players.js
+++ 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();
--- a/static/js/admin_users.js
+++ 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();
--- a/static/js/admin_votes.js
+++ 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();
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -1,4 +1,5 @@
 let vote = {
+    submit_date: null,
    plus_player_id: null,
    plus_nickname: "",
    plus_reason: "",
@@ -11,7 +12,7 @@ let current_page = 0;

 async function main() {
    if (read_cookie()) {
-        showMessage("Merci pour ton vote!", "Ton vote a bien été prit en compte.", false, "info");
+        showMessage("Merci pour ton vote!", "Ton vote a bien été pris en compte.", false, "info");
        return;
    }
    let players = await fetch("/data/players").then(r => r.json());
@@ -95,7 +96,6 @@ async function main() {
                method: "post", body: JSON.stringify(vote)
            })
                .then(r => r.status) === 200) {
-                set_cookie();
                showMessage("Merci pour ton vote!", "Ton vote a bien été pris en compte.", false, "info");
            }
            console.log(vote);
@@ -160,14 +160,6 @@ function showMessage(title, description, canBeDismissed, type) {
    })
 }

-function set_cookie() {
-    let date = new Date(Date.now());
-    date.setDate(date.getDate() + 1);
-    date.setHours(0, 0,0);
-    console.log(date);
-    document.cookie = `hasvoted=true; expires=${date.toUTCString()}; path=/`;
-}
-
 function read_cookie() {
    return document.cookie.includes("hasvoted=true");
 }
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -1,6 +1,7 @@
 async function login() {
    let username = document.getElementById("username").value;
    let password = document.getElementById("password").value;
+
    let code = await fetch("/login",
    {method: "POST", body: JSON.stringify({"username": username, "password": password})})
    .then(r => {
@@ -13,6 +14,15 @@ async function login() {
 }

 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", () => {
    let _ = login();
 })
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -56,3 +56,23 @@ passwordConfirm.addEventListener("input", () => {
        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";
+    }
+})
--- a/static/js/results.js
+++ b/static/js/results.js
@@ -36,12 +36,17 @@ function show_plus(id, votes, players) {
    minus.addEventListener("click", () => {show_minus(id, votes, players)})
    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");
    if (nickname === "") {
        p.innerHTML = `${player}`;
    }
    else {
-        p.innerHTML = `${nickname} (${player})`
+        p.innerHTML = `${nickname} (${player})`;
    }

    const r = document.createElement("p");
@@ -52,7 +57,10 @@ function show_plus(id, votes, players) {

    const buttons = document.createElement("div");
    buttons.className = "buttons";
-    buttons.append(minus)
+    if (id-1>=0) {
+        buttons.append(prev);
+    }
+    buttons.append(minus);

    app.append(head, p, r, buttons);
 }
@@ -84,12 +92,17 @@ function show_minus(id, votes, players) {
    })
    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");
    if (nickname === "") {
        p.innerHTML = `${player}`;
    }
    else {
-        p.innerHTML = `${nickname} (${player})`
+        p.innerHTML = `${nickname} (${player})`;
    }

    const r = document.createElement("p");
@@ -100,7 +113,10 @@ function show_minus(id, votes, players) {

    const buttons = document.createElement("div");
    buttons.className = "buttons";
-    buttons.append(next)
+    if (id-1>=0) {
+        buttons.append(prev);
+    }
+    buttons.append(next);

    app.append(head, p, r, buttons);
 }
@@ -137,7 +153,7 @@ async function show_results(players) {
            app.append(place);
        }
        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);
    }
    const sep = document.createElement("hr");
@@ -164,7 +180,7 @@ async function show_results(players) {
            app.append(place);
        }
        const result = document.createElement("h3");
-        result.textContent = `${player} avec ${score} votes!`;
+        result.textContent = `${player} avec ${score} vote${score > 1 ?'s': ''}!`;
        app.append(result);
    }
 }
Author	SHA1	Message	Date
AINDUSTRIES	e48dd25165	admin panel change into subsequent pages	2024-10-23 15:39:30 +02:00
AINDUSTRIES	344ebd6010	Results page back button + typo fix when only one vote.	2024-10-19 12:33:23 +02:00
AINDUSTRIES	3e5d185da1	Update static/js/admin.js	2024-10-08 13:31:34 +02:00
AINDUSTRIES	c68ce239f9	Admin panel sized textareas	2024-10-08 13:29:16 +02:00
AINDUSTRIES	b54e611f5f	Admin panel sized textareas	2024-10-08 13:27:00 +02:00
AINDUSTRIES	3956dad0ec	Changed from input to textarea with proper \n support for votes.	2024-10-05 17:42:07 +02:00
AINDUSTRIES	09b1f80582	Proper line breaks when seing votes	2024-10-05 17:12:51 +02:00
AINDUSTRIES	224457b8b6	Register scroll + fix of horizontal alignment	2024-10-05 17:05:29 +02:00
AINDUSTRIES	dcc01d2a99	Register scroll	2024-10-05 16:58:34 +02:00
AINDUSTRIES	bd57db2b8c	Ability to show password when logging in or registering	2024-10-05 16:42:42 +02:00
AINDUSTRIES	74c3a611a4	Merge pull request 'Merge of dev-auth' (#1 ) from dev-auth into main Reviewed-on: #1	2024-10-05 15:58:44 +02:00
AINDUSTRIES	cbaf52256d	Remove unused import	2024-10-05 15:52:59 +02:00
AINDUSTRIES	8a7c321044	Fixed bug related to new Vote struct, id and submit date can be None (useful for posting new votes, ie without id and submit date)	2024-10-05 15:09:51 +02:00
AINDUSTRIES	98dbcd11f1	Added submit date to votes	2024-10-05 15:08:41 +02:00