Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
375 changes: 222 additions & 153 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
backend:
image: mbround18/vtt-maps:latest
image: mbround18/vtt-maps:${VERSION:-latest}
build:
context: .
dockerfile: Dockerfile
Expand Down
17 changes: 9 additions & 8 deletions packages/actix-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,24 @@ git2 = "0"
actix-web = "4.11.0"
actix-files = "0.6.6"
actix-cors = "0.7.1"
tokio = { version = "1.45.1", features = ["full"] }
tokio = { version = "1.47.1", features = ["full"] }
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
glob = "0.3.2"
serde_json = "1.0.142"
glob = "0.3.3"
shared = { path = "../shared" }
meilisearch-sdk = "0.29.0"
anyhow = "1.0.98"
meilisearch-sdk = "0.29.1"
anyhow = "1.0.99"
tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter", "fmt"] }
tracing-actix-web = "0.7.18"
tracing-actix-web = "0.7.19"
pulldown-cmark = "0.13.0"
base64 = "0.22.1"
futures = "0.3.31"
kuchikiki = "0.8.8-speedreader"
futures-util = "0.3.31"
html5ever = "0.29"
html5ever = "0.35"
bytes = "1.10.1"
actix-session = { version = "0.10.1", features = ["cookie-session"] }
actix-identity = "0.8.0"
rand = "0.8.5"
rand = "0.9.2"
markup5ever = "0.35.0"
15 changes: 5 additions & 10 deletions packages/actix-backend/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,12 @@ async fn main() -> std::io::Result<()> {
web::scope("/maps")
.route("/all", web::get().to(maps::maps_all))
.route("/{id}", web::get().to(maps::map_detail))
.service(
web::resource("/rebuild")
.wrap(hooks::admin_auth::AdminAuth)
.route(web::post().to(maps::maps_rebuild)),
)
// .service(
// web::resource("/rebuild")
// .wrap(hooks::admin_auth::AdminAuth)
// .route(web::post().to(maps::maps_rebuild)),
// )
.route("/rebuild/status", web::get().to(maps::rebuild_status))
.service(
web::resource("/rebuild/clear")
.wrap(hooks::admin_auth::AdminAuth)
.route(web::delete().to(maps::clear_rebuild_lock)),
)
.route("/download/{id}", web::get().to(maps::download_map))
.route("/tiled/{id}", web::get().to(maps::tiled_map))
.route("/content/{id}", web::get().to(maps::map_content)),
Expand Down
2 changes: 1 addition & 1 deletion packages/actix-backend/src/maps/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ pub use all::maps_all;
pub use content::map_content;
pub use detail::map_detail;
pub use download::download_map;
pub use rebuild::{clear_rebuild_lock, maps_rebuild, rebuild_maps_init, rebuild_status};
pub use rebuild::{rebuild_maps_init, rebuild_status};
pub use tiled::tiled_map;
Loading
Loading