build process change + review fixes

CHANGELOG.md

@@ -7,3 +7,4 @@ Bob Management GUI changelog
 #### Added
 
 - Initial project structure, backend only (#9)
+- Initial project stricture, frontend (#10)

README.md

@@ -4,17 +4,35 @@ Management UI for Bob
 
 ## Commands
 
+Build backend server:
+
+```sh
+cargo build-backend
+```
+
+Run backend server:
+
+```sh
+cargo run-backend
+```
+
+Build frontend and move it into the backend's executable directory:
+
+```sh
+cargo build-frontend
+```
+
 ---
 
-Run debug build:
+Run debug build (Backend + Frontend):
 
 ```sh
 cargo run -- --default
 ```
 
 ---
 
-Make release build:
+Make release build (Backend + Frontend):
 
 ```sh
 cargo build --profile=release-lto

backend/Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "backend"
 default-run = "backend"
-build = "../build.rs"
 description = "Bob Management GUI: Backend"
 publish = false
 keywords = [ "BOB", "Management", "GUI" ]
@@ -43,7 +42,10 @@ utoipa-rapidoc = { version = "0.1", features = ["axum"], optional = true }
 ## CLI
 cli = { path = "../cli" }
 
+## Frontend
+frontend = { path = "../frontend", optional = true }
+
 [features]
 default = [ "swagger", "frontend-bundle" ]
 swagger = [ "dep:utoipa", "dep:utoipa-swagger-ui" , "dep:utoipa-redoc", "dep:utoipa-rapidoc" ]
-frontend-bundle = [ ]
+frontend-bundle = [ "dep:frontend" ]

backend/src/main.rs

@@ -48,6 +48,7 @@ fn init_tracer(_log_file: &Option<PathBuf>, trace_level: Level) {
 fn router(cors: CorsLayer) -> Router {
     let mut frontend = env::current_exe().expect("Couldn't get current executable path.");
     frontend.pop();
+    frontend.pop();
     frontend.push("dist");
     tracing::info!("serving frontend at: {frontend:?}");
     // Add api

frontend/build.rs

@@ -53,6 +53,29 @@ pub fn build_frontend() {
     // Only build frontend when building a release
     // #[cfg(not(debug_assertions))]
     shell("yarn build");
+
+    let mut dir = PathBuf::from(std::env::var("OUT_DIR").unwrap()); // OUT_DIR == <project_dir>/target/<traget_profile>/build/bob_management-<HASH>/out
+    dir.pop();
+    dir.pop();
+    dir.pop();
+    dir.pop();
+    let mut project_dir = dir.clone();
+    project_dir.pop();
+    println!("cargo:warning=Moving /dist to: {dir:?}");
+    println!("cargo:warning=PROJECT DIR: {project_dir:?}");
+    println!(
+        "cargo:warning=cp: {:?}",
+        Command::new("cp")
+            .args([
+                "-rf",
+                &format!("{}/frontend/dist", project_dir.to_string_lossy()),
+                dir.to_str().unwrap()
+            ])
+            .output()
+            .expect("Couldn't move frontend build artifacts")
+    );
+    // println!("cargo:rerun-if-changed=frontend");
+    println!("cargo:rerun-if-changed=NULL");
 }
 
 #[allow(dead_code)]