From fb10ca1464f856c7d7a7e19bbc29540faf40ef1a Mon Sep 17 00:00:00 2001
From: PlexSheep <software@cscherr.de>
Date: Sun, 8 Sep 2024 04:08:38 +0200
Subject: [PATCH] feat(meta): webinterface is now kinda useful and fancy

---
 data/www/admin/index.html | 73 +++-------------------------------
 data/www/details.html     | 26 +++---------
 data/www/index.html       | 83 +++++----------------------------------
 src/challenge/mod.rs      |  3 +-
 src/meta/admin.rs         | 24 +++++++++--
 src/meta/user.rs          | 24 +++++++++--
 6 files changed, 65 insertions(+), 168 deletions(-)

diff --git a/data/www/admin/index.html b/data/www/admin/index.html
index 5292743..534b920 100644
--- a/data/www/admin/index.html
+++ b/data/www/admin/index.html
@@ -122,89 +122,26 @@
 
       <hr class="mb-5">
 
-      <div class="row g-5 mb-5">
-        <h2 class="text-body-emphasis">Challenge {{ challenge_idx}} &mdash; {{ challenge_title }}</h2>
-        <p class="mt-1 mb-3">{{ challenge_description }}</p>
-        <div class="col mt-1">
-          <h3>Hints</h3>
-          <button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse" data-bs-target="#hints"
-            aria-expanded="false" aria-controls="collapseExample">
-            Show hints
-          </button>
-          <div class="collapse" id="hints">
-            <ul class="list-unstyled ps-0">
-              {% for hint in challenge_hints %}
-              <li>
-                <p>
-                  <svg class="bi" width="16" height="16">
-                    <use xlink:href="#arrow-right-circle" />
-                  </svg>
-                  {{hint}}
-                </p>
-              </li>
-              {% endfor %}
-            </ul>
-          </div>
-        </div>
-        <div class="col mt-1">
-          <h3>Solution</h3>
-          <button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse" data-bs-target="#solution"
-            aria-expanded="false" aria-controls="collapseExample">
-            Show solution
-          </button>
-          <div class="collapse" id="solution">
-            <p>
-              <svg class="bi" width="16" height="16">
-                <use xlink:href="#arrow-right-circle" />
-              </svg>
-              {{challenge_solution}}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      <hr class="mb-5">
-
       <div class="row g-5">
         <div class="col-md-6">
-          <h2 class="text-body-emphasis">Contestants</h2>
+          <h2 class="text-body-emphasis">Challenges</h2>
           <p>
-            There are cuttently {{ contestants_amount }} contestants.
-            These contestants currently have had at least one connection to
-            the challenge:
+            There are cuttently {{ challenges_amount }} active challenges.
           </p>
           <ul class="list-unstyled ps-0">
-            {% for contestant in contestants %}
+            {% for challenge in challenges %}
             <li>
-              <a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ contestant.ip }}">
+              <a class="icon-link mb-1" href="challenge/{{ challenge.id }}">
                 <svg class="bi" width="16" height="16">
                   <use xlink:href="#arrow-right-circle" />
                 </svg>
-                {{ contestant.ip }}
+                {{ challenge.id }} &mdash; {{ challenge.title }}
               </a>
             </li>
             {% endfor %}
           </ul>
         </div>
 
-        <div class="col-md-6">
-          <h2 class="text-body-emphasis">Winners</h2>
-          <p>
-            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="https://whatismyipaddress.com/ip/{{ winner.ip }}">
-                <svg class="bi" width="16" height="16">
-                  <use xlink:href="#arrow-right-circle" />
-                </svg>
-                {{ winner.ip }}
-              </a>
-            </li>
-            {% endfor %}
-          </ul>
-        </div>
       </div>
     </main>
     <footer class="pt-5 my-5 text-body-secondary border-top">
diff --git a/data/www/details.html b/data/www/details.html
index 7c45c16..d7e98de 100644
--- a/data/www/details.html
+++ b/data/www/details.html
@@ -112,12 +112,13 @@
 		</header>
 
 		<main>
-			<h1 class="text-body-emphasis">{{title}} Admin Interface</h1>
+			<h1 class="text-body-emphasis">{{title}} User Interface</h1>
 			<p class="fs-5 col-md-8">
