main #111

Merged
philipp merged 10 commits from main into staging 2024-01-01 16:30:54 +01:00
3 changed files with 2 additions and 3 deletions

View File

@ -23,7 +23,7 @@ pub mod triptype;
pub mod user;
pub mod usertrip;
#[derive(Serialize)]
#[derive(Serialize, Debug)]
pub struct Day {
day: NaiveDate,
planned_events: Vec<PlannedEventWithUserAndTriptype>,

View File

@ -25,7 +25,7 @@ pub struct Trip {
is_locked: bool,
}
#[derive(Serialize)]
#[derive(Serialize, Debug)]
pub struct TripWithUserAndType {
#[serde(flatten)]
pub trip: Trip,

View File

@ -57,7 +57,6 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
if let Some(msg) = flash {
context.insert("flash", &msg.into_inner());
}
println!("{user:#?}");
context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
context.insert("days", &days);
Template::render("index", context.into_json())