From 5f2617ef71c2c7d69ef155511fa11e85bb5d0ea8 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 29 Jun 2024 14:14:07 -0400 Subject: [PATCH] Add world status webpage --- src/bin/kawari-web.rs | 27 ++++++++++++--------------- src/lib.rs | 1 + templates/web.html | 1 + templates/worldstatus.html | 13 +++++++++++++ 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 templates/worldstatus.html diff --git a/src/bin/kawari-web.rs b/src/bin/kawari-web.rs index 4cbbea2f..31786bb 100644 --- a/src/bin/kawari-web.rs +++ b/src/bin/kawari-web.rs @@ -18,33 +18,35 @@ struct GateStatus { } async fn root() -> Html { - tracing::info!("Requesting gate status..."); - let config = get_config(); let environment = setup_default_environment(); let template = environment.get_template("web.html").unwrap(); - Html(template.render(context! { gate_open => config.gate_open }).unwrap()) + Html(template.render(context! { }).unwrap()) } async fn login() -> Html { - tracing::info!("Requesting gate status..."); - let config = get_config(); let environment = setup_default_environment(); let template = environment.get_template("login.html").unwrap(); - Html(template.render(context! { gate_open => config.gate_open }).unwrap()) + Html(template.render(context! { }).unwrap()) } async fn register() -> Html { - tracing::info!("Requesting gate status..."); - let config = get_config(); let environment = setup_default_environment(); let template = environment.get_template("register.html").unwrap(); - Html(template.render(context! { gate_open => config.gate_open }).unwrap()) + Html(template.render(context! { }).unwrap()) +} + +async fn world_status() -> Html { + let config = get_config(); + + let environment = setup_default_environment(); + let template = environment.get_template("worldstatus.html").unwrap(); + Html(template.render(context! { login_open => config.login_open, worlds_open => config.worlds_open }).unwrap()) } #[derive(Deserialize, Debug)] @@ -58,12 +60,6 @@ async fn apply(Form(input): Form) -> Redirect { let mut config = get_config(); - if let Some(gate_open) = input.gate_open { - config.gate_open = gate_open == "on"; - } else { - config.gate_open = false; - } - serde_json::to_writer( &std::fs::File::create("config.json").unwrap(), &config, @@ -81,6 +77,7 @@ async fn main() { .route("/", get(root)) .route("/login", get(login)) .route("/register", get(register)) + .route("/worldstatus", get(world_status)) .route("/apply", post(apply)); let addr = SocketAddr::from(([127, 0, 0, 1], 5801)); diff --git a/src/lib.rs b/src/lib.rs index ba2844b..94bbc63 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,6 +20,7 @@ pub fn setup_default_environment() -> Environment<'static> { env.add_template("web.html", include_str!("../templates/web.html")).unwrap(); env.add_template("login.html", include_str!("../templates/login.html")).unwrap(); env.add_template("register.html", include_str!("../templates/register.html")).unwrap(); + env.add_template("worldstatus.html", include_str!("../templates/worldstatus.html")).unwrap(); env } \ No newline at end of file diff --git a/templates/web.html b/templates/web.html index 85f27a4..98317ac 100644 --- a/templates/web.html +++ b/templates/web.html @@ -10,6 +10,7 @@ Login Signup +World Status \ No newline at end of file diff --git a/templates/worldstatus.html b/templates/worldstatus.html new file mode 100644 index 0000000..f57943d --- /dev/null +++ b/templates/worldstatus.html @@ -0,0 +1,13 @@ + + + + + Kawari - World Status + + + +

Worlds open: {{ worlds_open }}

+

Login open: {{ login_open }}

+ + + \ No newline at end of file