From e0f33897a1c1c5ff0eb7a27221b0166c9f518279 Mon Sep 17 00:00:00 2001
From: PlexSheep <software@cscherr.de>
Date: Sat, 7 Sep 2024 19:49:41 +0200
Subject: [PATCH] feat(admin): show contestants and winners

---
 data/www/admin.html    | 20 ++++++++++++--------
 src/challenge/admin.rs | 13 +++++++++++++
 src/vault.rs           |  7 ++++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/data/www/admin.html b/data/www/admin.html
index 3bc1931..5292743 100644
--- a/data/www/admin.html
+++ b/data/www/admin.html
@@ -169,42 +169,46 @@
         <div class="col-md-6">
           <h2 class="text-body-emphasis">Contestants</h2>
           <p>
+            There are cuttently {{ contestants_amount }} contestants.
             These contestants currently have had at least one connection to
-            the challenge.
+            the challenge:
           </p>
           <ul class="list-unstyled ps-0">
+            {% for contestant in contestants %}
             <li>
-              <a class="icon-link mb-1" href="https://github.com/twbs/examples/tree/main/icons-font" rel="noopener"
-                target="_blank">
+              <a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ contestant.ip }}">
                 <svg class="bi" width="16" height="16">
                   <use xlink:href="#arrow-right-circle" />
                 </svg>
-                Bootstrap npm starter
+                {{ contestant.ip }}
               </a>
             </li>
+            {% endfor %}
           </ul>
         </div>
 
         <div class="col-md-6">
           <h2 class="text-body-emphasis">Winners</h2>
           <p>
-            These contestants currently have been sent the secret.
+            There are cuttently {{ winners_amount }} winners. These contestants currently have been sent the secret:
           </p>
           <ul class="list-unstyled ps-0">
+            {% for winner in winners %}
             <li>
-              <a class="icon-link mb-1" href="/docs/5.3/getting-started/introduction/">
+              <a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ winner.ip }}">
                 <svg class="bi" width="16" height="16">
                   <use xlink:href="#arrow-right-circle" />
                 </svg>
-                Bootstrap quick start guide
+                {{ winner.ip }}
               </a>
             </li>
+            {% endfor %}
           </ul>
         </div>
       </div>
     </main>
     <footer class="pt-5 my-5 text-body-secondary border-top">
-      Created by {{ author }} &middot; &copy; {{year}}
+      Created by {{ author }} &copy; {{year}}
     </footer>
   </div>
   <script src="https://getbootstrap.com/docs/5.3/dist/js/bootstrap.bundle.min.js"
diff --git a/src/challenge/admin.rs b/src/challenge/admin.rs
index 04ddcea..3f4b6fd 100644
--- a/src/challenge/admin.rs
+++ b/src/challenge/admin.rs
@@ -74,6 +74,13 @@ impl Display for TemplateError {
 }
 
 async fn overview(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
+    let contestants = serv
+        .vault
+        .contestants()
+        .await
+        .into_iter()
+        .collect::<Vec<_>>();
+    let winners = serv.vault.winners().await.into_iter().collect::<Vec<_>>();
     let r = Response::new(
         serv.env
             .get_template("index")
@@ -87,6 +94,12 @@ async fn overview(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::
                 challenge_description => serv.text.description(),
                 challenge_hints => serv.text.hints(),
                 challenge_solution => serv.text.solution(),
+                contestants => serv.vault.contestants().await.iter().collect::<Vec<_>>(),
+                winners => serv.vault.winners().await.iter().collect::<Vec<_>>(),
+                contestants => contestants,
+                winners => winners,
+                contestants_amount => contestants.len(),
+                winners_amount => winners.len(),
             ))
             .map_err(TemplateError::from)?
             .into(),
diff --git a/src/vault.rs b/src/vault.rs
index 8f1b065..b066fb2 100644
--- a/src/vault.rs
+++ b/src/vault.rs
@@ -9,6 +9,7 @@ use std::net::{IpAddr, SocketAddr};
 use std::sync::Arc;
 
 use libpt::log::info;
+use serde::{Deserialize, Serialize};
 use tokio::sync::Mutex;
 
 /// A type alias for an [`Arc`] pointer to a [`Vault`] instance.
@@ -16,7 +17,7 @@ use tokio::sync::Mutex;
 /// This type is used to share a [`Vault`] instance across multiple parts of the application.
 pub type VaultRef = Arc<Vault>;
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Contestant {
     ip: IpAddr,
 }
@@ -52,7 +53,7 @@ impl From<&SocketAddr> for Contestant {
 
 impl Display for Contestant {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{self:?}")
+        write!(f, "{}", self.ip)
     }
 }
 
@@ -97,6 +98,6 @@ impl Vault {
     }
 
     pub async fn winners(&self) -> HashSet<Contestant> {
-        self.contestants.lock().await.clone()
+        self.winners.lock().await.clone()
     }
 }