Port worker page to maud

src/server/web/pages/worker.rs

@@ -1,11 +1,11 @@
 use std::sync::{Arc, Mutex};
 
-use askama::Template;
 use axum::{
     extract::State,
     http::StatusCode,
     response::{IntoResponse, Response},
 };
+use maud::html;
 use sqlx::SqlitePool;
 
 use crate::{
@@ -29,16 +29,6 @@ enum Status {
     Working { link: LinkRunShort, since: String },
 }
 
-#[derive(Template)]
-#[template(path = "pages/worker.html")]
-struct Page {
-    base: Base,
-
-    name: String,
-    connected: String,
-    status: Status,
-}
-
 async fn status(status: &WorkerStatus, db: &SqlitePool, base: &Base) -> somehow::Result<Status> {
     Ok(match status {
         WorkerStatus::Idle => Status::Idle,
@@ -68,12 +58,41 @@ pub async fn get_worker_by_name(
     };
 
     let base = Base::new(config, Tab::None);
-    Ok(Page {
-        name: path.name,
-        connected: util::format_time(info.first_seen),
-        status: status(&info.status, &db, &base).await?,
 
-        base,
+    let status = status(&info.status, &db, &base).await?;
-    }
+
-    .into_response())
+    Ok(base
+        .html(
+            &path.name,
+            html! {},
+            html! {
+                h2 { "Worker" }
+                div .commit-like .worker {
+                    span .title { "worker " (path.name) }
+                    dl {
+                        dt { "Connected:" }
+                        dd { (util::format_time(info.first_seen)) }
+
+                        @match status {
+                            Status::Idle => {
+                                dt { "Working on:" }
+                                dd { "nothing" }
+                            }
+                            Status::Busy => {
+                                dt { "Working on:" }
+                                dd { "run for another server" }
+                            }
+                            Status::Working { link, since } => {
+                                dt { "Working on:" }
+                                dd { (link.html()) }
+
+                                dt { "Working since:" }
+                                dd { (since) }
+                            }
+                        }
+                    }
+                }
+            },
+        )
+        .into_response())
 }

templates/pages/worker.html

@@ -1,31 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ name }}{% endblock %}
-
-{% block body %}
-
-<h2>Worker</h2>
-
-<div class="commit-like worker">
-    <span class="title">worker {{ name }}</span>
-    <dl>
-        <dt>Connected:</dt>
-        <dd>{{ connected }}</dd>
-
-        {% match status %}
-        {% when Status::Idle %}
-        <dt>Working on:</dt>
-        <dd>nothing</dd>
-        {% when Status::Busy %}
-        <dt>Working on:</dt>
-        <dd>run for another server</dd>
-        {% when Status::Working with { link, since } %}
-        <dt>Working on:</dt>
-        <dd>{{ link|safe }}</dd>
-        <dt>Working since:</dt>
-        <dd>{{ since }}</dd>
-        {% endmatch %}
-    </dl>
-</div>
-
-{% endblock %}