diff --git a/src/api.rs b/src/api.rs index a3cc449..5da1ff2 100644 --- a/src/api.rs +++ b/src/api.rs @@ -18,8 +18,8 @@ use futures_util::Stream; use serde::Deserialize; use tokio_stream::{wrappers::errors::BroadcastStreamRecvError, StreamExt as _}; -use crate::axum_ructe::render; use crate::AppState; +use cm_lib::render; pub(crate) fn router() -> axum::Router { axum::Router::new() diff --git a/src/axum_ructe.rs b/src/lib/axum_ructe.rs similarity index 97% rename from src/axum_ructe.rs rename to src/lib/axum_ructe.rs index e56b734..36ad35b 100644 --- a/src/axum_ructe.rs +++ b/src/lib/axum_ructe.rs @@ -3,6 +3,7 @@ use axum::{ response::{Html, IntoResponse}, }; +#[macro_export] macro_rules! render { ($template:path) => {{ use $crate::axum_ructe::Render; @@ -14,8 +15,6 @@ macro_rules! render { }} } -pub(crate) use render; - pub struct Render) -> std::io::Result<()>>(pub T); impl) -> std::io::Result<()>> IntoResponse for Render { diff --git a/src/lib/mod.rs b/src/lib/mod.rs index a1106da..8d560b4 100644 --- a/src/lib/mod.rs +++ b/src/lib/mod.rs @@ -1,4 +1,5 @@ -pub mod models; -pub mod schema; -pub mod report; +pub mod axum_ructe; pub mod hx_request; +pub mod models; +pub mod report; +pub mod schema; diff --git a/src/main.rs b/src/main.rs index 3c08785..9036b6f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,14 @@ mod api; -mod axum_ructe; -mod sse_handler; mod management; +mod sse_handler; -use axum_ructe::render; +use cm_lib::render; use cm_lib::{ + hx_request::HxRequest, models::{Drink, Shift}, report::GenerateDrinkReport, - schema::shifts, hx_request::HxRequest, + schema::shifts, }; use axum::{ diff --git a/src/management.rs b/src/management.rs index 7680be2..bf990b8 100644 --- a/src/management.rs +++ b/src/management.rs @@ -1,6 +1,8 @@ -use axum::{routing::get, response::IntoResponse}; +use axum::{response::IntoResponse, routing::get}; -use crate::{AppState, axum_ructe::render}; +use crate::AppState; + +use cm_lib::render; pub(crate) fn router() -> axum::Router { axum::Router::new() @@ -12,7 +14,6 @@ async fn home() -> impl IntoResponse { render!(crate::templates::management_html) } - async fn dancers() -> impl IntoResponse { render!(crate::templates::dancers_html) }