From a2542c6290b9f6f2a477baf70a1b21ff14e53895 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Sat, 19 Feb 2022 16:33:06 -0500 Subject: [PATCH] Better build support --- Makefile | 5 ++--- kitchen/src/web.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a5d0607..5b07e16 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,10 @@ release: wasmrelease cd kitchen; cargo build --release wasmrelease: web/index.html web/src/*.rs web/src/components/*.rs - cd web; trunk build --release --public-url /ui/ --dist ../kitchen/webdist + cd web; trunk build --release --public-url /ui/ wasm: web/index.html web/src/*.rs web/src/components/*.rs cd web; trunk build --public-url /ui/ - cp -r web/dist kitchen/webdist clean: - rm -rf web/dist/* kitchen/webdist \ No newline at end of file + rm -rf web/dist/* \ No newline at end of file diff --git a/kitchen/src/web.rs b/kitchen/src/web.rs index 9e89b70..a4e7469 100644 --- a/kitchen/src/web.rs +++ b/kitchen/src/web.rs @@ -36,7 +36,7 @@ pub async fn get_recipes(recipe_dir_path: PathBuf) -> Result, ParseE pub async fn ui_main(recipe_dir_path: PathBuf) { let root = warp::path::end().map(|| warp::redirect::found(Uri::from_static("/ui"))); - let ui = warp::path("ui").and(static_dir!("webdist/")); + let ui = warp::path("ui").and(static_dir!("../web/dist")); let api = warp::path("api") .and(warp::path("v1")) .and(warp::path("recipes"))