ActivityWatch
diff --git a/‎Cargo.lock‎
Lines changed: 152 additions & 2 deletions b/‎Cargo.lock‎
Lines changed: 152 additions & 2 deletions
diff --git a/‎aw-client-rust/tests/test.rs‎
Lines changed: 3 additions & 2 deletions b/‎aw-client-rust/tests/test.rs‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎aw-server/Cargo.toml‎
Lines changed: 1 addition & 0 deletions b/‎aw-server/Cargo.toml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎aw-server/build.rs‎
Lines changed: 8 additions & 0 deletions b/‎aw-server/build.rs‎
Lines changed: 8 additions & 0 deletions
@@ -12,7 +12,6 @@ mod test {
     use aw_client_rust::Event;
     use chrono::{DateTime, Duration, Utc};
     use serde_json::Map;
-    use std::path::PathBuf;
     use std::sync::Mutex;
     use std::thread;
     use tokio_test::block_on;
@@ -38,10 +37,12 @@ mod test {
     }
 
     fn setup_testserver() -> rocket::Shutdown {
+        use aw_server::endpoints::AssetResolver;
         use aw_server::endpoints::ServerState;
+
         let state = ServerState {
             datastore: Mutex::new(aw_datastore::Datastore::new_in_memory(false)),
-            asset_path: PathBuf::from("."), // webui won't be used, so it's invalidly set
+            asset_resolver: AssetResolver::new(None),
             device_id: "test_id".to_string(),
         };
         let mut aw_config = aw_server::config::AWConfig::default();
 
@@ -29,6 +29,7 @@ gethostname = "0.4"
 uuid = { version = "1.3", features = ["serde", "v4"] }
 clap = { version = "4.1", features = ["derive", "cargo"] }
 log-panics = { version = "2", features = ["with-backtrace"]}
+rust-embed = { version = "8.0.0", features = ["interpolate-folder-path"] }
 
 aw-datastore = { path = "../aw-datastore" }
 aw-models = { path = "../aw-models" }
 
@@ -0,0 +1,8 @@
+use std::error::Error;
+
+fn main() -> Result<(), Box<dyn Error>> {
+    std::fs::create_dir_all("../aw-webui/dist").unwrap();
+    println!("cargo:rustc-env=AW_WEBUI_DIR=../aw-webui/dist");
+
+    Ok(())
+}