From a2c2546c9d1ed8136284bb4806722bab8d962ace Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 12 May 2024 13:33:23 +0200 Subject: [PATCH] Remove axama completely --- Cargo.lock | 75 ------------------------------------------ Cargo.toml | 2 -- src/server/web/link.rs | 25 -------------- templates/base.html | 28 ---------------- templates/util.html | 19 ----------- 5 files changed, 149 deletions(-) delete mode 100644 templates/base.html delete mode 100644 templates/util.html diff --git a/Cargo.lock b/Cargo.lock index 90e72b7..5daa805 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -112,61 +112,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "askama" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28" -dependencies = [ - "askama_derive", - "askama_escape", - "humansize", - "num-traits", - "percent-encoding", -] - -[[package]] -name = "askama_axum" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" -dependencies = [ - "askama", - "axum-core", - "http", -] - -[[package]] -name = "askama_derive" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a0fc7dcf8bd4ead96b1d36b41df47c14beedf7b0301fc543d8f2384e66a2ec0" -dependencies = [ - "askama_parser", - "basic-toml", - "mime", - "mime_guess", - "proc-macro2", - "quote", - "serde", - "syn 2.0.62", -] - -[[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] -name = "askama_parser" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c268a96e01a4c47c8c5c2472aaa570707e006a875ea63e819f75474ceedaf7b4" -dependencies = [ - "nom", -] - [[package]] name = "async-trait" version = "0.1.74" @@ -321,15 +266,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "basic-toml" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" -dependencies = [ - "serde", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -1743,15 +1679,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "016b02deb8b0c415d8d56a6f0ab265e50c22df61194e37f9be75ed3a722de8a6" -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - [[package]] name = "humantime" version = "2.1.0" @@ -3198,8 +3125,6 @@ name = "tablejohn" version = "0.0.0" dependencies = [ "anyhow", - "askama", - "askama_axum", "axum", "axum-extra", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 1495c00..da6ff24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,6 @@ edition = "2021" [dependencies] anyhow = "1.0.83" -askama = { version = "0.12.1", features = ["with-axum"] } -askama_axum = "0.4.0" axum = { version = "0.7.5", features = ["macros"] } axum-extra = { version = "0.9.3", features = ["query", "typed-routing", "typed-header"] } bytes = "1.6.0" diff --git a/src/server/web/link.rs b/src/server/web/link.rs index d8dd1ff..3e232bb 100644 --- a/src/server/web/link.rs +++ b/src/server/web/link.rs @@ -1,4 +1,3 @@ -use askama::Template; use maud::{html, Markup}; use time::OffsetDateTime; @@ -9,18 +8,6 @@ use super::{ paths::{PathCommitByHash, PathRunById, PathWorkerByName}, }; -#[derive(Template)] -#[template( - ext = "html", - source = "\ -{% import \"util.html\" as util %} - - {{ short|truncate(80) }} - -" -)] pub struct LinkCommit { link: Link, short: String, @@ -65,11 +52,6 @@ impl LinkCommit { } } -#[derive(Template)] -#[template( - ext = "html", - source = "Run of {{ short|truncate(80) }}" -)] pub struct LinkRunShort { link: Link, short: String, @@ -90,11 +72,6 @@ impl LinkRunShort { } } -#[derive(Template)] -#[template( - ext = "html", - source = "Run from {{ date }}" -)] pub struct LinkRunDate { link: Link, date: String, // TODO base.date(...)? @@ -115,8 +92,6 @@ impl LinkRunDate { } } -#[derive(Template)] -#[template(ext = "html", source = "{{ name }}")] pub struct LinkWorker { link: Link, name: String, diff --git a/templates/base.html b/templates/base.html deleted file mode 100644 index bed3333..0000000 --- a/templates/base.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - {% block title %}{% endblock %} - {{ base.repo_name }} - - - {% block head %}{% endblock %} - - - - - {% block body %}{% endblock %} - - - diff --git a/templates/util.html b/templates/util.html deleted file mode 100644 index 2f94590..0000000 --- a/templates/util.html +++ /dev/null @@ -1,19 +0,0 @@ -{% macro commit_class(reachable) %} -{%- if reachable == 0 -%} -commit-orphaned -{%- else if reachable == 1 -%} -commit-reachable -{%- else -%} -commit-tracked -{%- endif -%} -{% endmacro %} - -{% macro commit_title(reachable) %} -{%- if reachable == 0 -%} -This commit is orphaned. It can't be reached from any ref. -{%- else if reachable == 1 -%} -This commit can only be reached from untracked refs. -{%- else -%} -This commit can be reached from a tracked ref. -{%- endif -%} -{% endmacro %}