From a70b1436046bce23b19a723137f6251cd8b2a1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ant=C3=B4nio=20Cardoso?= Date: Tue, 7 Jan 2025 17:57:56 -0300 Subject: [PATCH] src: lib: Update routing to match new axum --- src/lib/web/routes/mod.rs | 2 +- src/lib/web/routes/v1/rest/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/web/routes/mod.rs b/src/lib/web/routes/mod.rs index a733d56..7127345 100644 --- a/src/lib/web/routes/mod.rs +++ b/src/lib/web/routes/mod.rs @@ -20,7 +20,7 @@ static HTML_DIST: Dir = include_dir!("$CARGO_MANIFEST_DIR/src/webpage/dist"); pub fn router() -> Router { let app = Router::new() .route_service("/", get(root)) - .route("/:path", get(root)) + .route_service("/{*path}", get(root)) .nest("/v1", v1::router()) .fallback(handle_404()) .layer(CorsLayer::permissive()) diff --git a/src/lib/web/routes/v1/rest/mod.rs b/src/lib/web/routes/v1/rest/mod.rs index e86e234..6802e36 100644 --- a/src/lib/web/routes/v1/rest/mod.rs +++ b/src/lib/web/routes/v1/rest/mod.rs @@ -13,9 +13,9 @@ pub fn router() -> Router { "/mavlink", get(mavlink::mavlink).post(mavlink::post_mavlink), ) - .route("/mavlink/*path", get(mavlink::mavlink)) + .route("/mavlink/{*path}", get(mavlink::mavlink)) .route( - "/mavlink/message_id_from_name/*name", + "/mavlink/message_id_from_name/{*name}", get(mavlink::message_id_from_name), ) }