From 5d2d075eef4531100f5956879409b49fe84dbd55 Mon Sep 17 00:00:00 2001
From: Austen Adler <agadler@austenadler.com>
Date: Sun, 12 Mar 2023 00:54:16 -0500
Subject: [PATCH] Clean up build process

---
 docs/ALGORITHM.adoc                    |  2 +-
 docs/DESIGN.adoc                       |  2 +-
 docs/index.adoc                        |  6 +++---
 justfile                               | 16 ++++++++--------
 web-frontend/src/routes/+layout.svelte |  2 +-
 web/build.rs                           |  3 +++
 web/src/main.rs                        |  2 +-
 web/src/static_assets.rs               |  8 +++++++-
 8 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 web/build.rs

diff --git a/docs/ALGORITHM.adoc b/docs/ALGORITHM.adoc
index de5dd6f..94bc793 100644
--- a/docs/ALGORITHM.adoc
+++ b/docs/ALGORITHM.adoc
@@ -12,7 +12,7 @@
 
 The goal of this document is to define the algorithm.
 
-If you want to see the steps to get to this definition, go to link:DESIGN.html[DESIGN].
+If you want to see the steps to get to this definition, go to link:/docs/DESIGN[DESIGN].
 
 == Data format
 
diff --git a/docs/DESIGN.adoc b/docs/DESIGN.adoc
index c23b331..9080305 100644
--- a/docs/DESIGN.adoc
+++ b/docs/DESIGN.adoc
@@ -12,7 +12,7 @@
 
 The goal of this document is to walk through how the design was chosen.
 
-If you want to see the algorithm definition, go to link:ALGORITHM.html[ALGORITHM].
+If you want to see the algorithm definition, go to link:/docs/ALGORITHM[ALGORITHM].
 
 == 10,000 meter view
 
diff --git a/docs/index.adoc b/docs/index.adoc
index c077537..480e5ad 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -11,9 +11,9 @@
 == Pages
 
 * link:..[xpin.app] - Go back to the xpin homepage
-* link:ALGORITHM.html[ALGORITHM] - Algorithm definition
-* link:DESIGN.html[DESIGN] - Algorithm design documentation
-* link:WORDLIST.html[WORDLIST] - Wordlist design and implementation
+* link:/docs/ALGORITHM[ALGORITHM] - Algorithm definition
+* link:/docs/DESIGN[DESIGN] - Algorithm design documentation
+* link:/docs/WORDLIST[WORDLIST] - Wordlist design and implementation
 
 ++++
 <style>
diff --git a/justfile b/justfile
index 9b4e5e2..f67f790 100644
--- a/justfile
+++ b/justfile
@@ -1,15 +1,11 @@
-build: fmt js-build
-
-# Rust test needs to be built after because it depends on js-build
-all: output-clean fmt build rust-build rust-test
-    rsync -ha ./web-frontend/build/ build/
-    du -shc build/* | sort -h
+# Rust test needs to be built after because the web crate depends on js-build
+build: fmt js-build rust-build rust-test
 
 rust-test:
     cargo test --all
     cargo fmt --all --check
 
-rust-build:
+rust-build: output-clean js-build
     cargo build --all
     cargo build -p web --release --target x86_64-unknown-linux-musl
     earthly +rust-image
@@ -24,11 +20,13 @@ js-build: wasm-build docs-build
     # mkdir -p ./web-frontend/static/docs/
     # rsync -ha ./build/docs/ ./web-frontend/static/docs/
     yarn --cwd ./web-frontend/ build
+    rsync -ha ./web-frontend/build/ ./build/
 
 output-clean:
     rm -vrf build
+    mkdir build
 
-docs-build:
+docs-build: output-clean
     earthly +docs
     cargo doc --all
 
@@ -51,5 +49,7 @@ init:
     yarn --cwd ./web-frontend/
     cargo fetch
     cargo install wasm-pack
+
+init-python:
     if [ ! -d "wordlist/venv" ]; then python3 -m virtualenv wordlist/venv -p "$(which python3)"; fi; export OSTYPE=linux-gnu && . wordlist/venv/bin/activate
     export OSTYPE=linux-gnu && . wordlist/venv/bin/activate && pip install -r wordlist/requirements.txt && python -c 'import nltk; nltk.download('wordnet')'
diff --git a/web-frontend/src/routes/+layout.svelte b/web-frontend/src/routes/+layout.svelte
index 4812c92..a8c3a87 100644
--- a/web-frontend/src/routes/+layout.svelte
+++ b/web-frontend/src/routes/+layout.svelte
@@ -30,7 +30,7 @@
 				<div class="text-sm">
 					<a href="/" class="block inline-block text-white hover:text-gray-500 mr-4 p-2"> Home </a>
 					<a
-						href="/docs"
+						href="/docs/"
 						rel="external"
 						class="block inline-block text-white hover:text-gray-500 mr-4 p-2"
 					>
diff --git a/web/build.rs b/web/build.rs
new file mode 100644
index 0000000..7c66d85
--- /dev/null
+++ b/web/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("cargo:rerun-if-changed=../build");
+}
diff --git a/web/src/main.rs b/web/src/main.rs
index 5e84247..c3d6b8b 100644
--- a/web/src/main.rs
+++ b/web/src/main.rs
@@ -9,7 +9,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         // Add the API
         .mount("/api/v1", routes![api::get_address, api::get_coords])
         // Add the webui frontend
-        .mount("/", routes![static_assets::dist])
+        .mount("/", routes![static_assets::index, static_assets::dist])
         .launch()
         .await?;
 
diff --git a/web/src/static_assets.rs b/web/src/static_assets.rs
index e907cd5..274cd34 100644
--- a/web/src/static_assets.rs
+++ b/web/src/static_assets.rs
@@ -12,6 +12,7 @@ struct Asset;
 
 #[get("/<file..>")]
 pub(crate) fn dist(file: PathBuf) -> Option<(ContentType, Cow<'static, [u8]>)> {
+    eprintln!("file: {file:?}");
     if let Some(a) = Asset::get(&format!("{}", file.display().to_string())) {
         let content_type = file
             .extension()
@@ -22,8 +23,13 @@ pub(crate) fn dist(file: PathBuf) -> Option<(ContentType, Cow<'static, [u8]>)> {
         return Some((content_type, a.data));
     }
 
-    [".html", "index.html"].iter().find_map(|ext| {
+    [".html", "/index.html"].iter().find_map(|ext| {
         Asset::get(&format!("{}{}", file.display().to_string(), ext))
             .map(|a| (ContentType::HTML, a.data))
     })
 }
+
+#[get("/")]
+pub(crate) fn index() -> Option<(ContentType, Cow<'static, [u8]>)> {
+    Asset::get(&"index.html").map(|a| (ContentType::HTML, a.data))
+}