Compare commits

...

3 Commits

Author SHA1 Message Date
638c13bc53 Merge pull request 'fix-ci' (#286) from fix-ci into staging
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #286
2024-03-20 21:27:44 +01:00
35900f3059 fix ci
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-03-20 21:16:55 +01:00
e48bc468cd Merge pull request 'add membership pdf' (#283) from membership-pdf-new into main
Some checks failed
CI/CD Pipeline / test (push) Failing after 7m23s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #283
2024-03-20 21:04:42 +01:00
2 changed files with 4 additions and 8 deletions

View File

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

View File

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