diff --git a/src/server/web.rs b/src/server/web.rs index da8c19e..5319168 100644 --- a/src/server/web.rs +++ b/src/server/web.rs @@ -1,7 +1,6 @@ mod admin; mod api; mod base; -mod index; mod link; mod pages; pub mod paths; @@ -19,8 +18,10 @@ use self::{ get_api_worker_bench_repo_by_hash_tree_tar_gz, get_api_worker_repo_by_hash_tree_tar_gz, post_api_worker_status, }, - index::get_index, - pages::{commit::get_commit_by_hash, run::get_run_by_id, worker::get_worker_by_name}, + pages::{ + commit::get_commit_by_hash, index::get_index, run::get_run_by_id, + worker::get_worker_by_name, + }, queue::{get_queue, get_queue_inner}, }; diff --git a/src/server/web/pages.rs b/src/server/web/pages.rs index 6f3956f..24926e1 100644 --- a/src/server/web/pages.rs +++ b/src/server/web/pages.rs @@ -1,3 +1,4 @@ pub mod commit; +pub mod index; pub mod run; pub mod worker; diff --git a/src/server/web/index.rs b/src/server/web/pages/index.rs similarity index 87% rename from src/server/web/index.rs rename to src/server/web/pages/index.rs index 2aa8353..ed9176a 100644 --- a/src/server/web/index.rs +++ b/src/server/web/pages/index.rs @@ -3,12 +3,14 @@ use axum::{extract::State, response::IntoResponse}; use futures::TryStreamExt; use sqlx::SqlitePool; -use crate::{config::Config, somehow}; - -use super::{ - base::{Base, Tab}, - link::LinkCommit, - paths::PathIndex, +use crate::{ + config::Config, + server::web::{ + base::{Base, Tab}, + link::LinkCommit, + paths::PathIndex, + }, + somehow, }; struct Ref { @@ -18,7 +20,7 @@ struct Ref { } #[derive(Template)] -#[template(path = "index.html")] +#[template(path = "pages/index.html")] struct IndexTemplate { base: Base, tracked_refs: Vec, diff --git a/templates/index.html b/templates/pages/index.html similarity index 94% rename from templates/index.html rename to templates/pages/index.html index 814bacd..b7e5b8a 100644 --- a/templates/index.html +++ b/templates/pages/index.html @@ -1,10 +1,11 @@ {% extends "base.html" %} -{% import "util.html" as util %} {% block title %}overview{% endblock %} {% block body %} +

Refs

+
Tracked ({{ tracked_refs.len() }})
@@ -14,6 +15,7 @@ {% endfor %}
+
Untracked ({{ untracked_refs.len() }})
@@ -23,4 +25,5 @@ {% endfor %}
+ {% endblock %}