diff --git a/crates/app/src/lib.rs b/crates/app/src/lib.rs index 1dd9829..818e6ea 100644 --- a/crates/app/src/lib.rs +++ b/crates/app/src/lib.rs @@ -1,4 +1,4 @@ -use std::path::Path; +use std::path::PathBuf; use axum::http::{StatusCode, Uri}; use axum_htmx::AutoVaryLayer; @@ -11,7 +11,7 @@ async fn fallback(uri: Uri) -> (StatusCode, String) { (StatusCode::NOT_FOUND, format!("No route for {uri}")) } -pub fn get_router(assets_path: &Path) -> axum::Router { +pub async fn get_router(assets_path: PathBuf) -> axum::Router<()> { axum::Router::new() .nest_service("/assets", ServeDir::new(assets_path)) .merge(pages::get_routes()) diff --git a/crates/app/src/main.rs b/crates/app/src/main.rs index 67f59ab..ea1bc46 100644 --- a/crates/app/src/main.rs +++ b/crates/app/src/main.rs @@ -72,7 +72,7 @@ async fn main() -> Result<(), AppError> { let livereload_layer = get_livereload_layer(templates_paths).map_err(AppError::NotifyWatcher)?; - let router = get_router(assets_path.as_path()).layer(livereload_layer); + let router = get_router(assets_path).await.layer(livereload_layer); let listener: TcpListener = get_tcp_listener().await.map_err(AppError::TCPListener)?; let local_addr = listener.local_addr().map_err(AppError::TCPListener)?; diff --git a/crates/desktop/src/lib.rs b/crates/desktop/src/lib.rs index ac8bc77..3905361 100644 --- a/crates/desktop/src/lib.rs +++ b/crates/desktop/src/lib.rs @@ -55,7 +55,7 @@ pub fn run() { // Adds Axum router to application state // This makes it so we can retrieve it from any app instance (see bellow) - let router = Arc::new(Mutex::new(app::get_router(&assets_path))); + let router = Arc::new(Mutex::new(app::get_router(assets_path))); app.manage(router);