Arrelin/family_budget
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix' (#12) from bugfix/deps-update into master
All checks were successful
Build and Publish Images / build-and-push (push) Successful in 21s
Details

Browse Source 
Reviewed-on: http://192.168.31.100:3847/Arrelin/family_budget/pulls/12
This commit was merged in pull request #12.
This commit is contained in:
Arrelin
2026-01-24 17:07:44 +00:00
parent a9481676c1 86cb341ca4
commit c819668fd6
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
backend/src/lib.rs
View File

@@ -150,7 +150,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
let admin_family_routes = Router::new() let admin_family_routes = Router::new()
.route("/families", post(routes::family::create_family)) .route("/families", post(routes::family::create_family))
.route("/families/:id", delete(routes::family::delete_family)) .route("/families/{id}", delete(routes::family::delete_family))
.route_layer(axum_middleware::from_fn(middleware::require_admin)) .route_layer(axum_middleware::from_fn(middleware::require_admin))
.layer(auth_layer.clone()) .layer(auth_layer.clone())
.with_state(db.clone()); .with_state(db.clone());
@@ -174,42 +174,42 @@ pub async fn create_app(db: DatabaseConnection) -> Result<Router, DbErr> {
let invite_link_routes = Router::new() let invite_link_routes = Router::new()
.route("/my-family/invite-links", post(routes::invite_link::create_invite_link)) .route("/my-family/invite-links", post(routes::invite_link::create_invite_link))
.route("/my-family/invite-links", get(routes::invite_link::get_my_invite_links)) .route("/my-family/invite-links", get(routes::invite_link::get_my_invite_links))
.route("/my-family/invite-links/:token", delete(routes::invite_link::delete_invite_link)) .route("/my-family/invite-links/{token}", delete(routes::invite_link::delete_invite_link))
.route("/invite/:token/join", post(routes::invite_link::join_family_via_invite)) .route("/invite/{token}/join", post(routes::invite_link::join_family_via_invite))
.layer(auth_layer.clone()) .layer(auth_layer.clone())
.with_state(db.clone()); .with_state(db.clone());
let family_protected_routes = Router::new() let family_protected_routes = Router::new()
.route("/families/:family_id/categories", post(routes::category::create_category)) .route("/families/{family_id}/categories", post(routes::category::create_category))
.route("/families/:family_id/categories", get(routes::category::get_categories_by_family)) .route("/families/{family_id}/categories", get(routes::category::get_categories_by_family))
.route("/families/:family_id/categories/:category_id", get(routes::category::get_category)) .route("/families/{family_id}/categories/{category_id}", get(routes::category::get_category))
.route("/families/:family_id/categories/:category_id", put(routes::category::update_category)) .route("/families/{family_id}/categories/{category_id}", put(routes::category::update_category))
.route("/families/:family_id/categories/:category_id", delete(routes::category::delete_category)) .route("/families/{family_id}/categories/{category_id}", delete(routes::category::delete_category))
.route("/families/:family_id/categories/:category_id/expenses", post(routes::expense::create_expense)) .route("/families/{family_id}/categories/{category_id}/expenses", post(routes::expense::create_expense))
.route("/families/:family_id/categories/:category_id/expenses", get(routes::expense::get_expenses_by_category)) .route("/families/{family_id}/categories/{category_id}/expenses", get(routes::expense::get_expenses_by_category))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", get(routes::expense::get_expense)) .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", get(routes::expense::get_expense))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", put(routes::expense::update_expense)) .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", put(routes::expense::update_expense))
.route("/families/:family_id/categories/:category_id/expenses/:expense_id", delete(routes::expense::delete_expense)) .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", delete(routes::expense::delete_expense))
.route("/families/:family_id/categories/:category_id/remaining", get(routes::expense::get_remaining_limit)) .route("/families/{family_id}/categories/{category_id}/remaining", get(routes::expense::get_remaining_limit))
.route("/families/:family_id/shopping-items", post(routes::shopping_item::create_shopping_item)) .route("/families/{family_id}/shopping-items", post(routes::shopping_item::create_shopping_item))
.route("/families/:family_id/shopping-items", get(routes::shopping_item::get_shopping_items_by_family)) .route("/families/{family_id}/shopping-items", get(routes::shopping_item::get_shopping_items_by_family))
.route("/families/:family_id/shopping-items/:id", get(routes::shopping_item::get_shopping_item)) .route("/families/{family_id}/shopping-items/{id}", get(routes::shopping_item::get_shopping_item))
.route("/families/:family_id/shopping-items/:id", put(routes::shopping_item::update_shopping_item)) .route("/families/{family_id}/shopping-items/{id}", put(routes::shopping_item::update_shopping_item))
.route("/families/:family_id/shopping-items/:id", delete(routes::shopping_item::delete_shopping_item)) .route("/families/{family_id}/shopping-items/{id}", delete(routes::shopping_item::delete_shopping_item))
.route("/families/:family_id/shopping-items/:id/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased)) .route("/families/{family_id}/shopping-items/{id}/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased))
.route("/families/:family_id/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased)) .route("/families/{family_id}/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased))
.route("/families/:family_id/shopping-items/clear-all", delete(routes::shopping_item::clear_all)) .route("/families/{family_id}/shopping-items/clear-all", delete(routes::shopping_item::clear_all))
.route("/families/:family_id/members", get(routes::user::get_family_members)) .route("/families/{family_id}/members", get(routes::user::get_family_members))
.route_layer(axum_middleware::from_fn(middleware::require_family_access)) .route_layer(axum_middleware::from_fn(middleware::require_family_access))
.layer(auth_layer.clone()) .layer(auth_layer.clone())
.with_state(db.clone()); .with_state(db.clone());
let public_routes = Router::new() let public_routes = Router::new()
.route("/families", get(routes::family::get_all_families)) .route("/families", get(routes::family::get_all_families))
.route("/families/:id", get(routes::family::get_family)) .route("/families/{id}", get(routes::family::get_family))
.route("/families/:id", put(routes::family::update_family)) .route("/families/{id}", put(routes::family::update_family))
.route("/families/:id/verify", post(routes::family::verify_family_password)) .route("/families/{id}/verify", post(routes::family::verify_family_password))
.route("/invite/:token", get(routes::invite_link::validate_invite_link)) .route("/invite/{token}", get(routes::invite_link::validate_invite_link))
.layer(session_layer) .layer(session_layer)
.with_state(db); .with_state(db);