diff --git a/src/admin/mod.rs b/src/admin/mod.rs index 6200b61..243f8c4 100644 --- a/src/admin/mod.rs +++ b/src/admin/mod.rs @@ -1,7 +1,7 @@ -use crate::{auth::Backend, models::rating::Rating, page, AppState}; -use axum::{extract::State, routing::get, Router}; +use crate::{AppState, auth::Backend, models::rating::Rating, page}; +use axum::{Router, extract::State, routing::get}; use axum_login::login_required; -use maud::{html, Markup}; +use maud::{Markup, html}; use rand::{ distr::{Distribution, Uniform}, rng, diff --git a/src/admin/route/mod.rs b/src/admin/route/mod.rs index 92f81b4..1f32a97 100644 --- a/src/admin/route/mod.rs +++ b/src/admin/route/mod.rs @@ -1,6 +1,6 @@ use crate::{ - admin::{station::Station, team::Team}, AppState, + admin::{station::Station, team::Team}, }; use axum::Router; use futures::future::join_all; diff --git a/src/admin/route/web.rs b/src/admin/route/web.rs index 686c970..bc8a75b 100644 --- a/src/admin/route/web.rs +++ b/src/admin/route/web.rs @@ -1,12 +1,12 @@ use super::Route; -use crate::{admin::station::Station, er, page, suc, AppState}; +use crate::{AppState, admin::station::Station, er, page, suc}; use axum::{ + Form, Router, extract::State, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; -use maud::{html, Markup, PreEscaped}; +use maud::{Markup, PreEscaped, html}; use serde::Deserialize; use sqlx::SqlitePool; use std::sync::Arc; diff --git a/src/admin/station/mod.rs b/src/admin/station/mod.rs index bc3ceb1..8614440 100644 --- a/src/admin/station/mod.rs +++ b/src/admin/station/mod.rs @@ -1,13 +1,13 @@ use super::{generate_random_alphanumeric, team::Team}; use crate::{ + AppState, admin::route::Route, models::rating::{Rating, TeamsAtStationLocation}, - AppState, }; use axum::Router; use chrono::{DateTime, Local, NaiveDateTime, Utc}; -use futures::{stream, StreamExt}; -use maud::{html, Markup, Render}; +use futures::{StreamExt, stream}; +use maud::{Markup, Render, html}; use serde::{Deserialize, Serialize}; use sqlx::{FromRow, SqlitePool}; diff --git a/src/admin/station/web.rs b/src/admin/station/web.rs index 45349df..1c420a1 100644 --- a/src/admin/station/web.rs +++ b/src/admin/station/web.rs @@ -1,17 +1,18 @@ use crate::{ + AppState, admin::{station::Station, team::Team}, er, err, models::rating::{Rating, TeamsAtStationLocation}, partials::page, - suc, succ, AppState, + suc, succ, }; use axum::{ + Form, Router, extract::State, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; -use maud::{html, Markup}; +use maud::{Markup, html}; use serde::Deserialize; use sqlx::SqlitePool; use std::{collections::HashMap, sync::Arc}; diff --git a/src/admin/team/mod.rs b/src/admin/team/mod.rs index d7b43b6..2b3b7c8 100644 --- a/src/admin/team/mod.rs +++ b/src/admin/team/mod.rs @@ -1,7 +1,7 @@ use crate::{ + AppState, admin::{route::Route, station::Station}, models::rating::Rating, - AppState, }; use axum::Router; use chrono::{DateTime, Local, NaiveDateTime, Utc}; diff --git a/src/admin/team/web.rs b/src/admin/team/web.rs index 9c70eca..0716b0e 100644 --- a/src/admin/team/web.rs +++ b/src/admin/team/web.rs @@ -1,18 +1,19 @@ use super::{CreateError, LastContactTeam, Team}; use crate::{ + AppState, admin::{route::Route, station::Station}, err, models::rating::Rating, partials::page, - pl, succ, AppState, + pl, succ, }; use axum::{ + Form, Router, extract::State, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; -use maud::{html, Markup, PreEscaped}; +use maud::{Markup, PreEscaped, html}; use serde::Deserialize; use sqlx::SqlitePool; use std::{collections::HashMap, sync::Arc}; @@ -47,20 +48,20 @@ async fn create( } Err(CreateError::DuplicateName(e)) => { err!( - session, - "Team '{}' konnte _NICHT_ erstellt werden, da es bereits ein Team mit diesem Namen gibt ({e})!", - form.name - ); + session, + "Team '{}' konnte _NICHT_ erstellt werden, da es bereits ein Team mit diesem Namen gibt ({e})!", + form.name + ); return Redirect::to("/admin/team"); } Err(CreateError::NoStationForRoute) => { err!( - session, - "Team '{}' konnte _NICHT_ erstellt werden, da in der angegebenen Route '{}' noch keine Stationen vorkommen", - form.name, - route.name - ); + session, + "Team '{}' konnte _NICHT_ erstellt werden, da in der angegebenen Route '{}' noch keine Stationen vorkommen", + form.name, + route.name + ); return Redirect::to("/admin/team"); } diff --git a/src/admin/user/mod.rs b/src/admin/user/mod.rs index d7cad96..d47862e 100644 --- a/src/admin/user/mod.rs +++ b/src/admin/user/mod.rs @@ -1,7 +1,7 @@ use super::generate_random_alphanumeric; -use crate::{auth::User, AppState}; +use crate::{AppState, auth::User}; use argon2::password_hash::rand_core::OsRng; -use argon2::{password_hash::SaltString, Argon2, PasswordHasher}; +use argon2::{Argon2, PasswordHasher, password_hash::SaltString}; use axum::Router; use sqlx::SqlitePool; diff --git a/src/admin/user/web.rs b/src/admin/user/web.rs index 8caa1ca..2fc2d25 100644 --- a/src/admin/user/web.rs +++ b/src/admin/user/web.rs @@ -1,11 +1,11 @@ -use crate::{auth::User, err, partials::page, succ, AppState}; +use crate::{AppState, auth::User, err, partials::page, succ}; use axum::{ + Form, Router, extract::State, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; -use maud::{html, Markup}; +use maud::{Markup, html}; use serde::Deserialize; use sqlx::SqlitePool; use std::sync::Arc; diff --git a/src/auth.rs b/src/auth.rs index 864e708..a232fb2 100644 --- a/src/auth.rs +++ b/src/auth.rs @@ -1,13 +1,13 @@ -use crate::{er, page, suc, AppState}; +use crate::{AppState, er, page, suc}; use async_trait::async_trait; use axum::{ + Form, Router, http::StatusCode, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; use axum_login::{AuthUser, AuthnBackend}; -use maud::{html, Markup}; +use maud::{Markup, html}; use password_auth::verify_password; use serde::{Deserialize, Serialize}; use sqlx::{FromRow, SqlitePool}; diff --git a/src/lib.rs b/src/lib.rs index ead05e1..f03fb54 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,20 +19,20 @@ i18n!("locales", fallback = "de-AT"); use admin::station::Station; use auth::{AuthSession, Backend, User}; use axum::{ + Form, Router, body::Body, extract::{FromRef, State}, response::{IntoResponse, Redirect, Response}, routing::{get, post}, - Form, Router, }; use axum_login::AuthManagerLayerBuilder; -use maud::{html, Markup}; +use maud::{Markup, html}; use partials::page; use serde::Deserialize; use sqlx::SqlitePool; use std::{env, sync::Arc}; use tokio::net::TcpListener; -use tower_sessions::{cookie::time::Duration, Expiry, Session, SessionManagerLayer}; +use tower_sessions::{Expiry, Session, SessionManagerLayer, cookie::time::Duration}; use tower_sessions_sqlx_store_chrono::SqliteStore; pub(crate) mod admin; diff --git a/src/main.rs b/src/main.rs index dc419a6..9613569 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use dotenv::dotenv; -use sqlx::{pool::PoolOptions, SqlitePool}; +use sqlx::{SqlitePool, pool::PoolOptions}; use std::env; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; diff --git a/src/models/rating.rs b/src/models/rating.rs index cee6997..fec5a8c 100644 --- a/src/models/rating.rs +++ b/src/models/rating.rs @@ -1,4 +1,4 @@ -use crate::{admin::team::Team, Station}; +use crate::{Station, admin::team::Team}; use chrono::{DateTime, Local, NaiveDateTime, Utc}; use serde::{Deserialize, Serialize}; use sqlx::{FromRow, SqlitePool}; diff --git a/src/partials.rs b/src/partials.rs index a7fd0ba..92da7b8 100644 --- a/src/partials.rs +++ b/src/partials.rs @@ -1,5 +1,5 @@ use crate::test_version; -use maud::{html, Markup, DOCTYPE}; +use maud::{DOCTYPE, Markup, html}; use tower_sessions::Session; pub(crate) async fn page(content: Markup, session: Session, leaflet: bool) -> Markup { diff --git a/src/station.rs b/src/station.rs index e4180de..d068e61 100644 --- a/src/station.rs +++ b/src/station.rs @@ -1,14 +1,14 @@ use crate::{ - admin::team::Team, err, models::rating::TeamsAtStationLocation, partials, succ, AppState, - Station, + AppState, Station, admin::team::Team, err, models::rating::TeamsAtStationLocation, partials, + succ, }; use axum::{ + Form, Router, extract::State, response::{IntoResponse, Redirect}, routing::{get, post}, - Form, Router, }; -use maud::{html, Markup, PreEscaped}; +use maud::{Markup, PreEscaped, html}; use serde::Deserialize; use sqlx::SqlitePool; use std::sync::Arc; @@ -571,7 +571,7 @@ pub(super) fn routes() -> Router { #[cfg(test)] mod test { - use crate::{router, testdb, Station}; + use crate::{Station, router, testdb}; use sqlx::SqlitePool;