Clean up project structure

2026-03-27 15:53:17 +01:00
parent d4872a1a04
commit cdcc119e41
26 changed files with 952 additions and 30 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /target
 /dist
-/src/dist
-/src/target
+/brittle-ui/dist
+/brittle-ui/target
 /src-tauri/target
 /node_modules
 /src-tauri/pdfjs/node_modules
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
-members = ["brittle-model", "brittle-core", "brittle-keymap", "src-tauri", "tools/brittle-seed"]
+members = ["brittle-model", "brittle-core", "brittle-keymap", "src-tauri", "brittle-ui", "tools/brittle-seed"]
 resolver = "2"
--- a/brittle-ui/Cargo.lock
+++ b/brittle-ui/Cargo.lock
--- a/brittle-ui/Cargo.toml
+++ b/brittle-ui/Cargo.toml
@@ -3,8 +3,6 @@ name = "brittle-ui"
 version = "0.1.0"
 edition = "2021"

-[workspace]
-
 [dependencies]
 brittle-model = { path = "../brittle-model" }
 brittle-keymap = { path = "../brittle-keymap" }
--- a/brittle-ui/Trunk.toml
+++ b/brittle-ui/Trunk.toml
@@ -1,5 +1,5 @@
 [build]
-target = "../src/index.html"
+target = "index.html"
 dist = "../dist"

 [serve]
--- a/brittle-ui/index.html
+++ b/brittle-ui/index.html
--- a/brittle-ui/src/command_bar.rs
+++ b/brittle-ui/src/command_bar.rs
--- a/brittle-ui/src/commands.rs
+++ b/brittle-ui/src/commands.rs
--- a/brittle-ui/src/lib_tab.rs
+++ b/brittle-ui/src/lib_tab.rs
--- a/brittle-ui/src/lib_tree.rs
+++ b/brittle-ui/src/lib_tree.rs
--- a/brittle-ui/src/main.rs
+++ b/brittle-ui/src/main.rs
--- a/brittle-ui/src/mode.rs
+++ b/brittle-ui/src/mode.rs
--- a/brittle-ui/src/pdf_viewer.rs
+++ b/brittle-ui/src/pdf_viewer.rs
--- a/brittle-ui/src/pub_detail.rs
+++ b/brittle-ui/src/pub_detail.rs
--- a/brittle-ui/src/pub_list.rs
+++ b/brittle-ui/src/pub_list.rs
--- a/brittle-ui/src/tab_bar.rs
+++ b/brittle-ui/src/tab_bar.rs
--- a/brittle-ui/src/tauri.rs
+++ b/brittle-ui/src/tauri.rs
--- a/brittle-ui/style.css
+++ b/brittle-ui/style.css
--- a/src-tauri/assets/viewer/index.html
+++ b/src-tauri/assets/viewer/index.html
--- a/src-tauri/assets/viewer/pdfjs/pdf.min.js
+++ b/src-tauri/assets/viewer/pdfjs/pdf.min.js
--- a/src-tauri/assets/viewer/pdfjs/pdf.worker.min.js
+++ b/src-tauri/assets/viewer/pdfjs/pdf.worker.min.js
--- a/src-tauri/pdfjs/package.json
+++ b/src-tauri/pdfjs/package.json
@@ -1,8 +0,0 @@
-{
-  "name": "brittle-pdfjs",
-  "private": true,
-  "description": "Pre-built pdfjs-dist for the Brittle PDF viewer.",
-  "dependencies": {
-    "pdfjs-dist": "3.11.174"
-  }
-}
--- a/src-tauri/src/pdf_protocol.rs
+++ b/src-tauri/src/pdf_protocol.rs
@@ -18,12 +18,12 @@ use crate::state::AppState;

 // ── Embedded assets ───────────────────────────────────────────────────────────

-static VIEWER_HTML: &[u8] = include_bytes!("pdf_viewer.html");
+static VIEWER_HTML: &[u8] = include_bytes!("../assets/viewer/index.html");
 static PDFJS_MIN_JS: &[u8] = include_bytes!(
-    "../pdfjs/node_modules/pdfjs-dist/build/pdf.min.js"
+    "../assets/viewer/pdfjs/pdf.min.js"
 );
 static PDFJS_WORKER_JS: &[u8] = include_bytes!(
-    "../pdfjs/node_modules/pdfjs-dist/build/pdf.worker.min.js"
+    "../assets/viewer/pdfjs/pdf.worker.min.js"
 );

 // ── Public API ────────────────────────────────────────────────────────────────
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -6,11 +6,11 @@
  "build": {
    "beforeDevCommand": {
      "script": "trunk serve",
-      "cwd": "."
+      "cwd": "../brittle-ui"
    },
    "beforeBuildCommand": {
      "script": "trunk build --release",
-      "cwd": "."
+      "cwd": "../brittle-ui"
    },
    "devUrl": "http://localhost:1420",
    "frontendDist": "../dist"
--- a/vendor/pdfjs-dist
+++ b/vendor/pdfjs-dist