refacto: move home code into a dedicated file and rename index to home everywhere

This commit is contained in:
Florian Briand 2024-08-27 10:55:17 +02:00 committed by florian_briand
parent ab908f2664
commit b7fcfe3792
4 changed files with 17 additions and 14 deletions

View File

@ -1,8 +1,7 @@
use std::path::Path; use std::path::Path;
use askama_axum::Template;
use axum::http::{StatusCode, Uri}; use axum::http::{StatusCode, Uri};
use axum_htmx::{AutoVaryLayer, HxRequest}; use axum_htmx::AutoVaryLayer;
use tower_http::services::ServeDir; use tower_http::services::ServeDir;
mod menu; mod menu;
@ -12,20 +11,9 @@ async fn fallback(uri: Uri) -> (StatusCode, String) {
(StatusCode::NOT_FOUND, format!("No route for {uri}")) (StatusCode::NOT_FOUND, format!("No route for {uri}"))
} }
#[derive(Template)]
#[template(path = "index.html")]
pub struct GetIndexTemplate {
hx_request: bool,
}
async fn root(HxRequest(hx_request): HxRequest) -> GetIndexTemplate {
GetIndexTemplate { hx_request }
}
pub fn get_router(assets_path: &Path) -> axum::Router { pub fn get_router(assets_path: &Path) -> axum::Router {
axum::Router::new() axum::Router::new()
.nest_service("/assets", ServeDir::new(assets_path)) .nest_service("/assets", ServeDir::new(assets_path))
.route("/", axum::routing::get(root))
.merge(pages::get_routes()) .merge(pages::get_routes())
.fallback(fallback) .fallback(fallback)
.layer(AutoVaryLayer) .layer(AutoVaryLayer)

View File

@ -0,0 +1,12 @@
use askama_axum::Template;
use axum_htmx::HxRequest;
#[derive(Template)]
#[template(path = "home.html")]
pub struct GetHomeTemplate {
hx_request: bool,
}
pub async fn home(HxRequest(hx_request): HxRequest) -> GetHomeTemplate {
GetHomeTemplate { hx_request }
}

View File

@ -1,7 +1,10 @@
use axum::{routing, Router}; use axum::{routing, Router};
mod cps; mod cps;
mod home;
pub fn get_routes() -> Router { pub fn get_routes() -> Router {
Router::new().route("/cps", routing::get(cps::cps)) Router::new()
.route("/", axum::routing::get(home::home))
.route("/cps", routing::get(cps::cps))
} }