WIP #689

a
atomicdata-dev · Nov 20, 2023 · a35b5c7 · a35b5c7
1 parent 360e33f
commit a35b5c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/server/Cargo.toml b/server/Cargo.toml
@@ -9,6 +9,7 @@ name = "atomic-server"
 readme = "./README.md"
 repository = "https://github.com/atomicdata-dev/atomic-server"
 version = "0.36.0"
+include = ["src/**/*", "Cargo.toml", "assets_tmp"]
 
 [[bin]]
 name = "atomic-server"

diff --git a/server/build.rs b/server/build.rs
@@ -18,10 +18,10 @@ fn main() -> std::io::Result<()> {
 
     if should_build() {
         build_js();
-        // copy files to server folder
         dircpy::copy_dir(JS_DIST_SOURCE, JS_DIST_TMP)?;
     }
 
+    // Makes the static files available for compilation
     resource_dir(JS_DIST_TMP)
         .build()
         .unwrap_or_else(|e| panic!("failed to open data browser assets from {JS_DIST_TMP}. {e}"));

diff --git a/server/src/handlers/single_page_app.rs b/server/src/handlers/single_page_app.rs
@@ -10,7 +10,7 @@ pub async fn single_page(
     appstate: actix_web::web::Data<AppState>,
     path: actix_web::web::Path<String>,
 ) -> AtomicServerResult<HttpResponse> {
-    let template = include_str!("../../../browser/data-browser/dist/index.html");
+    let template = include_str!("../../assets_tmp/index.html");
     let subject = format!("{}/{}", appstate.store.get_server_url(), path);
     let meta_tags: MetaTags = if let Ok(resource) =
         appstate