From 841b16986b0368a95d5165ce9fe8d4da5230ea9e Mon Sep 17 00:00:00 2001
From: Matthew Gordon <matthew@gordon.earth>
Date: Mon, 26 Feb 2024 15:10:09 -0400
Subject: [PATCH] Move admin module into app module

---
 src/{ => app}/admin.rs     | 2 +-
 src/{app.rs => app/mod.rs} | 8 ++++++--
 src/main.rs                | 2 --
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename src/{ => app}/admin.rs (99%)
 rename src/{app.rs => app/mod.rs} (68%)

diff --git a/src/admin.rs b/src/app/admin.rs
similarity index 99%
rename from src/admin.rs
rename to src/app/admin.rs
index cb81775..0984ac0 100644
--- a/src/admin.rs
+++ b/src/app/admin.rs
@@ -22,7 +22,7 @@ use {
     serde::Deserialize,
 };
 
-use super::app::AppState;
+use super::AppState;
 
 pub fn routes<D: Database>() -> Router<AppState<D>> {
     Router::new()
diff --git a/src/app.rs b/src/app/mod.rs
similarity index 68%
rename from src/app.rs
rename to src/app/mod.rs
index 724cc11..e335b94 100644
--- a/src/app.rs
+++ b/src/app/mod.rs
@@ -4,13 +4,17 @@ use {
     axum::{routing::get, Router},
 };
 
+pub mod admin;
+
 #[derive(Clone)]
 pub struct AppState<D: Database> {
     pub db: D,
 }
 
-pub fn routes<D:Database>() -> Router<AppState<D>> {
-    Router::new().route("/", get(root))
+pub fn routes<D: Database>() -> Router<AppState<D>> {
+    Router::new()
+        .route("/", get(root))
+        .nest("/admin", admin::routes())
 }
 
 #[derive(Template)]
diff --git a/src/main.rs b/src/main.rs
index 53fa68f..60af8b1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,6 @@ use {
     tracing::Level,
 };
 
-mod admin;
 mod app;
 mod authentication;
 mod config;
@@ -54,7 +53,6 @@ async fn locality_main() -> Result<(), Error> {
     db_pool.migrate_to_current_version().await.unwrap();
 
     let app = app::routes()
-        .nest("/admin", admin::routes())
         .with_state(app::AppState { db: db_pool })
         .nest_service("/static", ServeDir::new(&config.static_file_path))
         .layer(TraceLayer::new_for_http());