-				You have reached the {{title}} Admin Interface. This site can be used by
-				the host of the challenge to see the challenge progress, solution, and
-				hints for that challenge. This site is <b>NOT</b> part of the
-				challenge.
+				You have reached the {{title}} User
+				Interface. This site can be used by the
+				contestants see the challenges and their
+				progress and hints for that challenge. This
+				site is <b>NOT</b> part of the challenge.
 			</p>
 
 			<hr class="mb-5">
@@ -146,21 +147,6 @@
 						</ul>
 					</div>
 				</div>
-				<div class="col mt-1">
-					<h3>Solution</h3>
-					<button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse"
-						data-bs-target="#solution" aria-expanded="false" aria-controls="collapseExample">
-						Show solution
-					</button>
-					<div class="collapse" id="solution">
-						<p>
-							<svg class="bi" width="16" height="16">
-								<use xlink:href="#arrow-right-circle" />
-							</svg>
-							{{challenge_solution}}
-						</p>
-					</div>
-				</div>
 			</div>
 
 			<hr class="mb-5">
diff --git a/data/www/index.html b/data/www/index.html
index 7c45c16..4bc8808 100644
--- a/data/www/index.html
+++ b/data/www/index.html
@@ -114,98 +114,35 @@
 		<main>
 			<h1 class="text-body-emphasis">{{title}} Admin Interface</h1>
 			<p class="fs-5 col-md-8">
-				You have reached the {{title}} Admin Interface. This site can be used by
-				the host of the challenge to see the challenge progress, solution, and
-				hints for that challenge. This site is <b>NOT</b> part of the
-				challenge.
+				You have reached the {{title}} User
+				Interface. This site can be used by the
+				contestants see the challenges and their
+				progress and hints for that challenge. This
+				site is <b>NOT</b> part of the challenge.
 			</p>
 
 			<hr class="mb-5">
 
-			<div class="row g-5 mb-5">
-				<h2 class="text-body-emphasis">Challenge {{ challenge_idx}} &mdash; {{ challenge_title }}</h2>
-				<p class="mt-1 mb-3">{{ challenge_description }}</p>
-				<div class="col mt-1">
-					<h3>Hints</h3>
-					<button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse" data-bs-target="#hints"
-						aria-expanded="false" aria-controls="collapseExample">
-						Show hints
-					</button>
-					<div class="collapse" id="hints">
-						<ul class="list-unstyled ps-0">
-							{% for hint in challenge_hints %}
-							<li>
-								<p>
-									<svg class="bi" width="16" height="16">
-										<use xlink:href="#arrow-right-circle" />
-									</svg>
-									{{hint}}
-								</p>
-							</li>
-							{% endfor %}
-						</ul>
-					</div>
-				</div>
-				<div class="col mt-1">
-					<h3>Solution</h3>
-					<button class="btn btn-primary my-2" type="button" data-bs-toggle="collapse"
-						data-bs-target="#solution" aria-expanded="false" aria-controls="collapseExample">
-						Show solution
-					</button>
-					<div class="collapse" id="solution">
-						<p>
-							<svg class="bi" width="16" height="16">
-								<use xlink:href="#arrow-right-circle" />
-							</svg>
-							{{challenge_solution}}
-						</p>
-					</div>
-				</div>
-			</div>
-
-			<hr class="mb-5">
-
 			<div class="row g-5">
 				<div class="col-md-6">
-					<h2 class="text-body-emphasis">Contestants</h2>
+					<h2 class="text-body-emphasis">Challenges</h2>
 					<p>
-						There are cuttently {{ contestants_amount }} contestants.
-						These contestants currently have had at least one connection to
-						the challenge:
+						There are cuttently {{ challenges_amount }} active challenges.
 					</p>
 					<ul class="list-unstyled ps-0">
-						{% for contestant in contestants %}
+						{% for challenge in challenges %}
 						<li>
-							<a class="icon-link mb-1" href="https://whatismyipaddress.com/ip/{{ contestant.ip }}">
+							<a class="icon-link mb-1" href="challenge/{{ challenge.id }}">
 								<svg class="bi" width="16" height="16">
 									<use xlink:href="#arrow-right-circle" />
 								</svg>
-								{{ contestant.ip }}
+								{{ challenge.id }} &mdash; {{ challenge.title }}
 							</a>
 						</li>
 						{% endfor %}
 					</ul>
 				</div>
 
