From b28ac5456df487dc9f472854078949e7bce78891 Mon Sep 17 00:00:00 2001 From: Johannes Heuel Date: Sun, 18 Sep 2022 15:44:41 +0200 Subject: [PATCH] improve index page --- zoidberg_server/src/main.rs | 86 +++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 12 deletions(-) diff --git a/zoidberg_server/src/main.rs b/zoidberg_server/src/main.rs index 21cb7e1..c15e710 100644 --- a/zoidberg_server/src/main.rs +++ b/zoidberg_server/src/main.rs @@ -15,20 +15,82 @@ struct State { #[get("/")] async fn index(data: web::Data) -> impl Responder { let workers = data.workers.lock().unwrap(); - let jobs = data.jobs.lock().unwrap(); + let jobs = data.running_jobs.lock().unwrap(); - let s: String = workers - .iter() - .map(|w| w.to_string()) - .collect::>() - .join("\n"); + let jobs_html: String = String::from("") + + "" + + &jobs + .iter() + .map(|j| { + format!( + "", + j.id, j.cmd, j.status + ) + }) + .collect::>() + .join("\n") + + "
IDcommandstatus
{}{}{}
"; - let s: String = s + &jobs - .iter() - .map(|j| serde_json::to_string(&j).unwrap()) - .collect::>() - .join("\n"); - HttpResponse::Ok().body(s) + let workers_html: String = String::from("") + + "" + + &workers + .iter() + .map(|w| format!("", w)) + .collect::>() + .join("\n") + + "
ID
{}
"; + + let debug_html = r#""#; + let debug_html = ""; + + let page = format!( + r#" + + + + + + Hello Bulma! + + {} + + +
+
+
+
+
+

+ Jobs +

+ {} +
+
+
+
+

+ Workers +

+ {} +
+
+
+
+
+ + +"#, + debug_html, jobs_html, workers_html + ); + HttpResponse::Ok().body(page) } #[get("/register")]