JSON API routes

Author: ReeceRose

src/lib.rs

@@ -9,9 +9,12 @@ mod utils;
 
 use axum::{routing::get, Router};
 
-use models::SharedState;
+use models::app_state::SharedState;
 use repository::todo::{Repo, TodoRepo};
-use routes::htmx::index::{create_htmx_routes, get_index};
+use routes::{
+    htmx::index::{create_htmx_routes, get_index},
+    json::index::create_json_routes,
+};
 use service::todo::{TodoService, TodoServiceImpl};
 use tokio::net::TcpListener;
 use tower_http::{services::ServeDir, trace::TraceLayer};
@@ -22,12 +25,11 @@ pub fn app() -> Router {
     let todo_repo = TodoRepo::new(SharedState::default());
     let todo_service = TodoServiceImpl::new(todo_repo);
 
-    let htmx_routes = create_htmx_routes();
-
     Router::new()
         .nest_service("/assets", ServeDir::new("assets"))
         .route("/", get(get_index))
-        .nest("/htmx-api", htmx_routes)
+        .nest("/htmx-api", create_htmx_routes())
+        .nest("/json-api", create_json_routes())
         .layer(TraceLayer::new_for_http())
         .with_state(todo_service)
 }

src/models.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 
 use crate::{
     error::TodoError,
-    models::{SharedState, Todo},
+    models::{app_state::SharedState, todo::Todo},
 };
 
 // TODO: refactor to use an in-memory db?

src/repository/todo.rs

@@ -1,5 +1,5 @@
 use crate::{
-    models::TodoRequest,
+    models::todo::TodoRequest,
     service::todo::{TodoService, TodoServiceImpl},
     templates::{
         index::EmptyResponse,

src/routes/htmx/todo.rs

@@ -1 +1,2 @@
 pub mod htmx;
+pub mod json;

src/routes/mod.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 
 use crate::{
     error::TodoError,
-    models::Todo,
+    models::todo::Todo,
     repository::todo::{Repo, TodoRepo},
 };
 

src/service/todo.rs

@@ -1,7 +1,7 @@
 use askama::Template;
 use serde::Deserialize;
 
-use crate::models::Todo;
+use crate::models::todo::Todo;
 
 #[derive(Template, Deserialize)]
 #[template(path = "todo/list.html")]