-				<div class="col-md-6">
-					<h2 class="text-body-emphasis">Winners</h2>
-					<p>
-						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="https://whatismyipaddress.com/ip/{{ winner.ip }}">
-								<svg class="bi" width="16" height="16">
-									<use xlink:href="#arrow-right-circle" />
-								</svg>
-								{{ winner.ip }}
-							</a>
-						</li>
-						{% endfor %}
-					</ul>
-				</div>
 			</div>
 		</main>
 		<footer class="pt-5 my-5 text-body-secondary border-top">
diff --git a/src/challenge/mod.rs b/src/challenge/mod.rs
index 83ff319..f7081b7 100644
--- a/src/challenge/mod.rs
+++ b/src/challenge/mod.rs
@@ -5,6 +5,7 @@
 
 use async_trait::async_trait;
 use libpt::log::{error, info};
+use serde::{Deserialize, Serialize};
 
 use crate::config::Config;
 use crate::vault::VaultRef;
@@ -13,7 +14,7 @@ pub mod c1;
 pub mod c2;
 pub mod c3;
 
-#[derive(Clone, PartialEq, Eq, Hash, Debug)]
+#[derive(Clone, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
 pub struct ChallengeDesc {
     id: usize,
     title: String,
diff --git a/src/meta/admin.rs b/src/meta/admin.rs
index 5badfe5..4d74070 100644
--- a/src/meta/admin.rs
+++ b/src/meta/admin.rs
@@ -26,7 +26,7 @@ impl<'tp> Service<'tp> {
     ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone + 'tp {
         let serv = this.clone();
         warp::path!("admin" / "challenge" / usize)
-            .map(move |id: usize| serv.challenges[id + 1].clone())
+            .map(move |id: usize| serv.challenges[id - 1].clone())
             .and(with_serv(this.clone()))
             .and_then(details)
             .with(warp::trace(|info| {
@@ -51,7 +51,7 @@ async fn details(
     let winners = vault.winners().await.into_iter().collect::<Vec<_>>();
     let r = Response::new(
         serv.env
-            .get_template("admin:index")
+            .get_template("admin:details")
             .map_err(TemplateError::from)?
             .render(context!(
                 title => "Wooly-Vault",
@@ -77,6 +77,24 @@ async fn details(
 }
 
 async fn index(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
-    let r = Response::new("todo".into());
+    let challenges = serv
+        .challenges
+        .iter()
+        .map(|v| v.0.to_owned())
+        .collect::<Vec<_>>();
+    let r = Response::new(
+        serv.env
+            .get_template("admin:index")
+            .map_err(TemplateError::from)?
+            .render(context!(
+                title => "Wooly-Vault",
+                author => env!("CARGO_PKG_AUTHORS"),
+                year => "2024",
+                challenges => challenges,
+                challenges_amount => challenges.len(),
+            ))
+            .map_err(TemplateError::from)?
+            .into(),
+    );
     Ok(Box::new(r))
 }
diff --git a/src/meta/user.rs b/src/meta/user.rs
index 19143b4..b5259a5 100644
--- a/src/meta/user.rs
+++ b/src/meta/user.rs
@@ -26,7 +26,7 @@ impl<'tp> Service<'tp> {
     ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone + 'tp {
         let serv = this.clone();
         warp::path!("challenge" / usize)
-            .map(move |id: usize| serv.challenges[id + 1].clone())
+            .map(move |id: usize| serv.challenges[id - 1].clone())
             .and(with_serv(this.clone()))
             .and_then(details)
             .with(warp::trace(|info| {
@@ -51,7 +51,7 @@ async fn details(
     let winners = vault.winners().await.into_iter().collect::<Vec<_>>();
     let r = Response::new(
         serv.env
-            .get_template("index")
+            .get_template("details")
             .map_err(TemplateError::from)?
             .render(context!(
                 title => "Wooly-Vault",
@@ -77,6 +77,24 @@ async fn details(
 }
 
 async fn index(serv: Arc<Service<'_>>) -> Result<Box<dyn warp::Reply>, warp::Rejection> {
-    let r = Response::new("todo".into());
+    let challenges = serv
+        .challenges
+        .iter()
+        .map(|v| v.0.to_owned())
+        .collect::<Vec<_>>();
+    let r = Response::new(
+        serv.env
+            .get_template("admin:index")
+            .map_err(TemplateError::from)?
+            .render(context!(
+                title => "Wooly-Vault",
+                author => env!("CARGO_PKG_AUTHORS"),
+                year => "2024",
+                challenges => challenges,
+                challenges_amount => challenges.len(),
+            ))
+            .map_err(TemplateError::from)?
+            .into(),
+    );
     Ok(Box::new(r))
 }