works, lets do updates now

This commit is contained in:
2023-09-17 15:45:02 +02:00
parent 849798f7cb
commit 8c0a4c53b8
6 changed files with 97 additions and 54 deletions

View File

@@ -12,7 +12,10 @@ use uuid::Uuid;
use std::{fmt, time::Duration};
use tower::{timeout::TimeoutLayer, ServiceBuilder};
use crate::{components::route, AppState, Error, RequestError, TopLevelPage};
use crate::{
components::{self, route::Router as _},
AppState, Error, RequestError, TopLevelPage,
};
use super::auth;
@@ -151,18 +154,7 @@ pub fn router(state: AppState) -> Router {
.route("/:id/todo/:id/edit", post(trip_todo_edit))
.route("/:id/todo/:id/edit/save", post(trip_todo_edit_save))
.route("/:id/todo/:id/edit/cancel", post(trip_todo_edit_cancel))
.route(
&<crate::components::trips::todos::Todo as route::Create>::with_prefix(
"/:id/todo",
),
post(<crate::components::trips::todos::Todo as route::Create>::create),
)
.route(
&<crate::components::trips::todos::Todo as route::Delete>::with_prefix(
"/:id/todo",
),
post(<crate::components::trips::todos::Todo as route::Delete>::delete),
),
.nest("/:id/todo/", components::trips::todos::Todo::get()),
)
.nest(
(&TopLevelPage::Inventory.path()).into(),

View File

@@ -1281,7 +1281,7 @@ pub async fn trip_todo_done_htmx(
&state.database_pool,
todos::Filter { trip_id },
todo_id,
todos::Update::State(components::trips::todos::State::Done),
todos::UpdateElement::State(components::trips::todos::State::Done),
)
.await?;
@@ -1317,7 +1317,7 @@ pub async fn trip_todo_done(
&state.database_pool,
todos::Filter { trip_id },
todo_id,
todos::Update::State(components::trips::todos::State::Done),
todos::UpdateElement::State(components::trips::todos::State::Done),
)
.await?;
@@ -1336,7 +1336,7 @@ pub async fn trip_todo_undone_htmx(
&state.database_pool,
todos::Filter { trip_id },
todo_id,
todos::Update::State(components::trips::todos::State::Todo),
todos::UpdateElement::State(components::trips::todos::State::Todo),
)
.await?;
@@ -1372,7 +1372,7 @@ pub async fn trip_todo_undone(
&state.database_pool,
todos::Filter { trip_id },
todo_id,
todos::Update::State(components::trips::todos::State::Todo),
todos::UpdateElement::State(components::trips::todos::State::Todo),
)
.await?;
@@ -1429,7 +1429,7 @@ pub async fn trip_todo_edit_save(
&state.database_pool,
todos::Filter { trip_id },
todo_id,
todos::Update::Description(form.description),
todos::UpdateElement::Description(form.description),
)
.await?;