diff --git a/Cargo.lock b/Cargo.lock index 37fb744..e4072fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,20 +105,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "analytics-graphs" -version = "0.1.0" -dependencies = [ - "axum", - "prost", - "prost-types", - "serde", - "serde_json", - "tokio", - "tonic", - "tonic-prost", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -6573,7 +6559,6 @@ dependencies = [ name = "server" version = "0.8.37" dependencies = [ - "analytics-graphs", "anyhow", "bcrypt", "casbin", @@ -6628,6 +6613,7 @@ dependencies = [ "url", "uuid", "validator", + "web", ] [[package]] @@ -8674,6 +8660,20 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" +[[package]] +name = "web" +version = "0.1.0" +dependencies = [ + "axum", + "prost", + "prost-types", + "serde", + "serde_json", + "tokio", + "tonic", + "tonic-prost", +] + [[package]] name = "web-sys" version = "0.3.103" diff --git a/server b/server index ad508b8..453d16c 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit ad508b8f274a9525c04cbd9070c8ac7d1b37fd79 +Subproject commit 453d16c4308393f1d612998c6ed70e0a4a5a814a diff --git a/graphs/.gitignore b/web/.gitignore similarity index 100% rename from graphs/.gitignore rename to web/.gitignore diff --git a/graphs/Cargo.toml b/web/Cargo.toml similarity index 91% rename from graphs/Cargo.toml rename to web/Cargo.toml index cd3885c..606d960 100644 --- a/graphs/Cargo.toml +++ b/web/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "analytics-graphs" +name = "web" version = "0.1.0" edition = "2024" diff --git a/graphs/README.md b/web/README.md similarity index 100% rename from graphs/README.md rename to web/README.md diff --git a/graphs/src/lib.rs b/web/src/lib.rs similarity index 99% rename from graphs/src/lib.rs rename to web/src/lib.rs index ad4baff..73d0481 100644 --- a/graphs/src/lib.rs +++ b/web/src/lib.rs @@ -141,7 +141,7 @@ struct ColumnOutput { pub fn spawn() -> tokio::task::JoinHandle<()> { tokio::spawn(async { if let Err(error) = serve().await { - eprintln!("Analytics graphs stopped: {error}"); + eprintln!("Web UI stopped: {error}"); } }) } @@ -179,7 +179,7 @@ pub async fn serve() -> Result<(), Box> { .with_state(state); let listener = tokio::net::TcpListener::bind(listen_address).await?; - println!("Analytics graphs: http://{listen_address}"); + println!("Web UI: http://{listen_address}"); println!("Analytics gRPC endpoint: {grpc_endpoint}"); axum::serve(listener, app).await?; Ok(()) diff --git a/graphs/src/pages/add_logic/loader.rs b/web/src/pages/add_logic/loader.rs similarity index 100% rename from graphs/src/pages/add_logic/loader.rs rename to web/src/pages/add_logic/loader.rs diff --git a/graphs/src/pages/add_logic/logic.rs b/web/src/pages/add_logic/logic.rs similarity index 100% rename from graphs/src/pages/add_logic/logic.rs rename to web/src/pages/add_logic/logic.rs diff --git a/graphs/src/pages/add_logic/mod.rs b/web/src/pages/add_logic/mod.rs similarity index 100% rename from graphs/src/pages/add_logic/mod.rs rename to web/src/pages/add_logic/mod.rs diff --git a/graphs/src/pages/add_logic/state.rs b/web/src/pages/add_logic/state.rs similarity index 100% rename from graphs/src/pages/add_logic/state.rs rename to web/src/pages/add_logic/state.rs diff --git a/graphs/src/pages/add_logic/ui.rs b/web/src/pages/add_logic/ui.rs similarity index 100% rename from graphs/src/pages/add_logic/ui.rs rename to web/src/pages/add_logic/ui.rs diff --git a/graphs/src/pages/add_table/loader.rs b/web/src/pages/add_table/loader.rs similarity index 100% rename from graphs/src/pages/add_table/loader.rs rename to web/src/pages/add_table/loader.rs diff --git a/graphs/src/pages/add_table/logic.rs b/web/src/pages/add_table/logic.rs similarity index 100% rename from graphs/src/pages/add_table/logic.rs rename to web/src/pages/add_table/logic.rs diff --git a/graphs/src/pages/add_table/mod.rs b/web/src/pages/add_table/mod.rs similarity index 100% rename from graphs/src/pages/add_table/mod.rs rename to web/src/pages/add_table/mod.rs diff --git a/graphs/src/pages/add_table/state.rs b/web/src/pages/add_table/state.rs similarity index 100% rename from graphs/src/pages/add_table/state.rs rename to web/src/pages/add_table/state.rs diff --git a/graphs/src/pages/add_table/ui.rs b/web/src/pages/add_table/ui.rs similarity index 100% rename from graphs/src/pages/add_table/ui.rs rename to web/src/pages/add_table/ui.rs diff --git a/graphs/src/pages/add_validation/loader.rs b/web/src/pages/add_validation/loader.rs similarity index 100% rename from graphs/src/pages/add_validation/loader.rs rename to web/src/pages/add_validation/loader.rs diff --git a/graphs/src/pages/add_validation/logic.rs b/web/src/pages/add_validation/logic.rs similarity index 100% rename from graphs/src/pages/add_validation/logic.rs rename to web/src/pages/add_validation/logic.rs diff --git a/graphs/src/pages/add_validation/mod.rs b/web/src/pages/add_validation/mod.rs similarity index 100% rename from graphs/src/pages/add_validation/mod.rs rename to web/src/pages/add_validation/mod.rs diff --git a/graphs/src/pages/add_validation/state.rs b/web/src/pages/add_validation/state.rs similarity index 100% rename from graphs/src/pages/add_validation/state.rs rename to web/src/pages/add_validation/state.rs diff --git a/graphs/src/pages/add_validation/ui.rs b/web/src/pages/add_validation/ui.rs similarity index 100% rename from graphs/src/pages/add_validation/ui.rs rename to web/src/pages/add_validation/ui.rs diff --git a/graphs/src/pages/admin/admin/loader.rs b/web/src/pages/admin/admin/loader.rs similarity index 100% rename from graphs/src/pages/admin/admin/loader.rs rename to web/src/pages/admin/admin/loader.rs diff --git a/graphs/src/pages/admin/admin/logic.rs b/web/src/pages/admin/admin/logic.rs similarity index 100% rename from graphs/src/pages/admin/admin/logic.rs rename to web/src/pages/admin/admin/logic.rs diff --git a/graphs/src/pages/admin/admin/mod.rs b/web/src/pages/admin/admin/mod.rs similarity index 100% rename from graphs/src/pages/admin/admin/mod.rs rename to web/src/pages/admin/admin/mod.rs diff --git a/graphs/src/pages/admin/admin/state.rs b/web/src/pages/admin/admin/state.rs similarity index 100% rename from graphs/src/pages/admin/admin/state.rs rename to web/src/pages/admin/admin/state.rs diff --git a/graphs/src/pages/admin/admin/ui.rs b/web/src/pages/admin/admin/ui.rs similarity index 100% rename from graphs/src/pages/admin/admin/ui.rs rename to web/src/pages/admin/admin/ui.rs diff --git a/graphs/src/pages/admin/mod.rs b/web/src/pages/admin/mod.rs similarity index 100% rename from graphs/src/pages/admin/mod.rs rename to web/src/pages/admin/mod.rs diff --git a/graphs/src/pages/import_export/common/csv.rs b/web/src/pages/import_export/common/csv.rs similarity index 100% rename from graphs/src/pages/import_export/common/csv.rs rename to web/src/pages/import_export/common/csv.rs diff --git a/graphs/src/pages/import_export/common/loader.rs b/web/src/pages/import_export/common/loader.rs similarity index 100% rename from graphs/src/pages/import_export/common/loader.rs rename to web/src/pages/import_export/common/loader.rs diff --git a/graphs/src/pages/import_export/common/mod.rs b/web/src/pages/import_export/common/mod.rs similarity index 100% rename from graphs/src/pages/import_export/common/mod.rs rename to web/src/pages/import_export/common/mod.rs diff --git a/graphs/src/pages/import_export/common/schema.rs b/web/src/pages/import_export/common/schema.rs similarity index 100% rename from graphs/src/pages/import_export/common/schema.rs rename to web/src/pages/import_export/common/schema.rs diff --git a/graphs/src/pages/import_export/export/loader.rs b/web/src/pages/import_export/export/loader.rs similarity index 100% rename from graphs/src/pages/import_export/export/loader.rs rename to web/src/pages/import_export/export/loader.rs diff --git a/graphs/src/pages/import_export/export/logic.rs b/web/src/pages/import_export/export/logic.rs similarity index 100% rename from graphs/src/pages/import_export/export/logic.rs rename to web/src/pages/import_export/export/logic.rs diff --git a/graphs/src/pages/import_export/export/mod.rs b/web/src/pages/import_export/export/mod.rs similarity index 100% rename from graphs/src/pages/import_export/export/mod.rs rename to web/src/pages/import_export/export/mod.rs diff --git a/graphs/src/pages/import_export/export/state.rs b/web/src/pages/import_export/export/state.rs similarity index 100% rename from graphs/src/pages/import_export/export/state.rs rename to web/src/pages/import_export/export/state.rs diff --git a/graphs/src/pages/import_export/export/ui.rs b/web/src/pages/import_export/export/ui.rs similarity index 100% rename from graphs/src/pages/import_export/export/ui.rs rename to web/src/pages/import_export/export/ui.rs diff --git a/graphs/src/pages/import_export/import/loader.rs b/web/src/pages/import_export/import/loader.rs similarity index 100% rename from graphs/src/pages/import_export/import/loader.rs rename to web/src/pages/import_export/import/loader.rs diff --git a/graphs/src/pages/import_export/import/logic.rs b/web/src/pages/import_export/import/logic.rs similarity index 100% rename from graphs/src/pages/import_export/import/logic.rs rename to web/src/pages/import_export/import/logic.rs diff --git a/graphs/src/pages/import_export/import/mod.rs b/web/src/pages/import_export/import/mod.rs similarity index 100% rename from graphs/src/pages/import_export/import/mod.rs rename to web/src/pages/import_export/import/mod.rs diff --git a/graphs/src/pages/import_export/import/state.rs b/web/src/pages/import_export/import/state.rs similarity index 100% rename from graphs/src/pages/import_export/import/state.rs rename to web/src/pages/import_export/import/state.rs diff --git a/graphs/src/pages/import_export/import/ui.rs b/web/src/pages/import_export/import/ui.rs similarity index 100% rename from graphs/src/pages/import_export/import/ui.rs rename to web/src/pages/import_export/import/ui.rs diff --git a/graphs/src/pages/import_export/mod.rs b/web/src/pages/import_export/mod.rs similarity index 100% rename from graphs/src/pages/import_export/mod.rs rename to web/src/pages/import_export/mod.rs diff --git a/graphs/src/pages/mod.rs b/web/src/pages/mod.rs similarity index 100% rename from graphs/src/pages/mod.rs rename to web/src/pages/mod.rs diff --git a/graphs/src/services/mod.rs b/web/src/services/mod.rs similarity index 100% rename from graphs/src/services/mod.rs rename to web/src/services/mod.rs diff --git a/graphs/static/admin.css b/web/static/admin.css similarity index 100% rename from graphs/static/admin.css rename to web/static/admin.css diff --git a/graphs/static/index.html b/web/static/index.html similarity index 100% rename from graphs/static/index.html rename to web/static/index.html diff --git a/graphs/static/login.html b/web/static/login.html similarity index 100% rename from graphs/static/login.html rename to web/static/login.html