fix: resolve merge conflicts with master (integrate DOG features into compact header)makima/soryu-co-soryu---makima--resolve-merge-conflicts-i-f750d00d

- Resolved conflict in OrderDetail.tsx: kept PR compact header layout
  with inline badges while adding DOG badge from master
- DOG selector in Actions section preserved from master
- orders.tsx correctly passes dogs prop to OrderDetail (auto-merged correctly)
- directives.tsx auto-merged correctly with DOG props for DirectiveDetail
- Frontend builds successfully with no TypeScript errors

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index b84b90e..6321518 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -249,6 +249,19 @@ pub fn make_router(state: SharedState) -> Router {
         .route("/directives/{id}/cleanup", post(directives::cleanup_directive))
         .route("/directives/{id}/create-pr", post(directives::create_pr))
         .route("/directives/{id}/pick-up-orders", post(directives::pick_up_orders))
+        // Directive Order Group (DOG) endpoints
+        .route(
+            "/directives/{id}/dogs",
+            get(directives::list_dogs).post(directives::create_dog),
+        )
+        .route(
+            "/directives/{id}/dogs/{dog_id}",
+            get(directives::get_dog)
+                .patch(directives::update_dog)
+                .delete(directives::delete_dog),
+        )
+        .route("/directives/{id}/dogs/{dog_id}/orders", get(directives::list_dog_orders))
+        .route("/directives/{id}/dogs/{dog_id}/pick-up-orders", post(directives::pick_up_dog_orders))
         // Order endpoints
         .route(
             "/orders",