Skip to content

Commit

Permalink
Update web framework deps in vzdv-site
Browse files Browse the repository at this point in the history
  • Loading branch information
Celeo committed Jan 9, 2025
1 parent 152fa0c commit 902c35d
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 69 deletions.
69 changes: 28 additions & 41 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions vzdv-site/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ vzdv = { path = "../vzdv" }

indexmap = "2.7.0"
anyhow = "1.0.95"
axum = { version = "0.7.4", features = ["multipart"] }
axum-extra = { version = "0.9.3", features = ["query"] }
axum = { version = "0.8.1", features = ["multipart"] }
axum-extra = { version = "0.10.0", features = ["query"] }
chrono = { version = "0.4.39", features = ["serde"] }
chrono-tz = "0.10.0"
clap = { version = "4.5.26", features = ["derive"] }
Expand All @@ -40,10 +40,10 @@ thousands = "0.2.0"
thiserror = "2.0.10"
time = { version = "0.3.37", default-features = false }
tokio = { version = "1.43.0", features = ["full"] }
tower = "0.4.13"
tower-http = { version = "0.5.2", features = ["fs", "timeout"] }
tower-sessions = "0.12.0"
tower-sessions-sqlx-store = { version = "0.13.0", features = ["sqlite"] }
tower = "0.5.2"
tower-http = { version = "0.6.2", features = ["fs", "timeout"] }
tower-sessions = "0.14.0"
tower-sessions-sqlx-store = { version = "0.15.0", features = ["sqlite"] }
uuid = { version = "1.11.0", features = ["v4", "fast-rng"] }
vatsim_utils = "0.5.3"

Expand Down
6 changes: 3 additions & 3 deletions vzdv-site/src/endpoints/admin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1308,15 +1308,15 @@ pub fn router() -> Router<Arc<AppState>> {
get(page_visitor_applications),
)
.route(
"/admin/visitor_applications/:id",
"/admin/visitor_applications/{id}",
get(post_visitor_application_action),
)
.route(
"/admin/resources",
get(page_resources).post(post_new_resource),
)
.layer(DefaultBodyLimit::disable()) // no upload limit on this endpoint
.route("/admin/resources/:id", delete(api_delete_resource))
.route("/admin/resources/{id}", delete(api_delete_resource))
.route("/admin/off_roster_list", get(page_off_roster_list))
.route("/admin/activity_report", get(page_activity_report))
.route(
Expand All @@ -1332,6 +1332,6 @@ pub fn router() -> Router<Arc<AppState>> {
"/admin/no_show_list",
get(page_no_show_list).post(post_new_no_show),
)
.route("/admin/no_show_list/:id", delete(api_delete_no_show_entry))
.route("/admin/no_show_list/{id}", delete(api_delete_no_show_entry))
.route("/admin/audit_log", get(page_audit_log))
}
24 changes: 12 additions & 12 deletions vzdv-site/src/endpoints/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -956,25 +956,25 @@ async fn post_remove_controller(

pub fn router() -> Router<Arc<AppState>> {
Router::new()
.route("/controller/:cid", get(page_controller))
.route("/controller/:cid/discord/unlink", post(api_unlink_discord))
.route("/controller/:cid/ois", post(post_change_ois))
.route("/controller/:cid/certs", post(post_change_certs))
.route("/controller/:cid/certs/solo", post(post_new_solo_cert))
.route("/controller/{cid}", get(page_controller))
.route("/controller/{cid}/discord/unlink", post(api_unlink_discord))
.route("/controller/{cid}/ois", post(post_change_ois))
.route("/controller/{cid}/certs", post(post_change_certs))
.route("/controller/{cid}/certs/solo", post(post_new_solo_cert))
.route(
"/controller/:cid/certs/solo/:cert_id",
"/controller/{cid}/certs/solo/{cert_id}",
delete(api_delete_solo_cert),
)
.route("/controller/:cid/note", post(post_new_staff_note))
.route("/controller/{cid}/note", post(post_new_staff_note))
.route(
"/controller/:cid/note/:note_id",
"/controller/{cid}/note/{note_id}",
delete(api_delete_staff_note),
)
.route(
"/controller/:cid/training_records",
"/controller/{cid}/training_records",
get(snippet_get_training_records).post(post_add_training_note),
)
.route("/controller/:cid/history", get(snippet_get_history))
.route("/controller/:cid/roles", post(post_set_roles))
.route("/controller/:cid/remove", post(post_remove_controller))
.route("/controller/{cid}/history", get(snippet_get_history))
.route("/controller/{cid}/roles", post(post_set_roles))
.route("/controller/{cid}/remove", post(post_remove_controller))
}
12 changes: 6 additions & 6 deletions vzdv-site/src/endpoints/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -805,17 +805,17 @@ pub fn router() -> Router<Arc<AppState>> {
get(get_upcoming_events).post(post_new_event_form),
)
.route(
"/events/:id",
"/events/{id}",
get(page_event)
.delete(api_delete_event)
.post(post_edit_event_form),
)
.route("/events/:id/register", post(post_register_for_event))
.route("/events/:id/unregister", post(api_register_unregister))
.route("/events/:id/add_position", post(post_add_position))
.route("/events/{id}/register", post(post_register_for_event))
.route("/events/{id}/unregister", post(api_register_unregister))
.route("/events/{id}/add_position", post(post_add_position))
.route(
"/events/:id/delete_position/:pos_id",
"/events/{id}/delete_position/{pos_id}",
post(post_delete_position),
)
.route("/events/:id/set_position", post(post_set_position))
.route("/events/{id}/set_position", post(post_set_position))
}
2 changes: 1 addition & 1 deletion vzdv-site/src/endpoints/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,6 @@ pub fn router() -> Router<Arc<AppState>> {
.route("/changelog", get(page_changelog))
.route("/privacy_policy", get(page_privacy_policy))
.nest_service("/assets", ServeDir::new("assets"))
.route("/static_special/:name", get(page_static_special))
.route("/static_special/{name}", get(page_static_special))
.nest_service("/static", ServeDir::new("static"))
}

0 comments on commit 902c35d

Please sign in to comment.