Merge branch '2024-editor-server' into EDITOR-NTUEELightDance#523

ChenBingWei1201 · Feb 4, 2024 · 374d373 · 374d373
2 parents 5909094 + 720e9b0
commit 374d373
Show file tree

Hide file tree

Showing 6 changed files with 549 additions and 26 deletions.
diff --git a/editor-server/Cargo.lock b/editor-server/Cargo.lock
diff --git a/editor-server/Cargo.toml b/editor-server/Cargo.toml
@@ -21,6 +21,7 @@ futures-core = "0.3.28"
 futures-util = "0.3.28"
 http = "0.2.7"
 itertools = "0.12.0"
+indicatif = { version = "*" }
 once_cell = "1.18.0"
 redis = { version = "0.23.3", features = ["tokio-comp"] }
 serde = "1.0.188"

diff --git a/editor-server/src/routes/api/mod.rs b/editor-server/src/routes/api/mod.rs
@@ -33,4 +33,5 @@ pub fn build_api_routes() -> Router {
             get(get_dancer_led_data::get_dancer_led_data),
         )
         .route("/exportData", get(export_data::export_data))
+        .route("/uploadData", post(upload_data::upload_data))
 }