Merge pull request #226 from frog-pond/drew/axum-compat-fixes

frog-pond · Jan 25, 2025 · cd3ee26 · cd3ee26
2 parents cdbbdbb + 73b091f
commit cd3ee26
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /target
 .env
+.DS_STORE
diff --git a/ccc-routes/src/food.rs b/ccc-routes/src/food.rs
@@ -8,10 +8,10 @@ use ccc_handlers::{
 
 pub fn router() -> Router {
 	Router::new()
-		.route("/menu/:cafe_id", get(cafe_menu_handler))
-		.route("/cafe/:cafe_id", get(cafe_handler))
-		.route("/item/:item_id", get(nutrition_handler))
-		.route("/named/cafe/:name", get(named_cafe_handler))
-		.route("/named/menu/:name", get(named_cafe_menu_handler))
+		.route("/menu/{cafe_id}", get(cafe_menu_handler))
+		.route("/cafe/{cafe_id}", get(cafe_handler))
+		.route("/item/{item_id}", get(nutrition_handler))
+		.route("/named/cafe/{name}", get(named_cafe_handler))
 		.route("/named/menu/the-pause", get(pause_menu_handler))
+		.route("/named/menu/{name}", get(named_cafe_menu_handler))
 }
diff --git a/ccc-server/src/main.rs b/ccc-server/src/main.rs
@@ -52,7 +52,7 @@ fn init_router() -> Router {
 		.nest("/webcams", ccc_routes::webcams::router());
 
 	Router::new()
-		.nest("/", meta_routes)
+		.merge(meta_routes)
 		.nest("/api", api_routes)
 		.layer(middleware_stack)
 		.fallback(fallback)