diff --git a/src/model/user/mod.rs b/src/model/user/mod.rs index 5aa18a1..9f00d37 100644 --- a/src/model/user/mod.rs +++ b/src/model/user/mod.rs @@ -1,20 +1,21 @@ use std::{fmt::Display, ops::DerefMut}; -use argon2::{password_hash::SaltString, Argon2, PasswordHasher}; +use argon2::{Argon2, PasswordHasher, password_hash::SaltString}; use chrono::{Datelike, Local, NaiveDate}; use log::info; use rocket::async_trait; use rocket::{ + Request, http::{Cookie, Status}, request::{FromRequest, Outcome}, time::{Duration, OffsetDateTime}, - Request, }; use serde::{Deserialize, Serialize}; use sqlx::{FromRow, Sqlite, SqlitePool, Transaction}; use super::activity::ActivityBuilder; use super::{ + Day, log::Log, logbook::Logbook, mail::Mail, @@ -23,7 +24,6 @@ use super::{ role::Role, stat::Stat, tripdetails::TripDetails, - Day, }; use crate::AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD; use scheckbuch::ScheckbuchUser; @@ -512,7 +512,7 @@ ASKÖ Ruderverein Donau Linz", self.name), .save(db) .await; return Err(LoginError::InvalidAuthenticationCombo); //User existed sometime ago; has - //been deleted + //been deleted } if let Some(user_pw) = user.pw.as_ref() { @@ -618,9 +618,9 @@ ASKÖ Ruderverein Donau Linz", self.name), pub(crate) async fn amount_days_to_show(&self, db: &SqlitePool) -> i64 { if self.allowed_to_steer(db).await { let end_of_year = NaiveDate::from_ymd_opt(Local::now().year(), 12, 31).unwrap(); //Ok, - //december - //has 31 - //days + //december + //has 31 + //days let days_left_in_year = end_of_year .signed_duration_since(Local::now().date_naive()) .num_days() @@ -629,9 +629,9 @@ ASKÖ Ruderverein Donau Linz", self.name), if days_left_in_year <= 31 { let end_of_next_year = NaiveDate::from_ymd_opt(Local::now().year() + 1, 12, 31).unwrap(); //Ok, - //december - //has 31 - //days + //december + //has 31 + //days end_of_next_year .signed_duration_since(Local::now().date_naive()) .num_days() @@ -863,8 +863,8 @@ special_user!(SteeringUser, +"cox", +"Bootsführer"); special_user!(AdminUser, +"admin"); special_user!(AllowedForPlannedTripsUser, +"Donau Linz", +"scheckbuch", +"Förderndes Mitglied"); special_user!(DonauLinzUser, +"Donau Linz", -"Unterstützend", -"Förderndes Mitglied"); // TODO: - // remove -> - // RegularUser +// remove -> +// RegularUser special_user!(SchnupperBetreuerUser, +"schnupper-betreuer"); special_user!(VorstandUser, +"admin", +"Vorstand"); special_user!(EventUser, +"manage_events"); @@ -978,17 +978,21 @@ mod test { #[sqlx::test] fn wrong_pw() { let pool = testdb!(); - assert!(User::login(&pool, "admin".into(), "admi".into()) - .await - .is_err()); + assert!( + User::login(&pool, "admin".into(), "admi".into()) + .await + .is_err() + ); } #[sqlx::test] fn wrong_username() { let pool = testdb!(); - assert!(User::login(&pool, "admi".into(), "admin".into()) - .await - .is_err()); + assert!( + User::login(&pool, "admi".into(), "admin".into()) + .await + .is_err() + ); } #[sqlx::test] @@ -1007,9 +1011,11 @@ mod test { let pool = testdb!(); let user = User::find_by_id(&pool, 1).await.unwrap(); - assert!(User::login(&pool, "admin".into(), "abc".into()) - .await - .is_err()); + assert!( + User::login(&pool, "admin".into(), "abc".into()) + .await + .is_err() + ); user.update_pw(&pool, "abc".into()).await; diff --git a/src/tera/admin/role.rs b/src/tera/admin/role.rs index 0e051f8..faa6393 100644 --- a/src/tera/admin/role.rs +++ b/src/tera/admin/role.rs @@ -3,13 +3,14 @@ use crate::model::{ user::{AdminUser, UserWithDetails, VorstandUser}, }; use rocket::{ + FromForm, Route, State, form::Form, get, post, request::FlashMessage, response::{Flash, Redirect}, - routes, FromForm, Route, State, + routes, }; -use rocket_dyn_templates::{tera::Context, Template}; +use rocket_dyn_templates::{Template, tera::Context}; use sqlx::SqlitePool; #[get("/role")] diff --git a/src/tera/admin/user.rs b/src/tera/admin/user.rs index 95ec6fc..d023935 100644 --- a/src/tera/admin/user.rs +++ b/src/tera/admin/user.rs @@ -7,11 +7,11 @@ use crate::{ mail::valid_mails, role::Role, user::{ + AdminUser, AllowedToEditPaymentStatusUser, ManageUserUser, User, UserWithDetails, + UserWithMembershipPdf, UserWithRolesAndMembershipPdf, VorstandUser, clubmember::ClubMemberUser, foerdernd::FoerderndUser, member::Member, regular::RegularUser, scheckbuch::ScheckbuchUser, schnupperant::SchnupperantUser, schnupperinterest::SchnupperInterestUser, unterstuetzend::UnterstuetzendUser, - AdminUser, AllowedToEditPaymentStatusUser, ManageUserUser, User, UserWithDetails, - UserWithMembershipPdf, UserWithRolesAndMembershipPdf, VorstandUser, }, }, tera::Config, @@ -19,6 +19,7 @@ use crate::{ use chrono::NaiveDate; use futures::future::join_all; use rocket::{ + FromForm, Request, Route, State, form::Form, fs::TempFile, get, @@ -26,9 +27,9 @@ use rocket::{ post, request::{FlashMessage, FromRequest, Outcome}, response::{Flash, Redirect}, - routes, FromForm, Request, Route, State, + routes, }; -use rocket_dyn_templates::{tera::Context, Template}; +use rocket_dyn_templates::{Template, tera::Context}; use sqlx::SqlitePool; // Custom request guard to extract the Referer header @@ -135,7 +136,7 @@ async fn view( if user.name == "Externe Steuerperson" { return Err(Flash::error( Redirect::to("/admin/user"), - "Diese besondere Person kannst du dir leider nicht anschauen, mein lieber neugieriger Ruderant!" + "Diese besondere Person kannst du dir leider nicht anschauen, mein lieber neugieriger Ruderant!", )); } diff --git a/src/tera/auth.rs b/src/tera/auth.rs index d820d7b..9440942 100644 --- a/src/tera/auth.rs +++ b/src/tera/auth.rs @@ -1,4 +1,5 @@ use rocket::{ + FromForm, Request, Route, State, form::Form, get, http::{Cookie, CookieJar}, @@ -8,9 +9,8 @@ use rocket::{ response::{Flash, Redirect}, routes, time::{Duration, OffsetDateTime}, - FromForm, Request, Route, State, }; -use rocket_dyn_templates::{context, tera, Template}; +use rocket_dyn_templates::{Template, context, tera}; use sqlx::SqlitePool; use crate::model::{ diff --git a/src/tera/log.rs b/src/tera/log.rs index ad8cfa6..77225e3 100644 --- a/src/tera/log.rs +++ b/src/tera/log.rs @@ -1,6 +1,7 @@ use std::net::IpAddr; use rocket::{ + Request, Route, State, form::Form, get, http::{Cookie, CookieJar}, @@ -9,9 +10,8 @@ use rocket::{ response::{Flash, Redirect}, routes, time::{Duration, OffsetDateTime}, - Request, Route, State, }; -use rocket_dyn_templates::{context, Template}; +use rocket_dyn_templates::{Template, context}; use sqlx::SqlitePool; use tera::Context; @@ -585,7 +585,7 @@ mod test { use sqlx::SqlitePool; use crate::model::logbook::Logbook; - use crate::tera::{log::Boat, User}; + use crate::tera::{User, log::Boat}; use crate::testdb; #[sqlx::test] diff --git a/templates/admin/role.html.tera b/templates/admin/role.html.tera index b014c21..2b29697 100644 --- a/templates/admin/role.html.tera +++ b/templates/admin/role.html.tera @@ -9,28 +9,28 @@ role="alert">

Rolle

{% for role in roles %} -
-
-
- -
- {{ role.name }} -
-
-
- {{ macros::input(label='Formatierter Name', name='formatted_name', type='text', value=role.formatted_name) }} - {{ macros::input(label='Beschreibung', name='desc', type='text', value=role.desc) }} - -
-
-
-
- {% endfor %} +
+
+
+ +
+ {{ role.name }} +
+
+
+ {{ macros::input(label='Formatierter Name', name='formatted_name', type='text', value=role.formatted_name) }} + {{ macros::input(label='Beschreibung', name='desc', type='text', value=role.desc) }} + +
+
+
+
+ {% endfor %} diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera index 05b1bd1..1a572a6 100644 --- a/templates/admin/user/index.html.tera +++ b/templates/admin/user/index.html.tera @@ -8,42 +8,39 @@ Neue Person hinzufügen -
- - - - - -
- -
- -
-

Neues Vereinsmitglied

-
+ + + +
+ +
+ +
+

Neues Vereinsmitglied

+
+ type="submit" + class="btn btn-primary" />
+
+
+ +
+ +
+

Neues Scheckbuch

+
+ {{ macros::input(label='Name', name='name', type="text", required=true) }} + {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }} + +
-
- - -
- -
-

Neues Scheckbuch

-
- {{ macros::input(label='Name', name='name', type="text", required=true) }} - {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }} - -
-
-
- - - -
- -
-
-

Neuer Schnupperant

- -
- - +
+
+ +
+ +
+ +

Neuer Schnupperant

+
+ + +
+ {{ macros::input(label='Name', name='name', type="text", required=true) }} + {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }} + {{ macros::select(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung") }} + +
- {{ macros::input(label='Name', name='name', type="text", required=true) }} - {{ macros::input(label='Mailadresse', name='mail', type="email", required=true, placeholder='user@mail.at') }} - {{ macros::select(label="Finanzielles", data=financial, name='financial_id', display=['name'], default="Keine Ermäßigung") }} - - -
-
- + + {% endif %} diff --git a/templates/admin/user/view.html.tera b/templates/admin/user/view.html.tera index cfd5d98..979a75e 100644 --- a/templates/admin/user/view.html.tera +++ b/templates/admin/user/view.html.tera @@ -385,9 +385,11 @@ {% endif %} {% else %} {% if "paid" in user.roles %} - ✅ {% for key, value in member %} + ✅ + {% for key, value in member %} {% if loop.first %}{{ key }}{% endif %} - {% endfor %} hat schon bezahlt + {% endfor %} + hat schon bezahlt {% else %} ❌ {% for key, value in member %} @@ -406,7 +408,9 @@