diff options
Diffstat (limited to '')
| -rw-r--r-- | crates/server/src/router.rs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/crates/server/src/router.rs b/crates/server/src/router.rs index 2a5c5f15..b0b98ecc 100644 --- a/crates/server/src/router.rs +++ b/crates/server/src/router.rs @@ -1,7 +1,6 @@ -use crate::{ - atuin_common::api::{ATUIN_CARGO_VERSION, ATUIN_HEADER_VERSION, ErrorResponse}, - atuin_server::database::{db::ServerPostgres, models::User}, -}; +use crate::database::{db::ServerPostgres, models::User}; +use turtle_common::api::{ATUIN_CARGO_VERSION, ATUIN_HEADER_VERSION, ErrorResponse}; + use axum::{ Router, extract::{FromRequestParts, Path, Request}, @@ -22,7 +21,7 @@ use crate::{ settings::Settings, }; -pub(crate) struct UserAuth(pub(crate) User); +pub struct UserAuth(pub User); impl FromRequestParts<AppState> for UserAuth { type Rejection = ErrorResponseStatus<'static>; @@ -66,12 +65,12 @@ async fn semver(request: Request, next: Next) -> Response { } #[derive(Clone)] -pub(crate) struct AppState { - pub(crate) database: ServerPostgres, - pub(crate) settings: Settings, +pub struct AppState { + pub database: ServerPostgres, + pub settings: Settings, } -pub(crate) fn router(database: ServerPostgres, settings: Settings) -> Router { +pub fn router(database: ServerPostgres, settings: Settings) -> Router { let routes = Router::new() .route("/", get(handlers::index)) .route("/api/v0/{user_id}/record", post(handlers::v0::record::post)) |