Add conflict resolution diff UI and app branding

2026-05-13 16:25:28 -04:00
parent 780ff3a02c
commit d359baa010
83 changed files with 4523 additions and 3735 deletions
--- a/apps/web/index.html
+++ b/apps/web/index.html
@@ -3,7 +3,7 @@
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>MD Hub Secure App</title>
+    <title>Cairnquire App</title>
    <script type="module" src="/src/main.tsx"></script>
  </head>
  <body>
--- a/apps/web/package-lock.json
+++ b/apps/web/package-lock.json
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "md-hub-secure-web",
+  "name": "cairnquire-web",
  "version": "0.1.0",
  "private": true,
  "type": "module",
--- a/apps/web/src/app.tsx
+++ b/apps/web/src/app.tsx
@@ -339,7 +339,10 @@ function WorkspaceView(props: {
      <section class="column-browser" aria-label="Workspace files">
        {columns.map((column) => (
          <div class="browser-column" key={column.prefix || "root"}>
-            <header>{column.title}</header>
+            <header>
+              <Folder size={15} />
+              {column.title}
+            </header>
            <div class="item-list">
              {column.items.map((item) => (
                <button
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -4,7 +4,7 @@ import { App } from "./app";
 import "./styles.css";

 render(
-  <LocationProvider>
+  <LocationProvider scope="/app">
    <Router>{[<Route path="/*" component={App} />]}</Router>
  </LocationProvider>,
  document.getElementById("app")!,
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -1,6 +1,8 @@
 import { defineConfig } from "vite";
 import preact from "@preact/preset-vite";

+const serverTarget = "http://localhost:8080";
+
 export default defineConfig({
  base: "/app/",
  plugins: [preact()],
@@ -12,7 +14,27 @@ export default defineConfig({
    port: 5173,
    proxy: {
      "/api": {
-        target: "http://localhost:8080",
+        target: serverTarget,
+        changeOrigin: true,
+      },
+      "/attachments": {
+        target: serverTarget,
+        changeOrigin: true,
+      },
+      "/docs": {
+        target: serverTarget,
+        changeOrigin: true,
+      },
+      "/health": {
+        target: serverTarget,
+        changeOrigin: true,
+      },
+      "/static": {
+        target: serverTarget,
+        changeOrigin: true,
+      },
+      "/sw.js": {
+        target: serverTarget,
        changeOrigin: true,
      },
      "/ws": {
@@ -20,7 +42,7 @@ export default defineConfig({
        ws: true,
      },
      "^/app$": {
-        target: "http://localhost:8080",
+        target: serverTarget,
        changeOrigin: true,
      },
    },