Compare commits

..

No commits in common. "ffce336199c8d170d2c593cdcde330a658683842" and "e48bc468cd612b3f56bd3f20a7099ea0a96dcb83" have entirely different histories.

2 changed files with 8 additions and 4 deletions

View File

@ -1,11 +1,16 @@
use std::ops::{Deref, DerefMut}; use std::{
fs::File,
io::Read,
ops::{Deref, DerefMut},
};
use argon2::{password_hash::SaltString, Argon2, PasswordHasher}; use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
use chrono::{Datelike, Local, NaiveDate}; use chrono::{Datelike, Local, NaiveDate};
use log::info; use log::info;
use rocket::{ use rocket::{
async_trait, async_trait,
http::{Cookie, Status}, data::ToByteUnit,
http::{ext::IntoCollection, Cookie, Status},
request::{self, FromRequest, Outcome}, request::{self, FromRequest, Outcome},
time::{Duration, OffsetDateTime}, time::{Duration, OffsetDateTime},
tokio::io::AsyncReadExt, tokio::io::AsyncReadExt,
@ -1064,7 +1069,6 @@ mod test {
phone: None, phone: None,
address: None, address: None,
family_id: None, family_id: None,
membership_pdf: None,
}, },
) )
.await; .await;

View File

@ -15,7 +15,7 @@ use rocket::{
http::{ContentType, Status}, http::{ContentType, Status},
post, post,
request::{FlashMessage, FromRequest, Outcome}, request::{FlashMessage, FromRequest, Outcome},
response::{Flash, Redirect}, response::{content, Flash, Redirect},
routes, FromForm, Request, Route, State, routes, FromForm, Request, Route, State,
}; };
use rocket_dyn_templates::{tera::Context, Template}; use rocket_dyn_templates::{tera::Context, Template};