Compare commits

..

436 Commits

Author SHA1 Message Date
Jeff Emmett 03894d2146 feat: add version history and change tracking system
- Add time-rewind button next to star dashboard button
- Create VersionHistoryPanel with Changes, Versions, and Deleted tabs
- Implement localStorage tracking of user's last-seen board state
- Add visual diff highlighting: yellow glow for new shapes, dim grey for deleted
- Create DeletedShapesOverlay with floating indicator and restore options
- Integrate with R2 backups for version snapshots via /api/versions API
- Add permission system (admin, editor, viewer roles)
- Admins can revert to versions, editors can restore shapes
- Viewers can see history but cannot modify

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 15:01:30 -08:00
Jeff Emmett ebb3ab661b Create task task-033 2025-12-04 13:44:43 -08:00
Jeff Emmett 477af6ae05 Update task task-028 2025-12-04 13:44:04 -08:00
Jeff Emmett 36ea5e5482 Update task task-028 2025-12-04 13:34:28 -08:00
Jeff Emmett f9f54f9f32 Update task task-028 2025-12-04 13:24:44 -08:00
Jeff Emmett 878227f31d Update task task-028 2025-12-04 13:12:44 -08:00
Jeff Emmett c95ece9fe5 Create task task-032 2025-12-04 13:12:10 -08:00
Jeff Emmett 538dbcd807 Create task task-031 2025-12-04 13:12:10 -08:00
Jeff Emmett f0d261ff98 Create task task-030 2025-12-04 13:12:10 -08:00
Jeff Emmett 1ec6faed56 Create task task-029 2025-12-04 13:12:09 -08:00
Jeff Emmett 37cd086ff0 Create task task-028 2025-12-04 13:12:06 -08:00
Jeff Emmett 808532a1b6 Create task task-027 2025-12-04 13:06:11 -08:00
Jeff Emmett a48708525c Update task task-025 2025-12-04 12:51:27 -08:00
Jeff Emmett c4e50f01fd Create task task-026 2025-12-04 12:48:09 -08:00
Jeff Emmett 16acd3d6ef Update task task-025 2025-12-04 12:43:47 -08:00
Jeff Emmett a50e3dad58 Update task task-001 2025-12-04 12:35:25 -08:00
Jeff Emmett 22ac1d65dd Update task task-025 2025-12-04 12:28:49 -08:00
Jeff Emmett f67ee111e6 Update task task-001 2025-12-04 12:27:04 -08:00
Jeff Emmett 63264cf636 Update task task-001 2025-12-04 12:25:53 -08:00
Jeff Emmett 0ec4e9382f Create task task-025 2025-12-04 12:25:35 -08:00
Jeff Emmett 8cda0d4e28 Merge main into feature/open-mapping, resolve conflicts 2025-12-04 06:51:35 -08:00
Jeff Emmett 8dac699acf Merge branch 'main' into feature/open-mapping 2025-12-04 06:50:37 -08:00
Jeff Emmett 966e1855c1 chore: remove open-mapping files (should be on feature branch) 2025-12-04 06:45:27 -08:00
Jeff Emmett 4f1a6d1314 feat: add open-mapping collaborative route planning module
Introduces a comprehensive mapping and routing layer for the canvas
that provides advanced route planning capabilities beyond Google Maps.

Built on open-source foundations:
- OpenStreetMap for base map data
- OSRM/Valhalla for routing engines
- MapLibre GL JS for map rendering
- VROOM for route optimization
- Y.js for real-time collaboration

Features planned:
- Multi-path routing with alternatives comparison
- Real-time collaborative waypoint editing
- Layer management (basemaps, overlays, custom GeoJSON)
- Calendar/scheduling integration
- Budget tracking per waypoint/route
- Offline tile caching via PWA

Includes:
- TypeScript types for routes, waypoints, layers
- React hooks for map instance, routing, collaboration
- Service abstractions for multiple routing providers
- Docker Compose config for backend deployment
- Setup script for OSRM data preparation

Backlog task: task-024

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 06:39:26 -08:00
Jeff Emmett 8c90727b93 Create task task-024 2025-12-04 06:30:57 -08:00
Jeff Emmett 7a471b0e37 fix: properly validate tldraw fractional indexing format
The previous validation allowed "b1" which is invalid because 'b' prefix
expects 2-digit integers (10-99), not 1-digit. This caused ValidationError
when selecting old format content.

Now validates that:
- 'a' prefix: 1 digit (a0-a9)
- 'b' prefix: 2 digits (b10-b99)
- 'c' prefix: 3 digits (c100-c999)
- etc.

Invalid indices are converted to 'a1' as a safe default.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 06:30:50 -08:00
Jeff Emmett 068ff7d3be Merge main, resolve conflict taking remote 2025-12-04 15:04:22 +01:00
Jeff Emmett 075e317a0d Update backlog tasks from server 2025-12-04 15:02:54 +01:00
Jeff Emmett aa742919cb Update task task-018 2025-12-04 04:27:37 -08:00
Jeff Emmett 5a6e04f26b Update task task-017 2025-12-04 04:27:35 -08:00
Jeff Emmett f15f46f742 Update task task-001 2025-12-04 04:13:56 -08:00
Jeff Emmett 9c1e8cbcaa Update task task-001 2025-12-04 04:09:47 -08:00
Jeff Emmett 60a6825dfd chore: clean up duplicate task-016 files
Removed auto-generated duplicates that were overwritten.
Correct tasks are now task-018 and task-019.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 04:04:57 -08:00
Jeff Emmett 0edac2968b Update task task-015 2025-12-04 04:03:00 -08:00
Jeff Emmett 1ccaf32d1a Update task task-018 2025-12-04 04:02:57 -08:00
Jeff Emmett a6f2d6e015 Update task task-017 2025-12-04 04:02:50 -08:00
Jeff Emmett f5c775e417 Create task task-019 2025-12-04 04:02:22 -08:00
Jeff Emmett 7191e2543d Create task task-018 2025-12-04 04:02:21 -08:00
Jeff Emmett cd58b1c1cd fix: accept all valid tldraw fractional indices (b1, c10, etc.)
The index validation was incorrectly rejecting valid tldraw fractional
indices like "b1", "c10", etc. tldraw's fractional indexing uses:
- First letter (a-z) indicates integer part length (a=1 digit, b=2 digits)
- Followed by alphanumeric characters for value and jitter

This was causing ValidationError on production for Embed shapes with
index "b1". Fixed regex in all validation functions to accept any
lowercase letter prefix, not just 'a'.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 04:01:35 -08:00
Jeff Emmett 01b5a84e42 Create task task-016 2025-12-04 04:01:02 -08:00
Jeff Emmett 478c1f6774 Create task task-017 2025-12-04 04:00:59 -08:00
Jeff Emmett 420ad28d9a Create task task-016 2025-12-04 04:00:57 -08:00
Jeff Emmett b1c3ceeab7 Create task task-016 2025-12-04 04:00:55 -08:00
Jeff Emmett a5c5c7f441 Create task task-015 2025-12-04 04:00:53 -08:00
Jeff Emmett abb80c05d8 fix: improve Multmux terminal resize handling
- Add ResizeObserver for reliable resize detection
- Use requestAnimationFrame for smoother fit operations
- Apply full-size styles to xterm elements after fit
- Hide tags to maximize terminal area
- Fix flex layout for proper container sizing
- Add error handling for fit operations during rapid resize

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 03:54:51 -08:00
Jeff Emmett 5ca4b19aec Update task task-014 2025-12-04 03:47:40 -08:00
Jeff Emmett 1d212c385d Create task task-014 2025-12-04 03:46:50 -08:00
Jeff Emmett 26a15b7aaf feat: add custom system prompt support to LLM utility
- Allow passing full system prompts (>100 chars) or personality IDs
- Auto-detect prompt type based on length
- Pass custom prompts through provider chain with retry logic

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 03:16:13 -08:00
Jeff Emmett 2cee2cb31b feat: improve Markdown tool toolbar UX
- Increase default width from 500px to 650px to fit full toolbar
- Add fixed-position toggle button (top-right) that doesn't move between states
- Remove horizontal scrollbar with overflow: hidden
- Add right padding to toolbar for toggle button space
- Tighten toolbar spacing (gap: 1px, padding: 4px 6px)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 03:00:48 -08:00
Jeff Emmett 26a931acf5 feat: refine Mycelial Intelligence prompt for concise, action-focused responses
- Shorten system prompt to emphasize brevity (1-3 sentences)
- Add explicit "never write code unless asked" instruction
- Include good/bad response examples for clarity
- Focus on suggesting tools and canvas actions over explanations
- Remove verbose identity/capability descriptions

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 02:39:05 -08:00
Jeff Emmett f3a9a28724 Replace CLAUDE.md symlink with actual file for Docker compatibility
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-04 02:29:06 -08:00
Jeff Emmett b2a7879d2c fix: make Markdown tool dark mode reactive to theme changes
- Replace useMemo with useState + MutationObserver for isDarkMode detection
- Add MDXEditor's built-in 'dark-theme' class for proper toolbar/icon theming
- Theme now switches instantly when user toggles dark/light mode

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-03 22:57:25 -08:00
Jeff Emmett 5f2166075b Fix Traefik routing - use single service for multiple routers
Traefik cannot auto-link routers when multiple services are defined.
Fixed by using a single service (canvas) that both routers explicitly
reference via the .service label.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-03 22:52:41 -08:00
Jeff Emmett ebf602fd21 Create task task-high.02 2025-12-03 22:35:50 -08:00
Jeff Emmett 0906704693 Create task task-high.01 2025-12-03 22:34:45 -08:00
Jeff Emmett 343f408661 Add production Traefik labels for jeffemmett.com
- Add router rules for jeffemmett.com and www.jeffemmett.com
- Keep staging.jeffemmett.com for testing
- Preparing for migration from Cloudflare Pages to Docker deployment

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-03 22:34:34 -08:00
Jeff Emmett 49cf763858 Update task task-013 2025-12-03 22:29:46 -08:00
Jeff Emmett d73aee3530 Create task task-013 2025-12-03 22:29:30 -08:00
Jeff Emmett 8bb87075ad Update task task-012 2025-12-03 22:29:14 -08:00
Jeff Emmett 42c3ec7587 Fix npm peer dependency conflict with --legacy-peer-deps 2025-12-03 22:06:09 -08:00
Jeff Emmett 55ac9381fa Add Docker configuration for self-hosted deployment
- Dockerfile: Multi-stage build with Vite frontend, nginx for serving
- nginx.conf: SPA routing, gzip, security headers
- docker-compose.yml: Traefik labels for staging.jeffemmett.com

Backend sync still uses Cloudflare Workers (jeffemmett-canvas.jeffemmett.workers.dev)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-03 22:03:25 -08:00
Jeff Emmett d89fb4baaf Add backlog tasks from worktrees and feature branches
- task-002: RunPod AI API Integration (worktree: add-runpod-AI-API)
- task-003: MulTmux Web Integration (worktree: mulTmux-webtree)
- task-004: IO Chip Feature (worktree: feature/io-chip)
- task-005: Automerge CRDT Sync
- task-006: Stripe Payment Integration
- task-007: Web3 Integration
- task-008: Audio Recording Feature
- task-009: Web Speech API Transcription
- task-010: Holon Integration
- task-011: Terminal Tool
- task-012: Dark Mode Theme

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-12-03 21:56:54 -08:00
Jeff Emmett b8d014a0af Create task task-001 2025-12-03 15:42:13 -08:00
Jeff Emmett c396bbca85 feat: standardize tool shapes with pin functionality and UI improvements
- Add pin functionality to ImageGen and VideoGen shapes
- Refactor ImageGen to use StandardizedToolWrapper with tags support
- Update StandardizedToolWrapper: grey tags, fix button overlap, improve header drag
- Fix index validation in AutomergeToTLStore for old format indices
- Update wrangler.toml with latest compatibility date and RunPod endpoint docs
- Refactor VideoGen to use captured editor reference for consistency

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 21:14:51 -08:00
Jeff Emmett 090646f893 fix: sanitize shape indices and improve RunPod error handling
- Add index sanitization in Board.tsx to fix "Expected an index key"
  validation errors when selecting shapes with old format indices
- Improve RunPod error handling to properly display status messages
  (IN_PROGRESS, IN_QUEUE, FAILED) instead of generic errors
- Update wrangler.toml with current compatibility date and document
  RunPod endpoint configuration for reference
- Add sanitizeIndex helper function to convert invalid indices like
  "b1" to valid tldraw fractional indices like "a1"

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 20:26:51 -08:00
Jeff Emmett 829dd4f642 fix: increase VideoGen timeout to 6 minutes for GPU cold starts
Video generation on RunPod can take significant time:
- GPU cold start: 30-120 seconds
- Model loading: 30-60 seconds
- Generation: 60-180 seconds

Increased polling timeout from 4 to 6 minutes and updated UI
to set proper expectations for users.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 18:51:41 -08:00
Jeff Emmett f2a77580b1 feat: add default RunPod endpoints for all AI services
All RunPod API functions now have hardcoded fallback values so
every user can access AI features without needing their own keys:

- Image Generation: Automatic1111 endpoint (tzf1j3sc3zufsy)
- Video Generation: Wan2.2 endpoint (4jql4l7l0yw0f3)
- Text Generation: vLLM endpoint (03g5hz3hlo8gr2)
- Transcription: Whisper endpoint (lrtisuv8ixbtub)
- Ollama: Netcup AI Orchestrator (ai.jeffemmett.com)

This ensures ImageGen, VideoGen, Mycelial Intelligence, and
transcription work for all users of the canvas out of the box.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 18:41:21 -08:00
Jeff Emmett e230d571e4 feat: add default AI endpoints for all users
Hardcoded fallback values for Ollama and RunPod text endpoints so
that all users have access to AI features without needing to
configure their own API keys:

- Ollama: defaults to https://ai.jeffemmett.com (Netcup AI Orchestrator)
- RunPod Text: defaults to pre-configured vLLM endpoint

This ensures Mycelial Intelligence works for everyone out of the box.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 18:38:09 -08:00
Jeff Emmett d42bae52d7 fix: register FathomNoteShape in customShapeUtils
The FathomNote shape was being created by FathomMeetingsBrowserShape
but wasn't registered with tldraw, causing "No shape util found for
type FathomNote" errors when loading canvases with Fathom notes.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 16:22:23 -07:00
Jeff Emmett dba981c2af fix: improve index migration to handle all invalid formats
- Added isValidTldrawIndex() function to properly validate tldraw
  fractional indices (e.g., "a1", "a1V" are valid, "b1", "c1" are not)
- Apply migration to IndexedDB data as well as server data
- This fixes ValidationError when loading old data with invalid indices

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 16:19:30 -07:00
Jeff Emmett 179a03057e fix: override sharp to 0.33.5 for Cloudflare Pages compatibility
Sharp 0.33.5 has prebuilt binaries for linux-x64 while the older
0.32.x version in @xenova/transformers requires native compilation.
Using npm overrides to force 0.33.5 throughout the dependency tree.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 23:15:32 -08:00
Jeff Emmett 439a7f07e8 fix: skip optional deps to avoid sharp compilation on Cloudflare Pages
Added omit=optional to .npmrc to prevent @xenova/transformers from
trying to compile sharp with native dependencies. Sharp is only used
for server-side image processing which isn't needed in the browser.

Also added override for sharp version in package.json as fallback.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 23:03:36 -08:00
Jeff Emmett c070e673ad fix: migrate invalid shape indices in old data
Adds migrateStoreData() function to fix ValidationError when loading
old data with invalid index keys (e.g., 'b1' instead of fractional
indices like 'a1V'). The migration detects invalid indices and
regenerates valid ones using tldraw's getIndexAbove().

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 22:40:21 -08:00
Jeff Emmett c175c0f29a fix: handle corrupted shapes causing "No nearest point found" errors
- Add cleanup routine on editor mount to remove corrupted draw/line shapes
  that have no points/segments (these cause geometry errors)
- Add global error handler to suppress geometry errors from tldraw
  instead of crashing the entire app
- Both fixes ensure old JSON data with corrupted shapes loads gracefully

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 22:21:24 -08:00
Jeff Emmett 928a535aec fix: resolve TypeScript errors for Cloudflare Pages build
- Fix undefined 'result' variable reference in useWhisperTranscriptionSimple.ts
- Add type guards for array checks in ImageGenShapeUtil.tsx output handling
- Add Record<string, any> type assertions for response.json() calls in llmUtils.ts
- Remove unused 'isDark' parameter from MicrophoneIcon component
- Remove unused 'index' parameter in components.tsx map callback

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 21:51:54 -08:00
Jeff Emmett 33ff5216cc feat: fix Holon shape H3 validation + offline persistence + geometry error handling
Holon Shape Improvements:
- Add H3 cell ID validation before connecting to Holosphere
- Extract coordinates and resolution from H3 cell IDs automatically
- Improve data rendering with proper lens/item structure display
- Add "Generate H3 Cell" button for quick cell ID creation
- Update placeholders and error messages for H3 format
- Fix HolonBrowser validation and placeholder text

Geometry Error Fix:
- Add try-catch in ClickPropagator.eventHandler for shapes with invalid paths
- Add try-catch in CmdK for getShapesAtPoint geometry errors
- Prevents "No nearest point found" crashes from corrupted draw/line shapes

Offline Persistence:
- Add IndexedDB storage adapter for Automerge documents
- Implement document ID mapping for room persistence
- Merge local and server data on reconnection
- Support offline editing with automatic sync

Other Changes:
- Update .env.example with Ollama and RunPod configuration
- Add multmux Docker configuration files
- UI styling improvements for toolbar and share zone
- Remove auto-creation of MycelialIntelligence shape (now permanent UI bar)
- Various shape utility minor fixes

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 21:36:02 -08:00
Jeff Emmett 5cd36c3d3c feat: move Mycelial Intelligence to permanent UI bar + fix ImageGen RunPod API
- Mycelial Intelligence UI refactor:
  - Created permanent floating bar at top of screen (MycelialIntelligenceBar.tsx)
  - Bar stays fixed and doesn't zoom with canvas
  - Collapses when clicking outside
  - Removed from toolbar tool menu
  - Added deprecated shape stub for backwards compatibility with old boards

- ImageGen RunPod fix:
  - Changed from async /run to sync /runsync endpoint
  - Fixed output parsing for output.images array format with base64

- Other updates:
  - Added FocusLockIndicator and UserSettingsModal UI components
  - mulTmux server and shape updates
  - Automerge sync and store improvements
  - Various CSS and UI refinements

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 23:57:26 -08:00
Jeff Emmett a8c3988e3f feat: add Ollama private AI integration with model selection
- Add Ollama as priority AI provider (FREE, self-hosted)
- Add model selection UI in Settings dialog
- Support for multiple models: Llama 3.1 70B, Devstral, Qwen Coder, etc.
- Ollama server configured at http://159.195.32.209:11434
- Models dropdown shows quality vs speed tradeoffs
- Falls back to RunPod/cloud providers when Ollama unavailable

Models available:
- llama3.1:70b (Best quality, ~7s)
- devstral (Best for coding agents)
- qwen2.5-coder:7b (Fast coding)
- llama3.1:8b (Balanced)
- llama3.2:3b (Fastest)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 14:47:07 -08:00
Jeff Emmett 5151b474be Merge branch 'mulTmux-webtree' - add collaborative terminal tool
Combines RunPod AI integration (ImageGen, VideoGen) with mulTmux
collaborative terminal functionality.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 04:13:37 -08:00
Jeff Emmett 8ea3490fb4 feat: update mulTmux terminal tool and improve shape utilities
Updates to collaborative terminal integration and various shape
improvements across the canvas.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 04:08:08 -08:00
Jeff Emmett 67d4db7281 Merge branch 'add-runpod-AI-API' - RunPod AI integration with image and video generation 2025-11-26 03:54:54 -08:00
Jeff Emmett 083095c821 feat: add direct RunPod integration for video generation
- Add RunPod config helpers for image, video, text, whisper endpoints
- Update VideoGenShapeUtil to call RunPod video endpoint directly
- Add Ollama URL config for local LLM support
- Remove dependency on AI orchestrator backend (not yet built)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 03:52:01 -08:00
Jeff Emmett 05197f8430 feat: add video generation and AI orchestrator client
- Add VideoGenShapeUtil with StandardizedToolWrapper for consistent UI
- Add VideoGenTool for canvas video generation
- Add AI Orchestrator client library for smart routing to RS 8000/RunPod
- Register new shapes and tools in Board.tsx
- Add deployment guides and migration documentation
- Ollama deployed on Netcup RS 8000 at 159.195.32.209:11434

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 02:56:55 -08:00
Jeff Emmett e479413363 feat: add mulTmux collaborative terminal tool
Add mulTmux as an integrated workspace in canvas-website project:

- Node.js/TypeScript backend with tmux session management
- CLI client with blessed-based terminal UI
- WebSocket-based real-time collaboration
- Token-based authentication with invite links
- Session management (create, join, list)
- PM2 deployment scripts for AI server
- nginx reverse proxy configuration
- Workspace integration with npm scripts

Usage:
- npm run multmux:build - Build server and CLI
- npm run multmux:start - Start production server
- multmux create <name> - Create collaborative session
- multmux join <token> - Join existing session

See MULTMUX_INTEGRATION.md for full documentation.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-24 02:41:03 -08:00
Jeff Emmett 6a0a53796c Add GitHub to Gitea mirror workflow
🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-22 18:00:44 -08:00
Jeff Emmett 3549326122 perf: optimize bundle size with code splitting and disable sourcemaps
- Split large libraries into separate chunks:
  * tldraw: 1.97 MB → 510 KB gzipped
  * large-utils (gun, webnative): 1.54 MB → 329 KB gzipped
  * markdown editors: 1.52 MB → 438 KB gzipped
  * ml-libs (@xenova/transformers): 1.09 MB → 218 KB gzipped
  * AI SDKs: 182 KB → 42 KB gzipped
  * automerge: 283 KB → 70 KB gzipped

- Disable sourcemaps in production builds
- Main bundle reduced to 616 KB gzipped
- Improves initial page load time with on-demand chunk loading

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-19 21:03:10 -07:00
Jeff Emmett 28b8ebdc72 feat: add automatic Git worktree creation
Add Git hook and management scripts for automatic worktree creation when branching from main.

## Features

**Automatic Worktree Creation:**
- Post-checkout Git hook automatically creates worktrees for new branches
- Creates worktrees at `../repo-name-branch-name`
- Only activates when branching from main/master
- Smart detection to avoid duplicate worktrees

**Worktree Manager Script:**
- `list` - List all worktrees with branches
- `create <branch>` - Manually create worktree
- `remove <branch>` - Remove worktree
- `clean` - Remove all worktrees except main
- `goto <branch>` - Get path to worktree (for cd)
- `status` - Show git status of all worktrees

## Benefits

- Work on multiple branches simultaneously
- No need to stash when switching branches
- Run dev servers on different branches in parallel
- Compare code across branches easily
- Keep main branch clean

## Files Added

- `.git/hooks/post-checkout` - Auto-creates worktrees on branch creation
- `scripts/worktree-manager.sh` - Manual worktree management CLI
- `WORKTREE_SETUP.md` - Complete documentation and usage guide

## Usage

**Automatic (when branching from main):**
```bash
git checkout -b feature/new-feature
# Worktree automatically created at ../canvas-website-feature-new-feature
```

**Manual:**
```bash
./scripts/worktree-manager.sh create feature/my-feature
./scripts/worktree-manager.sh list
cd $(./scripts/worktree-manager.sh goto feature/my-feature)
```

See WORKTREE_SETUP.md for complete documentation.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-19 20:55:30 -07:00
Jeff Emmett f4e72452f1 debug: add logging for coordinate defaults during sanitization 2025-11-19 20:25:24 -07:00
Jeff Emmett cae367db28 fix: migrate geo shapes with props.text during Automerge load
Geo shapes saved before the tldraw schema change have props.text which is
no longer valid. This causes ValidationError on page reload when shapes are
loaded from Automerge:

  "ValidationError: At shape(type = geo).props.text: Unexpected property"

The migration logic was only in JSON import (CustomMainMenu.tsx), but shapes
loading from Automerge also need migration.

This fix adds the props.text → props.richText migration to the sanitizeRecord
function in AutomergeToTLStore.ts, ensuring geo shapes are properly migrated
when loaded from Automerge, matching the behavior during JSON import.

The original text is preserved in meta.text for backward compatibility with
search and other features that reference it.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-19 16:25:58 -07:00
Jeff Emmett 7e09d22843 fix: preserve coordinates and convert geo shape text during JSON import
- Fix coordinate collapse bug where shapes were resetting to (0,0)
- Convert geo shape props.text to props.richText (tldraw schema change)
- Preserve text in meta.text for backward compatibility
- Add .nvmrc to enforce Node 20
- Update package.json to require Node >=20.0.0
- Add debug logging for sync and import operations

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-19 16:14:23 -07:00
Jeff Emmett 943162899e fix: use useMemo instead of useState for repo/adapter initialization
Fixed TypeScript error by changing from useState to useMemo for repo and
adapter initialization. This properly exposes the repo and adapter objects
instead of returning a state setter function.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 22:10:55 -07:00
Jeff Emmett e70cba82b4 fix: wait for network adapter to be ready before creating document
Added await for adapter.whenReady() to ensure WebSocket connection is
established before creating the Automerge document. This should enable
the Automerge Repo to properly send binary sync messages when document
changes occur.

Changes:
- Extract adapter from repo initialization to access it
- Wait for adapter.whenReady() before creating document
- Update useEffect dependencies to include adapter and workerUrl

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 22:07:24 -07:00
Jeff Emmett 63b19f7db8 fix: restore working Automerge sync from pre-Cloudflare version
Reverted to the proven approach from commit 90605be where each client
creates its own Automerge document with repo.create(). The Automerge
binary sync protocol handles synchronization between clients through
the WebSocket network adapter, without requiring shared document IDs.

Key changes:
- Each client calls repo.create() to get a unique document
- Initial content loaded from server via HTTP/R2
- Binary sync messages broadcast between clients keep documents in sync
- No need for shared document ID storage/retrieval

This fixes the "Document unavailable" errors and enables real-time
collaboration across multiple board instances.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 21:59:59 -07:00
Jeff Emmett c18d204814 fix: simplify Automerge document creation for concurrent access
Removed document ID storage/retrieval logic that was causing "Document unavailable"
errors. Each client now creates its own Automerge document handle and syncs content
via WebSocket binary protocol. This allows multiple boards to load the same room
simultaneously without conflicts.

- Removed /room/:roomId/documentId endpoints usage
- Each client creates document with repo.create()
- Content syncs via Automerge's native binary sync protocol
- Initial content still loaded from server via HTTP

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 21:40:15 -07:00
Jeff Emmett 3231720004 fix: add await to repo.find() call
repo.find() returns a Promise<DocHandle>, not DocHandle directly.
Added missing await keyword to fix TypeScript build error.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 21:26:42 -07:00
Jeff Emmett ca9f250de8 fix: handle concurrent Automerge document access with try-catch
When multiple clients try to load the same room simultaneously, repo.find()
throws "Document unavailable" error if the document isn't in the repo yet.
Wrapped repo.find() in try-catch to create a new handle when document isn't
available, allowing multiple boards to load the same page concurrently.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 21:15:56 -07:00
Jeff Emmett 6ab966cc95 fix: use proper Automerge URL format for repo.find()
The issue was that repo.find() was creating a NEW document instead of
waiting for the existing one to sync from the network.

Changes:
- Use 'automerge:{documentId}' URL format for repo.find()
- Remove try-catch that was creating new documents
- Let repo.find() properly wait for network sync

This ensures all clients use the SAME document ID and can sync in real-time.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 21:00:18 -07:00
Jeff Emmett 02808d170e fix: handle Document unavailable error with try-catch in repo.find()
When repo.find() is called for a document that exists on the server but not
locally, it throws 'Document unavailable' error. This fix:

- Wraps repo.find() in try-catch block
- Falls back to creating new handle if document not found
- Allows sync adapter to merge with server state via network

This handles the case where clients join existing rooms and need to sync
documents from the network.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 20:33:31 -07:00
Jeff Emmett 2cc7c52755 refactor: remove OddJS dependency and fix Automerge sync
Major Changes:
- Fix Automerge "Document unavailable" error by awaiting repo.find()
- Remove @oddjs/odd package and all related dependencies (205 packages)
- Remove location sharing features (OddJS filesystem-dependent)
- Simplify auth to use only CryptoAuthService (WebCryptoAPI-based)

Auth System Changes:
- Refactor AuthService to remove OddJS filesystem integration
- Update AuthContext to remove FileSystem references
- Delete unused auth files (account.ts, backup.ts, linking.ts)
- Delete unused auth components (Register.tsx, LinkDevice.tsx)

Location Features Removed:
- Delete all location components and routes
- Remove LocationShareShape from shape registry
- Clean up location references across codebase

Documentation Updates:
- Update WEBCRYPTO_AUTH.md to remove OddJS references
- Correct component names (CryptoLogin → CryptID)
- Update file structure and dependencies
- Fix Automerge README WebSocket path documentation

Build System:
- Successfully builds without OddJS dependencies
- All TypeScript errors resolved
- Production bundle size optimized

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 20:19:02 -07:00
Jeff Emmett 1e68150b60 fix: implement real-time Automerge sync across clients
- Add document ID coordination via server to ensure all clients sync to same document
- Add new endpoints GET/POST /room/:roomId/documentId for document ID management
- Store automergeDocumentId in Durable Object storage
- Add enhanced logging to CloudflareAdapter send() method for debugging
- Add sharePolicy to Automerge Repo to enable document sharing
- Fix TypeScript errors in useAutomergeSyncRepo

This fixes the issue where each client was creating its own Automerge document
with a unique ID, preventing real-time sync. Now all clients in a room use the
same document ID, enabling proper real-time collaboration.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 19:45:36 -07:00
Jeff Emmett dd190824d2 refactor: move wrangler config files to root directory
Moved wrangler.toml and wrangler.dev.toml from worker/ to root directory to fix Cloudflare Pages deployment. Updated package.json scripts to reference new config locations. This resolves the "Missing entry-point to Worker script" error during Pages builds.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 19:17:54 -07:00
Jeff Emmett 69ecaf2335 fix: correct worker entry point path in wrangler config files
Update main path from "worker/worker.ts" to "worker.ts" since the wrangler.toml files are located inside the worker/ directory. This fixes the "Missing entry-point to Worker script" error during deployment.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 19:05:25 -07:00
Jeff Emmett 693d38eb7d fix: move wrangler.dev.toml to worker/ directory to fix Pages deployment
Cloudflare Pages was detecting wrangler.dev.toml at root level and
switching to Worker deployment mode (running 'npx wrangler deploy')
instead of using the configured build command ('npm run build').

Changes:
- Move wrangler.dev.toml to worker/ directory alongside wrangler.toml
- Update all package.json scripts to reference new location
- Simplify .cfignore since all wrangler configs are now in worker/

This allows Pages to use the correct build command and deploy the
static site with proper routing for /contact and /presentations.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 18:43:34 -07:00
Jeff Emmett 7a921d8477
Merge pull request #20 from Jeff-Emmett/add-runpod-AI-API
Add runpod ai api
2025-11-16 18:08:45 -07:00
Jeff Emmett 831d463b5c fix: remove Vercel analytics import from App.tsx
- Remove @vercel/analytics import
- Remove inject() call
- Fixes build error: Cannot find module '@vercel/analytics'

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 17:57:05 -07:00
Jeff Emmett 8c9eaa1d2b chore: remove Vercel dependencies
- Remove @vercel/analytics package
- Remove vercel CLI package
- Site uses Cloudflare Pages for deployment

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 17:52:32 -07:00
Jeff Emmett b52b715340 feat: add RunPod AI integration with image generation and enhanced LLM support
Add comprehensive RunPod AI API integration including:
- New runpodApi.ts client for RunPod endpoint communication
- Image generation tool and shape utilities for AI-generated images
- Enhanced LLM utilities with RunPod support for text generation
- Updated Whisper transcription with improved error handling
- UI components for image generation tool
- Setup and testing documentation

This commit preserves work-in-progress RunPod integration before switching branches.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 16:14:39 -07:00
Jeff Emmett 0882648565 feat: rebrand CryptoLogin to CryptID
- Rename CryptoLogin component to CryptID
- Update all imports and usages across the codebase
- Display 'CryptID: username' in user dropdown menu
- Update UI text to reference CryptID branding
- Update Profile component header to show CryptID
- Update component comments and documentation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 14:09:23 -07:00
Jeff Emmett f963152238 chore: remove Vercel dependencies and config files
- Remove @vercel/analytics dependency and usage
- Remove vercel CLI dependency
- Delete vercel.json configuration file
- Delete .vercel cache directory
- Site now fully configured for Cloudflare Pages deployment

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 13:35:50 -07:00
Jeff Emmett 99ee87b6d6
Merge pull request #19 from Jeff-Emmett/add-runpod-AI-API
fix: add .cfignore to prevent Pages from using wrangler config
2025-11-16 13:30:06 -07:00
Jeff Emmett c2a56f08e1 fix: add .cfignore to prevent Pages from using wrangler config
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 13:27:07 -07:00
Jeff Emmett e2619f4aae
Merge pull request #18 from Jeff-Emmett/add-runpod-AI-API
fix: remove wrangler.jsonc causing Pages to use wrong deploy method
2025-11-16 05:22:17 -07:00
Jeff Emmett 88a162d6ae fix: remove wrangler.jsonc causing Pages to use wrong deploy method
Remove wrangler.jsonc from root - it was causing Cloudflare Pages to try
deploying via Wrangler instead of using the standard Pages deployment.

Pages should build with npm run build and automatically deploy dist/ directory.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 05:20:28 -07:00
Jeff Emmett fde305abf6
Merge pull request #17 from Jeff-Emmett/add-runpod-AI-API
fix: use repo.create() instead of invalid document ID format
2025-11-16 05:15:49 -07:00
Jeff Emmett 48dac00f59 fix: use repo.create() instead of invalid document ID format
Change from repo.find('automerge:patricia') to repo.create() because
Automerge requires proper UUID-based document IDs, not arbitrary strings.

Each client creates a local document, loads initial data from server,
and syncs via WebSocket. The server syncs documents by room ID, not
by Automerge document ID.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 05:13:37 -07:00
Jeff Emmett caf831cce7
Merge pull request #16 from Jeff-Emmett/add-runpod-AI-API
Add runpod ai api
2025-11-16 05:07:29 -07:00
Jeff Emmett 776526c65e fix: add type cast for currentDoc to fix TypeScript error
Cast handle.doc() to any to fix TypeScript error about missing 'store' property.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 05:04:54 -07:00
Jeff Emmett 64d4a65613 fix: await repo.find() to fix TypeScript build errors
repo.find() returns a Promise<DocHandle>, so we need to await it.
This fixes the TypeScript compilation errors in the build.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 05:00:04 -07:00
Jeff Emmett 432e90d9ef fix: enable production logging for R2 persistence debugging
Add console logs in production to debug why shapes aren't being saved to R2.
This will help identify if saves are:
- Being triggered
- Being deferred/skipped
- Successfully completing

Logs added:
- 💾 When persistence starts
-  When persistence succeeds
- 🔍 When shape patches are detected
- 🚫 When saves are skipped (ephemeral/pinned changes)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:56:32 -07:00
Jeff Emmett 52c1af6864 fix: add wrangler.jsonc for Pages static asset deployment
Configure Cloudflare Pages to deploy the dist directory as static assets.
This fixes the deployment error "Missing entry-point to Worker script".

The frontend (static assets) will be served by Pages while the backend
(WebSocket server, Durable Objects) runs separately as a Worker.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:33:22 -07:00
Jeff Emmett 13ceb2ebbd
Merge pull request #15 from Jeff-Emmett/add-runpod-AI-API
Add runpod ai api
2025-11-16 04:21:51 -07:00
Jeff Emmett 71e7e5de05 fix: remove ImageGen references to fix build
Remove ImageGenShape import and references from useAutomergeStoreV2.ts
to fix TypeScript build error. ImageGen feature files are not yet committed.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:17:49 -07:00
Jeff Emmett 9b7cde262a fix: move Worker config to separate file for Pages compatibility
Move wrangler.toml to worker/wrangler.toml to separate Worker and Pages configurations.
Cloudflare Pages was trying to read wrangler.toml and failing because it contained
Worker-specific configuration (Durable Objects, migrations, etc.) that Pages doesn't support.

Changes:
- Move wrangler.toml → worker/wrangler.toml
- Update deploy scripts to use --config worker/wrangler.toml
- Pages deployment now uses Cloudflare dashboard configuration only

This resolves the deployment error:
"Configuration file cannot contain both 'main' and 'pages_build_output_dir'"

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:14:40 -07:00
Jeff Emmett f0f7c47775 fix: add pages_build_output_dir to wrangler.toml
Add Cloudflare Pages configuration to wrangler.toml to resolve deployment warning.
This tells Cloudflare Pages where to find the built static files (dist directory).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:07:32 -07:00
Jeff Emmett 90605bee09 fix: enable real-time multiplayer sync for automerge
Add manual sync triggering to broadcast document changes to other peers in real-time.
The Automerge Repo wasn't auto-broadcasting because the WebSocket setup doesn't use peer discovery.

Changes:
- Add triggerSync() helper function to manually trigger sync broadcasts
- Call triggerSync() after all document changes (position updates, eraser changes, regular changes)
- Pass Automerge document to patch handlers to prevent coordinate loss
- Add ImageGenShape support to schema

This fixes the issue where changes were being saved to Automerge locally but not
broadcast to other connected clients until page reload.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 04:00:31 -07:00
Jeff Emmett 0de17476d5
Merge pull request #14 from Jeff-Emmett/add-runpod-AI-API
fix custom shape type validation errors
2025-11-16 03:15:51 -07:00
Jeff Emmett 7a17b0944a fix custom shape type validation errors
Add case normalization for custom shape types to prevent validation errors when loading shapes with lowercase type names (e.g., "chatBox" → "ChatBox"). The TLDraw schema expects PascalCase type names for custom shapes.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 03:13:07 -07:00
Jeff Emmett cb5045984b
Merge pull request #13 from Jeff-Emmett/add-runpod-AI-API
prevent coordinate collapse on reload
2025-11-16 03:08:07 -07:00
Jeff Emmett f5582fc7d1 prevent coordinate collapse on reload
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-16 03:03:39 -07:00
Jeff Emmett 7c0c888276
Merge pull request #12 from Jeff-Emmett/add-runpod-AI-API
Add runpod ai api
2025-11-16 02:52:01 -07:00
Jeff Emmett f66fac74d0 update multiplayer sync 2025-11-16 02:47:42 -07:00
Jeff Emmett 4d7b05efa2 update obsidian shape deployment 2025-11-12 16:23:08 -08:00
Jeff Emmett 7065626e71
Merge pull request #11 from Jeff-Emmett/pin-object-to-view
Pin object to view
2025-11-11 22:50:31 -08:00
Jeff Emmett ab1d0344a5 fix cloudflare deployment glitches 2025-11-11 22:47:36 -08:00
Jeff Emmett 04f6fe5192 deployment fix 2025-11-11 22:42:38 -08:00
Jeff Emmett 2528ad4726 update cloudflare errors 2025-11-11 22:38:24 -08:00
Jeff Emmett ffef04df50 pin object, fix fathom, and a bunch of other things 2025-11-11 22:32:36 -08:00
Jeff Emmett 5fd83944fc coordinate fix 2025-11-11 01:08:55 -08:00
Jeff Emmett a3950baf17 fix coords 2025-11-11 00:57:45 -08:00
Jeff Emmett ef4a84e8f1 remove coordinate reset 2025-11-11 00:53:55 -08:00
Jeff Emmett d1179169cc fix coordinates 2025-11-10 23:54:54 -08:00
Jeff Emmett 0e90e2d097 preserve coordinates 2025-11-10 23:51:53 -08:00
Jeff Emmett eafbf6c9fe shape rendering on prod 2025-11-10 23:36:12 -08:00
Jeff Emmett edbe76ebda fix coordinates 2025-11-10 23:25:44 -08:00
Jeff Emmett ef39328d95 preserve coordinates 2025-11-10 23:17:16 -08:00
Jeff Emmett 229f4d6b41 fix coordinates 2025-11-10 23:04:52 -08:00
Jeff Emmett 0fa1652f72 prevent coordinate reset 2025-11-10 23:01:35 -08:00
Jeff Emmett 1b172d7529 update x & y coordinates 2025-11-10 22:42:52 -08:00
Jeff Emmett c1df50c49b fix prod 2025-11-10 22:27:21 -08:00
Jeff Emmett 053bd95d4a fix prod I hope 2025-11-10 20:53:29 -08:00
Jeff Emmett 73ac456e17 update dev and prod shape render 2025-11-10 20:16:45 -08:00
Jeff Emmett 92cac8dee5 fix prod shape render 2025-11-10 20:05:07 -08:00
Jeff Emmett b8fb64c01b update prod shape render 2025-11-10 19:54:20 -08:00
Jeff Emmett 680b6a5359 update prod 2025-11-10 19:44:49 -08:00
Jeff Emmett fec80ddd18 fix shape rendering in prod 2025-11-10 19:42:06 -08:00
Jeff Emmett 5b32184012 fix shape deployment in prod 2025-11-10 19:26:44 -08:00
Jeff Emmett be5f1a5a3a fix prod deployment 2025-11-10 19:23:15 -08:00
Jeff Emmett bf5d214e45 update for prod 2025-11-10 19:21:22 -08:00
Jeff Emmett f8e4fa3802 update production shape loading 2025-11-10 19:15:36 -08:00
Jeff Emmett a063abdf77 switch from github action to cloudflare native worker deployment 2025-11-10 19:05:11 -08:00
Jeff Emmett 04135a5487 updates to production 2025-11-10 18:57:04 -08:00
Jeff Emmett 5e11183557 fix cloudflare 2025-11-10 18:48:39 -08:00
Jeff Emmett b5463d4d64 update for shape rendering in prod 2025-11-10 18:43:52 -08:00
Jeff Emmett bda2523e3b fix production automerge 2025-11-10 18:29:19 -08:00
Jeff Emmett 3072dc70c0 fix prod 2025-11-10 18:10:55 -08:00
Jeff Emmett 62afed445e final automerge errors on cloudflare 2025-11-10 18:01:36 -08:00
Jeff Emmett f2b05a8fe6 fix final bugs for automerge 2025-11-10 17:58:23 -08:00
Jeff Emmett 0a34c0ab3e shape viewing bug fixed 2025-11-10 15:57:17 -08:00
Jeff Emmett 0c2ca28d0e update automerge bug fix 2025-11-10 15:41:56 -08:00
Jeff Emmett 5cfa2d683c final update fix old data conversion 2025-11-10 15:38:53 -08:00
Jeff Emmett b5785f059f update automerge 2025-11-10 14:44:13 -08:00
Jeff Emmett fa6b874313 fix typescript errors 2025-11-10 14:36:30 -08:00
Jeff Emmett 657df72534 update to prod 2025-11-10 14:24:17 -08:00
Jeff Emmett 9664439f31 update worker 2025-11-10 14:18:23 -08:00
Jeff Emmett 8cce96ea20 update renaming to preserve old format 2025-11-10 14:11:18 -08:00
Jeff Emmett 5375f63e70
Merge pull request #10 from Jeff-Emmett/automerge/obsidian/transcribe/AI-API-attempt
Automerge/obsidian/transcribe/ai api attempt
2025-11-10 14:02:21 -08:00
Jeff Emmett 663c845cab more updates to convert to automerge 2025-11-10 14:00:46 -08:00
Jeff Emmett a82f8faa00 updates to worker 2025-11-10 13:50:31 -08:00
Jeff Emmett 065a3b3483
Merge pull request #9 from Jeff-Emmett/automerge/obsidian/transcribe/AI-API-attempt
Automerge/obsidian/transcribe/ai api attempt
2025-11-10 13:44:24 -08:00
Jeff Emmett f688851764 update to fix deployment 2025-11-10 13:41:17 -08:00
Jeff Emmett 5c99a82c14 final updates to Automerge conversion 2025-11-10 13:34:55 -08:00
Jeff Emmett 39c1e2251b
Merge pull request #8 from Jeff-Emmett/automerge/obsidian/transcribe/AI-API-attempt
Automerge/obsidian/transcribe/ai api attempt
2025-11-10 12:54:19 -08:00
Jeff Emmett 8a8568d042
Merge pull request #7 from Jeff-Emmett/main
Merge pull request #6 from Jeff-Emmett/automerge/obsidian/transcribe/…
2025-11-10 12:52:37 -08:00
Jeff Emmett 822b979864 update package.json, remove cloudflare worker deployment 2025-11-10 12:46:49 -08:00
Jeff Emmett 067dae1ba6
Merge pull request #6 from Jeff-Emmett/automerge/obsidian/transcribe/AI-API-attempt
Automerge/obsidian/transcribe/ai api attempt
2025-11-10 11:54:11 -08:00
Jeff Emmett d1ad51c8ab latest update to fix cloudflare 2025-11-10 11:51:57 -08:00
Jeff Emmett d3f2029521 more updates to get vercel and cloudflare working 2025-11-10 11:48:33 -08:00
Jeff Emmett 119146e094 update to fix vercel and cloudflare errors 2025-11-10 11:30:33 -08:00
Jeff Emmett 38d1f28e35 update more typescript errors for vercel 2025-11-10 11:22:32 -08:00
Jeff Emmett 4815fa4a23 update typescript errors for vercel 2025-11-10 11:19:24 -08:00
Jeff Emmett f8e4647e1a everything working in dev 2025-11-10 11:06:13 -08:00
Jeff Emmett 368732e3b1 Update presentations page to have sub-links 2025-10-08 14:19:02 -04:00
Jeff Emmett 719a4eb918 automerge, obsidian/quartz, transcribe attempt, fix AI APIs 2025-09-21 11:43:06 +02:00
Jeff Emmett 8fa8c388d9 fixed shared piano 2025-09-04 17:54:39 +02:00
Jeff Emmett 356a262114 update tldraw functions for update 2025-09-04 16:58:15 +02:00
Jeff Emmett 1abeeaea10 update R2 storage to JSON format 2025-09-04 16:26:35 +02:00
Jeff Emmett 808b37425a update tldraw functions 2025-09-04 15:30:57 +02:00
Jeff Emmett 8385e30d25 separate worker and buckets between dev & prod, fix cron job scheduler 2025-09-04 15:12:44 +02:00
Jeff Emmett 391e13c350 update embedshape 2025-09-02 22:59:10 +02:00
Jeff Emmett d0233c0eb6 update workers to work again 2025-09-02 22:29:12 +02:00
Jeff Emmett 3b137b0b55 fix worker url in env vars for prod 2025-09-02 14:28:11 +02:00
Jeff Emmett ec9db36a50 debug videochat 2025-09-02 13:26:57 +02:00
Jeff Emmett e78f9a8281 fix worker url in prod 2025-09-02 13:16:15 +02:00
Jeff Emmett c99b9710b5 worker env vars fix 2025-09-02 11:04:55 +02:00
Jeff Emmett a8c9bd845b deploy worker 2025-09-02 01:27:35 +02:00
Jeff Emmett 9a9cab1b8e fix video chat in prod env vars 2025-09-02 00:43:57 +02:00
Jeff Emmett 1d1b64fe7c update env vars 2025-09-01 20:47:22 +02:00
Jeff Emmett 17ba57ce6e fix zoom & videochat 2025-09-01 09:44:52 +02:00
Jeff Emmett fa2f16c019 fix vercel errors 2025-08-25 23:46:37 +02:00
Jeff Emmett 0c980f5f48 Merge branch 'auth-webcrypto' 2025-08-25 16:11:46 +02:00
Jeff Emmett fdc14a1a92 fix vercel deployment errors 2025-08-25 07:14:21 +02:00
Jeff Emmett 956463d43f user auth via webcryptoapi, starred boards, dashboard view 2025-08-25 06:48:47 +02:00
Jeff Emmett 125e565c55 shared piano in progress 2025-08-23 16:07:43 +02:00
Jeff Emmett 129d72cd58 fix gesturetool 2025-07-29 23:01:37 -04:00
Jeff Emmett b01cb9abf8 fix gesturetool for vercel 2025-07-29 22:49:27 -04:00
Jeff Emmett f949f323de working auth login and starred boards on dashboard! 2025-07-29 22:04:14 -04:00
Jeff Emmett 5eb5789c23 add in gestures and ctrl+space command tool (TBD add global LLM) 2025-07-29 16:02:51 -04:00
Jeff Emmett 15fa9b8d19 implemented collections and graph layout tool 2025-07-29 14:52:57 -04:00
Jeff Emmett 7e3cca656e update spelling 2025-07-29 12:46:23 -04:00
Jeff Emmett 6e373e57f1 update presentations and added resilience subpage 2025-07-29 12:41:15 -04:00
Jeff Emmett 545372dcba update presentations page 2025-07-27 17:52:23 -04:00
Jeff Emmett d7fcf121f8 update contact page with calendar booking & added presentations 2025-07-27 16:07:44 -04:00
Jeff Emmett c5e606e326 auth in progress 2025-04-17 15:51:49 -07:00
Shawn Anderson bb144428d0 Revert "updated website copy, installed locked-view function (coordinates break when locked tho), trying to get video transcripts working"
This reverts commit d7b1e348e9.
2025-04-16 13:05:57 -07:00
Shawn Anderson 33f1aa4e90 Revert "Update Daily API key in production env"
This reverts commit 30c0dfc3ba.
2025-04-16 13:05:55 -07:00
Shawn Anderson 411fc99201 Revert "fix daily API key in prod"
This reverts commit 49f11dc6e5.
2025-04-16 13:05:54 -07:00
Shawn Anderson 4364743555 Revert "update wrangler"
This reverts commit b0beefe516.
2025-04-16 13:05:52 -07:00
Shawn Anderson 6dd387613b Revert "Fix cron job connection to daily board backup"
This reverts commit e936d1c597.
2025-04-16 13:05:51 -07:00
Shawn Anderson 04705665f5 Revert "update website main page and repo readme, add scroll bar to markdown tool"
This reverts commit 7b84d34c98.
2025-04-16 13:05:50 -07:00
Shawn Anderson c13d8720d2 Revert "update readme"
This reverts commit 52736e9812.
2025-04-16 13:05:44 -07:00
Shawn Anderson df72890577 Revert "remove footer"
This reverts commit 4e88428706.
2025-04-16 13:05:31 -07:00
Jeff Emmett 4e88428706 remove footer 2025-04-15 23:04:17 -07:00
Jeff Emmett 52736e9812 update readme 2025-04-15 22:47:51 -07:00
Jeff Emmett 7b84d34c98 update website main page and repo readme, add scroll bar to markdown tool 2025-04-15 22:35:02 -07:00
Jeff-Emmett e936d1c597 Fix cron job connection to daily board backup 2025-04-08 15:49:34 -07:00
Jeff-Emmett b0beefe516 update wrangler 2025-04-08 15:32:37 -07:00
Jeff-Emmett 49f11dc6e5 fix daily API key in prod 2025-04-08 14:45:54 -07:00
Jeff-Emmett 30c0dfc3ba Update Daily API key in production env 2025-04-08 14:39:29 -07:00
Jeff-Emmett d7b1e348e9 updated website copy, installed locked-view function (coordinates break when locked tho), trying to get video transcripts working 2025-04-08 14:32:15 -07:00
Jeff-Emmett 2a3b79df15 fix asset upload rendering errors 2025-03-19 18:30:15 -07:00
Jeff-Emmett b11aecffa4 Fixed asset upload CORS for broken links, updated markdown tool, changed keyboard shortcuts & menu ordering 2025-03-19 17:24:22 -07:00
Jeff-Emmett 4b5ba9eab3 Markdown tool working, console log cleanup 2025-03-15 14:57:57 -07:00
Jeff-Emmett 0add9bd514 lock & unlock shapes, clean up overrides & context menu, make embed element easier to interact with 2025-03-15 01:03:55 -07:00
Jeff-Emmett a770d516df hide broadcast from context menu 2025-03-05 18:06:22 -05:00
Jeff-Emmett 47db716af3 camera initialization fixed 2025-02-26 09:48:17 -05:00
Jeff-Emmett e7e911c5bb prompt shape working, fix indicator & scroll later 2025-02-25 17:53:36 -05:00
Jeff-Emmett 1126fc4a1c LLM prompt tool operational, fixed keyboard shortcut conflicts 2025-02-25 15:48:29 -05:00
Jeff-Emmett 59e9025336 changed zoom shortcut to ctrl+up & ctrl+down, savetoPDF to alt+s 2025-02-25 15:24:41 -05:00
Jeff-Emmett 7d6afb6c6b Fix context menu with defaults 2025-02-25 11:38:53 -05:00
Jeff-Emmett 3a99af257d video fix 2025-02-16 11:35:05 +01:00
Jeff-Emmett 12256c5b9c working video calls 2025-02-13 20:38:01 +01:00
Jeff-Emmett 87854883c6 deploy embed minimize function 2025-02-12 18:20:33 +01:00
Jeff-Emmett ebe2d4c0a2 Fix localstorage error on worker, promptshape 2025-02-11 14:35:22 +01:00
Jeff-Emmett d733b61a66 fix llm prompt for mobile 2025-02-08 20:29:06 +01:00
Jeff-Emmett 61143d2c20 Fixed API key button placement & status update 2025-02-08 19:30:20 +01:00
Jeff-Emmett f47c3e0007 reduce file size for savetoPDF 2025-02-08 19:09:20 +01:00
Jeff-Emmett 536e1e7a87 update wrangler 2025-02-08 17:57:50 +01:00
Jeff-Emmett ab2a9f6a79 board backups to R2 2025-01-28 16:42:58 +01:00
Jeff-Emmett 9b33efdcb3 Clean up tool names 2025-01-28 16:38:41 +01:00
Jeff-Emmett 86b37b9cc8 llm edges 2025-01-23 22:49:55 +01:00
Jeff-Emmett 7805a1e961 working llm util 2025-01-23 22:38:27 +01:00
Jeff-Emmett fdb96b6ae1 slidedeck shape installed, still minor difficulty in keyboard arrow transition between slides (last slide + wraparound) 2025-01-23 14:14:04 +01:00
Jeff-Emmett 1783d1b6eb added scoped propagators (with javascript object on arrow edge to control) 2025-01-21 23:25:28 +07:00
Jeff-Emmett bfbe7b8325 expand board zoom & fixed embedshape focus on mobile 2025-01-18 01:57:54 +07:00
Jeff-Emmett e3e2c474ac implemented basic board text search function, added double click to zoom 2025-01-03 10:52:04 +07:00
Jeff-Emmett 7b1fe2b803 removed padding from printtoPDF, hid mycrozine template tool (need to fix sync), cleaned up redundancies between app & board, installed marked npm package, hid markdown tool (need to fix styles) 2025-01-03 09:42:53 +07:00
Jeff-Emmett 02f816e613 updated EmbedShape to default to drag rather than interact when selected 2024-12-29 22:50:20 +07:00
Jeff Emmett 198109a919 add debug logging for videochat render 2024-12-16 17:12:40 -05:00
Jeff Emmett c6370c0fde update Daily API in worker, add debug 2024-12-16 17:00:15 -05:00
Jeff Emmett c75acca85b added TODO for broadcast, fixed videochat 2024-12-16 16:36:36 -05:00
Jeff Emmett d7f4d61b55 fix local IP for dev, fix broadcast view 2024-12-14 14:12:31 -05:00
Jeff Emmett 221a453411 adding broadcast controls for view follow, and shared iframe state while broadcasting (attempt) 2024-12-12 23:37:14 -05:00
Jeff Emmett ce3063e9ba adding selected object resizing with ctrl+arrows 2024-12-12 23:22:35 -05:00
Jeff Emmett 7987c3a8e4 default embed proportions 2024-12-12 23:00:26 -05:00
Jeff Emmett 8f94ee3a6f remove markdown element from menu until fixed. Added copy link & open in new tab options in embedded element URL 2024-12-12 20:45:37 -05:00
Jeff Emmett 201e489cef create frame shortcut dropdown on context menu 2024-12-12 20:02:56 -05:00
Jeff Emmett d23dca3ba8 leave drag selected object for later 2024-12-12 19:45:39 -05:00
Jeff Emmett 42e5afbb21 adding arrow key movements and drag functionality on selected elements 2024-12-12 18:05:35 -05:00
Jeff Emmett 997f690d22 added URL below embedded elements 2024-12-12 17:09:00 -05:00
Jeff Emmett 7978772d7b fix map embed 2024-12-10 12:28:39 -05:00
Jeff Emmett 9f54400f18 updated medium embeds to link out to new tab 2024-12-09 20:19:35 -05:00
Jeff Emmett 34681a3f4f fixed map embeds to include directions, substack embeds, twitter embeds 2024-12-09 18:55:38 -05:00
Jeff Emmett 3bb7eda655 add github action deploy 2024-12-09 04:37:01 -05:00
Jeff Emmett 72a7a54866 fix? 2024-12-09 04:19:49 -05:00
Jeff Emmett e714233f67 remove package lock from gitignore 2024-12-09 04:15:35 -05:00
Jeff Emmett cca1a06b9f install github actions 2024-12-09 03:51:54 -05:00
Jeff Emmett 84e737216d videochat working 2024-12-09 03:42:44 -05:00
Jeff Emmett bf5b3239dd fix domain url 2024-12-08 23:14:22 -05:00
Jeff Emmett 5858775483 logging bugs 2024-12-08 20:55:09 -05:00
Jeff Emmett b74ae75fa8 turn off cloud recording due to plan 2024-12-08 20:52:17 -05:00
Jeff Emmett 6e1e03d05b video debug 2024-12-08 20:47:39 -05:00
Jeff Emmett ce50366985 fix video api key 2024-12-08 20:41:45 -05:00
Jeff Emmett d9fb9637bd video bugs 2024-12-08 20:21:16 -05:00
Jeff Emmett 5d39baaea8 fix videochat 2024-12-08 20:11:05 -05:00
Jeff Emmett 9def6c52b5 fix video 2024-12-08 20:02:14 -05:00
Jeff Emmett 1f6b693ec1 videochat debug 2024-12-08 19:57:25 -05:00
Jeff Emmett b2e06ad76b fix videochat bugs 2024-12-08 19:46:29 -05:00
Jeff Emmett ac69e09aca fix url characters for videochat app 2024-12-08 19:38:28 -05:00
Jeff Emmett 08f31a0bbd fix daily domain 2024-12-08 19:35:11 -05:00
Jeff Emmett 2bdd6a8dba fix daily API 2024-12-08 19:27:18 -05:00
Jeff Emmett 9ff366c80b fixing daily api and domain 2024-12-08 19:19:19 -05:00
Jeff Emmett cc216eb07f fixing daily domain on vite config 2024-12-08 19:10:39 -05:00
Jeff Emmett d2ff445ddf fixing daily domain on vite config 2024-12-08 19:08:40 -05:00
Jeff Emmett a8ca366bb6 videochat tool worker fix 2024-12-08 18:51:23 -05:00
Jeff Emmett 4901a56d61 videochat tool worker install 2024-12-08 18:32:39 -05:00
Jeff Emmett 2d562b3e4c videochat tool update 2024-12-08 18:13:47 -05:00
Jeff Emmett a9a23e27e3 fix vitejs plugin dependency 2024-12-08 14:01:30 -05:00
Jeff Emmett cee2bfa336 update package engine 2024-12-08 13:58:40 -05:00
Jeff Emmett 5924b0cc97 update jspdf package types 2024-12-08 13:54:58 -05:00
Jeff Emmett 4ec6b73fb3 PrintToPDF working 2024-12-08 13:39:07 -05:00
Jeff Emmett ce50026cc3 PrintToPDF integration 2024-12-08 13:31:53 -05:00
Jeff Emmett 0ff9c64908 same 2024-12-08 05:45:31 -05:00
Jeff Emmett cf722c2490 everything working but page load camera initialization 2024-12-08 05:45:16 -05:00
Jeff Emmett 64d7581e6b fixed lockCameraToFrame selection 2024-12-08 05:07:09 -05:00
Jeff Emmett 1190848222 lockCamera still almost working 2024-12-08 03:01:28 -05:00
Jeff Emmett 11c88ec0de lockCameraToFrame almost working 2024-12-08 02:43:19 -05:00
Jeff Emmett 95307ed453 cleanup 2024-12-07 23:22:10 -05:00
Jeff Emmett bfe6b238e9 cleanup 2024-12-07 23:03:42 -05:00
Jeff Emmett fe4b40a3fe
Merge pull request #3 from Jeff-Emmett/markdown-textbox
cleanup
2024-12-08 11:01:55 +07:00
Jeff Emmett 4fda800e8b cleanup 2024-12-07 23:00:30 -05:00
Jeff Emmett 7c28758204 cleanup 2024-12-07 22:50:55 -05:00
Jeff Emmett 75c769a774 fix dev script 2024-12-07 22:49:39 -05:00
Jeff Emmett 5d8781462d npm 2024-12-07 22:48:02 -05:00
Jeff Emmett b2d6b1599b bun 2024-12-07 22:23:19 -05:00
Jeff Emmett c81238c45a remove deps 2024-12-07 22:15:05 -05:00
Jeff Emmett f012632cde prettify and cleanup 2024-12-07 22:01:02 -05:00
Jeff Emmett 78e396d11e cleanup 2024-12-07 21:42:31 -05:00
Jeff Emmett cba62a453b remove homepage board 2024-12-07 21:28:45 -05:00
Jeff Emmett 923f61ac9e cleanup tools/menu/actions 2024-12-07 21:16:44 -05:00
Jeff Emmett 94bec533c4
Merge pull request #2 from Jeff-Emmett/main-fixed
Main fixed
2024-12-08 04:23:27 +07:00
Jeff Emmett e286a120f1 maybe this works 2024-12-07 16:02:10 -05:00
Jeff Emmett 2e0a05ab32 fix vite config 2024-12-07 15:50:37 -05:00
Jeff Emmett 110fc19b94 one more attempt 2024-12-07 15:35:53 -05:00
Jeff Emmett 111be03907 swap persistentboard with Tldraw native sync 2024-12-07 15:23:56 -05:00
Jeff Emmett 39e6cccc3f fix CORS 2024-12-07 15:10:25 -05:00
Jeff Emmett 08175d3a7c fix CORS 2024-12-07 15:03:53 -05:00
Jeff Emmett 3006e85375 fix prod env 2024-12-07 14:57:05 -05:00
Jeff Emmett 632e7979a2 fix CORS 2024-12-07 14:39:57 -05:00
Jeff Emmett 71fc07133a fix CORS for prod env 2024-12-07 14:33:31 -05:00
Jeff Emmett 97b00c1569 fix prod env 2024-12-07 13:43:56 -05:00
Jeff Emmett c4198e1faf add vite env types 2024-12-07 13:31:37 -05:00
Jeff Emmett 6f6c924f66 fix VITE_ worker URL 2024-12-07 13:27:37 -05:00
Jeff Emmett 0eb4407219 fix worker deployment 2024-12-07 13:15:38 -05:00
Jeff Emmett 3a2a38c0b6 fix CORS policy 2024-12-07 12:58:46 -05:00
Jeff Emmett 02124ce920 fix CORS policy 2024-12-07 12:58:25 -05:00
Jeff Emmett b700846a9c fixing production env 2024-12-07 12:52:20 -05:00
Jeff Emmett f7310919f8 fix camerarevert and default to select tool 2024-11-27 13:46:41 +07:00
Jeff Emmett 949062941f fix default to hand tool 2024-11-27 13:38:54 +07:00
Jeff Emmett 7f497ae8d8 fix camera history 2024-11-27 13:30:45 +07:00
Jeff Emmett 1d817c8e0f add all function shortcuts to contextmenu 2024-11-27 13:24:11 +07:00
Jeff Emmett 7dd045bb33 fix menus 2024-11-27 13:16:52 +07:00
Jeff Emmett 11d13a03d3 fix menus 2024-11-27 13:01:45 +07:00
Jeff Emmett 3bcfa83168 fix board camera controls 2024-11-27 12:47:52 +07:00
Jeff Emmett b0a3cd7328 remove copy file creating problems 2024-11-27 12:25:04 +07:00
Jeff Emmett c71b67e24c fix vercel 2024-11-27 12:13:29 +07:00
Jeff Emmett d582be49b2 Merge branch 'add-camera-controls-for-link-to-frame-and-screen-position' 2024-11-27 11:56:36 +07:00
Jeff Emmett 46ee4e7906 fix gitignore 2024-11-27 11:54:05 +07:00
Jeff Emmett c34418e964 fix durable object reference 2024-11-27 11:34:02 +07:00
Jeff Emmett 1c8909ce69 fix worker url 2024-11-27 11:31:16 +07:00
Jeff Emmett 5f2c90219d fix board 2024-11-27 11:27:59 +07:00
Jeff Emmett fef2ca0eb3 fixing final 2024-11-27 11:26:25 +07:00
Jeff Emmett eab574e130 fix underscore 2024-11-27 11:23:46 +07:00
Jeff Emmett b2656c911b fix durableobject 2024-11-27 11:21:33 +07:00
Jeff Emmett 6ba124b038 fix env vars in vite 2024-11-27 11:17:29 +07:00
Jeff Emmett 1cd7208ddf fix vite and asset upload 2024-11-27 11:14:52 +07:00
Jeff Emmett d555910c77 fixed wrangler.toml 2024-11-27 11:07:15 +07:00
Jeff Emmett d1a8407a9b swapped in daily.co video and removed whereby sdk, finished zoom and copylink except for context menu display 2024-11-27 10:39:33 +07:00
Jeff Emmett db3205f97a almost everything working, except maybe offline storage state (and browser reload) 2024-11-25 22:09:41 +07:00
Jeff Emmett 100b88268b CRDTs working, still finalizing local board state browser storage for offline board access 2024-11-25 16:18:05 +07:00
Jeff Emmett 202971f343 checkpoint before google auth 2024-11-21 17:00:46 +07:00
Jeff Emmett b26b9e6384 final copy fix 2024-10-22 19:19:47 -04:00
Jeff Emmett 4d69340a6b update copy 2024-10-22 19:13:14 -04:00
Jeff Emmett 14e0126995 site copy update 2024-10-21 12:12:22 -04:00
Jeff Emmett 04782854d2 fix board 2024-10-19 23:30:04 -04:00
Jeff Emmett 4eff918bd3 fixed a bunch of stuff 2024-10-19 23:21:42 -04:00
Jeff Emmett 4e2103aab2 fix mobile embed 2024-10-19 16:20:54 -04:00
Jeff Emmett 895d02a19c embeds work! 2024-10-19 00:42:23 -04:00
Jeff Emmett 375f69b365 CustomMainMenu 2024-10-18 23:54:28 -04:00
Jeff Emmett 09a729c787 remove old chatboxes 2024-10-18 23:37:27 -04:00
Jeff Emmett bb8a76026e fix 2024-10-18 23:14:18 -04:00
Jeff Emmett 4319a6b1ee fix chatbox 2024-10-18 23:09:25 -04:00
Jeff Emmett 2ca6705599 update 2024-10-18 22:55:35 -04:00
Jeff Emmett 07556dd53a remove old chatbox 2024-10-18 22:47:23 -04:00
Jeff Emmett c93b3066bd serializedRoom 2024-10-18 22:31:20 -04:00
Jeff Emmett d282f6b650 deploy logs 2024-10-18 22:23:28 -04:00
Jeff Emmett c34cae40b6 fixing worker 2024-10-18 22:14:48 -04:00
Jeff Emmett 46b54394ad remove old chat rooms 2024-10-18 21:58:29 -04:00
Jeff Emmett b05aa413e3 resize 2024-10-18 21:30:16 -04:00
Jeff Emmett 2435f3f495 resize 2024-10-18 21:26:53 -04:00
Jeff Emmett 49bca38b5f it works! 2024-10-18 21:04:53 -04:00
Jeff Emmett 0d7ee5889c fixing video 2024-10-18 20:59:46 -04:00
Jeff Emmett a0bba93055 update 2024-10-18 18:59:06 -04:00
Jeff Emmett a2d7ab4af0 remove prefix 2024-10-18 18:08:05 -04:00
Jeff Emmett 99f7f131ed fix 2024-10-18 17:54:45 -04:00
Jeff Emmett c369762001 revert 2024-10-18 17:41:50 -04:00
Jeff Emmett d81ae56de0
Merge pull request #1 from Jeff-Emmett/Video-Chat-Attempt
Video chat attempt
2024-10-18 17:38:25 -04:00
Jeff Emmett f384673cf9 replace all ChatBox with chatBox 2024-10-18 17:35:05 -04:00
Jeff Emmett 670c9ff0b0 maybe 2024-10-18 17:24:43 -04:00
Jeff Emmett 2ac4ec8de3 yay 2024-10-18 14:58:54 -04:00
Jeff Emmett 7e16f6e6b0 hi 2024-10-18 14:43:31 -04:00
Jeff Emmett 63cd76e919 add editor back in 2024-10-17 17:08:55 -04:00
Jeff Emmett 91df5214c6 remove editor in board.tsx 2024-10-17 17:00:48 -04:00
Jeff Emmett 900833c06c Fix live site 2024-10-17 16:21:00 -04:00
Jeff Emmett 700875434f good hygiene commit 2024-10-17 14:54:23 -04:00
Jeff Emmett 9d5d0d6655 big mess of a commit 2024-10-16 11:20:26 -04:00
Jeff Emmett 8ce8dec8f7 video chat attempt 2024-09-04 17:52:58 +02:00
Jeff Emmett 836d37df76 update msgboard UX 2024-08-31 16:17:05 +02:00
Jeff Emmett 2c35a0c53c fix stuff 2024-08-31 15:00:06 +02:00
Jeff Emmett a8c8d62e63 fix image/asset handling 2024-08-31 13:06:13 +02:00
Jeff Emmett 807637eae0 update gitignore 2024-08-31 12:50:29 +02:00
Jeff Emmett 572608f878 multiboard 2024-08-30 12:31:52 +02:00
Jeff Emmett 6747c5df02 move 2024-08-30 10:17:36 +02:00
Jeff Emmett 2c4b2f6c91 more stuff 2024-08-30 09:44:11 +02:00
Jeff Emmett 80cda32cba change 2024-08-29 22:07:38 +02:00
Jeff Emmett 032e4e1199 conf 2024-08-29 21:40:29 +02:00
Jeff Emmett 04676b3788 fix again 2024-08-29 21:35:13 +02:00
Jeff Emmett d6f3830884 fix plz 2024-08-29 21:33:48 +02:00
Jeff Emmett 50c7c52c3d update build step 2024-08-29 21:22:40 +02:00
Jeff Emmett a6eb2abed0 fixed? 2024-08-29 21:20:33 +02:00
Jeff Emmett 1c38cb1bdb multiplayer 2024-08-29 21:15:13 +02:00
Jeff Emmett 932c9935d5 multiplayer 2024-08-29 20:20:12 +02:00
Jeff Emmett 249031619d commit cal 2024-08-15 13:48:39 -04:00
Jeff Emmett 408df0d11e commit conviction voting 2024-08-11 20:37:10 -04:00
Jeff Emmett fc602ff943
Update Contact.tsx 2024-08-11 20:28:52 -04:00
Jeff Emmett d34e586215 poll for impox updates 2024-08-11 01:13:11 -04:00
Jeff Emmett ee2484f1d0 commit goat 2024-08-11 00:55:34 -04:00
Jeff Emmett 0ac03dec60 commit Books 2024-08-11 00:06:23 -04:00
Jeff Emmett 5f3cf2800c name update 2024-08-10 10:41:35 -04:00
Jeff Emmett 206d2a57ec cooptation 2024-08-10 10:27:38 -04:00
Jeff Emmett 87118b86d5 board commit 2024-08-10 01:53:56 -04:00
Jeff Emmett 58cb4da348 board commit 2024-08-10 01:47:58 -04:00
Jeff Emmett d087b61ce5 board commit 2024-08-10 01:43:09 -04:00
Jeff Emmett 9d73295702 oriomimicry 2024-08-09 23:14:58 -04:00
Jeff Emmett 3e6db31c69 Update 2024-08-09 18:34:12 -04:00
Jeff Emmett b8038a6a97 Merge branch 'main' of https://github.com/Jeff-Emmett/canvas-website 2024-08-09 18:27:38 -04:00
Jeff Emmett ee49689416
Update and rename page.html to index.html 2024-08-09 18:18:06 -04:00
331 changed files with 10222 additions and 90805 deletions

View File

@ -16,10 +16,6 @@ VITE_RUNPOD_IMAGE_ENDPOINT_ID='your_image_endpoint_id' # Automatic1111/SD
VITE_RUNPOD_VIDEO_ENDPOINT_ID='your_video_endpoint_id' # Wan2.2 VITE_RUNPOD_VIDEO_ENDPOINT_ID='your_video_endpoint_id' # Wan2.2
VITE_RUNPOD_WHISPER_ENDPOINT_ID='your_whisper_endpoint_id' # WhisperX VITE_RUNPOD_WHISPER_ENDPOINT_ID='your_whisper_endpoint_id' # WhisperX
# WalletConnect (Web3 wallet integration)
# Get your project ID at https://cloud.walletconnect.com/
VITE_WALLETCONNECT_PROJECT_ID='your_walletconnect_project_id'
# Worker-only Variables (Do not prefix with VITE_) # Worker-only Variables (Do not prefix with VITE_)
CLOUDFLARE_API_TOKEN='your_cloudflare_token' CLOUDFLARE_API_TOKEN='your_cloudflare_token'
CLOUDFLARE_ACCOUNT_ID='your_account_id' CLOUDFLARE_ACCOUNT_ID='your_account_id'

View File

@ -1,129 +0,0 @@
name: Tests
on:
push:
branches: [dev, main]
pull_request:
branches: [dev, main]
jobs:
unit-tests:
name: Unit & Integration Tests
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Run TypeScript check
run: npm run types
- name: Run unit tests with coverage
run: npm run test:coverage
- name: Run worker tests
run: npm run test:worker
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
files: ./coverage/lcov.info
fail_ci_if_error: false
verbose: true
e2e-tests:
name: E2E Tests
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Install Playwright browsers
run: npx playwright install chromium --with-deps
- name: Run E2E tests
run: npm run test:e2e
env:
CI: true
- name: Upload Playwright report
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-report
path: playwright-report/
retention-days: 7
- name: Upload Playwright traces
uses: actions/upload-artifact@v4
if: failure()
with:
name: playwright-traces
path: test-results/
retention-days: 7
build-check:
name: Build Check
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Build project
run: npm run build
env:
NODE_OPTIONS: '--max-old-space-size=8192'
# Gate job that requires all tests to pass before merge
merge-ready:
name: Merge Ready
needs: [unit-tests, e2e-tests, build-check]
runs-on: ubuntu-latest
if: always()
steps:
- name: Check all jobs passed
run: |
if [[ "${{ needs.unit-tests.result }}" != "success" ]]; then
echo "Unit tests failed"
exit 1
fi
if [[ "${{ needs.e2e-tests.result }}" != "success" ]]; then
echo "E2E tests failed"
exit 1
fi
if [[ "${{ needs.build-check.result }}" != "success" ]]; then
echo "Build check failed"
exit 1
fi
echo "All checks passed - ready to merge!"

4
.gitignore vendored
View File

@ -176,7 +176,3 @@ dist
.dev.vars .dev.vars
.env.production .env.production
.aider* .aider*
# Playwright
playwright-report/
test-results/

View File

@ -1,63 +0,0 @@
# Changelog
Activity log of changes to canvas boards, organized by contributor.
---
## 2026-01-06
### Claude
- Added per-board Activity Logger feature
- Automatically tracks shape creates, deletes, and updates
- Collapsible sidebar panel showing activity timeline
- Groups activities by date (Today, Yesterday, etc.)
- Debounces updates to avoid logging tiny movements
- Toggle button in top-right corner
---
## 2026-01-05
### Jeff
- Added embed shape linking to MycoFi whitepaper
- Deleted old map shape from planning board
- Added shared piano shape to music-collab board
- Moved token diagram to center of canvas
- Created new markdown note with meeting summary
### Claude
- Added "Last Visited" canvases feature to Dashboard
---
## 2026-01-04
### Jeff
- Created new board `/hyperindex-planning`
- Added 3 holon shapes for system architecture
- Uploaded screenshot of database schema
- Added arrow connectors between components
- Renamed board title to "Hyperindex Architecture"
---
## 2026-01-03
### Jeff
- Deleted duplicate image shapes from mycofi board
- Added video chat shape for team standup
- Created slide deck with 5 slides for presentation
- Added sticky notes with action items
---
## Legend
| User | Description |
|------|-------------|
| Jeff | Project Owner |
| Claude | AI Assistant |
---
*This log tracks user actions on canvas boards (shape additions, deletions, moves, etc.)*

View File

@ -46,7 +46,7 @@ These permissions are configured in `~/.claude/settings.json`.
- **GitHub**: Public mirror and collaboration - **GitHub**: Public mirror and collaboration
- Receives pushes from Gitea via mirror sync - Receives pushes from Gitea via mirror sync
- Token: `(REDACTED-GITHUB-TOKEN)` - Token: `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`
- SSH Key: `~/.ssh/github_deploy_key` (private), `~/.ssh/github_deploy_key.pub` (public) - SSH Key: `~/.ssh/github_deploy_key` (private), `~/.ssh/github_deploy_key.pub` (public)
- **GitHub CLI (gh)**: ✅ Installed and available for PR/issue management - **GitHub CLI (gh)**: ✅ Installed and available for PR/issue management
@ -146,7 +146,7 @@ main (production)
- SSH Key: `~/.ssh/runpod_ed25519` (private), `~/.ssh/runpod_ed25519.pub` (public) - SSH Key: `~/.ssh/runpod_ed25519` (private), `~/.ssh/runpod_ed25519.pub` (public)
- Public Key: `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAC7NYjI0U/2ChGaZBBWP7gKt/V12Ts6FgatinJOQ8JG runpod@jeffemmett.com` - Public Key: `ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAC7NYjI0U/2ChGaZBBWP7gKt/V12Ts6FgatinJOQ8JG runpod@jeffemmett.com`
- SSH Access: `ssh runpod` - SSH Access: `ssh runpod`
- **API Key**: `(REDACTED-RUNPOD-KEY)` - **API Key**: `rpa_YYOARL5MEBTTKKWGABRKTW2CVHQYRBTOBZNSGIL3lwwfdz`
- **CLI Config**: `~/.runpod/config.toml` - **CLI Config**: `~/.runpod/config.toml`
- **Serverless Endpoints**: - **Serverless Endpoints**:
- Image (SD): `tzf1j3sc3zufsy` (Automatic1111) - Image (SD): `tzf1j3sc3zufsy` (Automatic1111)

View File

@ -14,7 +14,7 @@ RUN npm ci --legacy-peer-deps
COPY . . COPY . .
# Build args for environment # Build args for environment
ARG VITE_WORKER_ENV=production ARG VITE_TLDRAW_WORKER_URL=https://jeffemmett-canvas.jeffemmett.workers.dev
ARG VITE_DAILY_API_KEY ARG VITE_DAILY_API_KEY
ARG VITE_RUNPOD_API_KEY ARG VITE_RUNPOD_API_KEY
ARG VITE_RUNPOD_IMAGE_ENDPOINT_ID ARG VITE_RUNPOD_IMAGE_ENDPOINT_ID
@ -23,8 +23,7 @@ ARG VITE_RUNPOD_TEXT_ENDPOINT_ID
ARG VITE_RUNPOD_WHISPER_ENDPOINT_ID ARG VITE_RUNPOD_WHISPER_ENDPOINT_ID
# Set environment for build # Set environment for build
# VITE_WORKER_ENV: 'production' | 'staging' | 'dev' | 'local' ENV VITE_TLDRAW_WORKER_URL=$VITE_TLDRAW_WORKER_URL
ENV VITE_WORKER_ENV=$VITE_WORKER_ENV
ENV VITE_DAILY_API_KEY=$VITE_DAILY_API_KEY ENV VITE_DAILY_API_KEY=$VITE_DAILY_API_KEY
ENV VITE_RUNPOD_API_KEY=$VITE_RUNPOD_API_KEY ENV VITE_RUNPOD_API_KEY=$VITE_RUNPOD_API_KEY
ENV VITE_RUNPOD_IMAGE_ENDPOINT_ID=$VITE_RUNPOD_IMAGE_ENDPOINT_ID ENV VITE_RUNPOD_IMAGE_ENDPOINT_ID=$VITE_RUNPOD_IMAGE_ENDPOINT_ID

View File

@ -1,236 +0,0 @@
# Offline Storage Feasibility Assessment
Summary
Difficulty: Medium — Feasible with Automerge's built-in support.
Why it's feasible
Automerge Repo supports storage adapters — you can add an IndexedDB adapter alongside the network adapter
CRDT merging — Automerge handles conflict resolution automatically
Existing architecture — minimal changes needed; mainly adding a storage adapter
What needs to be done
Add IndexedDB storage adapter (easy)
Install/create an IndexedDB storage adapter
Add it to the Repo configuration
Fix document ID consistency (important)
Currently uses repo.create() which generates new IDs each time
Need to use repo.find(roomId) or store a roomId → documentId mapping
This is the main blocker for local storage persistence
Handle online/offline transitions (medium)
Listen for network status changes
Trigger sync when coming back online
The existing network adapter already handles reconnection
Update initialization logic (medium)
Load from IndexedDB first (instant offline access)
Then sync with server when online
Automerge will automatically merge changes
Estimated effort
Research & setup: 1-2 hours
Implementation: 4-6 hours
Testing: 2-3 hours
Total: ~1 day of focused work
Main challenge
The document ID consistency issue. The code comment says "We can't use repo.find() with a custom ID because Automerge requires specific document ID formats" — this needs to be resolved. Options:
Store a mapping of roomId → documentId in IndexedDB
Use a deterministic algorithm to convert roomId to a valid Automerge document ID
Use Automerge's document ID generation but persist the mapping
Benefits
Instant offline access — no loading spinners
Automatic conflict resolution — Automerge handles merging
Better UX — works seamlessly offline
Resilience — works even if server is temporarily unavailable
I've created a detailed feasibility document at OFFLINE_STORAGE_FEASIBILITY.md with implementation steps, code examples, and considerations.
Should I start implementing this, or do you want to review the feasibility document first?
## Summary
**Difficulty: Medium** - The implementation is straightforward thanks to Automerge's built-in support for storage adapters, but requires careful integration with the existing sync architecture.
## Current Architecture
1. **Client-side**: Uses `@automerge/automerge-repo` with `CloudflareNetworkAdapter` for WebSocket sync
2. **Server-side**: `AutomergeDurableObject` stores documents in R2 and handles WebSocket connections
3. **Persistence flow**:
- Client saves to worker via POST `/room/:roomId`
- Worker persists to R2 (throttled to every 2 seconds)
- Client loads initial data from server via GET `/room/:roomId`
## What's Needed
### 1. Add IndexedDB Storage Adapter (Easy)
Automerge Repo supports storage adapters out of the box. You'll need to:
- Install `@automerge/automerge-repo-storage-indexeddb` (if available) or create a custom IndexedDB adapter
- Add the storage adapter to the Repo configuration alongside the network adapter
- The Repo will automatically persist document changes to IndexedDB
**Code changes needed:**
```typescript
// In useAutomergeSyncRepo.ts
import { IndexedDBStorageAdapter } from "@automerge/automerge-repo-storage-indexeddb"
const [repo] = useState(() => {
const adapter = new CloudflareNetworkAdapter(workerUrl, roomId, applyJsonSyncData)
const storageAdapter = new IndexedDBStorageAdapter() // Add this
return new Repo({
network: [adapter],
storage: [storageAdapter] // Add this
})
})
```
### 2. Load from Local Storage on Startup (Medium)
Modify the initialization logic to:
- Check IndexedDB for existing document data
- Load from IndexedDB first (for instant offline access)
- Then sync with server when online
- Automerge will automatically merge local and remote changes
**Code changes needed:**
```typescript
// In useAutomergeSyncRepo.ts - modify initializeHandle
const initializeHandle = async () => {
// Check if document exists in IndexedDB first
const localDoc = await repo.find(roomId) // This will load from IndexedDB if available
// Then sync with server (if online)
if (navigator.onLine) {
// Existing server sync logic
}
}
```
### 3. Handle Online/Offline Transitions (Medium)
- Detect network status changes
- When coming online, ensure sync happens
- The existing `CloudflareNetworkAdapter` already handles reconnection, but you may want to add explicit sync triggers
**Code changes needed:**
```typescript
// Add network status listener
useEffect(() => {
const handleOnline = () => {
console.log('🌐 Back online - syncing with server')
// Trigger sync - Automerge will handle merging automatically
if (handle) {
// The network adapter will automatically reconnect and sync
}
}
window.addEventListener('online', handleOnline)
return () => window.removeEventListener('online', handleOnline)
}, [handle])
```
### 4. Document ID Consistency (Important)
Currently, the code creates a new document handle each time (`repo.create()`). For local storage to work properly, you need:
- Consistent document IDs per room
- The challenge: Automerge requires specific document ID formats (like `automerge:xxxxx`)
- **Solution options:**
1. Use `repo.find()` with a properly formatted Automerge document ID (derive from roomId)
2. Store a mapping of roomId → documentId in IndexedDB
3. Use a deterministic way to generate document IDs from roomId
**Code changes needed:**
```typescript
// Option 1: Generate deterministic Automerge document ID from roomId
const documentId = `automerge:${roomId}` // May need proper formatting
const handle = repo.find(documentId) // This will load from IndexedDB or create new
// Option 2: Store mapping in IndexedDB
const storedMapping = await getDocumentIdMapping(roomId)
const documentId = storedMapping || generateNewDocumentId()
const handle = repo.find(documentId)
await saveDocumentIdMapping(roomId, documentId)
```
**Note**: The current code comment says "We can't use repo.find() with a custom ID because Automerge requires specific document ID formats" - this needs to be resolved. You may need to:
- Use Automerge's document ID generation but store the mapping
- Or use a deterministic algorithm to convert roomId to valid Automerge document ID format
## Benefits
1. **Instant Offline Access**: Users can immediately see and edit their data without waiting for server response
2. **Automatic Merging**: Automerge's CRDT nature means local and remote changes merge automatically without conflicts
3. **Better UX**: No loading spinners when offline - data is instantly available
4. **Resilience**: Works even if server is temporarily unavailable
## Challenges & Considerations
### 1. Storage Quota Limits
- IndexedDB has browser-specific limits (typically 50% of disk space)
- Large documents could hit quota limits
- **Solution**: Monitor storage usage and implement cleanup for old documents
### 2. Document ID Management
- Need to ensure consistent document IDs per room
- Current code uses `repo.create()` which generates new IDs
- **Solution**: Use `repo.find(roomId)` with a consistent ID format
### 3. Initial Load Strategy
- Should load from IndexedDB first (fast) or server first (fresh)?
- **Recommendation**: Load from IndexedDB first for instant UI, then sync with server in background
### 4. Conflict Resolution
- Automerge handles this automatically, but you may want to show users when their offline changes were merged
- **Solution**: Use Automerge's change tracking to show merge notifications
### 5. Storage Adapter Availability
- Need to verify if `@automerge/automerge-repo-storage-indexeddb` exists
- If not, you'll need to create a custom adapter (still straightforward)
## Implementation Steps
1. **Research**: Check if `@automerge/automerge-repo-storage-indexeddb` package exists
2. **Install**: Add storage adapter package or create custom adapter
3. **Modify Repo Setup**: Add storage adapter to Repo configuration
4. **Update Document Loading**: Use `repo.find()` instead of `repo.create()` for consistent IDs
5. **Add Network Detection**: Listen for online/offline events
6. **Test**: Verify offline editing works and syncs correctly when back online
7. **Handle Edge Cases**: Storage quota, document size limits, etc.
## Estimated Effort
- **Research & Setup**: 1-2 hours
- **Implementation**: 4-6 hours
- **Testing**: 2-3 hours
- **Total**: ~1 day of focused work
## Code Locations to Modify
1. `src/automerge/useAutomergeSyncRepo.ts` - Main sync hook (add storage adapter, modify initialization)
2. `src/automerge/CloudflareAdapter.ts` - Network adapter (may need minor changes for offline detection)
3. Potentially create: `src/automerge/IndexedDBStorageAdapter.ts` - If custom adapter needed
## Conclusion
This is a **medium-complexity** feature that's very feasible. Automerge's architecture is designed for this exact use case, and the main work is:
1. Adding the storage adapter (straightforward)
2. Ensuring consistent document IDs (important fix)
3. Handling online/offline transitions (moderate complexity)
The biggest benefit is that Automerge's CRDT nature means you don't need to write complex merge logic - it handles conflict resolution automatically.
---
## Related: Google Data Sovereignty
Beyond canvas document storage, we also support importing and securely storing Google Workspace data locally. See **[docs/GOOGLE_DATA_SOVEREIGNTY.md](./docs/GOOGLE_DATA_SOVEREIGNTY.md)** for the complete architecture covering:
- **Gmail** - Import and encrypt emails locally
- **Drive** - Import and encrypt documents locally
- **Photos** - Import thumbnails with on-demand full resolution
- **Calendar** - Import and encrypt events locally
Key principles:
1. **Local-first**: All data stored in encrypted IndexedDB
2. **User-controlled encryption**: Keys derived from WebCrypto auth, never leave browser
3. **Selective sharing**: Choose what to share to canvas boards
4. **Optional R2 backup**: Encrypted cloud backup (you hold the keys)
This builds on the same IndexedDB + Automerge foundation described above.

View File

@ -1,665 +0,0 @@
---
id: doc-001
title: Web3 Wallet Integration Architecture
type: other
created_date: '2026-01-02 16:07'
---
# Web3 Wallet Integration Architecture
**Status:** Planning
**Created:** 2026-01-02
**Related Task:** task-007
---
## 1. Overview
This document outlines the architecture for integrating Web3 wallet capabilities into the canvas-website, enabling CryptID users to link Ethereum wallets for on-chain transactions, voting, and token-gated features.
### Key Constraint: Cryptographic Curve Mismatch
| System | Curve | Usage |
|--------|-------|-------|
| **CryptID (WebCrypto)** | ECDSA P-256 (NIST) | Authentication, passwordless login |
| **Ethereum** | ECDSA secp256k1 | Transactions, message signing |
These curves are **incompatible**. A CryptID key cannot sign Ethereum transactions. Therefore, we use a **wallet linking** approach where:
1. CryptID handles authentication (who you are)
2. Linked wallet handles on-chain actions (what you can do)
---
## 2. Database Schema
### Migration: `002_linked_wallets.sql`
```sql
-- Migration: Add Linked Wallets for Web3 Integration
-- Date: 2026-01-02
-- Description: Enables CryptID users to link Ethereum wallets for
-- on-chain transactions, voting, and token-gated features.
-- =============================================================================
-- LINKED WALLETS TABLE
-- =============================================================================
-- Each CryptID user can link multiple Ethereum wallets (EOA, Safe, hardware)
-- Linking requires signature verification to prove wallet ownership
CREATE TABLE IF NOT EXISTS linked_wallets (
id TEXT PRIMARY KEY, -- UUID for the link record
user_id TEXT NOT NULL, -- References users.id (CryptID account)
wallet_address TEXT NOT NULL, -- Ethereum address (checksummed, 0x-prefixed)
-- Wallet metadata
wallet_type TEXT DEFAULT 'eoa' CHECK (wallet_type IN ('eoa', 'safe', 'hardware', 'contract')),
chain_id INTEGER DEFAULT 1, -- Primary chain (1 = Ethereum mainnet)
label TEXT, -- User-provided label (e.g., "Main Wallet")
-- Verification proof
signature_message TEXT NOT NULL, -- The message that was signed
signature TEXT NOT NULL, -- EIP-191 personal_sign signature
verified_at TEXT NOT NULL, -- When signature was verified
-- ENS integration
ens_name TEXT, -- Resolved ENS name (if any)
ens_avatar TEXT, -- ENS avatar URL (if any)
ens_resolved_at TEXT, -- When ENS was last resolved
-- Flags
is_primary INTEGER DEFAULT 0, -- 1 = primary wallet for this user
is_active INTEGER DEFAULT 1, -- 0 = soft-deleted
-- Timestamps
created_at TEXT DEFAULT (datetime('now')),
updated_at TEXT DEFAULT (datetime('now')),
last_used_at TEXT, -- Last time wallet was used for action
-- Constraints
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(user_id, wallet_address) -- Can't link same wallet twice
);
-- Indexes for efficient lookups
CREATE INDEX IF NOT EXISTS idx_linked_wallets_user ON linked_wallets(user_id);
CREATE INDEX IF NOT EXISTS idx_linked_wallets_address ON linked_wallets(wallet_address);
CREATE INDEX IF NOT EXISTS idx_linked_wallets_active ON linked_wallets(is_active);
CREATE INDEX IF NOT EXISTS idx_linked_wallets_primary ON linked_wallets(user_id, is_primary);
-- =============================================================================
-- WALLET LINKING TOKENS TABLE (for Safe/multisig delayed verification)
-- =============================================================================
-- For contract wallets that require on-chain signature verification
CREATE TABLE IF NOT EXISTS wallet_link_tokens (
id TEXT PRIMARY KEY,
user_id TEXT NOT NULL,
wallet_address TEXT NOT NULL,
nonce TEXT NOT NULL, -- Random nonce for signature message
token TEXT NOT NULL UNIQUE, -- Secret token for verification callback
expires_at TEXT NOT NULL,
used INTEGER DEFAULT 0,
created_at TEXT DEFAULT (datetime('now')),
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
);
CREATE INDEX IF NOT EXISTS idx_wallet_link_tokens_token ON wallet_link_tokens(token);
-- =============================================================================
-- TOKEN BALANCES CACHE (optional, for token-gating)
-- =============================================================================
-- Cache of token balances for faster permission checks
CREATE TABLE IF NOT EXISTS wallet_token_balances (
id TEXT PRIMARY KEY,
wallet_address TEXT NOT NULL,
token_address TEXT NOT NULL, -- ERC-20/721/1155 contract address
token_type TEXT CHECK (token_type IN ('erc20', 'erc721', 'erc1155')),
chain_id INTEGER NOT NULL,
balance TEXT NOT NULL, -- String to handle big numbers
last_updated TEXT DEFAULT (datetime('now')),
UNIQUE(wallet_address, token_address, chain_id)
);
CREATE INDEX IF NOT EXISTS idx_token_balances_wallet ON wallet_token_balances(wallet_address);
CREATE INDEX IF NOT EXISTS idx_token_balances_token ON wallet_token_balances(token_address);
```
### TypeScript Types
Add to `worker/types.ts`:
```typescript
// =============================================================================
// Linked Wallet Types
// =============================================================================
export type WalletType = 'eoa' | 'safe' | 'hardware' | 'contract';
export interface LinkedWallet {
id: string;
user_id: string;
wallet_address: string;
wallet_type: WalletType;
chain_id: number;
label: string | null;
signature_message: string;
signature: string;
verified_at: string;
ens_name: string | null;
ens_avatar: string | null;
ens_resolved_at: string | null;
is_primary: number; // SQLite boolean
is_active: number; // SQLite boolean
created_at: string;
updated_at: string;
last_used_at: string | null;
}
export interface WalletLinkToken {
id: string;
user_id: string;
wallet_address: string;
nonce: string;
token: string;
expires_at: string;
used: number;
created_at: string;
}
export interface WalletTokenBalance {
id: string;
wallet_address: string;
token_address: string;
token_type: 'erc20' | 'erc721' | 'erc1155';
chain_id: number;
balance: string;
last_updated: string;
}
// API Response types
export interface LinkedWalletResponse {
id: string;
address: string;
type: WalletType;
chainId: number;
label: string | null;
ensName: string | null;
ensAvatar: string | null;
isPrimary: boolean;
linkedAt: string;
lastUsedAt: string | null;
}
export interface WalletLinkRequest {
walletAddress: string;
signature: string;
message: string;
walletType?: WalletType;
chainId?: number;
label?: string;
}
```
---
## 3. API Endpoints
### Base Path: `/api/wallet`
All endpoints require CryptID authentication via `X-CryptID-PublicKey` header.
---
### `POST /api/wallet/link`
Link a new wallet to the authenticated CryptID account.
**Request:**
```typescript
{
walletAddress: string; // 0x-prefixed Ethereum address
signature: string; // EIP-191 signature of the message
message: string; // Must match server-generated format
walletType?: 'eoa' | 'safe' | 'hardware' | 'contract';
chainId?: number; // Default: 1 (mainnet)
label?: string; // Optional user label
}
```
**Message Format (must be signed):**
```
Link wallet to CryptID
Account: ${cryptidUsername}
Wallet: ${walletAddress}
Timestamp: ${isoTimestamp}
Nonce: ${randomNonce}
This signature proves you own this wallet.
```
**Response (201 Created):**
```typescript
{
success: true;
wallet: LinkedWalletResponse;
}
```
**Errors:**
- `400` - Invalid request body or signature
- `401` - Not authenticated
- `409` - Wallet already linked to this account
- `422` - Signature verification failed
---
### `GET /api/wallet/list`
Get all wallets linked to the authenticated user.
**Response:**
```typescript
{
wallets: LinkedWalletResponse[];
count: number;
}
```
---
### `GET /api/wallet/:address`
Get details for a specific linked wallet.
**Response:**
```typescript
{
wallet: LinkedWalletResponse;
}
```
---
### `PATCH /api/wallet/:address`
Update a linked wallet (label, primary status).
**Request:**
```typescript
{
label?: string;
isPrimary?: boolean;
}
```
**Response:**
```typescript
{
success: true;
wallet: LinkedWalletResponse;
}
```
---
### `DELETE /api/wallet/:address`
Unlink a wallet from the account.
**Response:**
```typescript
{
success: true;
message: 'Wallet unlinked';
}
```
---
### `GET /api/wallet/verify/:address`
Check if a wallet address is linked to any CryptID account.
(Public endpoint - no auth required)
**Response:**
```typescript
{
linked: boolean;
cryptidUsername?: string; // Only if user allows public display
}
```
---
### `POST /api/wallet/refresh-ens`
Refresh ENS name resolution for a linked wallet.
**Request:**
```typescript
{
walletAddress: string;
}
```
**Response:**
```typescript
{
ensName: string | null;
ensAvatar: string | null;
resolvedAt: string;
}
```
---
## 4. Signature Verification Implementation
```typescript
// worker/walletAuth.ts
import { verifyMessage, getAddress } from 'viem';
export function generateLinkMessage(
username: string,
address: string,
timestamp: string,
nonce: string
): string {
return `Link wallet to CryptID
Account: ${username}
Wallet: ${address}
Timestamp: ${timestamp}
Nonce: ${nonce}
This signature proves you own this wallet.`;
}
export async function verifyWalletSignature(
address: string,
message: string,
signature: `0x${string}`
): Promise<boolean> {
try {
// Normalize address
const checksumAddress = getAddress(address);
// Verify EIP-191 personal_sign signature
const valid = await verifyMessage({
address: checksumAddress,
message,
signature,
});
return valid;
} catch (error) {
console.error('Signature verification error:', error);
return false;
}
}
// For ERC-1271 contract wallet verification (Safe, etc.)
export async function verifyContractSignature(
address: string,
message: string,
signature: string,
rpcUrl: string
): Promise<boolean> {
// ERC-1271 magic value: 0x1626ba7e
// Implementation needed for Safe/contract wallet support
// Uses eth_call to isValidSignature(bytes32,bytes)
throw new Error('Contract signature verification not yet implemented');
}
```
---
## 5. Library Comparison
### Recommendation: **wagmi v2 + viem**
| Library | Bundle Size | Type Safety | React Hooks | Maintenance | Recommendation |
|---------|-------------|-------------|-------------|-------------|----------------|
| **wagmi v2** | ~40KB | Excellent | Native | Active (wevm team) | ✅ **Best for React** |
| **viem** | ~25KB | Excellent | N/A | Active (wevm team) | ✅ **Best for worker** |
| **ethers v6** | ~120KB | Good | None | Active | ⚠️ Larger bundle |
| **web3.js** | ~400KB | Poor | None | Declining | ❌ Avoid |
### Why wagmi + viem?
1. **Same team** - wagmi and viem are both from wevm, designed to work together
2. **Tree-shakeable** - Only import what you use
3. **TypeScript-first** - Excellent type inference and autocomplete
4. **Modern React** - Hooks-based, works with React 18+ and Suspense
5. **WalletConnect v2** - Built-in support via Web3Modal
6. **No ethers dependency** - Pure viem underneath
### Package Configuration
```json
{
"dependencies": {
"wagmi": "^2.12.0",
"viem": "^2.19.0",
"@tanstack/react-query": "^5.45.0",
"@web3modal/wagmi": "^5.0.0"
}
}
```
### Supported Wallets (via Web3Modal)
- MetaMask (injected)
- WalletConnect v2 (mobile wallets)
- Coinbase Wallet
- Rainbow
- Safe (via WalletConnect)
- Hardware wallets (via MetaMask bridge)
---
## 6. Frontend Architecture
### Provider Setup (`src/providers/Web3Provider.tsx`)
```typescript
import { WagmiProvider, createConfig, http } from 'wagmi';
import { mainnet, optimism, arbitrum, base } from 'wagmi/chains';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { createWeb3Modal } from '@web3modal/wagmi/react';
// Configure chains
const chains = [mainnet, optimism, arbitrum, base] as const;
// Create wagmi config
const config = createConfig({
chains,
transports: {
[mainnet.id]: http(),
[optimism.id]: http(),
[arbitrum.id]: http(),
[base.id]: http(),
},
});
// Create Web3Modal
const projectId = process.env.WALLETCONNECT_PROJECT_ID!;
createWeb3Modal({
wagmiConfig: config,
projectId,
chains,
themeMode: 'dark',
});
const queryClient = new QueryClient();
export function Web3Provider({ children }: { children: React.ReactNode }) {
return (
<WagmiProvider config={config}>
<QueryClientProvider client={queryClient}>
{children}
</QueryClientProvider>
</WagmiProvider>
);
}
```
### Wallet Link Hook (`src/hooks/useWalletLink.ts`)
```typescript
import { useAccount, useSignMessage, useDisconnect } from 'wagmi';
import { useAuth } from '../context/AuthContext';
import { useState } from 'react';
export function useWalletLink() {
const { address, isConnected } = useAccount();
const { signMessageAsync } = useSignMessage();
const { disconnect } = useDisconnect();
const { session } = useAuth();
const [isLinking, setIsLinking] = useState(false);
const linkWallet = async (label?: string) => {
if (!address || !session.username) return;
setIsLinking(true);
try {
// Generate link message
const timestamp = new Date().toISOString();
const nonce = crypto.randomUUID();
const message = generateLinkMessage(
session.username,
address,
timestamp,
nonce
);
// Request signature from wallet
const signature = await signMessageAsync({ message });
// Send to backend for verification
const response = await fetch('/api/wallet/link', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'X-CryptID-PublicKey': session.publicKey,
},
body: JSON.stringify({
walletAddress: address,
signature,
message,
label,
}),
});
if (!response.ok) {
throw new Error('Failed to link wallet');
}
return await response.json();
} finally {
setIsLinking(false);
}
};
return {
address,
isConnected,
isLinking,
linkWallet,
disconnect,
};
}
```
---
## 7. Integration Points
### A. AuthContext Extension
Add to `Session` type:
```typescript
interface Session {
// ... existing fields
linkedWallets?: LinkedWalletResponse[];
primaryWallet?: LinkedWalletResponse;
}
```
### B. Token-Gated Features
```typescript
// Check if user holds specific tokens
async function checkTokenGate(
walletAddress: string,
requirement: {
tokenAddress: string;
minBalance: string;
chainId: number;
}
): Promise<boolean> {
// Query on-chain balance or use cached value
}
```
### C. Snapshot Voting (Future)
```typescript
// Vote on Snapshot proposal
async function voteOnProposal(
space: string,
proposal: string,
choice: number,
walletAddress: string
): Promise<void> {
// Use Snapshot.js SDK with linked wallet
}
```
---
## 8. Security Considerations
1. **Signature Replay Prevention**
- Include timestamp and nonce in message
- Server validates timestamp is recent (within 5 minutes)
- Nonces are single-use
2. **Address Validation**
- Always checksum addresses before storing/comparing
- Validate address format (0x + 40 hex chars)
3. **Rate Limiting**
- Limit link attempts per user (e.g., 5/hour)
- Limit total wallets per user (e.g., 10)
4. **Wallet Verification**
- EOA: EIP-191 personal_sign
- Safe: ERC-1271 isValidSignature
- Hardware: Same as EOA (via MetaMask bridge)
---
## 9. Next Steps
1. **Phase 1 (This Sprint)**
- [ ] Add migration file
- [ ] Install wagmi/viem dependencies
- [ ] Implement link/list/unlink endpoints
- [ ] Create WalletLinkPanel UI
- [ ] Add wallet section to settings
2. **Phase 2 (Next Sprint)**
- [ ] Snapshot.js integration
- [ ] VotingShape for canvas
- [ ] Token balance caching
3. **Phase 3 (Future)**
- [ ] Safe SDK integration
- [ ] TransactionBuilderShape
- [ ] Account Abstraction exploration

View File

@ -4,7 +4,7 @@ title: offline local storage
status: Done status: Done
assignee: [] assignee: []
created_date: '2025-12-03 23:42' created_date: '2025-12-03 23:42'
updated_date: '2025-12-07 20:50' updated_date: '2025-12-04 20:35'
labels: labels:
- feature - feature
- offline - offline
@ -49,6 +49,4 @@ Implemented connection status tracking:
- Created ConnectionStatusIndicator component with visual feedback - Created ConnectionStatusIndicator component with visual feedback
- Shows status only when not connected (connecting/reconnecting/disconnected/offline) - Shows status only when not connected (connecting/reconnecting/disconnected/offline)
- Auto-hides when connected and online - Auto-hides when connected and online
Model files downloaded successfully: tiny.en-encoder.int8.onnx (13MB), tiny.en-decoder.int8.onnx (87MB), tokens.txt (816KB)
<!-- SECTION:NOTES:END --> <!-- SECTION:NOTES:END -->

View File

@ -1,38 +0,0 @@
---
id: task-004
title: IO Chip Feature
status: In Progress
assignee: []
created_date: '2025-12-03'
updated_date: '2025-12-07 06:43'
labels:
- feature
- io
- ui
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement IO chip feature for the canvas - enabling input/output connections between canvas elements.
## Branch Info
- **Branch**: `feature/io-chip`
- **Worktree**: `/home/jeffe/Github/canvas-website-io-chip`
- **Commit**: 527462a
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Create IO chip component
- [ ] #2 Enable connections between canvas elements
- [ ] #3 Handle data flow between connected chips
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Native Android app scaffolded and committed to main (0b1dac0). Dev branch created for future work.
<!-- SECTION:NOTES:END -->

View File

@ -1,42 +0,0 @@
---
id: task-005
title: Automerge CRDT Sync
status: Done
assignee: []
created_date: '2025-12-03'
updated_date: '2025-12-05 03:41'
labels:
- feature
- sync
- collaboration
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement Automerge CRDT-based synchronization for real-time collaborative canvas editing.
## Branch Info
- **Branch**: `Automerge`
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Integrate Automerge library
- [ ] #2 Enable real-time sync between clients
- [ ] #3 Handle conflict resolution automatically
- [ ] #4 Persist state across sessions
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Binary Automerge sync implemented:
- CloudflareNetworkAdapter sends/receives binary sync messages
- Worker sends initial sync on connect
- Message buffering for early server messages
- documentId tracking for proper Automerge Repo routing
- Multi-client sync verified working
<!-- SECTION:NOTES:END -->

View File

@ -0,0 +1,22 @@
---
id: task-005
title: Automerge CRDT Sync
status: To Do
assignee: []
created_date: '2025-12-03'
labels: [feature, sync, collaboration]
priority: high
branch: Automerge
---
## Description
Implement Automerge CRDT-based synchronization for real-time collaborative canvas editing.
## Branch Info
- **Branch**: `Automerge`
## Acceptance Criteria
- [ ] Integrate Automerge library
- [ ] Enable real-time sync between clients
- [ ] Handle conflict resolution automatically
- [ ] Persist state across sessions

View File

@ -1,182 +0,0 @@
---
id: task-007
title: Web3 Wallet Linking & Blockchain Integration
status: Done
assignee: []
created_date: '2025-12-03'
updated_date: '2026-01-02 17:05'
labels:
- feature
- web3
- blockchain
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Integrate Web3 wallet capabilities to enable CryptID users to link EOA wallets and Safe multisigs for on-chain transactions, voting (Snapshot), and token-gated features.
## Architecture Overview
CryptID uses ECDSA P-256 (WebCrypto), while Ethereum uses secp256k1. These curves are incompatible, so we use a **wallet linking** approach rather than key reuse.
### Core Concept
1. CryptID remains the primary authentication layer (passwordless)
2. Users can link one or more Ethereum wallets to their CryptID
3. Linking requires signing a verification message with the wallet
4. Linked wallets enable: transactions, voting, token-gating, NFT features
### Tech Stack
- **wagmi v2** + **viem** - Modern React hooks for wallet connection
- **WalletConnect v2** - Multi-wallet support (MetaMask, Rainbow, etc.)
- **Safe SDK** - Multisig wallet integration
- **Snapshot.js** - Off-chain governance voting
## Implementation Phases
### Phase 1: Wallet Linking Foundation (This Task)
- Add wagmi/viem/walletconnect dependencies
- Create linked_wallets D1 table
- Implement wallet linking API endpoints
- Build WalletLinkPanel UI component
- Display linked wallets in user settings
### Phase 2: Snapshot Voting (Future Task)
- Integrate Snapshot.js SDK
- Create VotingShape for canvas visualization
- Implement vote signing flow
### Phase 3: Safe Multisig (Future Task)
- Safe SDK integration
- TransactionBuilderShape for visual tx composition
- Collaborative signing UI
### Phase 4: Account Abstraction (Future Task)
- ERC-4337 smart wallet with P-256 signature validation
- Gasless transactions via paymaster
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Install and configure wagmi v2, viem, and @walletconnect/web3modal
- [x] #2 Create linked_wallets table in Cloudflare D1 with proper schema
- [x] #3 Implement POST /api/wallet/link endpoint with signature verification
- [ ] #4 Implement GET /api/wallet/list endpoint to retrieve linked wallets
- [ ] #5 Implement DELETE /api/wallet/unlink endpoint to remove wallet links
- [ ] #6 Create WalletConnectButton component using wagmi hooks
- [ ] #7 Create WalletLinkPanel component for linking flow UI
- [ ] #8 Add wallet section to user settings/profile panel
- [ ] #9 Display linked wallet addresses with ENS resolution
- [ ] #10 Support multiple wallet types: EOA, Safe, Hardware
- [ ] #11 Add wallet connection state to AuthContext
- [ ] #12 Write tests for wallet linking flow
- [ ] #13 Update CLAUDE.md with Web3 architecture documentation
<!-- AC:END -->
## Implementation Plan
<!-- SECTION:PLAN:BEGIN -->
## Implementation Plan
### Step 1: Dependencies & Configuration
```bash
npm install wagmi viem @tanstack/react-query @walletconnect/web3modal
```
Configure wagmi with WalletConnect projectId and supported chains.
### Step 2: Database Schema
Add to D1 migration:
- linked_wallets table (user_id, wallet_address, wallet_type, chain_id, verified_at, signature_proof, ens_name, is_primary)
### Step 3: API Endpoints
Worker routes:
- POST /api/wallet/link - Verify signature, create link
- GET /api/wallet/list - List user's linked wallets
- DELETE /api/wallet/unlink - Remove a linked wallet
- GET /api/wallet/verify/:address - Check if address is linked to any CryptID
### Step 4: Frontend Components
- WagmiProvider wrapper in App.tsx
- WalletConnectButton - Connect/disconnect wallet
- WalletLinkPanel - Full linking flow with signature
- WalletBadge - Display linked wallet in UI
### Step 5: Integration
- Add linkedWallets to Session type
- Update AuthContext with wallet state
- Add wallet section to settings panel
### Step 6: Testing
- Unit tests for signature verification
- Integration tests for linking flow
- E2E test for full wallet link journey
<!-- SECTION:PLAN:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Planning Complete (2026-01-02)
Comprehensive planning phase completed:
### Created Architecture Document (doc-001)
- Full technical architecture for wallet linking
- Database schema design
- API endpoint specifications
- Library comparison (wagmi/viem recommended)
- Security considerations
- Frontend component designs
### Created Migration File
- `worker/migrations/002_linked_wallets.sql`
- Tables: linked_wallets, wallet_link_tokens, wallet_token_balances
- Proper indexes and foreign keys
### Created Follow-up Tasks
- task-060: Snapshot Voting Integration
- task-061: Safe Multisig Integration
- task-062: Account Abstraction Exploration
### Key Architecture Decisions
1. **Wallet Linking** approach (not key reuse) due to P-256/secp256k1 incompatibility
2. **wagmi v2 + viem** for frontend (React hooks, tree-shakeable)
3. **viem** for worker (signature verification)
4. **EIP-191 personal_sign** for EOA verification
5. **ERC-1271** for Safe/contract wallet verification (future)
### Next Steps
1. Install dependencies: wagmi, viem, @tanstack/react-query, @web3modal/wagmi
2. Run migration on D1
3. Implement API endpoints in worker
4. Build WalletLinkPanel UI component
## Implementation Complete (Phase 1: Wallet Linking)
### Files Created:
- `src/providers/Web3Provider.tsx` - Wagmi v2 config with WalletConnect
- `src/hooks/useWallet.ts` - React hooks for wallet connection/linking
- `src/components/WalletLinkPanel.tsx` - UI component for wallet management
- `worker/walletAuth.ts` - Backend signature verification and API handlers
- `worker/migrations/002_linked_wallets.sql` - Database schema
### Files Modified:
- `worker/types.ts` - Added wallet types
- `worker/worker.ts` - Added wallet API routes
- `src/App.tsx` - Integrated Web3Provider
- `src/ui/UserSettingsModal.tsx` - Added wallet section to Integrations tab
### Features:
- Connect wallets via MetaMask, WalletConnect, Coinbase Wallet
- Link wallets to CryptID accounts via EIP-191 signature
- View/manage linked wallets
- Set primary wallet, unlink wallets
- Supports mainnet, Optimism, Arbitrum, Base, Polygon
### Remaining Work:
- Add @noble/hashes for proper keccak256/ecrecover (placeholder functions)
- Run D1 migration on production
- Get WalletConnect Project ID from cloud.walletconnect.com
<!-- SECTION:NOTES:END -->

View File

@ -0,0 +1,21 @@
---
id: task-007
title: Web3 Integration
status: To Do
assignee: []
created_date: '2025-12-03'
labels: [feature, web3, blockchain]
priority: low
branch: web3-integration
---
## Description
Integrate Web3 capabilities for blockchain-based features (wallet connect, NFT canvas elements, etc.).
## Branch Info
- **Branch**: `web3-integration`
## Acceptance Criteria
- [ ] Add wallet connection
- [ ] Enable NFT minting of canvas elements
- [ ] Blockchain-based ownership verification

View File

@ -1,10 +1,10 @@
--- ---
id: task-017 id: task-017
title: Deploy CryptID email recovery to dev branch and test title: Deploy CryptID email recovery to dev branch and test
status: In Progress status: To Do
assignee: [] assignee: []
created_date: '2025-12-04 12:00' created_date: '2025-12-04 12:00'
updated_date: '2025-12-11 15:15' updated_date: '2025-12-04 12:27'
labels: labels:
- feature - feature
- cryptid - cryptid

View File

@ -1,10 +1,10 @@
--- ---
id: task-018 id: task-018
title: Create Cloudflare D1 cryptid-auth database title: Create Cloudflare D1 cryptid-auth database
status: Done status: To Do
assignee: [] assignee: []
created_date: '2025-12-04 12:02' created_date: '2025-12-04 12:02'
updated_date: '2025-12-06 06:39' updated_date: '2025-12-04 12:27'
labels: labels:
- infrastructure - infrastructure
- cloudflare - cloudflare
@ -108,11 +108,4 @@ git commit -m "chore: add D1 database IDs for cryptid-auth"
Feature branch: `feature/cryptid-email-recovery` Feature branch: `feature/cryptid-email-recovery`
Code is ready - waiting for D1 database creation Code is ready - waiting for D1 database creation
Schema deployed to production D1 (35fbe755-0e7c-4b9a-a454-34f945e5f7cc)
Tables created:
- users, device_keys, verification_tokens (CryptID auth)
- boards, board_permissions (permissions system)
- user_profiles, user_connections, connection_metadata (social graph)
<!-- SECTION:NOTES:END --> <!-- SECTION:NOTES:END -->

View File

@ -1,19 +1,13 @@
--- ---
id: task-024 id: task-024
title: 'Open Mapping: Collaborative Route Planning Module' title: 'Open Mapping: Collaborative Route Planning Module'
status: Done status: To Do
assignee: [] assignee: []
created_date: '2025-12-04 14:30' created_date: '2025-12-04 14:30'
updated_date: '2025-12-07 06:43'
labels: labels:
- feature - feature
- mapping - mapping
dependencies: dependencies: []
- task-029
- task-030
- task-031
- task-036
- task-037
priority: high priority: high
--- ---
@ -25,9 +19,9 @@ Implement an open-source mapping and routing layer for the canvas that provides
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 MapLibre GL JS integrated with tldraw canvas - [ ] #1 MapLibre GL JS integrated with tldraw canvas
- [x] #2 OSRM routing backend deployed to Netcup - [ ] #2 OSRM routing backend deployed to Netcup
- [x] #3 Waypoint placement and route calculation working - [ ] #3 Waypoint placement and route calculation working
- [ ] #4 Multi-route comparison UI implemented - [ ] #4 Multi-route comparison UI implemented
- [ ] #5 Y.js collaboration for shared route editing - [ ] #5 Y.js collaboration for shared route editing
- [ ] #6 Layer management panel with basemap switching - [ ] #6 Layer management panel with basemap switching
@ -67,118 +61,3 @@ Phase 6 - Optimization:
- VROOM TSP/VRP - VROOM TSP/VRP
- Offline PWA - Offline PWA
<!-- SECTION:PLAN:END --> <!-- SECTION:PLAN:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
**Subsystem implementations completed:**
- task-029: zkGPS Privacy Protocol (src/open-mapping/privacy/)
- task-030: Mycelial Signal Propagation (src/open-mapping/mycelium/)
- task-031: Alternative Map Lens System (src/open-mapping/lenses/)
- task-036: Possibility Cones & Constraints (src/open-mapping/conics/)
- task-037: Location Games & Discovery (src/open-mapping/discovery/)
**Still needs:**
- MapLibre GL JS canvas integration
- OSRM backend deployment
- UI components for all subsystems
- Automerge sync for collaborative editing
Pushed to feature/open-mapping branch:
- MapShapeUtil for tldraw canvas integration
- Presence layer with location sharing
- Mycelium network visualization
- Discovery system (spores, hunts, collectibles)
- Privacy system with ZK-GPS protocol concepts
**Merged to dev branch (2025-12-05):**
- All subsystem TypeScript implementations merged
- MapShapeUtil integrated with canvas
- ConnectionStatusIndicator added
- Merged with PrivateWorkspace feature (no conflicts)
- Ready for staging/production testing
**Remaining work:**
- MapLibre GL JS full canvas integration
- OSRM backend deployment to Netcup
- UI polish and testing
**OSRM Backend Deployed (2025-12-05):**
- Docker container running on Netcup RS 8000
- Location: /opt/apps/osrm-routing/
- Public URL: https://routing.jeffemmett.com
- Uses Traefik for routing via Docker network
- Currently loaded with Monaco OSM data (for testing)
- MapShapeUtil updated to use self-hosted OSRM
- Verified working: curl returns valid route responses
Map refactoring completed:
- Created simplified MapShapeUtil.tsx (836 lines) with MapLibre + search + routing
- Created GPSCollaborationLayer.ts as standalone module for GPS sharing
- Added layers/index.ts and updated open-mapping exports
- Server running without compilation errors
- Architecture now follows layer pattern: Base Map → Collaboration Layers
Enhanced MapShapeUtil (1326 lines) with:
- Touch/pen/mouse support with proper z-index (1000+) and touchAction styles
- Search with autocomplete as you type (Nominatim, 400ms debounce)
- Directions panel with waypoint management, reverse route, clear
- GPS location sharing panel with start/stop, accuracy display
- Quick action toolbar: search, directions (🚗), GPS (📍), style picker
- Larger touch targets (44px buttons) for mobile
- Pulse animation on user GPS marker
- "Fit All" button to zoom to all GPS users
- Route info badge when panel is closed
Fixed persistence issue with two changes:
1. Server-side: handlePeerDisconnect now flushes pending saves immediately (prevents data loss on page close)
2. Client-side: Changed merge strategy from 'local takes precedence' to 'server takes precedence' for initial load
**D1 Database & Networking Fixes (2025-12-06):**
- Added CRYPTID_DB D1 binding to wrangler.dev.toml
- Applied schema.sql to local D1 database
- All 25 SQL commands executed successfully
- Networking API now working locally (returns 401 without auth as expected)
- Added d1_persist=true to miniflare config for data persistence
**CryptID Connections Feature:**
- Enhanced CustomToolbar.tsx with "People in Canvas" section
- Shows all tldraw collaborators with connection status colors
- Green border = trusted, Yellow = connected, Grey = unconnected
- Connect/Trust/Demote/Remove buttons for connection management
- Uses tldraw useValue hook for reactive collaborator updates
**Build Script Updates:**
- Added NODE_OPTIONS="--max-old-space-size=8192" to build, deploy, deploy:pages scripts
- Prevents memory issues during TypeScript compilation and Vite build
Completed Mapus-inspired MapShapeUtil enhancements:
- Left sidebar with title/description editing
- Search bar with Nominatim geocoding
- Find Nearby categories (8 types: Food, Drinks, Groceries, Hotels, Health, Services, Shopping, Transport)
- Collaborators list with Observe mode
- Annotations list with visibility toggle
- Drawing toolbar (cursor, marker, line, area, eraser)
- Color picker with 8 Mapus colors
- Style picker (Voyager, Light, Dark, Satellite)
- Zoom controls + GPS location button
- Fixed TypeScript errors (3 issues resolved)
**MapLibre Cleanup Fixes (2025-12-07):**
- Added isMountedRef to track component mount state
- Fixed map initialization cleanup with named event handlers
- Added try/catch blocks for all MapLibre operations
- Fixed style change, resize, and annotations effects with mounted checks
- Updated callbacks (observeUser, selectSearchResult, findNearby) with null checks
- Added legacy property support (interactive, showGPS, showSearch, showDirections, sharingLocation, gpsUsers)
- Prevents 'getLayer' and 'map' undefined errors during component unmount
- All schema validation errors resolved
**Feature Branch Created (2025-12-07):**
- Branch: feature/mapshapeutil-fixes
- Pushed to Gitea: https://gitea.jeffemmett.com/jeffemmett/canvas-website/compare/main...feature/mapshapeutil-fixes
- Includes all MapLibre cleanup fixes and z-index/pointer-event style improvements
- Ready for testing before merging to dev
<!-- SECTION:NOTES:END -->

View File

@ -4,7 +4,7 @@ title: 'Google Export: Local-First Data Sovereignty'
status: Done status: Done
assignee: [] assignee: []
created_date: '2025-12-04 20:25' created_date: '2025-12-04 20:25'
updated_date: '2025-12-05 01:53' updated_date: '2025-12-04 20:51'
labels: labels:
- feature - feature
- google - google
@ -68,38 +68,4 @@ Implemented core Google Data Sovereignty module:
- index.ts: Main module with GoogleDataService class and singleton pattern - index.ts: Main module with GoogleDataService class and singleton pattern
TypeScript compilation passes - all core modules implemented TypeScript compilation passes - all core modules implemented
Committed and pushed to feature/google-export branch (e69ed0e)
All core modules implemented and working: OAuth, encryption, database, share, backup
Gmail, Drive, and Calendar importers working correctly
Photos importer has 403 error on some thumbnail URLs - needs investigation:
- May require proper OAuth consent screen verification
- baseUrl might need different approach for non-public photos
- Consider using Photos API mediaItems.get for base URLs instead of direct thumbnail access
Phase 2 complete: Renamed GoogleDataBrowser to GoogleExportBrowser (commit 33f5dc7)
Pushed to feature/google-export branch
Phase 3 complete: Added Private Workspace zone (commit 052c984)
- PrivateWorkspaceShapeUtil: Frosted glass container with pin/collapse/close
- usePrivateWorkspace hook for event handling
- PrivateWorkspaceManager component integrated into Board.tsx
Phase 4 complete: Added GoogleItemShape with privacy badges (commit 84c6bf8)
- GoogleItemShapeUtil: Visual distinction for local vs shared items
- Privacy badge with 🔒/🌐 icons
- Updated ShareableItem type with service and thumbnailUrl
<!-- SECTION:NOTES:END --> <!-- SECTION:NOTES:END -->

View File

@ -1,10 +1,9 @@
--- ---
id: task-026 id: task-026
title: Fix text shape sync between clients title: Fix text shape sync between clients
status: Done status: To Do
assignee: [] assignee: []
created_date: '2025-12-04 20:48' created_date: '2025-12-04 20:48'
updated_date: '2025-12-25 23:30'
labels: labels:
- bug - bug
- sync - sync
@ -32,26 +31,7 @@ Files to investigate:
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 Text shapes sync correctly between multiple clients - [ ] #1 Text shapes sync correctly between multiple clients
- [x] #2 Text content preserved during automerge serialization/deserialization - [ ] #2 Text content preserved during automerge serialization/deserialization
- [x] #3 Both new and existing text shapes display correctly on all clients - [ ] #3 Both new and existing text shapes display correctly on all clients
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Fix Applied (2025-12-25)
Root cause: Text shapes arriving from other clients had `props.text` but the deserialization code was:
1. Initializing `richText` to empty `{ content: [], type: 'doc' }`
2. Then deleting `props.text`
3. Result: content lost
Fix: Added text → richText conversion for text shapes in `AutomergeToTLStore.ts` (lines 1162-1191), similar to the existing conversion for geo shapes.
The fix:
- Checks if `props.text` exists before initializing richText
- Converts text content to richText format
- Preserves original text in `meta.text` for backward compatibility
- Logs conversion for debugging
<!-- SECTION:NOTES:END -->

View File

@ -4,7 +4,6 @@ title: Implement proper Automerge CRDT sync for offline-first support
status: In Progress status: In Progress
assignee: [] assignee: []
created_date: '2025-12-04 21:06' created_date: '2025-12-04 21:06'
updated_date: '2025-12-25 23:59'
labels: labels:
- offline-sync - offline-sync
- crdt - crdt
@ -26,94 +25,10 @@ Solution: Use Automerge's native binary sync protocol with proper CRDT merge sem
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 Server stores Automerge binary documents in R2 (not JSON) - [ ] #1 Server stores Automerge binary documents in R2 (not JSON)
- [ ] #2 Client-server communication uses Automerge sync protocol (binary messages) - [ ] #2 Client-server communication uses Automerge sync protocol (binary messages)
- [ ] #3 Deletions persist correctly when offline client reconnects - [ ] #3 Deletions persist correctly when offline client reconnects
- [ ] #4 Concurrent edits merge deterministically without data loss - [ ] #4 Concurrent edits merge deterministically without data loss
- [x] #5 Existing JSON rooms are migrated to Automerge format - [ ] #5 Existing JSON rooms are migrated to Automerge format
- [ ] #6 All existing functionality continues to work - [ ] #6 All existing functionality continues to work
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Progress Update (2025-12-04)
### Implemented:
1. **automerge-init.ts** - WASM initialization for Cloudflare Workers using slim variant
2. **automerge-sync-manager.ts** - Core CRDT sync manager with proper merge semantics
3. **automerge-r2-storage.ts** - Binary R2 storage for Automerge documents
4. **wasm.d.ts** - TypeScript declarations for WASM imports
### Integration Fixes:
- `getDocument()` now returns CRDT document when sync manager is active
- `handleBinaryMessage()` syncs `currentDoc` with CRDT state after updates
- `schedulePersistToR2()` delegates to sync manager when CRDT mode is enabled
- Fixed CloudflareAdapter TypeScript errors (peer-candidate peerMetadata)
### Current State:
- `useCrdtSync = true` flag is enabled
- Worker compiles and runs successfully
- JSON sync fallback works for backward compatibility
- Binary sync infrastructure is in place
- Needs production testing with multi-client sync and delete operations
**Merged to dev branch (2025-12-05):**
- All Automerge CRDT infrastructure merged
- WASM initialization, sync manager, R2 storage
- Integration fixes for getDocument(), handleBinaryMessage(), schedulePersistToR2()
- Ready for production testing
### 2025-12-05: Data Safety Mitigations Added
Added safety mitigations for Automerge format conversion (commit f8092d8 on feature/google-export):
**Pre-conversion backups:**
- Before any format migration, raw document backed up to R2
- Location: `pre-conversion-backups/{roomId}/{timestamp}_{formatType}.json`
**Conversion threshold guards:**
- 10% loss threshold: Conversion aborts if too many records would be lost
- 5% shape loss warning: Emits warning if shapes are lost
**Unknown format handling:**
- Unknown formats backed up before creating empty document
- Raw document keys logged for investigation
**Also fixed:**
- Keyboard shortcuts dialog error (tldraw i18n objects)
- Google Workspace integration now first in Settings > Integrations
Fixed persistence issue: Modified handlePeerDisconnect to flush pending saves and updated client-side merge strategy in useAutomergeSyncRepo.ts to properly bootstrap from server when local is empty while preserving offline changes
Fixed TypeScript errors in networking module: corrected useSession->useAuth import, added myConnections to NetworkGraph type, fixed GraphEdge type alignment between client and worker
## Investigation Summary (2025-12-25)
**Current Architecture:**
- Worker: CRDT sync enabled with SyncManager
- Client: CloudflareNetworkAdapter with binary message support
- Storage: IndexedDB for offline persistence
**Issue:** Automerge Repo not generating sync messages when `handle.change()` is called. JSON sync workaround in use.
**Suspected Root Cause:**
The Automerge Repo requires proper peer discovery. The adapter emits `peer-candidate` for server, but Repo may not be establishing proper sync relationship.
**Remaining ACs:**
- #2 Client-server binary protocol (partially working - needs Repo to generate messages)
- #3 Deletions persist (needs testing once binary sync works)
- #4 Concurrent edits merge (needs testing)
- #6 All functionality works (JSON workaround is functional)
**Next Steps:**
1. Add debug logging to adapter.send() to verify Repo calls
2. Check sync states between local peer and server
3. May need to manually trigger sync or fix Repo configuration
Dec 25: Added debug logging and peer-candidate re-emission fix to CloudflareAdapter.ts
Key fix: Re-emit peer-candidate after documentId is set to trigger Repo sync (timing issue)
Committed and pushed to dev branch - needs testing to verify binary sync is now working
<!-- SECTION:NOTES:END -->

View File

@ -1,11 +1,9 @@
--- ---
id: task-029 id: task-029
title: zkGPS Protocol Design title: zkGPS Protocol Design
status: Done status: To Do
assignee: assignee: []
- '@claude'
created_date: '2025-12-04 21:12' created_date: '2025-12-04 21:12'
updated_date: '2025-12-04 23:29'
labels: labels:
- feature - feature
- privacy - privacy
@ -41,30 +39,10 @@ Integration with canvas:
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 Protocol specification document complete - [ ] #1 Protocol specification document complete
- [x] #2 Proof-of-concept proximity proof working - [ ] #2 Proof-of-concept proximity proof working
- [x] #3 Geohash commitment scheme implemented - [ ] #3 Geohash commitment scheme implemented
- [x] #4 Trust circle precision configuration UI - [ ] #4 Trust circle precision configuration UI
- [x] #5 Integration with canvas presence system - [ ] #5 Integration with canvas presence system
- [ ] #6 Performance benchmarks acceptable for real-time use - [ ] #6 Performance benchmarks acceptable for real-time use
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Completed all zkGPS Protocol Design implementation:
- ZKGPS_PROTOCOL.md: Full specification document with design goals, proof types, wire protocol, security considerations
- geohash.ts: Complete geohash encoding/decoding with precision levels, neighbor finding, radius/polygon cell intersection
- types.ts: Comprehensive TypeScript types for commitments, trust circles, proofs, and protocol messages
- commitments.ts: Hash-based commitment scheme with salt, signing, and verification
- proofs.ts: Proximity, region, temporal, and group proximity proof generation/verification
- trustCircles.ts: TrustCircleManager class for managing social layer and precision-per-contact
- index.ts: Barrel export for clean module API
<!-- SECTION:NOTES:END -->

View File

@ -1,11 +1,9 @@
--- ---
id: task-030 id: task-030
title: Mycelial Signal Propagation System title: Mycelial Signal Propagation System
status: Done status: To Do
assignee: assignee: []
- '@claude'
created_date: '2025-12-04 21:12' created_date: '2025-12-04 21:12'
updated_date: '2025-12-04 23:37'
labels: labels:
- feature - feature
- mapping - mapping
@ -39,26 +37,10 @@ The map becomes a living organism that breathes with activity cycles and grows w
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 Signal propagation algorithm implemented - [ ] #1 Signal propagation algorithm implemented
- [x] #2 Decay functions configurable (spatial, relational, temporal) - [ ] #2 Decay functions configurable (spatial, relational, temporal)
- [x] #3 Visualization of signal gradients on canvas - [ ] #3 Visualization of signal gradients on canvas
- [x] #4 Resonance detection alerts working - [ ] #4 Resonance detection alerts working
- [x] #5 Spore-style notification system - [ ] #5 Spore-style notification system
- [x] #6 Blindspot/unknown area highlighting - [ ] #6 Blindspot/unknown area highlighting
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Completed Mycelial Signal Propagation System - 5 files in src/open-mapping/mycelium/:
types.ts: Node/Hypha/Signal/Decay/Propagation/Resonance type definitions with event system
signals.ts: Decay functions (exponential, linear, inverse, step, gaussian) + 4 propagation algorithms (flood, gradient, random-walk, diffusion)
network.ts: MyceliumNetwork class with node/hypha CRUD, signal emission/queue, resonance detection, maintenance loop, stats
visualization.ts: Color palettes, dynamic sizing, Canvas 2D rendering, heat maps, CSS keyframes
index.ts: Clean barrel export for entire module
<!-- SECTION:NOTES:END -->

View File

@ -1,11 +1,9 @@
--- ---
id: task-031 id: task-031
title: Alternative Map Lens System title: Alternative Map Lens System
status: Done status: To Do
assignee: assignee: []
- '@claude'
created_date: '2025-12-04 21:12' created_date: '2025-12-04 21:12'
updated_date: '2025-12-04 23:42'
labels: labels:
- feature - feature
- mapping - mapping
@ -40,26 +38,10 @@ Each lens uses the same canvas shapes but transforms their positions and styling
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [ ] #1 Lens switcher UI implemented - [ ] #1 Lens switcher UI implemented
- [x] #2 Geographic lens working with OSM - [ ] #2 Geographic lens working with OSM
- [x] #3 Temporal lens with time scrubber - [ ] #3 Temporal lens with time scrubber
- [x] #4 Attention heatmap visualization - [ ] #4 Attention heatmap visualization
- [x] #5 Smooth transitions between lenses - [ ] #5 Smooth transitions between lenses
- [x] #6 Lens blending capability - [ ] #6 Lens blending capability
- [ ] #7 Temporal portal feature (click to see history) - [ ] #7 Temporal portal feature (click to see history)
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Completed Alternative Map Lens System - 5 files in src/open-mapping/lenses/:
types.ts: All lens type definitions (Geographic, Temporal, Attention, Incentive, Relational, Possibility) with configs, transitions, events
transforms.ts: Coordinate transform functions for each lens type + force-directed layout algorithm for relational lens
blending.ts: Easing functions, transition creation/interpolation, point blending for multi-lens views
manager.ts: LensManager class with lens activation/deactivation, transitions, viewport control, temporal playback, temporal portals
index.ts: Clean barrel export for entire lens system
<!-- SECTION:NOTES:END -->

View File

@ -4,13 +4,11 @@ title: Privacy Gradient Trust Circle System
status: To Do status: To Do
assignee: [] assignee: []
created_date: '2025-12-04 21:12' created_date: '2025-12-04 21:12'
updated_date: '2025-12-05 01:42'
labels: labels:
- feature - feature
- privacy - privacy
- social - social
dependencies: dependencies: []
- task-029
priority: medium priority: medium
--- ---
@ -42,28 +40,10 @@ The system should default to maximum privacy and require explicit opt-in to shar
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [ ] #1 Trust circle configuration UI - [ ] #1 Trust circle configuration UI
- [ ] #2 Per-contact precision settings - [ ] #2 Per-contact precision settings
- [x] #3 Group-based trust levels - [ ] #3 Group-based trust levels
- [x] #4 Precision degradation over time working - [ ] #4 Precision degradation over time working
- [ ] #5 Visual representation of trust circles on map - [ ] #5 Visual representation of trust circles on map
- [ ] #6 Consent management interface - [ ] #6 Consent management interface
- [x] #7 Integration points with zkGPS task - [ ] #7 Integration points with zkGPS task
- [x] #8 Privacy-by-default enforced - [ ] #8 Privacy-by-default enforced
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
**TypeScript foundation completed in task-029:**
- TrustCircleManager class (src/open-mapping/privacy/trustCircles.ts)
- 5 trust levels with precision mapping
- Per-contact trust configuration
- Group trust levels
- Precision degradation over time
- Integration with zkGPS commitments
**Still needs UI components:**
- Trust circle configuration panel
- Contact management interface
- Visual concentric circles on map
- Consent management dialog
<!-- SECTION:NOTES:END -->

View File

@ -1,10 +1,9 @@
--- ---
id: task-033 id: task-033
title: Version History & Reversion System with Visual Diffs title: Version History & Reversion System with Visual Diffs
status: Done status: In Progress
assignee: [] assignee: []
created_date: '2025-12-04 21:44' created_date: '2025-12-04 21:44'
updated_date: '2025-12-05 00:46'
labels: labels:
- feature - feature
- version-control - version-control
@ -36,52 +35,14 @@ Key features:
## Acceptance Criteria ## Acceptance Criteria
<!-- AC:BEGIN --> <!-- AC:BEGIN -->
- [x] #1 Version history button renders next to star button with time-rewind icon - [ ] #1 Version history button renders next to star button with time-rewind icon
- [x] #2 Clicking button opens popup showing list of historical versions - [ ] #2 Clicking button opens popup showing list of historical versions
- [x] #3 User can select a version to preview or revert to - [ ] #3 User can select a version to preview or revert to
- [x] #4 Newly added shapes since last user visit have yellow glow effect - [ ] #4 Newly added shapes since last user visit have yellow glow effect
- [x] #5 Deleted shapes show dimmed with 'undo discard' option - [ ] #5 Deleted shapes show dimmed with 'undo discard' option
- [x] #6 Version navigation respects user permissions (admin/editor/viewer) - [ ] #6 Version navigation respects user permissions (admin/editor/viewer)
- [x] #7 Works with R2 backup snapshots for coarse-grained history - [ ] #7 Works with R2 backup snapshots for coarse-grained history
- [ ] #8 Leverages Automerge CRDT for fine-grained change tracking - [ ] #8 Leverages Automerge CRDT for fine-grained change tracking
- [x] #9 User's last-seen state stored in localStorage for diff comparison - [ ] #9 User's last-seen state stored in localStorage for diff comparison
- [x] #10 Visual effects are subtle and non-intrusive - [ ] #10 Visual effects are subtle and non-intrusive
<!-- AC:END --> <!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Implementation complete in feature/version-reversion worktree:
**Files Created:**
- src/lib/versionHistory.ts - Core version history utilities
- src/lib/permissions.ts - Role-based permission system
- src/components/VersionHistoryButton.tsx - Time-rewind icon button
- src/components/VersionHistoryPanel.tsx - Panel with 3 tabs
- src/components/DeletedShapesOverlay.tsx - Floating deleted shapes indicator
- src/hooks/useVersionHistory.ts - React hook for state management
- src/hooks/usePermissions.ts - Permission context hook
- src/css/version-history.css - Visual effects CSS
**Files Modified:**
- src/ui/CustomToolbar.tsx - Added VersionHistoryButton
- src/ui/components.tsx - Added DeletedShapesOverlay
- src/css/style.css - Imported version-history.css
- worker/worker.ts - Added /api/versions endpoints
**Features Implemented:**
1. Time-rewind button next to star dashboard
2. Version History Panel with Changes/Versions/Deleted tabs
3. localStorage tracking of user's last-seen state
4. Yellow glow animation for new shapes
5. Dim grey effect for deleted shapes
6. Floating indicator with restore options
7. R2 integration for version snapshots
8. Permission system (admin/editor/viewer roles)
Commit: 03894d2
Renamed GoogleDataBrowser to GoogleExportBrowser as requested by user
Pushed to feature/google-export branch (commit 33f5dc7)
<!-- SECTION:NOTES:END -->

View File

@ -1,42 +0,0 @@
---
id: task-034
title: Fix Google Photos 403 error on thumbnail URLs
status: To Do
assignee: []
created_date: '2025-12-04 23:24'
labels:
- bug
- google
- photos
dependencies:
- task-025
priority: low
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Debug and fix the 403 Forbidden errors when fetching Google Photos thumbnails in the Google Data Sovereignty module.
Current behavior:
- Photos metadata imports successfully
- Thumbnail URLs (baseUrl with =w200-h200 suffix) return 403
- Error occurs even with valid OAuth token
Investigation areas:
1. OAuth consent screen verification status (test mode vs published)
2. Photo sharing status (private vs shared photos may behave differently)
3. baseUrl expiration - Google Photos baseUrls expire after ~1 hour
4. May need to use mediaItems.get API to refresh baseUrl before each fetch
5. Consider adding Authorization header to thumbnail fetch requests
Reference: src/lib/google/importers/photos.ts in feature/google-export branch
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Photos thumbnails download without 403 errors
- [ ] #2 OAuth consent screen properly configured if needed
- [ ] #3 baseUrl refresh mechanism implemented if required
- [ ] #4 Test with both private and shared photos
<!-- AC:END -->

View File

@ -1,90 +0,0 @@
---
id: task-035
title: 'Data Sovereignty Zone: Private Workspace UI'
status: Done
assignee: []
created_date: '2025-12-04 23:36'
updated_date: '2025-12-05 02:00'
labels:
- feature
- privacy
- google
- ui
dependencies:
- task-025
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement privacy-first UX for managing LOCAL (encrypted IndexedDB) vs SHARED (collaborative) data on the canvas.
Key features:
- Google Integration card in Settings modal
- Data Browser popup for selecting encrypted items
- Private Workspace zone (toggleable, frosted glass container)
- Visual distinction: 🔒 shaded overlay for local, normal for shared
- Permission prompt when dragging items outside workspace
Design decisions:
- Toggleable workspace that can pin to viewport
- Items always start private, explicit share action required
- ZK integration deferred to future phase
- R2 upload visual-only for now
Worktree: /home/jeffe/Github/canvas-website-branch-worktrees/google-export
Branch: feature/google-export
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Google Workspace integration card in Settings Integrations tab
- [x] #2 Data Browser popup with service tabs and item selection
- [x] #3 Private Workspace zone shape with frosted glass effect
- [x] #4 Privacy badges (lock/globe) on items showing visibility
- [x] #5 Permission modal when changing visibility from local to shared
- [ ] #6 Zone can be toggled visible/hidden and pinned to viewport
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Phase 1 complete (c9c8c00):
- Added Google Workspace section to Settings > Integrations tab
- Connection status badge and import counts display
- Connect/Disconnect buttons with loading states
- Added getStoredCounts() method to GoogleDataService
- Privacy messaging about AES-256 encryption
Phase 2 complete (a754ffa):
- GoogleDataBrowser component with service tabs
- Searchable, multi-select item list
- Dark mode support
- Privacy messaging and 'Add to Private Workspace' action
Phase 5 completed: Implemented permission flow and drag detection
Created VisibilityChangeModal.tsx for confirming visibility changes
Created VisibilityChangeManager.tsx to handle events and drag detection
GoogleItem shapes dispatch visibility change events on badge click
Support both local->shared and shared->local transitions
Auto-detect when GoogleItems are dragged outside PrivateWorkspace
Session storage for 'don't ask again' preference
All 5 phases complete - full data sovereignty UI implementation done
<!-- SECTION:NOTES:END -->

View File

@ -1,35 +0,0 @@
---
id: task-036
title: Implement Possibility Cones and Constraint Propagation System
status: Done
assignee: []
created_date: '2025-12-05 00:45'
labels:
- feature
- open-mapping
- visualization
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implemented a mathematical framework for visualizing how constraints propagate through decision pipelines. Each decision point creates a "possibility cone" - a light-cone-like structure representing reachable futures. Subsequent constraints act as apertures that narrow these cones.
Key components:
- types.ts: Core type definitions (SpacePoint, PossibilityCone, ConeConstraint, ConeIntersection, etc.)
- geometry.ts: Vector operations, cone math, conic sections, intersection algorithms
- pipeline.ts: ConstraintPipelineManager for constraint propagation through stages
- optimization.ts: PathOptimizer with A*, Dijkstra, gradient descent, simulated annealing
- visualization.ts: Rendering helpers for 2D/3D projections, SVG paths, canvas rendering
Features:
- N-dimensional possibility space with configurable dimensions
- Constraint pipeline with stages and dependency analysis
- Multiple constraint surface types (hyperplane, sphere, cone, custom)
- Value-weighted path optimization through constrained space
- Waist detection (bottleneck finding)
- Caustic point detection (convergence analysis)
- Animation helpers for cone narrowing visualization
<!-- SECTION:DESCRIPTION:END -->

View File

@ -1,114 +0,0 @@
---
id: task-037
title: zkGPS Location Games and Discovery System
status: In Progress
assignee: []
created_date: '2025-12-05 00:49'
updated_date: '2025-12-05 03:52'
labels:
- feature
- open-mapping
- games
- zkGPS
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Build a location-based game framework combining zkGPS privacy proofs with collaborative mapping for treasure hunts, collectibles, and IoT-anchored discoveries.
Use cases:
- Conference treasure hunts with provable location without disclosure
- Collectible elements anchored to physical locations
- Crafting/combining discovered items
- Mycelial network growth between discovered nodes
- IoT hardware integration (NFC tags, BLE beacons)
Game mechanics:
- Proximity proofs ("I'm within 50m of X" without revealing where)
- Hot/cold navigation using geohash precision degradation
- First-finder rewards with timestamp proofs
- Group discovery requiring N players in proximity
- Spore collection and mycelium cultivation
- Fruiting bodies when networks connect
Integration points:
- zkGPS commitments for hidden locations
- Mycelium network for discovery propagation
- Trust circles for team-based play
- Possibility cones for "reachable discoveries" visualization
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Discovery anchor types (physical, virtual, IoT)
- [x] #2 Proximity proof verification for discoveries
- [x] #3 Collectible item system with crafting
- [x] #4 Mycelium growth between discovered locations
- [x] #5 Team/group discovery mechanics
- [x] #6 Hot/cold navigation hints
- [x] #7 First-finder and timestamp proofs
- [x] #8 IoT anchor protocol (NFC/BLE/QR)
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Implemented complete discovery game system with:
**types.ts** - Comprehensive type definitions:
- Discovery anchors (physical, NFC, BLE, QR, virtual, temporal, social)
- IoT requirements and social requirements
- Collectibles, crafting recipes, inventory slots
- Spores, planted spores, fruiting bodies
- Treasure hunts, scoring, leaderboards
- Hot/cold navigation hints
**anchors.ts** - Anchor management:
- Create anchors with zkGPS commitments
- Proximity-based discovery verification
- Hot/cold navigation hints
- Prerequisite and cooldown checking
- IoT and social requirement verification
**collectibles.ts** - Item and crafting system:
- ItemRegistry for item definitions
- InventoryManager with stacking
- CraftingManager with recipes
- Default spore, fragment, and artifact items
**spores.ts** - Mycelium integration:
- 7 spore types (explorer, connector, amplifier, guardian, harvester, temporal, social)
- Planting spores at discovered locations
- Hypha connections between nearby spores
- Fruiting body emergence when networks connect
- Growth simulation with nutrient decay
**hunts.ts** - Treasure hunt management:
- Create hunts with multiple anchors
- Sequential or free-form discovery
- Scoring with bonuses (first finder, time, sequence, group)
- Leaderboards and prizes
- Hunt templates (quick, standard, epic, team)
Moving to In Progress - core TypeScript implementation complete, still needs:
- UI components for discovery/hunt interfaces
- Canvas integration for map visualization
- Real IoT hardware testing (NFC/BLE)
- Backend persistence layer
- Multiplayer sync via Automerge
**Merged to dev branch (2025-12-05):**
- Complete discovery game system TypeScript merged
- Anchor, collectible, spore, and hunt systems in place
- All type definitions and core logic implemented
**Still needs for production:**
- React UI components for discovery/hunt interfaces
- Canvas map visualization integration
- IoT hardware testing (NFC/BLE)
- Backend persistence layer
- Multiplayer sync testing
<!-- SECTION:NOTES:END -->

View File

@ -1,59 +0,0 @@
---
id: task-038
title: Real-Time Location Presence with Privacy Controls
status: Done
assignee: []
created_date: '2025-12-05 02:00'
updated_date: '2025-12-05 02:00'
labels:
- feature
- open-mapping
- privacy
- collaboration
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implemented real-time location sharing with trust-based privacy controls for collaborative mapping.
Key features:
- Privacy-preserving location via zkGPS commitments
- Trust circle precision controls (intimate ~2.4m → public ~630km)
- Real-time broadcasting and receiving of presence
- Proximity detection without revealing exact location
- React hook for easy canvas integration
- Map visualization components (PresenceLayer, PresenceList)
Files created in src/open-mapping/presence/:
- types.ts: Comprehensive type definitions
- manager.ts: PresenceManager class with location watch, broadcasting, trust circles
- useLocationPresence.ts: React hook for canvas integration
- PresenceLayer.tsx: Map visualization components
- index.ts: Barrel export
Integration pattern:
```typescript
const presence = useLocationPresence({
channelId: 'room-id',
user: { pubKey, privKey, displayName, color },
broadcastFn: (data) => automergeAdapter.broadcast(data),
});
// Set trust levels for contacts
presence.setTrustLevel(bobKey, 'friends'); // ~2.4km precision
presence.setTrustLevel(aliceKey, 'intimate'); // ~2.4m precision
```
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Location presence types defined
- [x] #2 PresenceManager with broadcasting
- [x] #3 Trust-based precision controls
- [x] #4 React hook for canvas integration
- [x] #5 Map visualization components
- [x] #6 Proximity detection without exact location
<!-- AC:END -->

View File

@ -1,154 +0,0 @@
---
id: task-039
title: 'MapShape Integration: Connect Subsystems to Canvas Shape'
status: Done
assignee: []
created_date: '2025-12-05 02:12'
updated_date: '2025-12-05 03:41'
labels:
- feature
- mapping
- integration
dependencies:
- task-024
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Evolve MapShapeUtil.tsx to integrate the 6 implemented subsystems (privacy, mycelium, lenses, conics, discovery, presence) into the canvas map shape. Currently the MapShape is a standalone map viewer - it needs to become the central hub for all open-mapping features.
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 MapShape props extended for subsystem toggles
- [x] #2 Presence layer integrated with opt-in location sharing
- [x] #3 Lens system accessible via UI
- [x] #4 Route/waypoint visualization working
- [x] #5 Collaboration sync via Automerge
- [x] #6 Discovery game elements visible on map
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
**MapShape Evolution Progress (Dec 5, 2025):**
### Completed:
1. **Extended IMapShape Props** - Added comprehensive subsystem configuration types:
- `MapPresenceConfig` - Location sharing with privacy levels
- `MapLensConfig` - Alternative map projections
- `MapDiscoveryConfig` - Games, anchors, spores, hunts
- `MapRoutingConfig` - Waypoints, routes, alternatives
- `MapConicsConfig` - Possibility cones visualization
2. **Header UI Controls** - Subsystem toolbar with:
- ⚙️ Expandable subsystem panel
- Toggle buttons for each subsystem
- Lens selector dropdown (6 lens types)
- Share location button for presence
- Active subsystem indicators in header
3. **Visualization Layers Added:**
- Route polyline layer (MapLibre GeoJSON source/layer)
- Waypoint markers management
- Routing panel (bottom-right) with stats
- Presence panel (bottom-left) with share button
- Discovery panel (top-right) with checkboxes
- Lens indicator badge (top-left when active)
### Still Needed:
- Actual MapLibre marker implementation for waypoints
- Integration with OSRM routing backend
- Connect presence system to actual location services
- Wire up discovery system to anchor/spore data
**Additional Implementation (Dec 5, 2025):**
### Routing System - Fully Working:
- ✅ MapLibre.Marker implementation with draggable waypoints
- ✅ Click-to-add-waypoint when routing enabled
- ✅ OSRM routing service integration (public server)
- ✅ Auto-route calculation after adding/dragging waypoints
- ✅ Route polyline rendering with GeoJSON layer
- ✅ Clear route button with full state reset
- ✅ Loading indicator during route calculation
- ✅ Distance/duration display in routing panel
### Presence System - Fully Working:
- ✅ Browser Geolocation API integration
- ✅ Location watching with configurable accuracy
- ✅ User location marker with pulsing animation
- ✅ Error handling (permission denied, unavailable, timeout)
- ✅ "Go to My Location" button with flyTo animation
- ✅ Privacy level affects GPS accuracy settings
- ✅ Real-time coordinate display when sharing
### Still TODO:
- Discovery system anchor visualization
- Automerge sync for collaborative editing
Phase 5: Automerge Sync Integration - Analyzing existing sync architecture. TLDraw shapes sync automatically via TLStoreToAutomerge.ts. MapShape props should already sync since they're part of the shape record.
**Automerge Sync Implementation Complete (Dec 5, 2025):**
1. **Collaborative sharedLocations** - Added `sharedLocations: Record<string, SharedLocation>` to MapPresenceConfig props
2. **Conflict-free updates** - Each user updates only their own key in sharedLocations, allowing Automerge CRDT to handle concurrent updates automatically
3. **Location sync effect** - When user shares location, their coordinate is published to sharedLocations with userId, userName, color, timestamp, and privacyLevel
4. **Auto-cleanup** - User's entry is removed from sharedLocations when they stop sharing
5. **Collaborator markers** - Renders MapLibre markers for all other users' shared locations (different from user's own pulsing marker)
6. **Stale location filtering** - Collaborator locations older than 5 minutes are not rendered
7. **UI updates** - Presence panel now shows count of online collaborators
**How it works:**
- MapShape props sync automatically via existing TLDraw → Automerge infrastructure
- When user calls editor.updateShape() to update MapShape props, changes flow through TLStoreToAutomerge.ts
- Remote changes come back via Automerge patches and update the shape's props
- Each user only writes to their own key in sharedLocations, so no conflicts occur
**Discovery Visualization Complete (Dec 5, 2025):**
### Added Display Types for Automerge Sync:
- `DiscoveryAnchorMarker` - Simplified anchor data for map markers
- `SporeMarker` - Mycelium spore data with strength and connections
- `HuntMarker` - Treasure hunt waypoints with sequence numbers
### MapDiscoveryConfig Extended:
- `anchors: DiscoveryAnchorMarker[]` - Synced anchor data
- `spores: SporeMarker[]` - Synced spore data with connection graph
- `hunts: HuntMarker[]` - Synced treasure hunt waypoints
### Marker Rendering Implemented:
1. **Anchor Markers** - Circular markers with type-specific colors (physical=green, nfc=blue, qr=purple, virtual=amber). Hidden anchors shown with reduced opacity until discovered.
2. **Spore Markers** - Pulsing circular markers with radial gradients. Size scales with spore strength (40-100%). Animation keyframes for organic feel.
3. **Mycelium Network** - GeoJSON LineString layer connecting spores. Dashed green lines with 60% opacity visualize the network connections.
4. **Hunt Markers** - Numbered square markers for treasure hunts. Amber when not found, green with checkmark when discovered.
### Discovery Panel Enhanced:
- Stats display showing counts: 📍 anchors, 🍄 spores, 🏆 hunts
- "+Add Anchor" button - Creates demo anchor at map center
- "+Add Spore" button - Creates demo spore with random connection
- "+Add Hunt Point" button - Creates treasure hunt waypoint
- "Clear All" button - Removes all discovery elements
### How Automerge Sync Works:
- Discovery data stored in MapShape.props.discovery
- Shape updates via editor.updateShape() flow through TLStoreToAutomerge
- All collaborators see markers appear in real-time
- Each user can add/modify elements, CRDT handles conflicts
<!-- SECTION:NOTES:END -->

View File

@ -1,39 +0,0 @@
---
id: task-040
title: 'Open-Mapping Production Ready: Fix TypeScript, Enable Build, Polish UI'
status: In Progress
assignee: []
created_date: '2025-12-05 21:58'
labels:
- feature
- mapping
- typescript
- build
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Make the open-mapping module production-ready by fixing TypeScript errors, re-enabling it in the build, and polishing the UI components.
Currently the open-mapping directory is excluded from tsconfig due to TypeScript errors. This task covers:
1. Fix TypeScript errors in src/open-mapping/**
2. Re-enable in tsconfig.json
3. Add NODE_OPTIONS for build memory
4. Polish MapShapeUtil UI (multi-route, layer panel)
5. Test collaboration features
6. Deploy to staging
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 open-mapping included in tsconfig without errors
- [ ] #2 npm run build succeeds
- [ ] #3 MapShapeUtil renders and functions correctly
- [ ] #4 Routing via OSRM works
- [ ] #5 GPS sharing works between clients
- [ ] #6 Layer switching works
- [ ] #7 Search with autocomplete works
<!-- AC:END -->

View File

@ -1,91 +0,0 @@
---
id: task-041
title: User Networking & Social Graph Visualization
status: Done
assignee: []
created_date: '2025-12-06 06:17'
updated_date: '2025-12-06 06:46'
labels:
- feature
- social
- visualization
- networking
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Build a social networking layer on the canvas that allows users to:
1. Tag other users as "connected" to them
2. Search by username to add connections
3. Track connected network of CryptIDs
4. Replace top-right presence icons with bottom-right graph visualization
5. Create 3D interactive graph at graph.jeffemmett.com
Key Components:
- Connection storage (extend trust circles in D1/Automerge)
- User search API
- 2D mini-graph in bottom-right (like minimap)
- 3D force-graph visualization (Three.js/react-force-graph-3d)
- Edge metadata (relationship types, clickable edges)
Architecture: Extends existing presence system in open-mapping/presence/ and trust circles in privacy/trustCircles.ts
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Users can search and add connections to other CryptIDs
- [x] #2 Connections persist across sessions in D1 database
- [x] #3 Bottom-right graph visualization shows room users and connections
- [ ] #4 3D graph at graph.jeffemmett.com is interactive (spin, zoom, click)
- [ ] #5 Clicking edges allows defining relationship metadata
- [x] #6 Real-time updates when connections change
- [x] #7 Privacy-respecting (honors trust circle permissions)
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Design decisions made:
- Binary connections only: 'connected' or 'not connected'
- All usernames publicly searchable
- One-way following allowed (no acceptance required)
- Graph scope: full network in grey, room participants colored by presence
- Edge metadata private to the two connected parties
Implementation complete:
**Files Created:**
- worker/schema.sql: Added user_profiles, user_connections, connection_metadata tables
- worker/types.ts: Added TrustLevel, UserConnection, GraphEdge, NetworkGraph types
- worker/networkingApi.ts: Full API implementation for connections, search, graph
- src/lib/networking/types.ts: Client-side types with trust levels
- src/lib/networking/connectionService.ts: API client
- src/lib/networking/index.ts: Module exports
- src/components/networking/useNetworkGraph.ts: React hook for graph state
- src/components/networking/UserSearchModal.tsx: User search UI
- src/components/networking/NetworkGraphMinimap.tsx: 2D force graph with d3
- src/components/networking/NetworkGraphPanel.tsx: Tldraw integration wrapper
- src/components/networking/index.ts: Component exports
**Modified Files:**
- worker/worker.ts: Added networking API routes
- src/ui/components.tsx: Added NetworkGraphPanel to InFrontOfCanvas
**Trust Levels:**
- unconnected (grey): No permissions
- connected (yellow): View permission
- trusted (green): Edit permission
**Features:**
- One-way following (no acceptance required)
- Trust level upgrade/downgrade
- Edge metadata (private labels, notes, colors)
- Room participants highlighted with presence colors
- Full network shown in grey, room subset colored
- Expandable to 3D view (future: graph.jeffemmett.com)
2D implementation complete. Follow-up task-042 created for 3D graph and edge metadata editor modal.
<!-- SECTION:NOTES:END -->

View File

@ -1,52 +0,0 @@
---
id: task-042
title: 3D Network Graph Visualization & Edge Metadata Editor
status: To Do
assignee: []
created_date: '2025-12-06 06:46'
labels:
- feature
- visualization
- 3d
- networking
dependencies:
- task-041
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Build the 3D interactive network visualization at graph.jeffemmett.com and implement the edge metadata editor modal. This extends the 2D minimap created in task-041.
Key Features:
1. **3D Force Graph** at graph.jeffemmett.com
- Three.js / react-force-graph-3d visualization
- Full-screen, interactive (spin, zoom, pan)
- Click nodes to view user profiles
- Click edges to edit metadata
- Same trust level coloring (grey/yellow/green)
- Real-time presence sync with canvas rooms
2. **Edge Metadata Editor Modal**
- Opens on edge click in 2D minimap or 3D view
- Edit: label, notes, color, strength (1-10)
- Private to each party on the edge
- Bidirectional - each user has their own metadata view
3. **Expand Button Integration**
- 2D minimap expand button opens 3D view
- URL sharing for specific graph views
- Optional: embed 3D graph back in canvas as iframe
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 3D force graph at graph.jeffemmett.com renders user network
- [ ] #2 Graph is interactive: spin, zoom, pan, click nodes/edges
- [ ] #3 Edge metadata editor modal allows editing label, notes, color, strength
- [ ] #4 Edge metadata persists to D1 and is private per-user
- [ ] #5 Expand button in 2D minimap opens 3D view
- [ ] #6 Real-time updates when connections change
- [ ] #7 Trust level colors match 2D minimap (grey/yellow/green)
<!-- AC:END -->

View File

@ -1,79 +0,0 @@
---
id: task-042
title: User Permissions - View, Edit, Admin Levels
status: In Progress
assignee: [@claude]
created_date: '2025-12-05 14:00'
updated_date: '2025-12-05 14:00'
labels:
- feature
- auth
- permissions
- cryptid
- security
dependencies:
- task-018
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement a three-tier permission system for canvas boards:
**Permission Levels:**
1. **View** - Can see board contents, cannot edit. Default for anonymous/unauthenticated users.
2. **Edit** - Can see and modify board contents. Requires CryptID authentication.
3. **Admin** - Full access + can manage board settings and user permissions. Board owner by default.
**Key Features:**
- Anonymous users can view any shared board but cannot edit
- Creating a CryptID (username only, no password) grants edit access
- CryptID uses WebCrypto API for browser-based cryptographic keys (W3C standard)
- Session state encrypted and stored offline for authenticated users
- Admins can invite users with specific permission levels
**Anonymous User Banner:**
Display a banner for unauthenticated users:
> "If you want to edit this board, just sign in by creating a username as your CryptID - no password required! Your CryptID is secured with encrypted keys, right in your browser, by a W3C standard algorithm. As a bonus, your session will be stored for offline access, encrypted in your browser storage by the same key, allowing you to use it securely any time you like, with full data portability."
**Technical Foundation:**
- Builds on existing CryptID WebCrypto authentication (`auth-webcrypto` branch)
- Extends D1 database schema for board-level permissions
- Read-only mode in tldraw editor for view-only users
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Anonymous users can view any shared board content
- [ ] #2 Anonymous users cannot create, edit, or delete shapes
- [ ] #3 Anonymous users see a dismissible banner prompting CryptID sign-up
- [ ] #4 Creating a CryptID grants immediate edit access to current board
- [ ] #5 Board creator automatically becomes admin
- [ ] #6 Admins can view and manage board permissions
- [ ] #7 Permission levels enforced on both client and server (worker)
- [ ] #8 Authenticated user sessions stored encrypted in browser storage
- [ ] #9 Read-only toolbar/UI state for view-only users
- [ ] #10 Permission state syncs correctly across devices via CryptID
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
**Branch:** `feature/user-permissions`
**Completed:**
- [x] Database schema for boards and board_permissions tables
- [x] Permission types (PermissionLevel) in worker and client
- [x] Permission API handlers (boardPermissions.ts)
- [x] AuthContext updated with permission fetching/caching
- [x] AnonymousViewerBanner component with CryptID signup
**In Progress:**
- [ ] Board component read-only mode integration
- [ ] Automerge sync permission checking
**Dependencies:**
- `task-018` - D1 database creation (blocking for production)
- `auth-webcrypto` branch - WebCrypto authentication (merged)
<!-- SECTION:NOTES:END -->

View File

@ -1,38 +0,0 @@
---
id: task-043
title: Build and publish Voice Command Android APK
status: To Do
assignee: []
created_date: '2025-12-07 06:31'
labels:
- android
- voice-command
- mobile
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Native Android app for voice-to-text transcription with on-device Whisper processing has been scaffolded. Next steps:
1. Download Whisper model files (run download-models.sh)
2. Set up Android signing keystore
3. Build debug APK and test on device
4. Fix any runtime issues
5. Build release APK
6. Publish to GitHub releases
The app uses sherpa-onnx for on-device transcription, supports floating button, volume button triggers, and Quick Settings tile.
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Model files downloaded and bundled
- [ ] #2 APK builds successfully
- [ ] #3 Recording works on real device
- [ ] #4 Transcription produces accurate results
- [ ] #5 All trigger methods functional
- [ ] #6 Release APK signed and published
<!-- AC:END -->

View File

@ -1,39 +0,0 @@
---
id: task-044
title: Test dev branch UI redesign and Map fixes
status: Done
assignee: []
created_date: '2025-12-07 23:26'
updated_date: '2025-12-08 01:19'
labels: []
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Test the changes pushed to dev branch in commit 8123f0f
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 CryptID dropdown works (sign in/out, Google integration)
- [ ] #2 Settings gear dropdown shows dark mode toggle
- [ ] #3 Social Network graph shows user as lone node when solo
- [ ] #4 Map marker tool adds markers on click
- [ ] #5 Map scroll wheel zooms correctly
- [ ] #6 Old boards with Map shapes load without validation errors
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Session completed. All changes pushed to dev branch:
- UI redesign: unified top-right menu with grey oval container
- Social Network graph: dark theme with directional arrows
- MI bar: responsive layout (bottom on mobile)
- Map fixes: tool clicks work, scroll zoom works
- Automerge: Map shape schema validation fix
- Network graph: graceful fallback on API errors
<!-- SECTION:NOTES:END -->

View File

@ -1,19 +0,0 @@
---
id: task-045
title: Implement offline-first loading from IndexedDB
status: Done
assignee: []
created_date: '2025-12-08 08:47'
labels:
- bug-fix
- offline
- automerge
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Fixed a bug where the app would hang indefinitely when the server wasn't running because `await adapter.whenReady()` blocked IndexedDB loading. Now the app loads from IndexedDB first (offline-first), then syncs with server in the background with a 5-second timeout.
<!-- SECTION:DESCRIPTION:END -->

View File

@ -1,26 +0,0 @@
---
id: task-046
title: Add maximize button to StandardizedToolWrapper
status: Done
assignee: []
created_date: '2025-12-08 08:51'
updated_date: '2025-12-08 09:03'
labels:
- feature
- ui
- shapes
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Added a maximize/fullscreen button to the standardized header bar. When clicked, the tool fills the viewport. Press Esc or click again to restore original dimensions. Created useMaximize hook that shape utils can use. Implemented on ChatBoxShapeUtil as example.
<!-- SECTION:DESCRIPTION:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Added maximize to ALL 16 shapes using StandardizedToolWrapper (not just ChatBox)
<!-- SECTION:NOTES:END -->

View File

@ -1,49 +0,0 @@
---
id: task-047
title: Improve mobile touch/pen interactions across custom tools
status: Done
assignee: []
created_date: '2025-12-10 18:28'
updated_date: '2025-12-10 18:28'
labels:
- mobile
- touch
- ux
- accessibility
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Fixed touch and pen interaction issues across all custom canvas tools to ensure they work properly on mobile devices and with stylus input.
Changes made:
- Added onTouchStart/onTouchEnd handlers to all interactive elements
- Added touchAction: 'manipulation' CSS to prevent 300ms click delay
- Increased minimum touch target sizes to 44px for accessibility
- Fixed ImageGen: Generate button, Copy/Download/Delete, input field
- Fixed VideoGen: Upload, URL input, prompt, duration, Generate button
- Fixed Transcription: Start/Stop/Pause buttons, textarea, Save/Cancel
- Fixed Multmux: Create Session, Refresh, session list, input fields
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 All buttons respond to touch on mobile devices
- [x] #2 No 300ms click delay on interactive elements
- [x] #3 Touch targets are at least 44px for accessibility
- [x] #4 Image generation works on mobile
- [x] #5 Video generation works on mobile
- [x] #6 Transcription controls work on mobile
- [x] #7 Terminal (Multmux) controls work on mobile
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Pushed to dev branch: b6af3ec
Files modified: ImageGenShapeUtil.tsx, VideoGenShapeUtil.tsx, TranscriptionShapeUtil.tsx, MultmuxShapeUtil.tsx
<!-- SECTION:NOTES:END -->

View File

@ -1,58 +0,0 @@
---
id: task-048
title: Version History & CryptID Registration Enhancements
status: Done
assignee: []
created_date: '2025-12-10 22:22'
updated_date: '2025-12-10 22:22'
labels:
- feature
- auth
- history
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Add version history feature with diff visualization and enhance CryptID registration flow with email backup
<!-- SECTION:DESCRIPTION:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Implementation Summary
### Email Service (SendGrid → Resend)
- Updated `worker/types.ts` to use `RESEND_API_KEY`
- Updated `worker/cryptidAuth.ts` sendEmail() to use Resend API
### CryptID Registration Flow
- Multi-step registration: welcome → username → email → success
- Detailed explainer about passwordless authentication
- Email backup for multi-device access
- Added `email` field to Session type
### Version History Feature
**Backend API Endpoints:**
- `GET /room/:roomId/history` - Get version history
- `GET /room/:roomId/snapshot/:hash` - Get snapshot at version
- `POST /room/:roomId/diff` - Compute diff between versions
- `POST /room/:roomId/revert` - Revert to a version
**Frontend Components:**
- `VersionHistoryPanel.tsx` - Timeline with diff visualization
- `useVersionHistory.ts` - React hook for programmatic access
- GREEN highlighting for added shapes
- RED highlighting for removed shapes
- PURPLE highlighting for modified shapes
### Other Fixes
- Network graph connect/trust buttons now work
- CryptID dropdown integration buttons improved
- Obsidian vault connection modal added
Pushed to dev branch: commit 195cc7f
<!-- SECTION:NOTES:END -->

View File

@ -1,35 +0,0 @@
---
id: task-049
title: Implement second device verification for CryptID
status: To Do
assignee: []
created_date: '2025-12-10 22:24'
labels:
- cryptid
- auth
- security
- testing
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Set up and test second device verification flow for the CryptID authentication system. This ensures users can recover their account and verify identity across multiple devices.
Key areas to implement/verify:
- QR code scanning between devices for key sharing
- Email backup verification flow
- Device linking and trust establishment
- Recovery flow when primary device is lost
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Second device can scan QR code to link account
- [ ] #2 Email backup sends verification code correctly (via Resend)
- [ ] #3 Linked devices can both access the same account
- [ ] #4 Recovery flow works when primary device unavailable
- [ ] #5 Test across different browsers/devices
<!-- AC:END -->

View File

@ -1,52 +0,0 @@
---
id: task-050
title: Implement Make-Real Feature (Wireframe to Working Prototype)
status: To Do
assignee: []
created_date: '2025-12-14 18:32'
labels:
- feature
- ai
- canvas
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement the full make-real workflow that converts wireframe sketches/designs on the canvas into working HTML/CSS/JS prototypes using AI.
## Current State
The backend infrastructure is ~60% complete:
- ✅ `makeRealSettings` atom in `src/lib/settings.tsx` with provider/model/API key configs
- ✅ System prompt in `src/prompt.ts` for wireframe-to-prototype conversion
- ✅ LLM backend in `src/utils/llmUtils.ts` with OpenAI, Anthropic, Ollama, RunPod support
- ✅ Settings migration in `src/routes/Board.tsx` loading `makereal_settings_2`
- ✅ "Make Real" placeholder in AI_TOOLS dropdown
## Missing Components
1. **Selection-to-image capture** - Export selected shapes as base64 PNG
2. **`makeReal()` action function** - Orchestrate the capture → AI → render pipeline
3. **ResponseShape/PreviewShape** - Custom tldraw shape to render generated HTML in iframe
4. **UI trigger** - Button/keyboard shortcut to invoke make-real on selection
5. **Iteration support** - Allow annotations on generated output for refinement
## Reference Implementation
- tldraw make-real demo: https://github.com/tldraw/make-real
- Key files to reference: `makeReal.ts`, `ResponseShape.tsx`, `getSelectionAsImageDataUrl.ts`
## Old Branch
`remotes/origin/make-real-integration` exists but is very outdated with errors - needs complete rewrite rather than merge.
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 User can select shapes on canvas and trigger make-real action
- [ ] #2 Selection is captured as image and sent to configured AI provider
- [ ] #3 AI generates HTML/CSS/JS prototype based on wireframe and system prompt
- [ ] #4 Generated prototype renders in interactive iframe on canvas (ResponseShape)
- [ ] #5 User can annotate/modify and re-run make-real for iterations
- [ ] #6 Settings modal allows configuring provider/model/API keys
- [ ] #7 Works with Ollama (free), OpenAI, and Anthropic backends
<!-- AC:END -->

View File

@ -1,88 +0,0 @@
---
id: task-051
title: Offline storage and cold reload from offline state
status: Done
assignee: []
created_date: '2025-12-15 04:58'
updated_date: '2025-12-25 23:38'
labels:
- feature
- offline
- storage
- IndexedDB
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Implement offline storage fallback so that when a browser reloads without network connectivity, it automatically loads from local IndexedDB storage and renders the last known state of the board for that user.
## Implementation Summary (Completed)
### Changes Made:
1. **Board.tsx** - Updated render condition to allow rendering when offline with local data (`isOfflineWithLocalData` flag)
2. **useAutomergeStoreV2** - Added `isNetworkOnline` parameter and offline fast path that immediately loads records from Automerge doc without waiting for network patches
3. **useAutomergeSyncRepo** - Passes `isNetworkOnline` to `useAutomergeStoreV2`
4. **ConnectionStatusIndicator** - Updated messaging to clarify users are viewing locally cached canvas when offline
### How It Works:
1. useAutomergeSyncRepo detects no network and loads data from IndexedDB
2. useAutomergeStoreV2 receives handle with local data and detects offline state
3. Offline Fast Path immediately loads records into TLDraw store
4. Board.tsx renders with local data
5. ConnectionStatusIndicator shows "Working Offline - Viewing locally saved canvas"
6. When back online, Automerge automatically syncs via CRDT merge
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Board renders from local IndexedDB when browser reloads offline
- [x] #2 User sees 'Working Offline' indicator with clear messaging
- [x] #3 Changes made offline are saved locally
- [x] #4 Auto-sync when network connectivity returns
- [x] #5 No data loss during offline/online transitions
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Testing Required
- Test cold reload while offline (airplane mode)
- Test with board containing various shape types
- Test transition from offline to online (auto-sync)
- Test making changes while offline and syncing
- Verify no data loss scenarios
Commit: 4df9e42 pushed to dev branch
## Code Review Complete (2025-12-25)
All acceptance criteria implemented:
**AC #1 - Board renders from IndexedDB offline:**
- Board.tsx line 1225: `isOfflineWithLocalData = !isNetworkOnline && hasStore`
- Line 1229: `shouldRender = hasStore && (isSynced || isOfflineWithLocalData)`
**AC #2 - Working Offline indicator:**
- ConnectionStatusIndicator shows 'Working Offline' with purple badge
- Detailed message explains local caching and auto-sync
**AC #3 - Changes saved locally:**
- Automerge Repo uses IndexedDBStorageAdapter
- Changes persisted via handle.change() automatically
**AC #4 - Auto-sync on reconnect:**
- CloudflareAdapter has networkOnlineHandler/networkOfflineHandler
- Triggers reconnect when network returns
**AC #5 - No data loss:**
- CRDT merge semantics preserve all changes
- JSON sync fallback also handles offline changes
**Manual testing recommended:**
- Test in airplane mode with browser reload
- Verify data persists across offline sessions
- Test online/offline transitions
<!-- SECTION:NOTES:END -->

View File

@ -1,79 +0,0 @@
---
id: task-052
title: 'Flip permissions model: everyone edits by default, protected boards opt-in'
status: Done
assignee: []
created_date: '2025-12-15 17:23'
updated_date: '2025-12-15 19:26'
labels: []
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Change the default permission model so ALL users (including anonymous) can edit by default. Boards can be marked as "protected" by an admin, making them view-only for non-designated users.
Key changes:
1. Add is_protected column to boards table
2. Add global_admins table (jeffemmett@gmail.com as initial admin)
3. Flip getEffectivePermission logic
4. Create BoardSettingsDropdown component with view-only toggle
5. Add user invite for protected boards
6. Admin request email flow
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Anonymous users can edit unprotected boards
- [x] #2 Protected boards are view-only for non-editors
- [x] #3 Global admin (jeffemmett@gmail.com) has admin on all boards
- [x] #4 Settings dropdown shows view-only toggle for admins
- [x] #5 Can add/remove editors on protected boards
- [x] #6 Admin request button sends email
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Implementation Complete (Dec 15, 2025)
### Backend Changes (commit 2fe96fa)
- **worker/schema.sql**: Added `is_protected` column to boards, created `global_admins` table
- **worker/types.ts**: Added `GlobalAdmin` interface, extended `PermissionCheckResult`
- **worker/boardPermissions.ts**: Rewrote `getEffectivePermission()` with new logic, added `isGlobalAdmin()`, new API handlers
- **worker/worker.ts**: Added routes for `/boards/:boardId/info`, `/boards/:boardId/editors`, `/admin/request`
- **worker/migrations/001_add_protected_boards.sql**: Migration script created
### D1 Migration (executed manually)
```sql
ALTER TABLE boards ADD COLUMN is_protected INTEGER DEFAULT 0;
CREATE INDEX IF NOT EXISTS idx_boards_protected ON boards(is_protected);
CREATE TABLE IF NOT EXISTS global_admins (email TEXT PRIMARY KEY, added_at TEXT, added_by TEXT);
INSERT OR IGNORE INTO global_admins (email) VALUES ('jeffemmett@gmail.com');
```
### Frontend Changes (commit 3f71222)
- **src/ui/components.tsx**: Integrated board protection settings into existing settings dropdown
- Protection toggle (view-only mode)
- Editor list management (add/remove)
- Global Admin badge display
- **src/context/AuthContext.tsx**: Changed default permission to 'edit' for everyone
- **src/routes/Board.tsx**: Updated `isReadOnly` logic for new permission model
- **src/components/BoardSettingsDropdown.tsx**: Created standalone component (kept for reference)
### Worker Deployment
- Deployed to Cloudflare Workers (version 5ddd1e23-d32f-459f-bc5c-cf3f799ab93f)
### Remaining
- [ ] AC #6: Admin request email flow (Resend integration needed)
### Resend Email Integration (commit a46ce44)
- Added `RESEND_API_KEY` secret to Cloudflare Worker
- Fixed from email to use verified domain: `Canvas <noreply@jeffemmett.com>`
- Admin request emails will be sent to jeffemmett@gmail.com
- Test email sent successfully: ID 7113526b-ce1e-43e7-b18d-42b3d54823d1
**All acceptance criteria now complete!**
<!-- SECTION:NOTES:END -->

View File

@ -1,44 +0,0 @@
---
id: task-053
title: Initial mycro-zine toolkit setup
status: Done
assignee: []
created_date: '2025-12-15 23:41'
updated_date: '2025-12-15 23:41'
labels:
- setup
- feature
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Created the mycro-zine repository with:
- Single-page print layout generator (2x4 grid, all 8 pages on one 8.5"x11" sheet)
- Prompt templates for AI content/image generation
- Example Undernet zine pages
- Support for US Letter and A4 paper sizes
- CLI and programmatic API
- Pushed to Gitea and GitHub
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Repository structure created
- [x] #2 Layout script generates single-page output
- [x] #3 Prompt templates created
- [x] #4 Example zine pages included
- [x] #5 Pushed to Gitea and GitHub
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Completed 2025-12-15. Repository at:
- Gitea: gitea.jeffemmett.com:jeffemmett/mycro-zine
- GitHub: github.com/Jeff-Emmett/mycro-zine
Test with: cd /home/jeffe/Github/mycro-zine && npm run example
<!-- SECTION:NOTES:END -->

View File

@ -1,42 +0,0 @@
---
id: task-054
title: Re-enable Map tool with GPS location sharing
status: Done
assignee: []
created_date: '2025-12-15 23:40'
updated_date: '2025-12-15 23:40'
labels:
- feature
- map
- collaboration
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Re-enabled the Map tool in the toolbar and context menu. Added GPS location sharing feature allowing collaborators to share their real-time location on the map with colored markers.
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Map tool visible in toolbar (globe icon)
- [x] #2 Map tool available in context menu under Create Tool
- [x] #3 GPS location sharing toggle button works
- [x] #4 Collaborator locations shown as colored markers
- [x] #5 GPS watch cleaned up on component unmount
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Implemented in commit 2d9d216.
Changes:
- CustomToolbar.tsx: Uncommented Map tool
- CustomContextMenu.tsx: Uncommented Map tool in Create Tool submenu
- MapShapeUtil.tsx: Added GPS location sharing with collaborator markers
GPS feature includes toggle button, real-time location updates, colored markers for each collaborator, and proper cleanup on unmount.
<!-- SECTION:NOTES:END -->

View File

@ -1,75 +0,0 @@
---
id: task-055
title: Integrate MycroZine generator tool into canvas
status: In Progress
assignee: []
created_date: '2025-12-15 23:41'
updated_date: '2025-12-18 23:24'
labels:
- feature
- canvas
- ai
- gemini
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Create a MycroZineGeneratorShape - an interactive tool on the canvas that allows users to generate complete 8-page mini-zines from a topic/prompt.
5-phase iterative workflow:
1. Ideation: User discusses content with Claude (conversational)
2. Drafts: Claude generates 8 draft pages using Gemini, spawns on canvas
3. Feedback: User gives spatial feedback on each page
4. Finalization: Claude integrates feedback into final versions
5. Print: Aggregate into single-page printable (2x4 grid)
Key requirements:
- Always use Gemini for image generation (latest model)
- Store completed zines as templates for reprinting
- Individual image shapes spawned on canvas for spatial feedback
- Single-page print layout (all 8 pages on one 8.5"x11" sheet)
References mycro-zine repo at /home/jeffe/Github/mycro-zine for layout utilities and prompt templates.
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 MycroZineGeneratorShapeUtil.tsx created
- [x] #2 MycroZineGeneratorTool.ts created and registered
- [ ] #3 Ideation phase with embedded chat UI
- [ ] #4 Drafts phase generates 8 images via Gemini and spawns on canvas
- [ ] #5 Feedback phase collects user input per page
- [ ] #6 Finalizing phase regenerates pages with feedback
- [ ] #7 Complete phase with print-ready download and template save
- [ ] #8 Templates stored in localStorage for reprinting
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Starting implementation of full 5-phase MycroZineGenerator shape
Created MycroZineGeneratorShapeUtil.tsx with full 5-phase workflow (ideation, drafts, feedback, finalizing, complete)
Created MycroZineGeneratorTool.ts
Registered in Board.tsx
Build successful - no TypeScript errors
Integrated Gemini Nano Banana Pro for image generation:
- Updated standalone mycro-zine app (generate-page/route.ts) with fallback chain: Nano Banana Pro → Imagen 3 → Gemini 2.0 Flash → placeholder
- Updated canvas MycroZineGeneratorShapeUtil.tsx to call Gemini API directly with proper types
- Added getGeminiConfig() to clientConfig.ts for API key management
- Aspect ratio: 3:4 portrait for zine pages (825x1275 target dimensions)
2025-12-18: Fixed geo-restriction issue for image generation
- Direct Gemini API calls were blocked in EU (Netcup server location)
- Created RunPod serverless proxy (US-based) to bypass geo-restrictions
- Added /api/generate-image endpoint to zine.jeffemmett.com that returns base64
- Updated canvas MycroZineGeneratorShapeUtil to call zine.jeffemmett.com API instead of Gemini directly
- Image generation now works reliably from any location
<!-- SECTION:NOTES:END -->

View File

@ -1,75 +0,0 @@
---
id: task-056
title: Test Infrastructure & Merge Readiness Tests
status: Done
assignee: []
created_date: '2025-12-18 07:25'
updated_date: '2025-12-18 07:26'
labels:
- testing
- ci-cd
- infrastructure
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Established comprehensive testing infrastructure to verify readiness for merging dev to main. Includes:
- Vitest for unit/integration tests
- Playwright for E2E tests
- Miniflare setup for worker tests
- GitHub Actions CI/CD pipeline with 80% coverage gate
Test coverage for:
- Automerge CRDT sync (collaboration tests)
- Offline storage/cold reload
- CryptID authentication (registration, login, device linking)
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 Vitest configured with jsdom environment
- [x] #2 Playwright configured for E2E tests
- [x] #3 Unit tests for crypto and IndexedDB document mapping
- [x] #4 E2E tests for collaboration, offline mode, authentication
- [x] #5 GitHub Actions workflow for CI/CD
- [x] #6 All current tests passing
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
## Implementation Summary
### Files Created:
- `vitest.config.ts` - Vitest configuration with jsdom, coverage thresholds
- `playwright.config.ts` - Playwright E2E test configuration
- `tests/setup.ts` - Global test setup (mocks for matchMedia, ResizeObserver, etc.)
- `tests/mocks/indexeddb.ts` - fake-indexeddb utilities
- `tests/mocks/websocket.ts` - MockWebSocket for sync tests
- `tests/mocks/automerge.ts` - Test helpers for CRDT documents
- `tests/unit/cryptid/crypto.test.ts` - WebCrypto unit tests (14 tests)
- `tests/unit/offline/document-mapping.test.ts` - IndexedDB tests (13 tests)
- `tests/e2e/collaboration.spec.ts` - CRDT sync E2E tests
- `tests/e2e/offline-mode.spec.ts` - Offline storage E2E tests
- `tests/e2e/authentication.spec.ts` - CryptID auth E2E tests
- `.github/workflows/test.yml` - CI/CD pipeline
### Test Commands Added to package.json:
- `npm run test` - Run Vitest in watch mode
- `npm run test:run` - Run once
- `npm run test:coverage` - With coverage report
- `npm run test:e2e` - Run Playwright E2E tests
### Current Test Results:
- 27 unit tests passing
- E2E tests ready to run against dev server
### Next Steps:
- Add worker tests with Miniflare (task-056 continuation)
- Run E2E tests to verify collaboration/offline/auth flows
- Increase unit test coverage to 80%
<!-- SECTION:NOTES:END -->

View File

@ -1,24 +0,0 @@
---
id: task-057
title: Set up Cloudflare WARP split tunnels for Claude Code
status: Done
assignee: []
created_date: '2025-12-19 01:10'
labels: []
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Configured Cloudflare Zero Trust split tunnel excludes to allow Claude Code to work in WSL2 with WARP enabled on Windows.
Completed:
- Created Zero Trust API token with device config permissions
- Added localhost (127.0.0.0/8) to excludes
- Added Anthropic domains (api.anthropic.com, claude.ai, anthropic.com)
- Private networks already excluded (172.16.0.0/12, 192.168.0.0/16, 10.0.0.0/8)
- Created ~/bin/warp-split-tunnel CLI tool for future management
- Saved token to Netcup ~/.cloudflare-credentials.env
<!-- SECTION:DESCRIPTION:END -->

View File

@ -1,48 +0,0 @@
---
id: task-058
title: Set FAL_API_KEY and RUNPOD_API_KEY secrets in Cloudflare Worker
status: Done
assignee: []
created_date: '2025-12-25 23:30'
updated_date: '2025-12-26 01:26'
labels:
- security
- infrastructure
- canvas-website
dependencies: []
priority: high
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
SECURITY FIX: API keys were exposed in browser bundle. They've been removed from client code and proxy endpoints added to the worker. Need to set the secrets server-side for the proxy to work.
Run these commands:
```bash
cd /home/jeffe/Github/canvas-website
wrangler secret put FAL_API_KEY
# Paste: (REDACTED-FAL-KEY)
wrangler secret put RUNPOD_API_KEY
# Paste: (REDACTED-RUNPOD-KEY)
wrangler deploy
```
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [x] #1 FAL_API_KEY secret set in Cloudflare Worker
- [x] #2 RUNPOD_API_KEY secret set in Cloudflare Worker
- [x] #3 Worker deployed with new secrets
- [x] #4 Browser console no longer shows 'fal credentials exposed' warning
<!-- AC:END -->
## Implementation Notes
<!-- SECTION:NOTES:BEGIN -->
Secrets set and deployed on 2025-12-25
Dec 25: Completed full client migration to server-side proxies. Pushed to dev branch.
<!-- SECTION:NOTES:END -->

View File

@ -1,32 +0,0 @@
---
id: task-059
title: Debug Drawfast tool output
status: To Do
assignee: []
created_date: '2025-12-26 04:37'
labels:
- bug
- ai
- shapes
dependencies: []
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
The Drawfast tool has been temporarily disabled due to output issues that need debugging.
## Background
Drawfast is a real-time AI image generation tool that generates images as users draw. The tool has been disabled in Board.tsx pending debugging.
## Files to investigate
- `src/shapes/DrawfastShapeUtil.tsx` - Shape rendering and state
- `src/tools/DrawfastTool.ts` - Tool interaction logic
- `src/hooks/useLiveImage.tsx` - Live image generation hook
## To re-enable
1. Uncomment imports in Board.tsx (lines 50-52)
2. Uncomment DrawfastShape in customShapeUtils array (line 173)
3. Uncomment DrawfastTool in customTools array (line 199)
<!-- SECTION:DESCRIPTION:END -->

View File

@ -1,60 +0,0 @@
---
id: task-060
title: Snapshot Voting Integration
status: To Do
assignee: []
created_date: '2026-01-02 16:08'
labels:
- feature
- web3
- governance
- voting
dependencies:
- task-007
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Integrate Snapshot.js SDK for off-chain governance voting through the canvas interface.
## Overview
Enable CryptID users with linked wallets to participate in Snapshot governance votes directly from the canvas. Proposals and voting can be visualized as shapes on the canvas.
## Dependencies
- Requires task-007 (Web3 Wallet Linking) to be completed first
- User must have at least one linked wallet with voting power
## Technical Approach
- Use Snapshot.js SDK for proposal fetching and vote submission
- Create VotingShape to visualize proposals on canvas
- Support EIP-712 signature-based voting via linked wallet
- Cache voting power from linked wallets
## Features
1. **Proposal Browser** - List active proposals from configured spaces
2. **VotingShape** - Canvas shape to display proposal details and vote
3. **Vote Signing** - Use wagmi's signTypedData for EIP-712 votes
4. **Voting Power Display** - Show user's voting power per space
5. **Vote History** - Track user's past votes
## Spaces to Support Initially
- mycofi.eth (MycoFi DAO)
- Add configuration for additional spaces
## References
- Snapshot.js: https://docs.snapshot.org/tools/snapshot.js
- Snapshot API: https://docs.snapshot.org/tools/api
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Install and configure Snapshot.js SDK
- [ ] #2 Create VotingShape with proposal details display
- [ ] #3 Implement vote signing flow with EIP-712
- [ ] #4 Add proposal browser panel to canvas UI
- [ ] #5 Display voting power from linked wallets
- [ ] #6 Support multiple Snapshot spaces via configuration
- [ ] #7 Cache and display vote history
<!-- AC:END -->

View File

@ -1,68 +0,0 @@
---
id: task-061
title: Safe Multisig Integration for Collaborative Transactions
status: To Do
assignee: []
created_date: '2026-01-02 16:08'
labels:
- feature
- web3
- multisig
- safe
- governance
dependencies:
- task-007
priority: medium
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Integrate Safe (Gnosis Safe) SDK to enable collaborative transaction building and signing through the canvas interface.
## Overview
Allow CryptID users to create, propose, and sign Safe multisig transactions visually on the canvas. Multiple signers can collaborate in real-time to approve transactions.
## Dependencies
- Requires task-007 (Web3 Wallet Linking) to be completed first
- Users must link their Safe wallet or EOA that is a Safe signer
## Technical Approach
- Use Safe{Core} SDK for transaction building and signing
- Create TransactionBuilderShape for visual tx composition
- Use Safe Transaction Service API for proposal queue
- Real-time signature collection via canvas collaboration
## Features
1. **Safe Linking** - Link Safe addresses (detect via ERC-1271)
2. **TransactionBuilderShape** - Visual transaction composer
3. **Signature Collection UI** - See who has signed, who is pending
4. **Transaction Queue** - View pending transactions for linked Safes
5. **Execution** - Execute transactions when threshold is met
## Visual Transaction Builder Capabilities
- Transfer ETH/tokens
- Contract interactions (with ABI import)
- Batch transactions
- Scheduled transactions (via delay module)
## Collaboration Features
- Real-time signature status on canvas
- Notifications when signatures are needed
- Discussion threads on pending transactions
## References
- Safe{Core} SDK: https://docs.safe.global/sdk/overview
- Safe Transaction Service API: https://docs.safe.global/core-api/transaction-service-overview
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Install and configure Safe{Core} SDK
- [ ] #2 Implement ERC-1271 signature verification for Safe linking
- [ ] #3 Create TransactionBuilderShape for visual tx composition
- [ ] #4 Build signature collection UI with real-time updates
- [ ] #5 Display pending transaction queue for linked Safes
- [ ] #6 Enable transaction execution when threshold is met
- [ ] #7 Support basic transfer and contract interaction transactions
<!-- AC:END -->

View File

@ -1,72 +0,0 @@
---
id: task-062
title: Account Abstraction (ERC-4337) Exploration
status: To Do
assignee: []
created_date: '2026-01-02 16:08'
labels:
- research
- web3
- account-abstraction
- erc-4337
dependencies:
- task-007
priority: low
---
## Description
<!-- SECTION:DESCRIPTION:BEGIN -->
Research and prototype using ERC-4337 Account Abstraction to enable CryptID's P-256 keys to directly control smart contract wallets.
## Overview
Explore the possibility of using Account Abstraction (ERC-4337) to bridge CryptID's WebCrypto P-256 keys with Ethereum transactions. This would eliminate the need for wallet linking by allowing CryptID keys to directly sign UserOperations that control a smart wallet.
## Background
- CryptID uses ECDSA P-256 (NIST curve) via WebCrypto API
- Ethereum uses ECDSA secp256k1
- These curves are incompatible for direct signing
- ERC-4337 allows any signature scheme via custom validation logic
## Research Questions
1. Is P-256 signature verification gas-efficient on-chain?
2. What existing implementations exist? (Clave, Daimo)
3. What are the wallet deployment costs per user?
4. How do we handle gas sponsorship (paymaster)?
5. Which bundler/paymaster providers support this?
## Potential Benefits
- Single key for auth AND transactions
- Gasless transactions via paymaster
- Social recovery using CryptID email
- No MetaMask/wallet app needed
- True passwordless Web3
## Risks & Challenges
- Complex implementation
- Gas costs for P-256 verification (~100k gas)
- Not all L2s support ERC-4337 yet
- User education on new paradigm
## Providers to Evaluate
- Pimlico (bundler + paymaster)
- Alchemy Account Kit
- Stackup
- Biconomy
## References
- ERC-4337 Spec: https://eips.ethereum.org/EIPS/eip-4337
- Clave (P-256 wallet): https://getclave.io/
- Daimo (P-256 wallet): https://daimo.com/
- viem Account Abstraction: https://viem.sh/account-abstraction
<!-- SECTION:DESCRIPTION:END -->
## Acceptance Criteria
<!-- AC:BEGIN -->
- [ ] #1 Research P-256 on-chain verification gas costs
- [ ] #2 Evaluate existing P-256 wallet implementations (Clave, Daimo)
- [ ] #3 Prototype UserOperation signing with CryptID keys
- [ ] #4 Evaluate bundler/paymaster providers
- [ ] #5 Document architecture proposal if viable
- [ ] #6 Estimate implementation timeline and costs
<!-- AC:END -->

View File

@ -1 +0,0 @@
if('serviceWorker' in navigator) navigator.serviceWorker.register('/dev-sw.js?dev-sw', { scope: '/', type: 'classic' })

View File

@ -1,114 +0,0 @@
/**
* Copyright 2018 Google Inc. All Rights Reserved.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// If the loader is already loaded, just stop.
if (!self.define) {
let registry = {};
// Used for `eval` and `importScripts` where we can't get script URL by other means.
// In both cases, it's safe to use a global var because those functions are synchronous.
let nextDefineUri;
const singleRequire = (uri, parentUri) => {
uri = new URL(uri + ".js", parentUri).href;
return registry[uri] || (
new Promise(resolve => {
if ("document" in self) {
const script = document.createElement("script");
script.src = uri;
script.onload = resolve;
document.head.appendChild(script);
} else {
nextDefineUri = uri;
importScripts(uri);
resolve();
}
})
.then(() => {
let promise = registry[uri];
if (!promise) {
throw new Error(`Module ${uri} didnt register its module`);
}
return promise;
})
);
};
self.define = (depsNames, factory) => {
const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
if (registry[uri]) {
// Module is already loading or loaded.
return;
}
let exports = {};
const require = depUri => singleRequire(depUri, uri);
const specialDeps = {
module: { uri },
exports,
require
};
registry[uri] = Promise.all(depsNames.map(
depName => specialDeps[depName] || require(depName)
)).then(deps => {
factory(...deps);
return exports;
});
};
}
define(['./workbox-52f2a342'], (function (workbox) { 'use strict';
self.skipWaiting();
workbox.clientsClaim();
/**
* The precacheAndRoute() method efficiently caches and responds to
* requests for URLs in the manifest.
* See https://goo.gl/S9QRab
*/
workbox.precacheAndRoute([{
"url": "registerSW.js",
"revision": "3ca0b8505b4bec776b69afdba2768812"
}, {
"url": "index.html",
"revision": "0.n708e9nairg"
}], {});
workbox.cleanupOutdatedCaches();
workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
allowlist: [/^\/$/]
}));
workbox.registerRoute(/^https?:\/\/.*\/api\/.*/i, new workbox.NetworkFirst({
"cacheName": "api-cache",
"networkTimeoutSeconds": 10,
plugins: [new workbox.ExpirationPlugin({
maxEntries: 100,
maxAgeSeconds: 86400
})]
}), 'GET');
workbox.registerRoute(/^https:\/\/fonts\.googleapis\.com\/.*/i, new workbox.CacheFirst({
"cacheName": "google-fonts-cache",
plugins: [new workbox.ExpirationPlugin({
maxEntries: 10,
maxAgeSeconds: 31536000
})]
}), 'GET');
workbox.registerRoute(/^https:\/\/fonts\.gstatic\.com\/.*/i, new workbox.CacheFirst({
"cacheName": "gstatic-fonts-cache",
plugins: [new workbox.ExpirationPlugin({
maxEntries: 10,
maxAgeSeconds: 31536000
})]
}), 'GET');
}));

File diff suppressed because it is too large Load Diff

View File

@ -1,31 +0,0 @@
# Canvas Website - Dev Branch Deployment
# Automatically deploys from `dev` branch for testing
# Access at: staging.jeffemmett.com
services:
canvas-dev:
build:
context: .
dockerfile: Dockerfile
args:
- VITE_WORKER_ENV=staging
container_name: canvas-dev
restart: unless-stopped
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik-public"
- "traefik.http.services.canvas-dev.loadbalancer.server.port=80"
- "traefik.http.routers.canvas-dev.rule=Host(`staging.jeffemmett.com`)"
- "traefik.http.routers.canvas-dev.entrypoints=web"
- "traefik.http.routers.canvas-dev.service=canvas-dev"
networks:
- traefik-public
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/health"]
interval: 30s
timeout: 10s
retries: 3
networks:
traefik-public:
external: true

View File

@ -1,6 +1,6 @@
# Canvas Website Docker Compose # Canvas Website Docker Compose
# Production: jeffemmett.com, www.jeffemmett.com # Production: jeffemmett.com, www.jeffemmett.com
# Dev branch: staging.jeffemmett.com (separate container via docker-compose.dev.yml) # Staging: staging.jeffemmett.com
services: services:
canvas-website: canvas-website:
@ -8,18 +8,23 @@ services:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- VITE_WORKER_ENV=production - VITE_TLDRAW_WORKER_URL=https://jeffemmett-canvas.jeffemmett.workers.dev
# Add other build args from .env if needed # Add other build args from .env if needed
container_name: canvas-website container_name: canvas-website
restart: unless-stopped restart: unless-stopped
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=traefik-public" - "traefik.docker.network=traefik-public"
# Single service definition (both routers use same backend)
- "traefik.http.services.canvas.loadbalancer.server.port=80" - "traefik.http.services.canvas.loadbalancer.server.port=80"
# Production deployment (jeffemmett.com and www) # Production deployment (jeffemmett.com and www)
- "traefik.http.routers.canvas-prod.rule=Host(`jeffemmett.com`) || Host(`www.jeffemmett.com`)" - "traefik.http.routers.canvas-prod.rule=Host(`jeffemmett.com`) || Host(`www.jeffemmett.com`)"
- "traefik.http.routers.canvas-prod.entrypoints=web" - "traefik.http.routers.canvas-prod.entrypoints=web"
- "traefik.http.routers.canvas-prod.service=canvas" - "traefik.http.routers.canvas-prod.service=canvas"
# Staging deployment (keep for testing)
- "traefik.http.routers.canvas-staging.rule=Host(`staging.jeffemmett.com`)"
- "traefik.http.routers.canvas-staging.entrypoints=web"
- "traefik.http.routers.canvas-staging.service=canvas"
networks: networks:
- traefik-public - traefik-public
healthcheck: healthcheck:

View File

@ -1,913 +0,0 @@
# Google Data Sovereignty: Local-First Secure Storage
This document outlines the architecture for securely importing, storing, and optionally sharing Google Workspace data (Gmail, Drive, Photos, Calendar) using a **local-first, data sovereign** approach.
## Overview
**Philosophy**: Your data should be yours. Import it locally, encrypt it client-side, and choose when/what to share.
```
┌─────────────────────────────────────────────────────────────────────────┐
│ USER'S BROWSER (Data Sovereign Zone) │
├─────────────────────────────────────────────────────────────────────────┤
│ │
│ ┌─────────────┐ ┌──────────────────────────────────────────────┐ │
│ │ Google APIs │───>│ Local Processing Layer │ │
│ │ (OAuth 2.0) │ │ ├── Fetch data │ │
│ └─────────────┘ │ ├── Encrypt with user's WebCrypto keys │ │
│ │ └── Store to IndexedDB │ │
│ └────────────────────────┬─────────────────────┘ │
│ │ │
│ ┌───────────────────────────────────────────┴───────────────────────┐ │
│ │ IndexedDB Encrypted Storage │ │
│ │ ├── gmail_messages (encrypted blobs) │ │
│ │ ├── drive_documents (encrypted blobs) │ │
│ │ ├── photos_media (encrypted references) │ │
│ │ ├── calendar_events (encrypted data) │ │
│ │ └── encryption_metadata (key derivation info) │ │
│ └─────────────────────────────────────────────────────────────────── │
│ │ │
│ ┌────────────────────────┴───────────────────────┐ │
│ │ Share Decision Layer (User Controlled) │ │
│ │ ├── Keep Private (local only) │ │
│ │ ├── Share to Board (Automerge sync) │ │
│ │ └── Backup to R2 (encrypted cloud backup) │ │
│ └────────────────────────────────────────────────┘ │
│ │
└─────────────────────────────────────────────────────────────────────────┘
```
## Browser Storage Capabilities & Limitations
### IndexedDB Storage
| Browser | Default Quota | Max Quota | Persistence |
|---------|--------------|-----------|-------------|
| Chrome/Edge | 60% of disk | Unlimited* | Persistent with permission |
| Firefox | 10% up to 10GB | 50% of disk | Persistent with permission |
| Safari | 1GB (lax) | ~1GB per origin | Non-persistent (7-day eviction) |
*Chrome "Unlimited" requires `navigator.storage.persist()` permission
### Storage API Persistence
```typescript
// Request persistent storage (prevents automatic eviction)
async function requestPersistentStorage(): Promise<boolean> {
if (navigator.storage && navigator.storage.persist) {
const isPersisted = await navigator.storage.persist();
console.log(`Persistent storage ${isPersisted ? 'granted' : 'denied'}`);
return isPersisted;
}
return false;
}
// Check current storage quota
async function checkStorageQuota(): Promise<{used: number, quota: number}> {
if (navigator.storage && navigator.storage.estimate) {
const estimate = await navigator.storage.estimate();
return {
used: estimate.usage || 0,
quota: estimate.quota || 0
};
}
return { used: 0, quota: 0 };
}
```
### Safari's 7-Day Eviction Rule
**CRITICAL for Safari users**: Safari evicts IndexedDB data after 7 days of non-use.
**Mitigations**:
1. Use a Service Worker with periodic background sync to "touch" data
2. Prompt Safari users to add to Home Screen (PWA mode bypasses some restrictions)
3. Automatically sync important data to R2 backup
4. Show clear warnings about Safari limitations
```typescript
// Detect Safari's storage limitations
function hasSafariLimitations(): boolean {
const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
return isSafari || isIOS;
}
// Register touch activity to prevent eviction
async function touchLocalData(): Promise<void> {
const db = await openDatabase();
const tx = db.transaction('metadata', 'readwrite');
tx.objectStore('metadata').put({
key: 'last_accessed',
timestamp: Date.now()
});
}
```
## Data Types & Storage Strategies
### 1. Gmail Messages
```typescript
interface EncryptedEmailStore {
id: string; // Gmail message ID
threadId: string; // Thread ID for grouping
encryptedSubject: ArrayBuffer; // AES-GCM encrypted
encryptedBody: ArrayBuffer; // AES-GCM encrypted
encryptedFrom: ArrayBuffer; // Sender info
encryptedTo: ArrayBuffer[]; // Recipients
date: number; // Timestamp (unencrypted for sorting)
labels: string[]; // Gmail labels (encrypted or not based on sensitivity)
hasAttachments: boolean; // Flag only, attachments stored separately
snippet: ArrayBuffer; // Encrypted preview
// Metadata for search (encrypted bloom filter or encrypted index)
searchIndex: ArrayBuffer;
// Sync metadata
syncedAt: number;
localOnly: boolean; // Not yet synced to any external storage
}
// Storage estimate per email:
// - Average email: ~20KB raw → ~25KB encrypted
// - With attachments: varies, but reference stored, not full attachment
// - 10,000 emails ≈ 250MB
```
### 2. Google Drive Documents
```typescript
interface EncryptedDriveDocument {
id: string; // Drive file ID
encryptedName: ArrayBuffer;
encryptedMimeType: ArrayBuffer;
encryptedContent: ArrayBuffer; // For text-based docs
encryptedPreview: ArrayBuffer; // Thumbnail or preview
// Large files: store reference, not content
contentStrategy: 'inline' | 'reference' | 'chunked';
chunks?: string[]; // IDs of content chunks if chunked
// Hierarchy
parentId: string | null;
path: ArrayBuffer; // Encrypted path string
// Sharing & permissions (for UI display)
isShared: boolean;
modifiedTime: number;
size: number; // Unencrypted for quota management
syncedAt: number;
}
// Storage considerations:
// - Google Docs: Convert to markdown/HTML, typically 10-100KB
// - Spreadsheets: JSON export, 100KB-10MB depending on size
// - PDFs: Store reference only, load on demand
// - Images: Thumbnail locally, full resolution on demand
```
### 3. Google Photos
```typescript
interface EncryptedPhotoReference {
id: string; // Photos media item ID
encryptedFilename: ArrayBuffer;
encryptedDescription: ArrayBuffer;
// Thumbnails stored locally (encrypted)
thumbnail: {
width: number;
height: number;
encryptedData: ArrayBuffer; // Base64 or blob
};
// Full resolution: reference only (fetch on demand)
fullResolution: {
width: number;
height: number;
// NOT storing full image - too large
// Fetch via API when user requests
};
mediaType: 'image' | 'video';
creationTime: number;
// Album associations
albumIds: string[];
// Location data (highly sensitive - always encrypted)
encryptedLocation?: ArrayBuffer;
syncedAt: number;
}
// Storage strategy:
// - Thumbnails: ~50KB each, store locally
// - Full images: NOT stored locally (too large)
// - 1,000 photos thumbnails ≈ 50MB
// - Full resolution loaded via API on demand
```
### 4. Google Calendar Events
```typescript
interface EncryptedCalendarEvent {
id: string; // Calendar event ID
calendarId: string;
encryptedSummary: ArrayBuffer;
encryptedDescription: ArrayBuffer;
encryptedLocation: ArrayBuffer;
// Time data (unencrypted for query/sort performance)
startTime: number;
endTime: number;
isAllDay: boolean;
timezone: string;
// Recurrence
isRecurring: boolean;
encryptedRecurrence?: ArrayBuffer;
// Attendees (encrypted)
encryptedAttendees: ArrayBuffer;
// Reminders
reminders: { method: string; minutes: number }[];
// Meeting links (encrypted - sensitive)
encryptedMeetingLink?: ArrayBuffer;
syncedAt: number;
}
// Storage estimate:
// - Average event: ~5KB encrypted
// - 2 years of events (~3000): ~15MB
```
## Encryption Strategy
### Key Derivation
Using the existing WebCrypto infrastructure, derive data encryption keys from the user's master key:
```typescript
// Derive a data-specific encryption key from master key
async function deriveDataEncryptionKey(
masterKey: CryptoKey,
purpose: 'gmail' | 'drive' | 'photos' | 'calendar'
): Promise<CryptoKey> {
const encoder = new TextEncoder();
const purposeBytes = encoder.encode(`canvas-data-${purpose}`);
// Import master key for HKDF
const baseKey = await crypto.subtle.importKey(
'raw',
await crypto.subtle.exportKey('raw', masterKey),
'HKDF',
false,
['deriveKey']
);
// Derive purpose-specific key
return await crypto.subtle.deriveKey(
{
name: 'HKDF',
hash: 'SHA-256',
salt: purposeBytes,
info: new ArrayBuffer(0)
},
baseKey,
{ name: 'AES-GCM', length: 256 },
false,
['encrypt', 'decrypt']
);
}
```
### Encryption/Decryption
```typescript
// Encrypt data before storing
async function encryptData(
data: string | ArrayBuffer,
key: CryptoKey
): Promise<{encrypted: ArrayBuffer, iv: Uint8Array}> {
const iv = crypto.getRandomValues(new Uint8Array(12)); // 96-bit IV for AES-GCM
const dataBuffer = typeof data === 'string'
? new TextEncoder().encode(data)
: data;
const encrypted = await crypto.subtle.encrypt(
{ name: 'AES-GCM', iv },
key,
dataBuffer
);
return { encrypted, iv };
}
// Decrypt data when reading
async function decryptData(
encrypted: ArrayBuffer,
iv: Uint8Array,
key: CryptoKey
): Promise<ArrayBuffer> {
return await crypto.subtle.decrypt(
{ name: 'AES-GCM', iv },
key,
encrypted
);
}
```
## IndexedDB Schema
```typescript
// Database schema for encrypted Google data
const GOOGLE_DATA_DB = 'canvas-google-data';
const DB_VERSION = 1;
interface GoogleDataSchema {
gmail: {
key: string; // message ID
indexes: ['threadId', 'date', 'syncedAt'];
};
drive: {
key: string; // file ID
indexes: ['parentId', 'modifiedTime', 'mimeType'];
};
photos: {
key: string; // media item ID
indexes: ['creationTime', 'mediaType'];
};
calendar: {
key: string; // event ID
indexes: ['calendarId', 'startTime', 'endTime'];
};
syncMetadata: {
key: string; // 'gmail' | 'drive' | 'photos' | 'calendar'
// Stores last sync token, sync progress, etc.
};
encryptionKeys: {
key: string; // purpose
// Stores IV, salt for key derivation
};
}
async function initGoogleDataDB(): Promise<IDBDatabase> {
return new Promise((resolve, reject) => {
const request = indexedDB.open(GOOGLE_DATA_DB, DB_VERSION);
request.onerror = () => reject(request.error);
request.onsuccess = () => resolve(request.result);
request.onupgradeneeded = (event) => {
const db = (event.target as IDBOpenDBRequest).result;
// Gmail store
if (!db.objectStoreNames.contains('gmail')) {
const gmailStore = db.createObjectStore('gmail', { keyPath: 'id' });
gmailStore.createIndex('threadId', 'threadId', { unique: false });
gmailStore.createIndex('date', 'date', { unique: false });
gmailStore.createIndex('syncedAt', 'syncedAt', { unique: false });
}
// Drive store
if (!db.objectStoreNames.contains('drive')) {
const driveStore = db.createObjectStore('drive', { keyPath: 'id' });
driveStore.createIndex('parentId', 'parentId', { unique: false });
driveStore.createIndex('modifiedTime', 'modifiedTime', { unique: false });
}
// Photos store
if (!db.objectStoreNames.contains('photos')) {
const photosStore = db.createObjectStore('photos', { keyPath: 'id' });
photosStore.createIndex('creationTime', 'creationTime', { unique: false });
photosStore.createIndex('mediaType', 'mediaType', { unique: false });
}
// Calendar store
if (!db.objectStoreNames.contains('calendar')) {
const calendarStore = db.createObjectStore('calendar', { keyPath: 'id' });
calendarStore.createIndex('calendarId', 'calendarId', { unique: false });
calendarStore.createIndex('startTime', 'startTime', { unique: false });
}
// Sync metadata
if (!db.objectStoreNames.contains('syncMetadata')) {
db.createObjectStore('syncMetadata', { keyPath: 'service' });
}
// Encryption metadata
if (!db.objectStoreNames.contains('encryptionMeta')) {
db.createObjectStore('encryptionMeta', { keyPath: 'purpose' });
}
};
});
}
```
## Google OAuth & API Integration
### OAuth 2.0 Scopes
```typescript
const GOOGLE_SCOPES = {
// Read-only access (data sovereignty - we import, not modify)
gmail: 'https://www.googleapis.com/auth/gmail.readonly',
drive: 'https://www.googleapis.com/auth/drive.readonly',
photos: 'https://www.googleapis.com/auth/photoslibrary.readonly',
calendar: 'https://www.googleapis.com/auth/calendar.readonly',
// Profile for user identification
profile: 'https://www.googleapis.com/auth/userinfo.profile',
email: 'https://www.googleapis.com/auth/userinfo.email'
};
// Selective scope request - user chooses what to import
function getRequestedScopes(services: string[]): string {
const scopes = [GOOGLE_SCOPES.profile, GOOGLE_SCOPES.email];
services.forEach(service => {
if (GOOGLE_SCOPES[service as keyof typeof GOOGLE_SCOPES]) {
scopes.push(GOOGLE_SCOPES[service as keyof typeof GOOGLE_SCOPES]);
}
});
return scopes.join(' ');
}
```
### OAuth Flow with PKCE
```typescript
interface GoogleAuthState {
codeVerifier: string;
redirectUri: string;
state: string;
}
async function initiateGoogleAuth(services: string[]): Promise<void> {
const codeVerifier = generateCodeVerifier();
const codeChallenge = await generateCodeChallenge(codeVerifier);
const state = crypto.randomUUID();
// Store state for verification
sessionStorage.setItem('google_auth_state', JSON.stringify({
codeVerifier,
state,
redirectUri: window.location.origin + '/oauth/google/callback'
}));
const params = new URLSearchParams({
client_id: import.meta.env.VITE_GOOGLE_CLIENT_ID,
redirect_uri: window.location.origin + '/oauth/google/callback',
response_type: 'code',
scope: getRequestedScopes(services),
access_type: 'offline', // Get refresh token
prompt: 'consent',
code_challenge: codeChallenge,
code_challenge_method: 'S256',
state
});
window.location.href = `https://accounts.google.com/o/oauth2/v2/auth?${params}`;
}
// PKCE helpers
function generateCodeVerifier(): string {
const array = new Uint8Array(32);
crypto.getRandomValues(array);
return base64UrlEncode(array);
}
async function generateCodeChallenge(verifier: string): Promise<string> {
const encoder = new TextEncoder();
const data = encoder.encode(verifier);
const hash = await crypto.subtle.digest('SHA-256', data);
return base64UrlEncode(new Uint8Array(hash));
}
```
### Token Storage (Encrypted)
```typescript
interface EncryptedTokens {
accessToken: ArrayBuffer; // Encrypted
refreshToken: ArrayBuffer; // Encrypted
accessTokenIv: Uint8Array;
refreshTokenIv: Uint8Array;
expiresAt: number; // Unencrypted for refresh logic
scopes: string[]; // Unencrypted for UI display
}
async function storeGoogleTokens(
tokens: { access_token: string; refresh_token?: string; expires_in: number },
encryptionKey: CryptoKey
): Promise<void> {
const { encrypted: encAccessToken, iv: accessIv } = await encryptData(
tokens.access_token,
encryptionKey
);
const encryptedTokens: Partial<EncryptedTokens> = {
accessToken: encAccessToken,
accessTokenIv: accessIv,
expiresAt: Date.now() + (tokens.expires_in * 1000)
};
if (tokens.refresh_token) {
const { encrypted: encRefreshToken, iv: refreshIv } = await encryptData(
tokens.refresh_token,
encryptionKey
);
encryptedTokens.refreshToken = encRefreshToken;
encryptedTokens.refreshTokenIv = refreshIv;
}
const db = await initGoogleDataDB();
const tx = db.transaction('encryptionMeta', 'readwrite');
tx.objectStore('encryptionMeta').put({
purpose: 'google_tokens',
...encryptedTokens
});
}
```
## Data Import Workflow
### Progressive Import with Background Sync
```typescript
interface ImportProgress {
service: 'gmail' | 'drive' | 'photos' | 'calendar';
total: number;
imported: number;
lastSyncToken?: string;
status: 'idle' | 'importing' | 'paused' | 'error';
errorMessage?: string;
}
class GoogleDataImporter {
private encryptionKey: CryptoKey;
private db: IDBDatabase;
async importGmail(options: {
maxMessages?: number;
labelsFilter?: string[];
dateAfter?: Date;
}): Promise<void> {
const accessToken = await this.getAccessToken();
// Use pagination for large mailboxes
let pageToken: string | undefined;
let imported = 0;
do {
const response = await fetch(
`https://gmail.googleapis.com/gmail/v1/users/me/messages?${new URLSearchParams({
maxResults: '100',
...(pageToken && { pageToken }),
...(options.labelsFilter && { labelIds: options.labelsFilter.join(',') }),
...(options.dateAfter && { q: `after:${Math.floor(options.dateAfter.getTime() / 1000)}` })
})}`,
{ headers: { Authorization: `Bearer ${accessToken}` } }
);
const data = await response.json();
// Fetch and encrypt each message
for (const msg of data.messages || []) {
const fullMessage = await this.fetchGmailMessage(msg.id, accessToken);
await this.storeEncryptedEmail(fullMessage);
imported++;
// Update progress
this.updateProgress('gmail', imported);
// Yield to UI periodically
if (imported % 10 === 0) {
await new Promise(r => setTimeout(r, 0));
}
}
pageToken = data.nextPageToken;
} while (pageToken && (!options.maxMessages || imported < options.maxMessages));
}
private async storeEncryptedEmail(message: any): Promise<void> {
const emailKey = await deriveDataEncryptionKey(this.encryptionKey, 'gmail');
const encrypted: EncryptedEmailStore = {
id: message.id,
threadId: message.threadId,
encryptedSubject: (await encryptData(
this.extractHeader(message, 'Subject') || '',
emailKey
)).encrypted,
encryptedBody: (await encryptData(
this.extractBody(message),
emailKey
)).encrypted,
// ... other fields
date: parseInt(message.internalDate),
syncedAt: Date.now(),
localOnly: true
};
const tx = this.db.transaction('gmail', 'readwrite');
tx.objectStore('gmail').put(encrypted);
}
}
```
## Sharing to Canvas Board
### Selective Sharing Model
```typescript
interface ShareableItem {
type: 'email' | 'document' | 'photo' | 'event';
id: string;
// Decrypted data for sharing
decryptedData: any;
}
class DataSharingService {
/**
* Share a specific item to the current board
* This decrypts the item and adds it to the Automerge document
*/
async shareToBoard(
item: ShareableItem,
boardHandle: DocumentHandle<CanvasDoc>,
userKey: CryptoKey
): Promise<void> {
// 1. Decrypt the item
const decrypted = await this.decryptItem(item, userKey);
// 2. Create a canvas shape representation
const shape = this.createShapeFromItem(decrypted, item.type);
// 3. Add to Automerge document (syncs to other board users)
boardHandle.change(doc => {
doc.shapes[shape.id] = shape;
});
// 4. Mark item as shared (no longer localOnly)
await this.markAsShared(item.id, item.type);
}
/**
* Create a visual shape from data
*/
private createShapeFromItem(data: any, type: string): TLShape {
switch (type) {
case 'email':
return {
id: createShapeId(),
type: 'email-card',
props: {
subject: data.subject,
from: data.from,
date: data.date,
snippet: data.snippet
}
};
case 'event':
return {
id: createShapeId(),
type: 'calendar-event',
props: {
title: data.summary,
startTime: data.startTime,
endTime: data.endTime,
location: data.location
}
};
// ... other types
}
}
}
```
## R2 Encrypted Backup
### Backup Architecture
```
User Browser Cloudflare Worker R2 Storage
│ │ │
│ 1. Encrypt data locally │ │
│ (already encrypted in IndexedDB) │ │
│ │ │
│ 2. Generate backup key │ │
│ (derived from master key) │ │
│ │ │
│ 3. POST encrypted blob ──────────> 4. Validate user │
│ │ (CryptID auth) │
│ │ │
│ │ 5. Store blob ─────────────────> │
│ │ (already encrypted, │
│ │ worker can't read) │
│ │ │
<──────────────────────────────── 6. Return backup ID │
```
### Backup Implementation
```typescript
interface BackupMetadata {
id: string;
createdAt: number;
services: ('gmail' | 'drive' | 'photos' | 'calendar')[];
itemCount: number;
sizeBytes: number;
// Encrypted with user's key - only they can read
encryptedManifest: ArrayBuffer;
}
class R2BackupService {
private workerUrl = '/api/backup';
async createBackup(
services: string[],
encryptionKey: CryptoKey
): Promise<BackupMetadata> {
// 1. Gather all encrypted data from IndexedDB
const dataToBackup = await this.gatherData(services);
// 2. Create a manifest (encrypted)
const manifest = {
version: 1,
createdAt: Date.now(),
services,
itemCounts: dataToBackup.counts
};
const { encrypted: encManifest } = await encryptData(
JSON.stringify(manifest),
encryptionKey
);
// 3. Serialize and chunk if large
const blob = await this.serializeForBackup(dataToBackup);
// 4. Upload to R2 via worker
const response = await fetch(this.workerUrl, {
method: 'POST',
headers: {
'Content-Type': 'application/octet-stream',
'X-Backup-Manifest': base64Encode(encManifest)
},
body: blob
});
const { backupId } = await response.json();
return {
id: backupId,
createdAt: Date.now(),
services: services as any,
itemCount: Object.values(dataToBackup.counts).reduce((a, b) => a + b, 0),
sizeBytes: blob.size,
encryptedManifest: encManifest
};
}
async restoreBackup(
backupId: string,
encryptionKey: CryptoKey
): Promise<void> {
// 1. Fetch encrypted blob from R2
const response = await fetch(`${this.workerUrl}/${backupId}`);
const encryptedBlob = await response.arrayBuffer();
// 2. Data is already encrypted with user's key
// Just write directly to IndexedDB
await this.writeToIndexedDB(encryptedBlob);
}
}
```
## Privacy & Security Guarantees
### What Never Leaves the Browser (Unencrypted)
1. **Email content** - body, subject, attachments
2. **Document content** - file contents, names
3. **Photo data** - images, location metadata
4. **Calendar details** - event descriptions, attendee info
5. **OAuth tokens** - access/refresh tokens
### What the Server Never Sees
1. **Encryption keys** - derived locally, never transmitted
2. **Plaintext data** - all API calls are client-side
3. **User's Google account data** - we use read-only scopes
### Data Flow Summary
```
┌─────────────────────┐
│ Google APIs │
│ (authenticated) │
└──────────┬──────────┘
┌─────────▼─────────┐
│ Browser Fetch │
│ (client-side) │
└─────────┬─────────┘
┌─────────▼─────────┐
│ Encrypt with │
│ WebCrypto │
│ (AES-256-GCM) │
└─────────┬─────────┘
┌────────────────────┼────────────────────┐
│ │ │
┌─────────▼─────────┐ ┌───────▼────────┐ ┌────────▼───────┐
│ IndexedDB │ │ Share to │ │ R2 Backup │
│ (local only) │ │ Board │ │ (encrypted) │
│ │ │ (Automerge) │ │ │
└───────────────────┘ └────────────────┘ └────────────────┘
│ │ │
▼ ▼ ▼
Only you can read Board members Only you can
(your keys) see shared items decrypt backup
```
## Implementation Phases
### Phase 1: Foundation
- [ ] IndexedDB schema for encrypted data
- [ ] Key derivation from existing WebCrypto keys
- [ ] Encrypt/decrypt utility functions
- [ ] Storage quota monitoring
### Phase 2: Google OAuth
- [ ] OAuth 2.0 with PKCE flow
- [ ] Token encryption and storage
- [ ] Token refresh logic
- [ ] Scope selection UI
### Phase 3: Data Import
- [ ] Gmail import with pagination
- [ ] Drive document import
- [ ] Photos thumbnail import
- [ ] Calendar event import
- [ ] Progress tracking UI
### Phase 4: Canvas Integration
- [ ] Email card shape
- [ ] Document preview shape
- [ ] Photo thumbnail shape
- [ ] Calendar event shape
- [ ] Share to board functionality
### Phase 5: R2 Backup
- [ ] Encrypted backup creation
- [ ] Backup restore
- [ ] Backup management UI
- [ ] Automatic backup scheduling
### Phase 6: Polish
- [ ] Safari storage warnings
- [ ] Offline data access
- [ ] Search within encrypted data
- [ ] Data export (Google Takeout style)
## Security Checklist
- [ ] All data encrypted before storage
- [ ] Keys never leave browser unencrypted
- [ ] OAuth tokens encrypted at rest
- [ ] PKCE used for OAuth flow
- [ ] Read-only Google API scopes
- [ ] Safari 7-day eviction handled
- [ ] Storage quota warnings
- [ ] Secure context required (HTTPS)
- [ ] CSP headers configured
- [ ] No sensitive data in console logs
## Related Documents
- [Local File Upload](./LOCAL_FILE_UPLOAD.md) - Multi-item upload with same encryption model
- [Offline Storage Feasibility](../OFFLINE_STORAGE_FEASIBILITY.md) - IndexedDB + Automerge foundation
## References
- [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)
- [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API)
- [Storage API](https://developer.mozilla.org/en-US/docs/Web/API/Storage_API)
- [Google OAuth 2.0](https://developers.google.com/identity/protocols/oauth2)
- [Gmail API](https://developers.google.com/gmail/api)
- [Drive API](https://developers.google.com/drive/api)
- [Photos Library API](https://developers.google.com/photos/library/reference/rest)
- [Calendar API](https://developers.google.com/calendar/api)

View File

@ -1,862 +0,0 @@
# Local File Upload: Multi-Item Encrypted Import
A simpler, more broadly compatible approach to importing local files into the canvas with the same privacy-first, encrypted storage model.
## Overview
Instead of maintaining persistent folder connections (which have browser compatibility issues), provide a **drag-and-drop / file picker** interface for batch importing files into encrypted local storage.
```
┌─────────────────────────────────────────────────────────────────────────┐
│ UPLOAD INTERFACE │
├─────────────────────────────────────────────────────────────────────────┤
│ │
│ ┌─────────────────────────────────────────────────────────────────┐ │
│ │ │ │
│ │ 📁 Drop files here or click to browse │ │
│ │ │ │
│ │ Supports: Images, PDFs, Documents, Text, Audio, Video │ │
│ │ │ │
│ └─────────────────────────────────────────────────────────────────┘ │
│ │
│ ┌──────────────────────────────────────────────────────────────────┐ │
│ │ Import Queue [Upload] │ │
│ ├──────────────────────────────────────────────────────────────────┤ │
│ │ ☑ photo_001.jpg (2.4 MB) 🔒 Encrypt 📤 Share │ │
│ │ ☑ meeting_notes.pdf (450 KB) 🔒 Encrypt ☐ Private │ │
│ │ ☑ project_plan.md (12 KB) 🔒 Encrypt ☐ Private │ │
│ │ ☐ sensitive_doc.docx (1.2 MB) 🔒 Encrypt ☐ Private │ │
│ └──────────────────────────────────────────────────────────────────┘ │
│ │
│ Storage: 247 MB used / ~5 GB available │
│ │
└─────────────────────────────────────────────────────────────────────────┘
```
## Why Multi-Item Upload vs. Folder Connection
| Feature | Folder Connection | Multi-Item Upload |
|---------|------------------|-------------------|
| Browser Support | Chrome/Edge only | All browsers |
| Persistent Access | Yes (with permission) | No (one-time import) |
| Implementation | Complex | Simple |
| User Control | Less explicit | Very explicit |
| Privacy UX | Hidden | Clear per-file choices |
**Recommendation**: Multi-item upload is better for privacy-conscious users who want explicit control over what enters the system.
## Supported File Types
### Documents
| Type | Extension | Processing | Storage Strategy |
|------|-----------|-----------|------------------|
| Markdown | `.md` | Parse frontmatter, render | Full content |
| PDF | `.pdf` | Extract text, thumbnail | Text + thumbnail |
| Word | `.docx` | Convert to markdown | Converted content |
| Text | `.txt`, `.csv`, `.json` | Direct | Full content |
| Code | `.js`, `.ts`, `.py`, etc. | Syntax highlight | Full content |
### Images
| Type | Extension | Processing | Storage Strategy |
|------|-----------|-----------|------------------|
| Photos | `.jpg`, `.png`, `.webp` | Generate thumbnail | Thumbnail + full |
| Vector | `.svg` | Direct | Full content |
| GIF | `.gif` | First frame thumb | Thumbnail + full |
### Media
| Type | Extension | Processing | Storage Strategy |
|------|-----------|-----------|------------------|
| Audio | `.mp3`, `.wav`, `.m4a` | Waveform preview | Reference + metadata |
| Video | `.mp4`, `.webm` | Frame thumbnail | Reference + metadata |
### Archives (Future)
| Type | Extension | Processing |
|------|-----------|-----------|
| ZIP | `.zip` | List contents, selective extract |
| Obsidian Export | `.zip` | Vault structure import |
## Architecture
```typescript
interface UploadedFile {
id: string; // Generated UUID
originalName: string; // User's filename
mimeType: string;
size: number;
// Processing results
processed: {
thumbnail?: ArrayBuffer; // For images/PDFs/videos
extractedText?: string; // For searchable docs
metadata?: Record<string, any>; // EXIF, frontmatter, etc.
};
// Encryption
encrypted: {
content: ArrayBuffer; // Encrypted file content
iv: Uint8Array;
keyId: string; // Reference to encryption key
};
// User choices
sharing: {
localOnly: boolean; // Default true
sharedToBoard?: string; // Board ID if shared
backedUpToR2?: boolean;
};
// Timestamps
importedAt: number;
lastAccessedAt: number;
}
```
## Implementation
### 1. File Input Component
```typescript
import React, { useCallback, useState } from 'react';
interface FileUploadProps {
onFilesSelected: (files: File[]) => void;
maxFileSize?: number; // bytes
maxFiles?: number;
acceptedTypes?: string[];
}
export function FileUploadZone({
onFilesSelected,
maxFileSize = 100 * 1024 * 1024, // 100MB default
maxFiles = 50,
acceptedTypes
}: FileUploadProps) {
const [isDragging, setIsDragging] = useState(false);
const [errors, setErrors] = useState<string[]>([]);
const handleDrop = useCallback((e: React.DragEvent) => {
e.preventDefault();
setIsDragging(false);
const files = Array.from(e.dataTransfer.files);
validateAndProcess(files);
}, []);
const handleFileInput = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
const files = Array.from(e.target.files || []);
validateAndProcess(files);
}, []);
const validateAndProcess = (files: File[]) => {
const errors: string[] = [];
const validFiles: File[] = [];
for (const file of files.slice(0, maxFiles)) {
if (file.size > maxFileSize) {
errors.push(`${file.name}: exceeds ${maxFileSize / 1024 / 1024}MB limit`);
continue;
}
if (acceptedTypes && !acceptedTypes.some(t => file.type.match(t))) {
errors.push(`${file.name}: unsupported file type`);
continue;
}
validFiles.push(file);
}
if (files.length > maxFiles) {
errors.push(`Only first ${maxFiles} files will be imported`);
}
setErrors(errors);
if (validFiles.length > 0) {
onFilesSelected(validFiles);
}
};
return (
<div
onDrop={handleDrop}
onDragOver={(e) => { e.preventDefault(); setIsDragging(true); }}
onDragLeave={() => setIsDragging(false)}
className={`upload-zone ${isDragging ? 'dragging' : ''}`}
>
<input
type="file"
multiple
onChange={handleFileInput}
accept={acceptedTypes?.join(',')}
id="file-upload"
hidden
/>
<label htmlFor="file-upload">
<span className="upload-icon">📁</span>
<span>Drop files here or click to browse</span>
<span className="upload-hint">
Images, PDFs, Documents, Text files
</span>
</label>
{errors.length > 0 && (
<div className="upload-errors">
{errors.map((err, i) => <div key={i}>{err}</div>)}
</div>
)}
</div>
);
}
```
### 2. File Processing Pipeline
```typescript
interface ProcessedFile {
file: File;
thumbnail?: Blob;
extractedText?: string;
metadata?: Record<string, any>;
}
class FileProcessor {
async process(file: File): Promise<ProcessedFile> {
const result: ProcessedFile = { file };
// Route based on MIME type
if (file.type.startsWith('image/')) {
return this.processImage(file, result);
} else if (file.type === 'application/pdf') {
return this.processPDF(file, result);
} else if (file.type.startsWith('text/') || this.isTextFile(file)) {
return this.processText(file, result);
} else if (file.type.startsWith('video/')) {
return this.processVideo(file, result);
} else if (file.type.startsWith('audio/')) {
return this.processAudio(file, result);
}
// Default: store as-is
return result;
}
private async processImage(file: File, result: ProcessedFile): Promise<ProcessedFile> {
// Generate thumbnail
const img = await createImageBitmap(file);
const canvas = new OffscreenCanvas(200, 200);
const ctx = canvas.getContext('2d')!;
// Calculate aspect-ratio preserving dimensions
const scale = Math.min(200 / img.width, 200 / img.height);
const w = img.width * scale;
const h = img.height * scale;
ctx.drawImage(img, (200 - w) / 2, (200 - h) / 2, w, h);
result.thumbnail = await canvas.convertToBlob({ type: 'image/webp', quality: 0.8 });
// Extract EXIF if available
if (file.type === 'image/jpeg') {
result.metadata = await this.extractExif(file);
}
return result;
}
private async processPDF(file: File, result: ProcessedFile): Promise<ProcessedFile> {
// Use pdf.js for text extraction and thumbnail
const pdfjsLib = await import('pdfjs-dist');
const arrayBuffer = await file.arrayBuffer();
const pdf = await pdfjsLib.getDocument({ data: arrayBuffer }).promise;
// Get first page as thumbnail
const page = await pdf.getPage(1);
const viewport = page.getViewport({ scale: 0.5 });
const canvas = new OffscreenCanvas(viewport.width, viewport.height);
const ctx = canvas.getContext('2d')!;
await page.render({ canvasContext: ctx, viewport }).promise;
result.thumbnail = await canvas.convertToBlob({ type: 'image/webp' });
// Extract text from all pages
let text = '';
for (let i = 1; i <= pdf.numPages; i++) {
const page = await pdf.getPage(i);
const content = await page.getTextContent();
text += content.items.map((item: any) => item.str).join(' ') + '\n';
}
result.extractedText = text;
result.metadata = { pageCount: pdf.numPages };
return result;
}
private async processText(file: File, result: ProcessedFile): Promise<ProcessedFile> {
result.extractedText = await file.text();
// Parse markdown frontmatter if applicable
if (file.name.endsWith('.md')) {
const frontmatter = this.parseFrontmatter(result.extractedText);
if (frontmatter) {
result.metadata = frontmatter;
}
}
return result;
}
private async processVideo(file: File, result: ProcessedFile): Promise<ProcessedFile> {
// Generate thumbnail from first frame
const video = document.createElement('video');
video.preload = 'metadata';
video.src = URL.createObjectURL(file);
await new Promise(resolve => video.addEventListener('loadedmetadata', resolve));
video.currentTime = 1; // First second
await new Promise(resolve => video.addEventListener('seeked', resolve));
const canvas = new OffscreenCanvas(200, 200);
const ctx = canvas.getContext('2d')!;
const scale = Math.min(200 / video.videoWidth, 200 / video.videoHeight);
ctx.drawImage(video, 0, 0, video.videoWidth * scale, video.videoHeight * scale);
result.thumbnail = await canvas.convertToBlob({ type: 'image/webp' });
result.metadata = {
duration: video.duration,
width: video.videoWidth,
height: video.videoHeight
};
URL.revokeObjectURL(video.src);
return result;
}
private async processAudio(file: File, result: ProcessedFile): Promise<ProcessedFile> {
// Extract duration and basic metadata
const audio = document.createElement('audio');
audio.src = URL.createObjectURL(file);
await new Promise(resolve => audio.addEventListener('loadedmetadata', resolve));
result.metadata = {
duration: audio.duration
};
URL.revokeObjectURL(audio.src);
return result;
}
private isTextFile(file: File): boolean {
const textExtensions = ['.md', '.txt', '.json', '.csv', '.yaml', '.yml', '.xml', '.html', '.css', '.js', '.ts', '.py', '.sh'];
return textExtensions.some(ext => file.name.toLowerCase().endsWith(ext));
}
private parseFrontmatter(content: string): Record<string, any> | null {
const match = content.match(/^---\n([\s\S]*?)\n---/);
if (!match) return null;
try {
// Simple YAML-like parsing (or use a proper YAML parser)
const lines = match[1].split('\n');
const result: Record<string, any> = {};
for (const line of lines) {
const [key, ...valueParts] = line.split(':');
if (key && valueParts.length) {
result[key.trim()] = valueParts.join(':').trim();
}
}
return result;
} catch {
return null;
}
}
private async extractExif(file: File): Promise<Record<string, any>> {
// Would use exif-js or similar library
return {};
}
}
```
### 3. Encryption & Storage
```typescript
class LocalFileStore {
private db: IDBDatabase;
private encryptionKey: CryptoKey;
async storeFile(processed: ProcessedFile, options: {
shareToBoard?: boolean;
} = {}): Promise<UploadedFile> {
const fileId = crypto.randomUUID();
// Read file content
const content = await processed.file.arrayBuffer();
// Encrypt content
const iv = crypto.getRandomValues(new Uint8Array(12));
const encryptedContent = await crypto.subtle.encrypt(
{ name: 'AES-GCM', iv },
this.encryptionKey,
content
);
// Encrypt thumbnail if present
let encryptedThumbnail: ArrayBuffer | undefined;
let thumbnailIv: Uint8Array | undefined;
if (processed.thumbnail) {
thumbnailIv = crypto.getRandomValues(new Uint8Array(12));
const thumbBuffer = await processed.thumbnail.arrayBuffer();
encryptedThumbnail = await crypto.subtle.encrypt(
{ name: 'AES-GCM', iv: thumbnailIv },
this.encryptionKey,
thumbBuffer
);
}
const uploadedFile: UploadedFile = {
id: fileId,
originalName: processed.file.name,
mimeType: processed.file.type,
size: processed.file.size,
processed: {
extractedText: processed.extractedText,
metadata: processed.metadata
},
encrypted: {
content: encryptedContent,
iv,
keyId: 'user-master-key'
},
sharing: {
localOnly: !options.shareToBoard,
sharedToBoard: options.shareToBoard ? getCurrentBoardId() : undefined
},
importedAt: Date.now(),
lastAccessedAt: Date.now()
};
// Store encrypted thumbnail separately (for faster listing)
if (encryptedThumbnail && thumbnailIv) {
await this.storeThumbnail(fileId, encryptedThumbnail, thumbnailIv);
}
// Store to IndexedDB
const tx = this.db.transaction('files', 'readwrite');
tx.objectStore('files').put(uploadedFile);
return uploadedFile;
}
async getFile(fileId: string): Promise<{
file: UploadedFile;
decryptedContent: ArrayBuffer;
} | null> {
const tx = this.db.transaction('files', 'readonly');
const file = await new Promise<UploadedFile | undefined>(resolve => {
const req = tx.objectStore('files').get(fileId);
req.onsuccess = () => resolve(req.result);
});
if (!file) return null;
// Decrypt content
const decryptedContent = await crypto.subtle.decrypt(
{ name: 'AES-GCM', iv: file.encrypted.iv },
this.encryptionKey,
file.encrypted.content
);
return { file, decryptedContent };
}
async listFiles(options?: {
mimeTypeFilter?: string;
limit?: number;
offset?: number;
}): Promise<UploadedFile[]> {
const tx = this.db.transaction('files', 'readonly');
const store = tx.objectStore('files');
return new Promise(resolve => {
const files: UploadedFile[] = [];
const req = store.openCursor();
req.onsuccess = (e) => {
const cursor = (e.target as IDBRequest).result;
if (cursor) {
const file = cursor.value as UploadedFile;
// Filter by MIME type if specified
if (!options?.mimeTypeFilter || file.mimeType.startsWith(options.mimeTypeFilter)) {
files.push(file);
}
cursor.continue();
} else {
resolve(files);
}
};
});
}
}
```
### 4. IndexedDB Schema
```typescript
const LOCAL_FILES_DB = 'canvas-local-files';
const DB_VERSION = 1;
async function initLocalFilesDB(): Promise<IDBDatabase> {
return new Promise((resolve, reject) => {
const request = indexedDB.open(LOCAL_FILES_DB, DB_VERSION);
request.onerror = () => reject(request.error);
request.onsuccess = () => resolve(request.result);
request.onupgradeneeded = (event) => {
const db = (event.target as IDBOpenDBRequest).result;
// Main files store
if (!db.objectStoreNames.contains('files')) {
const store = db.createObjectStore('files', { keyPath: 'id' });
store.createIndex('mimeType', 'mimeType', { unique: false });
store.createIndex('importedAt', 'importedAt', { unique: false });
store.createIndex('originalName', 'originalName', { unique: false });
store.createIndex('sharedToBoard', 'sharing.sharedToBoard', { unique: false });
}
// Thumbnails store (separate for faster listing)
if (!db.objectStoreNames.contains('thumbnails')) {
db.createObjectStore('thumbnails', { keyPath: 'fileId' });
}
// Search index (encrypted full-text search)
if (!db.objectStoreNames.contains('searchIndex')) {
const searchStore = db.createObjectStore('searchIndex', { keyPath: 'fileId' });
searchStore.createIndex('tokens', 'tokens', { unique: false, multiEntry: true });
}
};
});
}
```
## UI Components
### Import Dialog
```tsx
function ImportFilesDialog({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) {
const [selectedFiles, setSelectedFiles] = useState<ProcessedFile[]>([]);
const [importing, setImporting] = useState(false);
const [progress, setProgress] = useState(0);
const fileStore = useLocalFileStore();
const handleFilesSelected = async (files: File[]) => {
const processor = new FileProcessor();
const processed: ProcessedFile[] = [];
for (const file of files) {
processed.push(await processor.process(file));
}
setSelectedFiles(prev => [...prev, ...processed]);
};
const handleImport = async () => {
setImporting(true);
for (let i = 0; i < selectedFiles.length; i++) {
await fileStore.storeFile(selectedFiles[i]);
setProgress((i + 1) / selectedFiles.length * 100);
}
setImporting(false);
onClose();
};
return (
<Dialog open={isOpen} onClose={onClose}>
<DialogTitle>Import Files</DialogTitle>
<FileUploadZone onFilesSelected={handleFilesSelected} />
{selectedFiles.length > 0 && (
<div className="file-list">
{selectedFiles.map((pf, i) => (
<FilePreviewRow
key={i}
file={pf}
onRemove={() => setSelectedFiles(prev => prev.filter((_, j) => j !== i))}
/>
))}
</div>
)}
{importing && (
<progress value={progress} max={100} />
)}
<DialogActions>
<button onClick={onClose}>Cancel</button>
<button
onClick={handleImport}
disabled={selectedFiles.length === 0 || importing}
>
Import {selectedFiles.length} files
</button>
</DialogActions>
</Dialog>
);
}
```
### File Browser Panel
```tsx
function LocalFilesBrowser() {
const [files, setFiles] = useState<UploadedFile[]>([]);
const [filter, setFilter] = useState<string>('all');
const fileStore = useLocalFileStore();
useEffect(() => {
loadFiles();
}, [filter]);
const loadFiles = async () => {
const mimeFilter = filter === 'all' ? undefined : filter;
setFiles(await fileStore.listFiles({ mimeTypeFilter: mimeFilter }));
};
const handleDragToCanvas = (file: UploadedFile) => {
// Create a shape from the file and add to canvas
};
return (
<div className="local-files-browser">
<div className="filter-bar">
<button onClick={() => setFilter('all')}>All</button>
<button onClick={() => setFilter('image/')}>Images</button>
<button onClick={() => setFilter('application/pdf')}>PDFs</button>
<button onClick={() => setFilter('text/')}>Documents</button>
</div>
<div className="files-grid">
{files.map(file => (
<FileCard
key={file.id}
file={file}
onDragStart={() => handleDragToCanvas(file)}
/>
))}
</div>
</div>
);
}
```
## Canvas Integration
### Drag Files to Canvas
```typescript
// When user drags a local file onto the canvas
async function createShapeFromLocalFile(
file: UploadedFile,
position: { x: number; y: number },
editor: Editor
): Promise<TLShapeId> {
const fileStore = getLocalFileStore();
const { decryptedContent } = await fileStore.getFile(file.id);
if (file.mimeType.startsWith('image/')) {
// Create image shape
const blob = new Blob([decryptedContent], { type: file.mimeType });
const assetId = AssetRecordType.createId();
await editor.createAssets([{
id: assetId,
type: 'image',
typeName: 'asset',
props: {
name: file.originalName,
src: URL.createObjectURL(blob),
w: 400,
h: 300,
mimeType: file.mimeType,
isAnimated: file.mimeType === 'image/gif'
}
}]);
return editor.createShape({
type: 'image',
x: position.x,
y: position.y,
props: { assetId, w: 400, h: 300 }
}).id;
} else if (file.mimeType === 'application/pdf') {
// Create PDF embed or preview shape
return editor.createShape({
type: 'pdf-preview',
x: position.x,
y: position.y,
props: {
fileId: file.id,
name: file.originalName,
pageCount: file.processed.metadata?.pageCount
}
}).id;
} else if (file.mimeType.startsWith('text/') || file.originalName.endsWith('.md')) {
// Create note shape with content
const text = new TextDecoder().decode(decryptedContent);
return editor.createShape({
type: 'note',
x: position.x,
y: position.y,
props: {
text: text.slice(0, 1000), // Truncate for display
fileId: file.id,
fullContentAvailable: text.length > 1000
}
}).id;
}
// Default: generic file card
return editor.createShape({
type: 'file-card',
x: position.x,
y: position.y,
props: {
fileId: file.id,
name: file.originalName,
size: file.size,
mimeType: file.mimeType
}
}).id;
}
```
## Storage Considerations
### Size Limits & Recommendations
| File Type | Max Recommended | Notes |
|-----------|----------------|-------|
| Images | 20MB each | Larger images get resized |
| PDFs | 50MB each | Text extracted for search |
| Videos | 100MB each | Store reference, thumbnail only |
| Audio | 50MB each | Store with waveform preview |
| Documents | 10MB each | Full content stored |
### Total Storage Budget
```typescript
const STORAGE_CONFIG = {
// Soft warning at 500MB
warningThreshold: 500 * 1024 * 1024,
// Hard limit at 2GB (leaves room for other data)
maxStorage: 2 * 1024 * 1024 * 1024,
// Auto-cleanup: remove thumbnails for files not accessed in 30 days
thumbnailRetentionDays: 30
};
async function checkStorageQuota(): Promise<{
used: number;
available: number;
warning: boolean;
}> {
const estimate = await navigator.storage.estimate();
const used = estimate.usage || 0;
const quota = estimate.quota || 0;
return {
used,
available: Math.min(quota - used, STORAGE_CONFIG.maxStorage - used),
warning: used > STORAGE_CONFIG.warningThreshold
};
}
```
## Privacy Features
### Per-File Privacy Controls
```typescript
interface FilePrivacySettings {
// Encryption is always on - this is about sharing
localOnly: boolean; // Never leaves browser
shareableToBoard: boolean; // Can be added to shared board
includeInR2Backup: boolean; // Include in cloud backup
// Metadata privacy
stripExif: boolean; // Remove location/camera data from images
anonymizeFilename: boolean; // Use generated name instead of original
}
const DEFAULT_PRIVACY: FilePrivacySettings = {
localOnly: true,
shareableToBoard: false,
includeInR2Backup: true,
stripExif: true,
anonymizeFilename: false
};
```
### Sharing Flow
```
┌─────────────────────────────────────────────────────────────────┐
│ User drags local file onto shared board │
├─────────────────────────────────────────────────────────────────┤
│ │
│ ⚠️ Share "meeting_notes.pdf" to this board? │
│ │
│ This file is currently private. Sharing it will: │
│ • Make it visible to all board members │
│ • Upload an encrypted copy to sync storage │
│ • Keep the original encrypted on your device │
│ │
│ [Keep Private] [Share to Board] │
│ │
└─────────────────────────────────────────────────────────────────┘
```
## Implementation Checklist
### Phase 1: Core Upload
- [ ] File drop zone component
- [ ] File type detection
- [ ] Image thumbnail generation
- [ ] PDF text extraction & thumbnail
- [ ] Encryption before storage
- [ ] IndexedDB schema & storage
### Phase 2: File Management
- [ ] File browser panel
- [ ] Filter by type
- [ ] Search within files
- [ ] Delete files
- [ ] Storage quota display
### Phase 3: Canvas Integration
- [ ] Drag files to canvas
- [ ] Image shape from file
- [ ] PDF preview shape
- [ ] Document/note shape
- [ ] Generic file card shape
### Phase 4: Sharing & Backup
- [ ] Share confirmation dialog
- [ ] Upload to Automerge sync
- [ ] Include in R2 backup
- [ ] Privacy settings per file
## Related Documents
- [Google Data Sovereignty](./GOOGLE_DATA_SOVEREIGNTY.md) - Same encryption model for Google imports
- [Offline Storage Feasibility](../OFFLINE_STORAGE_FEASIBILITY.md) - IndexedDB + Automerge foundation

View File

@ -4,42 +4,32 @@
<head> <head>
<title>Jeff Emmett</title> <title>Jeff Emmett</title>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>🍄</text></svg>" />
<link rel="apple-touch-icon" href="/pwa-192x192.svg" />
<link rel="manifest" href="/manifest.webmanifest" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta http-equiv="Permissions-Policy" content="midi=*, microphone=*, camera=*, autoplay=*"> <meta http-equiv="Permissions-Policy" content="midi=*, microphone=*, camera=*, autoplay=*">
<!-- Preconnect to critical origins for faster loading -->
<link rel="preconnect" href="https://fonts.googleapis.com" /> <link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link rel="dns-prefetch" href="https://jeffemmett-canvas.jeffemmett.workers.dev" />
<link rel="dns-prefetch" href="https://jeffemmett-canvas-dev.jeffemmett.workers.dev" />
<link rel="preconnect" href="https://jeffemmett-canvas.jeffemmett.workers.dev" crossorigin />
<link rel="preconnect" href="https://jeffemmett-canvas-dev.jeffemmett.workers.dev" crossorigin />
<link <link
href="https://fonts.googleapis.com/css2?family=Recursive:slnt,wght,CASL,CRSV,MONO@-15..0,300..1000,0..1,0..1,0..1&display=swap" href="https://fonts.googleapis.com/css2?family=Recursive:slnt,wght,CASL,CRSV,MONO@-15..0,300..1000,0..1,0..1,0..1&display=swap"
rel="stylesheet"> rel="stylesheet">
<!-- Social Meta Tags --> <!-- Social Meta Tags -->
<meta name="description" <meta name="description"
content="Exploring mycoeconomics, token engineering, psilo-cybernetics, zero-knowledge local-first systems, and institutional neuroplasticity. Research at the intersection of regenerative systems, crypto commons, and emancipatory technology."> content="My research investigates the intersection of computing, human-system interfaces, and emancipatory politics. I am interested in the potential of computing as a medium for thought, as a tool for collective action, and as a means of emancipation.">
<meta property="og:url" content="https://jeffemmett.com"> <meta property="og:url" content="https://jeffemmett.com">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:title" content="Jeff Emmett"> <meta property="og:title" content="Jeff Emmett">
<meta property="og:description" <meta property="og:description"
content="Exploring mycoeconomics, token engineering, psilo-cybernetics, zero-knowledge local-first systems, and institutional neuroplasticity. Research at the intersection of regenerative systems, crypto commons, and emancipatory technology."> content="My research doesn't investigate the intersection of computing, human-system interfaces, and emancipatory politics. I am interested in the potential of computing as a medium for thought, as a tool for collective action, and as a means of emancipation.">
<meta property="og:image" content="https://jeffemmett.com/og-image.jpg"> <meta property="og:image" content="/website-embed.png">
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">
<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:card" content="summary_large_image">
<meta property="twitter:domain" content="jeffemmett.com"> <meta property="twitter:domain" content="jeffemmett.com">
<meta property="twitter:url" content="https://jeffemmett.com"> <meta property="twitter:url" content="https://jeffemmett.com">
<meta name="twitter:title" content="Jeff Emmett"> <meta name="twitter:title" content="Jeff Emmett">
<meta name="twitter:description" <meta name="twitter:description"
content="Exploring mycoeconomics, token engineering, psilo-cybernetics, zero-knowledge local-first systems, and institutional neuroplasticity. Research at the intersection of regenerative systems, crypto commons, and emancipatory technology."> content="My research doesn't investigate the intersection of computing, human-system interfaces, and emancipatory politics. I am interested in the potential of computing as a medium for thought, as a tool for collective action, and as a means of emancipation.">
<meta name="twitter:image" content="https://jeffemmett.com/og-image.jpg"> <meta name="twitter:image" content="/website-embed.png">
<!-- Analytics --> <!-- Analytics -->
<script data-goatcounter="https://jeff.goatcounter.com/count" async src="//gc.zgo.at/count.js"></script> <script data-goatcounter="https://jeff.goatcounter.com/count" async src="//gc.zgo.at/count.js"></script>

View File

@ -4,25 +4,12 @@ server {
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;
# Gzip compression (fallback for clients that don't support Brotli) # Gzip compression
gzip on; gzip on;
gzip_vary on; gzip_vary on;
gzip_comp_level 6; gzip_min_length 1024;
gzip_min_length 256; gzip_proxied expired no-cache no-store private auth;
gzip_proxied any; gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/javascript application/json;
gzip_types
text/plain
text/css
text/xml
text/javascript
application/javascript
application/x-javascript
application/json
application/xml
application/wasm
application/octet-stream
image/svg+xml
font/woff2;
gzip_disable "MSIE [1-6]\."; gzip_disable "MSIE [1-6]\.";
# Security headers # Security headers
@ -31,32 +18,7 @@ server {
add_header X-XSS-Protection "1; mode=block" always; add_header X-XSS-Protection "1; mode=block" always;
add_header Referrer-Policy "strict-origin-when-cross-origin" always; add_header Referrer-Policy "strict-origin-when-cross-origin" always;
# NEVER cache index.html and service worker - always fetch fresh # Cache static assets
location = /index.html {
add_header Cache-Control "no-cache, no-store, must-revalidate";
add_header Pragma "no-cache";
add_header Expires "0";
}
location = /sw.js {
add_header Cache-Control "no-cache, no-store, must-revalidate";
add_header Pragma "no-cache";
add_header Expires "0";
}
location = /registerSW.js {
add_header Cache-Control "no-cache, no-store, must-revalidate";
add_header Pragma "no-cache";
add_header Expires "0";
}
location = /manifest.webmanifest {
add_header Cache-Control "no-cache, no-store, must-revalidate";
add_header Pragma "no-cache";
add_header Expires "0";
}
# Cache static assets with hashed filenames (immutable)
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ { location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
expires 1y; expires 1y;
add_header Cache-Control "public, immutable"; add_header Cache-Control "public, immutable";

12200
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,23 +11,14 @@
"dev:client": "vite --host 0.0.0.0 --port 5173", "dev:client": "vite --host 0.0.0.0 --port 5173",
"dev:worker": "wrangler dev --config wrangler.dev.toml --remote --port 5172", "dev:worker": "wrangler dev --config wrangler.dev.toml --remote --port 5172",
"dev:worker:local": "wrangler dev --config wrangler.dev.toml --port 5172 --ip 0.0.0.0", "dev:worker:local": "wrangler dev --config wrangler.dev.toml --port 5172 --ip 0.0.0.0",
"build": "NODE_OPTIONS=\"--max-old-space-size=8192\" tsc && NODE_OPTIONS=\"--max-old-space-size=8192\" vite build", "build": "tsc && vite build",
"build:worker": "wrangler build --config wrangler.dev.toml", "build:worker": "wrangler build --config wrangler.dev.toml",
"preview": "vite preview", "preview": "vite preview",
"deploy": "NODE_OPTIONS=\"--max-old-space-size=8192\" tsc && NODE_OPTIONS=\"--max-old-space-size=8192\" vite build && wrangler deploy", "deploy": "tsc && vite build && wrangler deploy",
"deploy:pages": "NODE_OPTIONS=\"--max-old-space-size=8192\" tsc && NODE_OPTIONS=\"--max-old-space-size=8192\" vite build", "deploy:pages": "tsc && vite build",
"deploy:worker": "wrangler deploy", "deploy:worker": "wrangler deploy",
"deploy:worker:dev": "wrangler deploy --config wrangler.dev.toml", "deploy:worker:dev": "wrangler deploy --config wrangler.dev.toml",
"types": "tsc --noEmit", "types": "tsc --noEmit",
"test": "vitest",
"test:ui": "vitest --ui",
"test:run": "vitest run",
"test:coverage": "vitest run --coverage",
"test:e2e": "playwright test",
"test:e2e:ui": "playwright test --ui",
"test:e2e:headed": "playwright test --headed",
"test:worker": "vitest run --config vitest.worker.config.ts",
"test:all": "vitest run && vitest run --config vitest.worker.config.ts && playwright test",
"multmux:install": "npm install --workspaces", "multmux:install": "npm install --workspaces",
"multmux:build": "npm run build --workspace=@multmux/server --workspace=@multmux/cli", "multmux:build": "npm run build --workspace=@multmux/server --workspace=@multmux/cli",
"multmux:dev:server": "npm run dev --workspace=@multmux/server", "multmux:dev:server": "npm run dev --workspace=@multmux/server",
@ -46,21 +37,13 @@
"@chengsokdara/use-whisper": "^0.2.0", "@chengsokdara/use-whisper": "^0.2.0",
"@daily-co/daily-js": "^0.60.0", "@daily-co/daily-js": "^0.60.0",
"@daily-co/daily-react": "^0.20.0", "@daily-co/daily-react": "^0.20.0",
"@fal-ai/client": "^1.7.2",
"@mdxeditor/editor": "^3.51.0", "@mdxeditor/editor": "^3.51.0",
"@noble/hashes": "^2.0.1",
"@noble/secp256k1": "^3.0.0",
"@react-three/drei": "^9.114.3",
"@react-three/fiber": "^8.17.10",
"@tanstack/react-query": "^5.90.16",
"@tldraw/assets": "^3.15.4", "@tldraw/assets": "^3.15.4",
"@tldraw/tldraw": "^3.15.4", "@tldraw/tldraw": "^3.15.4",
"@tldraw/tlschema": "^3.15.4", "@tldraw/tlschema": "^3.15.4",
"@types/d3": "^7.4.3",
"@types/markdown-it": "^14.1.1", "@types/markdown-it": "^14.1.1",
"@types/marked": "^5.0.2", "@types/marked": "^5.0.2",
"@uiw/react-md-editor": "^4.0.5", "@uiw/react-md-editor": "^4.0.5",
"@web3modal/wagmi": "^5.1.11",
"@xenova/transformers": "^2.17.2", "@xenova/transformers": "^2.17.2",
"@xterm/addon-fit": "^0.10.0", "@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0", "@xterm/xterm": "^5.5.0",
@ -68,20 +51,19 @@
"ajv": "^8.17.1", "ajv": "^8.17.1",
"cherry-markdown": "^0.8.57", "cherry-markdown": "^0.8.57",
"cloudflare-workers-unfurl": "^0.0.7", "cloudflare-workers-unfurl": "^0.0.7",
"d3": "^7.9.0",
"fathom-typescript": "^0.0.36", "fathom-typescript": "^0.0.36",
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"gun": "^0.2020.1241",
"h3-js": "^4.3.0", "h3-js": "^4.3.0",
"holosphere": "^1.1.20",
"html2canvas": "^1.4.1", "html2canvas": "^1.4.1",
"itty-router": "^5.0.17", "itty-router": "^5.0.17",
"jotai": "^2.6.0", "jotai": "^2.6.0",
"jspdf": "^2.5.2", "jspdf": "^2.5.2",
"lodash.throttle": "^4.1.1", "lodash.throttle": "^4.1.1",
"maplibre-gl": "^5.14.0",
"marked": "^15.0.4", "marked": "^15.0.4",
"one-webcrypto": "^1.0.3", "one-webcrypto": "^1.0.3",
"openai": "^4.79.3", "openai": "^4.79.3",
"qrcode.react": "^4.2.0",
"rbush": "^4.0.1", "rbush": "^4.0.1",
"react": "^18.2.0", "react": "^18.2.0",
"react-cmdk": "^1.3.9", "react-cmdk": "^1.3.9",
@ -90,41 +72,24 @@
"react-router-dom": "^7.0.2", "react-router-dom": "^7.0.2",
"recoil": "^0.7.7", "recoil": "^0.7.7",
"sharp": "^0.33.5", "sharp": "^0.33.5",
"three": "^0.168.0",
"tldraw": "^3.15.4", "tldraw": "^3.15.4",
"use-whisper": "^0.0.1", "use-whisper": "^0.0.1",
"viem": "^2.43.4", "webcola": "^3.4.0",
"wagmi": "^3.1.4", "webnative": "^0.36.3"
"webcola": "^3.4.0"
}, },
"devDependencies": { "devDependencies": {
"@cloudflare/types": "^6.0.0", "@cloudflare/types": "^6.0.0",
"@cloudflare/vitest-pool-workers": "^0.11.0",
"@cloudflare/workers-types": "^4.20240821.1", "@cloudflare/workers-types": "^4.20240821.1",
"@playwright/test": "^1.57.0",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.1",
"@testing-library/user-event": "^14.6.1",
"@types/lodash.throttle": "^4", "@types/lodash.throttle": "^4",
"@types/rbush": "^4.0.0", "@types/rbush": "^4.0.0",
"@types/react": "^19.0.1", "@types/react": "^19.0.1",
"@types/react-dom": "^19.0.1", "@types/react-dom": "^19.0.1",
"@vitejs/plugin-react": "^4.0.3", "@vitejs/plugin-react": "^4.0.3",
"@vitest/coverage-v8": "^4.0.16",
"@vitest/ui": "^4.0.16",
"concurrently": "^9.1.0", "concurrently": "^9.1.0",
"fake-indexeddb": "^6.2.5",
"jsdom": "^27.0.1",
"miniflare": "^4.20251213.0",
"msw": "^2.12.4",
"playwright": "^1.57.0",
"typescript": "^5.6.3", "typescript": "^5.6.3",
"vite": "^6.0.3", "vite": "^6.0.3",
"vite-plugin-pwa": "^1.2.0",
"vite-plugin-top-level-await": "^1.6.0", "vite-plugin-top-level-await": "^1.6.0",
"vite-plugin-wasm": "^3.5.0", "vite-plugin-wasm": "^3.5.0",
"vitest": "^4.0.16",
"wrangler": "^4.33.2" "wrangler": "^4.33.2"
}, },
"engines": { "engines": {

View File

@ -1,45 +0,0 @@
import { defineConfig, devices } from '@playwright/test'
export default defineConfig({
testDir: './tests/e2e',
timeout: 60000, // Increase timeout for canvas loading
expect: {
timeout: 10000
},
fullyParallel: true,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 1, // Retry once locally too
workers: process.env.CI ? 1 : 4,
reporter: process.env.CI ? 'github' : 'html',
use: {
baseURL: 'http://localhost:5173',
trace: 'on-first-retry',
screenshot: 'only-on-failure',
video: 'retain-on-failure',
},
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] },
},
// Only run other browsers in CI with full browser install
// {
// name: 'firefox',
// use: { ...devices['Desktop Firefox'] },
// },
// {
// name: 'webkit',
// use: { ...devices['Desktop Safari'] },
// },
],
// Run local dev server before starting tests
webServer: {
command: 'npm run dev',
port: 5173,
reuseExistingServer: !process.env.CI,
timeout: 120000,
},
})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

View File

@ -1,21 +1,23 @@
import "tldraw/tldraw.css"
import "@/css/style.css"
import { Default } from "@/routes/Default"
import { BrowserRouter, Route, Routes, Navigate, useParams } from "react-router-dom"
import { Contact } from "@/routes/Contact"
import { Board } from "./routes/Board"
import { Inbox } from "./routes/Inbox"
import { Presentations } from "./routes/Presentations"
import { Resilience } from "./routes/Resilience"
import { createRoot } from "react-dom/client"
import { DailyProvider } from "@daily-co/daily-react"
import Daily from "@daily-co/daily-js"
import "tldraw/tldraw.css"; import "tldraw/tldraw.css";
import "@/css/style.css"; import "@/css/style.css";
import "@/css/auth.css"; // Import auth styles import "@/css/auth.css"; // Import auth styles
import "@/css/crypto-auth.css"; // Import crypto auth styles import "@/css/crypto-auth.css"; // Import crypto auth styles
import "@/css/starred-boards.css"; // Import starred boards styles import "@/css/starred-boards.css"; // Import starred boards styles
import "@/css/user-profile.css"; // Import user profile styles import "@/css/user-profile.css"; // Import user profile styles
import { BrowserRouter, Route, Routes, Navigate, useParams } from "react-router-dom"; import { Dashboard } from "./routes/Dashboard";
import { createRoot } from "react-dom/client"; import { useState, useEffect } from 'react';
import { useState, useEffect, lazy, Suspense } from 'react';
// Lazy load heavy route components for faster initial load
const Default = lazy(() => import("@/routes/Default").then(m => ({ default: m.Default })));
const Contact = lazy(() => import("@/routes/Contact").then(m => ({ default: m.Contact })));
const Board = lazy(() => import("./routes/Board").then(m => ({ default: m.Board })));
const Inbox = lazy(() => import("./routes/Inbox").then(m => ({ default: m.Inbox })));
const Presentations = lazy(() => import("./routes/Presentations").then(m => ({ default: m.Presentations })));
const Resilience = lazy(() => import("./routes/Resilience").then(m => ({ default: m.Resilience })));
const Dashboard = lazy(() => import("./routes/Dashboard").then(m => ({ default: m.Dashboard })));
// Import React Context providers // Import React Context providers
import { AuthProvider, useAuth } from './context/AuthContext'; import { AuthProvider, useAuth } from './context/AuthContext';
@ -28,65 +30,19 @@ import { ErrorBoundary } from './components/ErrorBoundary';
import CryptID from './components/auth/CryptID'; import CryptID from './components/auth/CryptID';
import CryptoDebug from './components/auth/CryptoDebug'; import CryptoDebug from './components/auth/CryptoDebug';
// Import Web3 provider for wallet integration // Initialize Daily.co call object with error handling
import { Web3Provider } from './providers/Web3Provider'; let callObject: any = null;
try {
// Import Google Data test component
import { GoogleDataTest } from './components/GoogleDataTest';
// Lazy load Daily.co provider - only needed for video chat
const DailyProvider = lazy(() =>
import('@daily-co/daily-react').then(m => ({ default: m.DailyProvider }))
);
// Loading skeleton for lazy-loaded routes
const LoadingSpinner = () => (
<div style={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
height: '100vh',
width: '100vw',
background: 'linear-gradient(135deg, #1a1a2e 0%, #16213e 100%)',
color: '#fff',
fontFamily: 'Inter, system-ui, sans-serif',
}}>
<div style={{
width: '48px',
height: '48px',
border: '3px solid rgba(255,255,255,0.1)',
borderTopColor: '#4f46e5',
borderRadius: '50%',
animation: 'spin 1s linear infinite',
}} />
<p style={{ marginTop: '16px', fontSize: '14px', opacity: 0.7 }}>Loading canvas...</p>
<style>{`
@keyframes spin {
to { transform: rotate(360deg); }
}
`}</style>
</div>
);
// Daily.co call object - initialized lazily when needed
let dailyCallObject: any = null;
const getDailyCallObject = async () => {
if (dailyCallObject) return dailyCallObject;
try {
// Only create call object if we're in a secure context and mediaDevices is available // Only create call object if we're in a secure context and mediaDevices is available
if (typeof window !== 'undefined' && if (typeof window !== 'undefined' &&
window.location.protocol === 'https:' && window.location.protocol === 'https:' &&
navigator.mediaDevices) { navigator.mediaDevices) {
const Daily = (await import('@daily-co/daily-js')).default; callObject = Daily.createCallObject();
dailyCallObject = Daily.createCallObject();
} }
} catch (error) { } catch (error) {
console.warn('Daily.co call object initialization failed:', error); console.warn('Daily.co call object initialization failed:', error);
} // Continue without video chat functionality
return dailyCallObject; }
};
/** /**
* Optional Auth Route component * Optional Auth Route component
@ -112,15 +68,13 @@ const OptionalAuthRoute = ({ children }: { children: React.ReactNode }) => {
}; };
/** /**
* Component to redirect /board/:slug URLs to clean /:slug/ URLs * Component to redirect board URLs without trailing slashes
* Used on staging to support both old and new URL patterns
*/ */
const RedirectBoardSlug = () => { const RedirectBoardSlug = () => {
const { slug } = useParams<{ slug: string }>(); const { slug } = useParams<{ slug: string }>();
return <Navigate to={`/${slug}/`} replace />; return <Navigate to={`/board/${slug}/`} replace />;
}; };
/** /**
* Main App with context providers * Main App with context providers
*/ */
@ -147,16 +101,13 @@ const AppWithProviders = () => {
return ( return (
<ErrorBoundary> <ErrorBoundary>
<AuthProvider> <AuthProvider>
<Web3Provider>
<FileSystemProvider> <FileSystemProvider>
<NotificationProvider> <NotificationProvider>
<Suspense fallback={<LoadingSpinner />}> <DailyProvider callObject={callObject}>
<DailyProvider callObject={null}>
<BrowserRouter> <BrowserRouter>
{/* Display notifications */} {/* Display notifications */}
<NotificationsDisplay /> <NotificationsDisplay />
<Suspense fallback={<LoadingSpinner />}>
<Routes> <Routes>
{/* Redirect routes without trailing slashes to include them */} {/* Redirect routes without trailing slashes to include them */}
<Route path="/login" element={<Navigate to="/login/" replace />} /> <Route path="/login" element={<Navigate to="/login/" replace />} />
@ -171,7 +122,7 @@ const AppWithProviders = () => {
{/* Auth routes */} {/* Auth routes */}
<Route path="/login/" element={<AuthPage />} /> <Route path="/login/" element={<AuthPage />} />
{/* Optional auth routes - all lazy loaded */} {/* Optional auth routes */}
<Route path="/" element={ <Route path="/" element={
<OptionalAuthRoute> <OptionalAuthRoute>
<Default /> <Default />
@ -182,7 +133,11 @@ const AppWithProviders = () => {
<Contact /> <Contact />
</OptionalAuthRoute> </OptionalAuthRoute>
} /> } />
<Route path="/board/:slug/" element={<RedirectBoardSlug />} /> <Route path="/board/:slug/" element={
<OptionalAuthRoute>
<Board />
</OptionalAuthRoute>
} />
<Route path="/inbox/" element={ <Route path="/inbox/" element={
<OptionalAuthRoute> <OptionalAuthRoute>
<Inbox /> <Inbox />
@ -208,31 +163,11 @@ const AppWithProviders = () => {
<Resilience /> <Resilience />
</OptionalAuthRoute> </OptionalAuthRoute>
} /> } />
{/* Google Data routes */}
<Route path="/google" element={<GoogleDataTest />} />
<Route path="/oauth/google/callback" element={<GoogleDataTest />} />
{/* Catch-all: Direct slug URLs serve board directly */}
{/* e.g., canvas.jeffemmett.com/ccc → shows board "ccc" */}
{/* Must be LAST to not interfere with other routes */}
<Route path="/:slug" element={
<OptionalAuthRoute>
<Board />
</OptionalAuthRoute>
} />
<Route path="/:slug/" element={
<OptionalAuthRoute>
<Board />
</OptionalAuthRoute>
} />
</Routes> </Routes>
</Suspense>
</BrowserRouter> </BrowserRouter>
</DailyProvider> </DailyProvider>
</Suspense>
</NotificationProvider> </NotificationProvider>
</FileSystemProvider> </FileSystemProvider>
</Web3Provider>
</AuthProvider> </AuthProvider>
</ErrorBoundary> </ErrorBoundary>
); );

View File

@ -300,9 +300,11 @@ export function applyAutomergePatchesToTLStore(
case "unmark": case "unmark":
case "conflict": { case "conflict": {
// These actions are not currently supported for TLDraw // These actions are not currently supported for TLDraw
console.log("Unsupported patch action:", patch.action)
break break
} }
default: { default: {
console.log("Unsupported patch:", patch)
} }
} }
@ -420,6 +422,7 @@ export function applyAutomergePatchesToTLStore(
// Filter out SharedPiano shapes since they're no longer supported // Filter out SharedPiano shapes since they're no longer supported
if (record.typeName === 'shape' && (record as any).type === 'SharedPiano') { if (record.typeName === 'shape' && (record as any).type === 'SharedPiano') {
console.log(`⚠️ Filtering out deprecated SharedPiano shape: ${record.id}`)
return // Skip - SharedPiano is deprecated return // Skip - SharedPiano is deprecated
} }
@ -441,6 +444,23 @@ export function applyAutomergePatchesToTLStore(
// put / remove the records in the store // put / remove the records in the store
// Log patch application for debugging // Log patch application for debugging
console.log(`🔧 AutomergeToTLStore: Applying ${patches.length} patches, ${toPut.length} records to put, ${toRemove.length} records to remove`)
// DEBUG: Log shape updates being applied to store
toPut.forEach(record => {
if (record.typeName === 'shape' && (record as any).props?.w) {
console.log(`🔧 AutomergeToTLStore: Putting shape ${(record as any).type} ${record.id}:`, {
w: (record as any).props.w,
h: (record as any).props.h,
x: (record as any).x,
y: (record as any).y
})
}
})
if (failedRecords.length > 0) {
console.log({ patches, toPut: toPut.length, failed: failedRecords.length })
}
if (failedRecords.length > 0) { if (failedRecords.length > 0) {
console.error("Failed to sanitize records:", failedRecords) console.error("Failed to sanitize records:", failedRecords)
@ -675,12 +695,14 @@ export function sanitizeRecord(record: any): TLRecord {
// Normalize the shape type if it's a custom type with incorrect case // Normalize the shape type if it's a custom type with incorrect case
if (sanitized.type && typeof sanitized.type === 'string' && customShapeTypeMap[sanitized.type]) { if (sanitized.type && typeof sanitized.type === 'string' && customShapeTypeMap[sanitized.type]) {
console.log(`🔧 Normalizing shape type: "${sanitized.type}" → "${customShapeTypeMap[sanitized.type]}"`)
sanitized.type = customShapeTypeMap[sanitized.type] sanitized.type = customShapeTypeMap[sanitized.type]
} }
// CRITICAL: Sanitize Multmux shapes AFTER case normalization - ensure all required props exist // CRITICAL: Sanitize Multmux shapes AFTER case normalization - ensure all required props exist
// Old shapes may have wsUrl (removed) or undefined values // Old shapes may have wsUrl (removed) or undefined values
if (sanitized.type === 'Multmux') { if (sanitized.type === 'Multmux') {
console.log(`🔧 Sanitizing Multmux shape ${sanitized.id}:`, JSON.stringify(sanitized.props))
// Remove deprecated wsUrl prop // Remove deprecated wsUrl prop
if ('wsUrl' in sanitized.props) { if ('wsUrl' in sanitized.props) {
delete sanitized.props.wsUrl delete sanitized.props.wsUrl
@ -740,78 +762,7 @@ export function sanitizeRecord(record: any): TLRecord {
} }
sanitized.props = cleanProps sanitized.props = cleanProps
} console.log(`🔧 Sanitized Multmux shape ${sanitized.id} props:`, JSON.stringify(sanitized.props))
// CRITICAL: Sanitize Map shapes - ensure all required props have defaults
// Old shapes may be missing pinnedToView, isMinimized, or other newer properties
if (sanitized.type === 'Map') {
// Ensure boolean props have proper defaults (old data may have undefined)
if (typeof sanitized.props.pinnedToView !== 'boolean') {
sanitized.props.pinnedToView = false
}
if (typeof sanitized.props.isMinimized !== 'boolean') {
sanitized.props.isMinimized = false
}
if (typeof sanitized.props.showSidebar !== 'boolean') {
sanitized.props.showSidebar = true
}
if (typeof sanitized.props.interactive !== 'boolean') {
sanitized.props.interactive = true
}
if (typeof sanitized.props.showGPS !== 'boolean') {
sanitized.props.showGPS = false
}
if (typeof sanitized.props.showSearch !== 'boolean') {
sanitized.props.showSearch = false
}
if (typeof sanitized.props.showDirections !== 'boolean') {
sanitized.props.showDirections = false
}
if (typeof sanitized.props.sharingLocation !== 'boolean') {
sanitized.props.sharingLocation = false
}
// Ensure array props exist
if (!Array.isArray(sanitized.props.annotations)) {
sanitized.props.annotations = []
}
if (!Array.isArray(sanitized.props.waypoints)) {
sanitized.props.waypoints = []
}
if (!Array.isArray(sanitized.props.collaborators)) {
sanitized.props.collaborators = []
}
if (!Array.isArray(sanitized.props.gpsUsers)) {
sanitized.props.gpsUsers = []
}
if (!Array.isArray(sanitized.props.tags)) {
sanitized.props.tags = ['map']
}
// Ensure string props exist
if (typeof sanitized.props.styleKey !== 'string') {
sanitized.props.styleKey = 'voyager'
}
if (typeof sanitized.props.title !== 'string') {
sanitized.props.title = 'Collaborative Map'
}
if (typeof sanitized.props.description !== 'string') {
sanitized.props.description = ''
}
// Ensure viewport exists with defaults
if (!sanitized.props.viewport || typeof sanitized.props.viewport !== 'object') {
sanitized.props.viewport = {
center: { lat: 40.7128, lng: -74.006 },
zoom: 12,
bearing: 0,
pitch: 0,
}
}
// Ensure numeric props
if (typeof sanitized.props.w !== 'number' || isNaN(sanitized.props.w)) {
sanitized.props.w = 800
}
if (typeof sanitized.props.h !== 'number' || isNaN(sanitized.props.h)) {
sanitized.props.h = 550
}
} }
// CRITICAL: Infer type from properties BEFORE defaulting to 'geo' // CRITICAL: Infer type from properties BEFORE defaulting to 'geo'
@ -1159,37 +1110,6 @@ export function sanitizeRecord(record: any): TLRecord {
// CRITICAL: Fix richText structure for text shapes - REQUIRED field // CRITICAL: Fix richText structure for text shapes - REQUIRED field
if (sanitized.type === 'text') { if (sanitized.type === 'text') {
// CRITICAL: Convert props.text to props.richText for text shapes (fixes sync issue)
// Text shapes may arrive from other clients with props.text instead of props.richText
// We must convert BEFORE initializing richText to empty, otherwise content is lost
if ('text' in sanitized.props && typeof sanitized.props.text === 'string' && sanitized.props.text.trim()) {
const textContent = sanitized.props.text
// Only use text content if richText is missing or empty
const hasRichTextContent = sanitized.props.richText &&
typeof sanitized.props.richText === 'object' &&
sanitized.props.richText.content &&
Array.isArray(sanitized.props.richText.content) &&
sanitized.props.richText.content.length > 0
if (!hasRichTextContent) {
// Convert text string to richText format for tldraw
sanitized.props.richText = {
type: 'doc',
content: [{
type: 'paragraph',
content: [{
type: 'text',
text: textContent
}]
}]
}
console.log(`🔧 AutomergeToTLStore: Converted props.text to richText for text shape ${sanitized.id}`)
}
// Preserve original text in meta for backward compatibility
if (!sanitized.meta) sanitized.meta = {}
sanitized.meta.text = textContent
}
// Text shapes MUST have props.richText as an object - initialize if missing // Text shapes MUST have props.richText as an object - initialize if missing
if (!sanitized.props.richText || typeof sanitized.props.richText !== 'object' || sanitized.props.richText === null) { if (!sanitized.props.richText || typeof sanitized.props.richText !== 'object' || sanitized.props.richText === null) {
sanitized.props.richText = { content: [], type: 'doc' } sanitized.props.richText = { content: [], type: 'doc' }

View File

@ -23,16 +23,20 @@ export class CloudflareAdapter {
async getHandle(roomId: string): Promise<DocHandle<TLStoreSnapshot>> { async getHandle(roomId: string): Promise<DocHandle<TLStoreSnapshot>> {
if (!this.handles.has(roomId)) { if (!this.handles.has(roomId)) {
console.log(`Creating new Automerge handle for room ${roomId}`)
const handle = this.repo.create<TLStoreSnapshot>() const handle = this.repo.create<TLStoreSnapshot>()
// Initialize with default store if this is a new document // Initialize with default store if this is a new document
handle.change((doc) => { handle.change((doc) => {
if (!doc.store) { if (!doc.store) {
console.log("Initializing new document with default store")
init(doc) init(doc)
} }
}) })
this.handles.set(roomId, handle) this.handles.set(roomId, handle)
} else {
console.log(`Reusing existing Automerge handle for room ${roomId}`)
} }
return this.handles.get(roomId)! return this.handles.get(roomId)!
@ -68,11 +72,13 @@ export class CloudflareAdapter {
async saveToCloudflare(roomId: string): Promise<void> { async saveToCloudflare(roomId: string): Promise<void> {
const handle = this.handles.get(roomId) const handle = this.handles.get(roomId)
if (!handle) { if (!handle) {
console.log(`No handle found for room ${roomId}`)
return return
} }
const doc = handle.doc() const doc = handle.doc()
if (!doc) { if (!doc) {
console.log(`No document found for room ${roomId}`)
return return
} }
@ -108,6 +114,7 @@ export class CloudflareAdapter {
async loadFromCloudflare(roomId: string): Promise<TLStoreSnapshot | null> { async loadFromCloudflare(roomId: string): Promise<TLStoreSnapshot | null> {
try { try {
// Add retry logic for connection issues // Add retry logic for connection issues
let response: Response; let response: Response;
let retries = 3; let retries = 3;
@ -134,6 +141,11 @@ export class CloudflareAdapter {
} }
const doc = await response!.json() as TLStoreSnapshot const doc = await response!.json() as TLStoreSnapshot
console.log(`Successfully loaded document from Cloudflare for room ${roomId}:`, {
hasStore: !!doc.store,
storeKeys: doc.store ? Object.keys(doc.store).length : 0
})
// Initialize the last persisted state with the loaded document // Initialize the last persisted state with the loaded document
if (doc) { if (doc) {
@ -149,17 +161,12 @@ export class CloudflareAdapter {
} }
} }
export type ConnectionState = 'disconnected' | 'connecting' | 'connected' | 'reconnecting'
export class CloudflareNetworkAdapter extends NetworkAdapter { export class CloudflareNetworkAdapter extends NetworkAdapter {
private workerUrl: string private workerUrl: string
private websocket: WebSocket | null = null private websocket: WebSocket | null = null
private roomId: string | null = null private roomId: string | null = null
public peerId: PeerId | undefined = undefined public peerId: PeerId | undefined = undefined
public sessionId: string | null = null // Track our session ID public sessionId: string | null = null // Track our session ID
private serverPeerId: PeerId | null = null // The server's peer ID for Automerge sync
private currentDocumentId: string | null = null // Track the current document ID for sync messages
private pendingBinaryMessages: Uint8Array[] = [] // Buffer for binary messages received before documentId is set
private readyPromise: Promise<void> private readyPromise: Promise<void>
private readyResolve: (() => void) | null = null private readyResolve: (() => void) | null = null
private keepAliveInterval: NodeJS.Timeout | null = null private keepAliveInterval: NodeJS.Timeout | null = null
@ -170,78 +177,21 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
private isConnecting: boolean = false private isConnecting: boolean = false
private onJsonSyncData?: (data: any) => void private onJsonSyncData?: (data: any) => void
private onPresenceUpdate?: (userId: string, data: any, senderId?: string, userName?: string, userColor?: string) => void private onPresenceUpdate?: (userId: string, data: any, senderId?: string, userName?: string, userColor?: string) => void
private onPresenceLeave?: (sessionId: string) => void
// Binary sync mode - when true, uses native Automerge sync protocol
private useBinarySync: boolean = true
// Connection state tracking
private _connectionState: ConnectionState = 'disconnected'
private connectionStateListeners: Set<(state: ConnectionState) => void> = new Set()
private _isNetworkOnline: boolean = typeof navigator !== 'undefined' ? navigator.onLine : true
get connectionState(): ConnectionState {
return this._connectionState
}
get isNetworkOnline(): boolean {
return this._isNetworkOnline
}
private setConnectionState(state: ConnectionState): void {
if (this._connectionState !== state) {
this._connectionState = state
this.connectionStateListeners.forEach(listener => listener(state))
}
}
onConnectionStateChange(listener: (state: ConnectionState) => void): () => void {
this.connectionStateListeners.add(listener)
// Immediately call with current state
listener(this._connectionState)
return () => this.connectionStateListeners.delete(listener)
}
private networkOnlineHandler: () => void
private networkOfflineHandler: () => void
constructor( constructor(
workerUrl: string, workerUrl: string,
roomId?: string, roomId?: string,
onJsonSyncData?: (data: any) => void, onJsonSyncData?: (data: any) => void,
onPresenceUpdate?: (userId: string, data: any, senderId?: string, userName?: string, userColor?: string) => void, onPresenceUpdate?: (userId: string, data: any, senderId?: string, userName?: string, userColor?: string) => void
onPresenceLeave?: (sessionId: string) => void
) { ) {
super() super()
this.workerUrl = workerUrl this.workerUrl = workerUrl
this.roomId = roomId || 'default-room' this.roomId = roomId || 'default-room'
this.onJsonSyncData = onJsonSyncData this.onJsonSyncData = onJsonSyncData
this.onPresenceUpdate = onPresenceUpdate this.onPresenceUpdate = onPresenceUpdate
this.onPresenceLeave = onPresenceLeave
this.readyPromise = new Promise((resolve) => { this.readyPromise = new Promise((resolve) => {
this.readyResolve = resolve this.readyResolve = resolve
}) })
// Set up network online/offline listeners
this.networkOnlineHandler = () => {
this._isNetworkOnline = true
// Trigger reconnect if we were disconnected
if (this._connectionState === 'disconnected' && this.peerId) {
this.setConnectionState('reconnecting')
this.connect(this.peerId)
}
}
this.networkOfflineHandler = () => {
this._isNetworkOnline = false
if (this._connectionState === 'connected') {
this.setConnectionState('disconnected')
}
}
if (typeof window !== 'undefined') {
window.addEventListener('online', this.networkOnlineHandler)
window.addEventListener('offline', this.networkOfflineHandler)
}
} }
isReady(): boolean { isReady(): boolean {
@ -252,62 +202,15 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
return this.readyPromise return this.readyPromise
} }
/**
* Set the document ID for this adapter
* This is needed because the server may send sync messages before we've sent any
* @param documentId The Automerge document ID to use for incoming messages
*/
setDocumentId(documentId: string): void {
const previousDocId = this.currentDocumentId
this.currentDocumentId = documentId
// Process any buffered binary messages now that we have a documentId
if (this.pendingBinaryMessages.length > 0) {
const bufferedMessages = this.pendingBinaryMessages
this.pendingBinaryMessages = []
for (const binaryData of bufferedMessages) {
const message: Message = {
type: 'sync',
data: binaryData,
senderId: this.serverPeerId || ('server' as PeerId),
targetId: this.peerId || ('unknown' as PeerId),
documentId: this.currentDocumentId as any
}
this.emit('message', message)
}
}
// CRITICAL: Re-emit peer-candidate now that we have a documentId
// This triggers the Repo to sync this document with the server peer
// Without this, the Repo may have connected before the document was created
// and won't know to sync the document with the peer
if (this.serverPeerId && this.websocket?.readyState === WebSocket.OPEN && !previousDocId) {
this.emit('peer-candidate', {
peerId: this.serverPeerId,
peerMetadata: { storageId: undefined, isEphemeral: false }
})
}
}
/**
* Get the current document ID
*/
getDocumentId(): string | null {
return this.currentDocumentId
}
connect(peerId: PeerId, peerMetadata?: PeerMetadata): void { connect(peerId: PeerId, peerMetadata?: PeerMetadata): void {
if (this.isConnecting) { if (this.isConnecting) {
console.log('🔌 CloudflareAdapter: Connection already in progress, skipping')
return return
} }
// Store peerId // Store peerId
this.peerId = peerId this.peerId = peerId
// Set connection state
this.setConnectionState(this.reconnectAttempts > 0 ? 'reconnecting' : 'connecting')
// Clean up existing connection // Clean up existing connection
this.cleanup() this.cleanup()
@ -326,26 +229,15 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
// Add a small delay to ensure the server is ready // Add a small delay to ensure the server is ready
setTimeout(() => { setTimeout(() => {
try { try {
console.log('🔌 CloudflareAdapter: Creating WebSocket connection to:', wsUrl)
this.websocket = new WebSocket(wsUrl) this.websocket = new WebSocket(wsUrl)
this.websocket.onopen = () => { this.websocket.onopen = () => {
console.log('🔌 CloudflareAdapter: WebSocket connection opened successfully')
this.isConnecting = false this.isConnecting = false
this.reconnectAttempts = 0 this.reconnectAttempts = 0
this.setConnectionState('connected')
this.readyResolve?.() this.readyResolve?.()
this.startKeepAlive() this.startKeepAlive()
// Emit 'ready' event for Automerge Repo
;(this as any).emit('ready', { network: this })
// Create a server peer ID based on the room
this.serverPeerId = `server-${this.roomId}` as PeerId
// Emit 'peer-candidate' to announce the server as a sync peer
this.emit('peer-candidate', {
peerId: this.serverPeerId,
peerMetadata: { storageId: undefined, isEphemeral: false }
})
} }
this.websocket.onmessage = (event) => { this.websocket.onmessage = (event) => {
@ -353,32 +245,25 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
// Automerge's native protocol uses binary messages // Automerge's native protocol uses binary messages
// We need to handle both binary and text messages // We need to handle both binary and text messages
if (event.data instanceof ArrayBuffer) { if (event.data instanceof ArrayBuffer) {
const binaryData = new Uint8Array(event.data) console.log('🔌 CloudflareAdapter: Received binary message (Automerge protocol)')
if (!this.currentDocumentId) { // Handle binary Automerge sync messages - convert ArrayBuffer to Uint8Array
this.pendingBinaryMessages.push(binaryData) // Automerge Repo expects binary sync messages as Uint8Array
return
}
const message: Message = { const message: Message = {
type: 'sync', type: 'sync',
data: binaryData, data: new Uint8Array(event.data),
senderId: this.serverPeerId || ('server' as PeerId), senderId: this.peerId || ('unknown' as PeerId),
targetId: this.peerId || ('unknown' as PeerId), targetId: this.peerId || ('unknown' as PeerId)
documentId: this.currentDocumentId as any
} }
this.emit('message', message) this.emit('message', message)
} else if (event.data instanceof Blob) { } else if (event.data instanceof Blob) {
// Handle Blob messages (convert to Uint8Array)
event.data.arrayBuffer().then((buffer) => { event.data.arrayBuffer().then((buffer) => {
const binaryData = new Uint8Array(buffer) console.log('🔌 CloudflareAdapter: Received Blob message, converted to Uint8Array')
if (!this.currentDocumentId) {
this.pendingBinaryMessages.push(binaryData)
return
}
const message: Message = { const message: Message = {
type: 'sync', type: 'sync',
data: binaryData, data: new Uint8Array(buffer),
senderId: this.serverPeerId || ('server' as PeerId), senderId: this.peerId || ('unknown' as PeerId),
targetId: this.peerId || ('unknown' as PeerId), targetId: this.peerId || ('unknown' as PeerId)
documentId: this.currentDocumentId as any
} }
this.emit('message', message) this.emit('message', message)
}) })
@ -386,6 +271,11 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
// Handle text messages (our custom protocol for backward compatibility) // Handle text messages (our custom protocol for backward compatibility)
const message = JSON.parse(event.data) const message = JSON.parse(event.data)
// Only log non-presence messages to reduce console spam
if (message.type !== 'presence' && message.type !== 'pong') {
console.log('🔌 CloudflareAdapter: Received WebSocket message:', message.type)
}
// Handle ping/pong messages for keep-alive // Handle ping/pong messages for keep-alive
if (message.type === 'ping') { if (message.type === 'ping') {
this.sendPong() this.sendPong()
@ -394,44 +284,55 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
// Handle test messages // Handle test messages
if (message.type === 'test') { if (message.type === 'test') {
console.log('🔌 CloudflareAdapter: Received test message:', message.message)
return return
} }
// Handle presence updates from other clients // Handle presence updates from other clients
if (message.type === 'presence') { if (message.type === 'presence') {
// Pass senderId, userName, and userColor so we can create proper instance_presence records
if (this.onPresenceUpdate && message.userId && message.data) { if (this.onPresenceUpdate && message.userId && message.data) {
this.onPresenceUpdate(message.userId, message.data, message.senderId, message.userName, message.userColor) this.onPresenceUpdate(message.userId, message.data, message.senderId, message.userName, message.userColor)
} }
return return
} }
// Handle leave messages (user disconnected)
if (message.type === 'leave') {
if (this.onPresenceLeave && message.sessionId) {
this.onPresenceLeave(message.sessionId)
}
return
}
// Convert the message to the format expected by Automerge // Convert the message to the format expected by Automerge
if (message.type === 'sync' && message.data) { if (message.type === 'sync' && message.data) {
console.log('🔌 CloudflareAdapter: Received sync message with data:', {
hasStore: !!message.data.store,
storeKeys: message.data.store ? Object.keys(message.data.store).length : 0,
documentId: message.documentId,
documentIdType: typeof message.documentId
})
// JSON sync for real-time collaboration // JSON sync for real-time collaboration
// When we receive TLDraw changes from other clients, apply them locally
const isJsonDocumentData = message.data && typeof message.data === 'object' && message.data.store const isJsonDocumentData = message.data && typeof message.data === 'object' && message.data.store
if (isJsonDocumentData) { if (isJsonDocumentData) {
console.log('📥 CloudflareAdapter: Received JSON sync message with store data')
// Call the JSON sync callback to apply changes
if (this.onJsonSyncData) { if (this.onJsonSyncData) {
this.onJsonSyncData(message.data) this.onJsonSyncData(message.data)
} else {
console.warn('⚠️ No JSON sync callback registered')
} }
return return // JSON sync handled
} }
// Validate documentId format // Validate documentId - Automerge requires a valid Automerge URL format
// Valid formats: "automerge:xxxxx" or other valid URL formats
// Invalid: plain strings like "default", "default-room", etc.
const isValidDocumentId = message.documentId && const isValidDocumentId = message.documentId &&
(typeof message.documentId === 'string' && (typeof message.documentId === 'string' &&
(message.documentId.startsWith('automerge:') || (message.documentId.startsWith('automerge:') ||
message.documentId.includes(':') || message.documentId.includes(':') ||
/^[a-f0-9-]{36,}$/i.test(message.documentId))) /^[a-f0-9-]{36,}$/i.test(message.documentId))) // UUID-like format
// For binary sync messages, use Automerge's sync protocol
// Only include documentId if it's a valid Automerge document ID format
const syncMessage: Message = { const syncMessage: Message = {
type: 'sync', type: 'sync',
senderId: message.senderId || this.peerId || ('unknown' as PeerId), senderId: message.senderId || this.peerId || ('unknown' as PeerId),
@ -440,39 +341,59 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
...(isValidDocumentId && { documentId: message.documentId }) ...(isValidDocumentId && { documentId: message.documentId })
} }
if (message.documentId && !isValidDocumentId) {
console.warn('⚠️ CloudflareAdapter: Ignoring invalid documentId from server:', message.documentId)
}
this.emit('message', syncMessage) this.emit('message', syncMessage)
} else if (message.senderId && message.targetId) { } else if (message.senderId && message.targetId) {
this.emit('message', message as Message) this.emit('message', message as Message)
} }
} }
} catch (error) { } catch (error) {
console.error('Error parsing WebSocket message:', error) console.error('❌ CloudflareAdapter: Error parsing WebSocket message:', error)
} }
} }
this.websocket.onclose = (event) => { this.websocket.onclose = (event) => {
console.log('Disconnected from Cloudflare WebSocket', {
code: event.code,
reason: event.reason,
wasClean: event.wasClean,
url: wsUrl,
reconnectAttempts: this.reconnectAttempts
})
this.isConnecting = false this.isConnecting = false
this.stopKeepAlive() this.stopKeepAlive()
if (event.code === 1000) { // Log specific error codes for debugging
this.setConnectionState('disconnected') if (event.code === 1005) {
console.error('❌ WebSocket closed with code 1005 (No Status Received) - this usually indicates a connection issue or idle timeout')
} else if (event.code === 1006) {
console.error('❌ WebSocket closed with code 1006 (Abnormal Closure) - connection was lost unexpectedly')
} else if (event.code === 1011) {
console.error('❌ WebSocket closed with code 1011 (Server Error) - server encountered an error')
} else if (event.code === 1000) {
console.log('✅ WebSocket closed normally (code 1000)')
return // Don't reconnect on normal closure return // Don't reconnect on normal closure
} }
// Set state based on whether we'll try to reconnect
if (this.reconnectAttempts < this.maxReconnectAttempts && this._isNetworkOnline) {
this.setConnectionState('reconnecting')
} else {
this.setConnectionState('disconnected')
}
this.emit('close') this.emit('close')
// Attempt to reconnect with exponential backoff // Attempt to reconnect with exponential backoff
this.scheduleReconnect(peerId, peerMetadata) this.scheduleReconnect(peerId, peerMetadata)
} }
this.websocket.onerror = () => { this.websocket.onerror = (error) => {
console.error('WebSocket error:', error)
console.error('WebSocket readyState:', this.websocket?.readyState)
console.error('WebSocket URL:', wsUrl)
console.error('Error event details:', {
type: error.type,
target: error.target,
isTrusted: error.isTrusted
})
this.isConnecting = false this.isConnecting = false
} }
} catch (error) { } catch (error) {
@ -484,25 +405,62 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
} }
send(message: Message): void { send(message: Message): void {
// Capture documentId from outgoing sync messages // Only log non-presence messages to reduce console spam
if (message.type === 'sync' && (message as any).documentId) { if (message.type !== 'presence') {
const docId = (message as any).documentId console.log('📤 CloudflareAdapter.send() called:', {
if (this.currentDocumentId !== docId) { messageType: message.type,
this.currentDocumentId = docId dataType: (message as any).data?.constructor?.name || typeof (message as any).data,
} dataLength: (message as any).data?.byteLength || (message as any).data?.length,
documentId: (message as any).documentId,
hasTargetId: !!message.targetId,
hasSenderId: !!message.senderId
})
} }
if (this.websocket && this.websocket.readyState === WebSocket.OPEN) { if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
// Check if this is a binary sync message from Automerge Repo // Check if this is a binary sync message from Automerge Repo
if (message.type === 'sync' && (message as any).data instanceof ArrayBuffer) { if (message.type === 'sync' && (message as any).data instanceof ArrayBuffer) {
console.log('📤 CloudflareAdapter: Sending binary sync message (Automerge protocol)', {
dataLength: (message as any).data.byteLength,
documentId: (message as any).documentId,
targetId: message.targetId
})
// Send binary data directly for Automerge's native sync protocol
this.websocket.send((message as any).data) this.websocket.send((message as any).data)
return
} else if (message.type === 'sync' && (message as any).data instanceof Uint8Array) { } else if (message.type === 'sync' && (message as any).data instanceof Uint8Array) {
this.websocket.send((message as any).data) console.log('📤 CloudflareAdapter: Sending Uint8Array sync message (Automerge protocol)', {
return dataLength: (message as any).data.length,
documentId: (message as any).documentId,
targetId: message.targetId
})
// Convert Uint8Array to ArrayBuffer and send
this.websocket.send((message as any).data.buffer)
} else { } else {
// Handle text-based messages (backward compatibility and control messages)
// Only log non-presence messages
if (message.type !== 'presence') {
console.log('📤 Sending WebSocket message:', message.type)
}
// Debug: Log patch content if it's a patch message
if (message.type === 'patch' && (message as any).patches) {
console.log('🔍 Sending patches:', (message as any).patches.length, 'patches')
;(message as any).patches.forEach((patch: any, index: number) => {
console.log(` Patch ${index}:`, {
action: patch.action,
path: patch.path,
value: patch.value ? (typeof patch.value === 'object' ? 'object' : patch.value) : 'undefined'
})
})
}
this.websocket.send(JSON.stringify(message)) this.websocket.send(JSON.stringify(message))
} }
} else {
if (message.type !== 'presence') {
console.warn('⚠️ CloudflareAdapter: Cannot send message - WebSocket not open', {
messageType: message.type,
readyState: this.websocket?.readyState
})
}
} }
} }
@ -515,15 +473,6 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
disconnect(): void { disconnect(): void {
this.cleanup() this.cleanup()
this.roomId = null this.roomId = null
this.setConnectionState('disconnected')
// Clean up network listeners
if (typeof window !== 'undefined') {
window.removeEventListener('online', this.networkOnlineHandler)
window.removeEventListener('offline', this.networkOfflineHandler)
}
this.connectionStateListeners.clear()
this.emit('close') this.emit('close')
} }
@ -532,17 +481,6 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
this.clearReconnectTimeout() this.clearReconnectTimeout()
if (this.websocket) { if (this.websocket) {
// Send leave message before closing to notify other clients
if (this.websocket.readyState === WebSocket.OPEN && this.sessionId) {
try {
this.websocket.send(JSON.stringify({
type: 'leave',
sessionId: this.sessionId
}))
} catch (e) {
// Ignore errors when sending leave message
}
}
this.websocket.close(1000, 'Client disconnecting') this.websocket.close(1000, 'Client disconnecting')
this.websocket = null this.websocket = null
} }
@ -552,12 +490,13 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
// Send ping every 30 seconds to prevent idle timeout // Send ping every 30 seconds to prevent idle timeout
this.keepAliveInterval = setInterval(() => { this.keepAliveInterval = setInterval(() => {
if (this.websocket && this.websocket.readyState === WebSocket.OPEN) { if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
console.log('🔌 CloudflareAdapter: Sending keep-alive ping')
this.websocket.send(JSON.stringify({ this.websocket.send(JSON.stringify({
type: 'ping', type: 'ping',
timestamp: Date.now() timestamp: Date.now()
})) }))
} }
}, 30000) }, 30000) // 30 seconds
} }
private stopKeepAlive(): void { private stopKeepAlive(): void {
@ -578,14 +517,18 @@ export class CloudflareNetworkAdapter extends NetworkAdapter {
private scheduleReconnect(peerId: PeerId, peerMetadata?: PeerMetadata): void { private scheduleReconnect(peerId: PeerId, peerMetadata?: PeerMetadata): void {
if (this.reconnectAttempts >= this.maxReconnectAttempts) { if (this.reconnectAttempts >= this.maxReconnectAttempts) {
console.error('❌ CloudflareAdapter: Max reconnection attempts reached, giving up')
return return
} }
this.reconnectAttempts++ this.reconnectAttempts++
const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts - 1), 30000) const delay = Math.min(this.reconnectDelay * Math.pow(2, this.reconnectAttempts - 1), 30000) // Max 30 seconds
console.log(`🔄 CloudflareAdapter: Scheduling reconnect attempt ${this.reconnectAttempts}/${this.maxReconnectAttempts} in ${delay}ms`)
this.reconnectTimeout = setTimeout(() => { this.reconnectTimeout = setTimeout(() => {
if (this.roomId) { if (this.roomId) {
console.log(`🔄 CloudflareAdapter: Attempting reconnect ${this.reconnectAttempts}/${this.maxReconnectAttempts}`)
this.connect(peerId, peerMetadata) this.connect(peerId, peerMetadata)
} }
}, delay) }, delay)

View File

@ -316,19 +316,6 @@ function sanitizeRecord(record: TLRecord): TLRecord {
} }
} }
// CRITICAL: For text shapes, preserve richText property (required for text shapes)
// Text shapes store their content in props.richText, not props.text
if (sanitized.type === 'text') {
// CRITICAL: Use the extracted richText value if available, otherwise create default
if (richTextValue !== undefined) {
// Clean NaN values to prevent SVG export errors
(sanitized.props as any).richText = cleanRichTextNaN(richTextValue)
} else {
// Text shapes require richText - create default if missing
(sanitized.props as any).richText = { content: [], type: 'doc' }
}
}
// CRITICAL: For ObsNote shapes, ensure all props are preserved (title, content, tags, etc.) // CRITICAL: For ObsNote shapes, ensure all props are preserved (title, content, tags, etc.)
if (sanitized.type === 'ObsNote') { if (sanitized.type === 'ObsNote') {
// Props are already a mutable copy from above, so all properties are preserved // Props are already a mutable copy from above, so all properties are preserved
@ -462,6 +449,49 @@ export function applyTLStoreChangesToAutomerge(
originalX = (record as any).x originalX = (record as any).x
originalY = (record as any).y originalY = (record as any).y
} }
// DEBUG: Log richText, meta.text, and Obsidian note properties before sanitization
if (record.typeName === 'shape') {
if (record.type === 'geo' && (record.props as any)?.richText) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${record.id} has richText before sanitization:`, {
hasRichText: !!(record.props as any).richText,
richTextType: typeof (record.props as any).richText,
richTextContent: Array.isArray((record.props as any).richText) ? 'array' : (record.props as any).richText?.content ? 'object with content' : 'object without content'
})
}
if (record.type === 'geo' && (record.meta as any)?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${record.id} has meta.text before sanitization:`, {
hasMetaText: !!(record.meta as any).text,
metaTextValue: (record.meta as any).text,
metaTextType: typeof (record.meta as any).text
})
}
if (record.type === 'note' && (record.props as any)?.richText) {
console.log(`🔍 TLStoreToAutomerge: Note shape ${record.id} has richText before sanitization:`, {
hasRichText: !!(record.props as any).richText,
richTextType: typeof (record.props as any).richText,
richTextContent: Array.isArray((record.props as any).richText) ? 'array' : (record.props as any).richText?.content ? 'object with content' : 'object without content',
richTextContentLength: Array.isArray((record.props as any).richText?.content) ? (record.props as any).richText.content.length : 'not array'
})
}
if (record.type === 'arrow' && (record.props as any)?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Arrow shape ${record.id} has text before sanitization:`, {
hasText: !!(record.props as any).text,
textValue: (record.props as any).text,
textType: typeof (record.props as any).text
})
}
if (record.type === 'ObsNote') {
console.log(`🔍 TLStoreToAutomerge: ObsNote shape ${record.id} before sanitization:`, {
hasTitle: !!(record.props as any).title,
hasContent: !!(record.props as any).content,
hasTags: Array.isArray((record.props as any).tags),
title: (record.props as any).title,
contentLength: (record.props as any).content?.length || 0,
tagsCount: Array.isArray((record.props as any).tags) ? (record.props as any).tags.length : 0
})
}
}
const sanitizedRecord = sanitizeRecord(record) const sanitizedRecord = sanitizeRecord(record)
// CRITICAL: Restore original coordinates if they were valid // CRITICAL: Restore original coordinates if they were valid
@ -475,11 +505,99 @@ export function applyTLStoreChangesToAutomerge(
} }
} }
// DEBUG: Log richText, meta.text, and Obsidian note properties after sanitization
if (sanitizedRecord.typeName === 'shape') {
if (sanitizedRecord.type === 'geo' && (sanitizedRecord.props as any)?.richText) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${sanitizedRecord.id} has richText after sanitization:`, {
hasRichText: !!(sanitizedRecord.props as any).richText,
richTextType: typeof (sanitizedRecord.props as any).richText,
richTextContent: Array.isArray((sanitizedRecord.props as any).richText) ? 'array' : (sanitizedRecord.props as any).richText?.content ? 'object with content' : 'object without content'
})
}
if (sanitizedRecord.type === 'geo' && (sanitizedRecord.meta as any)?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${sanitizedRecord.id} has meta.text after sanitization:`, {
hasMetaText: !!(sanitizedRecord.meta as any).text,
metaTextValue: (sanitizedRecord.meta as any).text,
metaTextType: typeof (sanitizedRecord.meta as any).text
})
}
if (sanitizedRecord.type === 'note' && (sanitizedRecord.props as any)?.richText) {
console.log(`🔍 TLStoreToAutomerge: Note shape ${sanitizedRecord.id} has richText after sanitization:`, {
hasRichText: !!(sanitizedRecord.props as any).richText,
richTextType: typeof (sanitizedRecord.props as any).richText,
richTextContent: Array.isArray((sanitizedRecord.props as any).richText) ? 'array' : (sanitizedRecord.props as any).richText?.content ? 'object with content' : 'object without content',
richTextContentLength: Array.isArray((sanitizedRecord.props as any).richText?.content) ? (sanitizedRecord.props as any).richText.content.length : 'not array'
})
}
if (sanitizedRecord.type === 'arrow' && (sanitizedRecord.props as any)?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Arrow shape ${sanitizedRecord.id} has text after sanitization:`, {
hasText: !!(sanitizedRecord.props as any).text,
textValue: (sanitizedRecord.props as any).text,
textType: typeof (sanitizedRecord.props as any).text
})
}
if (sanitizedRecord.type === 'ObsNote') {
console.log(`🔍 TLStoreToAutomerge: ObsNote shape ${sanitizedRecord.id} after sanitization:`, {
hasTitle: !!(sanitizedRecord.props as any).title,
hasContent: !!(sanitizedRecord.props as any).content,
hasTags: Array.isArray((sanitizedRecord.props as any).tags),
title: (sanitizedRecord.props as any).title,
contentLength: (sanitizedRecord.props as any).content?.length || 0,
tagsCount: Array.isArray((sanitizedRecord.props as any).tags) ? (sanitizedRecord.props as any).tags.length : 0
})
}
}
// CRITICAL: Create a deep copy to ensure all properties (including richText and text) are preserved // CRITICAL: Create a deep copy to ensure all properties (including richText and text) are preserved
// This prevents Automerge from treating the object as read-only // This prevents Automerge from treating the object as read-only
// Note: sanitizedRecord.props is already a deep copy from sanitizeRecord, but we need to deep copy the entire record // Note: sanitizedRecord.props is already a deep copy from sanitizeRecord, but we need to deep copy the entire record
const recordToSave = JSON.parse(JSON.stringify(sanitizedRecord)) const recordToSave = JSON.parse(JSON.stringify(sanitizedRecord))
// DEBUG: Log richText, meta.text, and Obsidian note properties after deep copy
if (recordToSave.typeName === 'shape') {
if (recordToSave.type === 'geo' && recordToSave.props?.richText) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${recordToSave.id} has richText after deep copy:`, {
hasRichText: !!recordToSave.props.richText,
richTextType: typeof recordToSave.props.richText,
richTextContent: Array.isArray(recordToSave.props.richText) ? 'array' : recordToSave.props.richText?.content ? 'object with content' : 'object without content',
richTextContentLength: Array.isArray(recordToSave.props.richText?.content) ? recordToSave.props.richText.content.length : 'not array'
})
}
if (recordToSave.type === 'geo' && recordToSave.meta?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Geo shape ${recordToSave.id} has meta.text after deep copy:`, {
hasMetaText: !!recordToSave.meta.text,
metaTextValue: recordToSave.meta.text,
metaTextType: typeof recordToSave.meta.text
})
}
if (recordToSave.type === 'note' && recordToSave.props?.richText) {
console.log(`🔍 TLStoreToAutomerge: Note shape ${recordToSave.id} has richText after deep copy:`, {
hasRichText: !!recordToSave.props.richText,
richTextType: typeof recordToSave.props.richText,
richTextContent: Array.isArray(recordToSave.props.richText) ? 'array' : recordToSave.props.richText?.content ? 'object with content' : 'object without content',
richTextContentLength: Array.isArray(recordToSave.props.richText?.content) ? recordToSave.props.richText.content.length : 'not array'
})
}
if (recordToSave.type === 'arrow' && recordToSave.props?.text !== undefined) {
console.log(`🔍 TLStoreToAutomerge: Arrow shape ${recordToSave.id} has text after deep copy:`, {
hasText: !!recordToSave.props.text,
textValue: recordToSave.props.text,
textType: typeof recordToSave.props.text
})
}
if (recordToSave.type === 'ObsNote') {
console.log(`🔍 TLStoreToAutomerge: ObsNote shape ${recordToSave.id} after deep copy:`, {
hasTitle: !!recordToSave.props.title,
hasContent: !!recordToSave.props.content,
hasTags: Array.isArray(recordToSave.props.tags),
title: recordToSave.props.title,
contentLength: recordToSave.props.content?.length || 0,
tagsCount: Array.isArray(recordToSave.props.tags) ? recordToSave.props.tags.length : 0,
allPropsKeys: Object.keys(recordToSave.props || {})
})
}
}
// Replace the entire record - Automerge will handle merging with concurrent changes // Replace the entire record - Automerge will handle merging with concurrent changes
doc.store[record.id] = recordToSave doc.store[record.id] = recordToSave
}) })

View File

@ -115,6 +115,7 @@ export async function saveDocumentId(roomId: string, documentId: string): Promis
} }
request.onsuccess = () => { request.onsuccess = () => {
console.log(`Saved document mapping: ${roomId} -> ${documentId}`)
resolve() resolve()
} }
}) })
@ -170,6 +171,7 @@ export async function deleteDocumentMapping(roomId: string): Promise<void> {
} }
request.onsuccess = () => { request.onsuccess = () => {
console.log(`Deleted document mapping for: ${roomId}`)
resolve() resolve()
} }
}) })
@ -236,6 +238,7 @@ export async function cleanupOldMappings(maxAgeDays: number = 30): Promise<numbe
deletedCount++ deletedCount++
cursor.continue() cursor.continue()
} else { } else {
console.log(`Cleaned up ${deletedCount} old document mappings`)
resolve(deletedCount) resolve(deletedCount)
} }
} }

View File

@ -17,46 +17,6 @@ import throttle from "lodash.throttle"
import { applyAutomergePatchesToTLStore, sanitizeRecord } from "./AutomergeToTLStore.js" import { applyAutomergePatchesToTLStore, sanitizeRecord } from "./AutomergeToTLStore.js"
import { applyTLStoreChangesToAutomerge } from "./TLStoreToAutomerge.js" import { applyTLStoreChangesToAutomerge } from "./TLStoreToAutomerge.js"
// Default tldraw shape types (built into the library)
const DEFAULT_SHAPE_TYPES = [
'arrow', 'bookmark', 'draw', 'embed', 'frame', 'geo', 'group',
'highlight', 'image', 'line', 'note', 'text', 'video'
]
// Custom shape types registered in this application
// IMPORTANT: Keep this in sync with shapeUtils array inside useAutomergeSync
const CUSTOM_SHAPE_TYPES = [
'ChatBox',
'VideoChat',
'Embed',
'Markdown',
'MycrozineTemplate',
'MycroZineGenerator',
'Slide',
'Prompt',
'Transcription',
'ObsNote',
'FathomNote',
'Holon',
'ObsidianBrowser',
'FathomMeetingsBrowser',
'ImageGen',
'VideoGen',
'Multmux',
'MycelialIntelligence', // AI-powered collaborative intelligence shape
'Map', // Open Mapping - OSM map shape
'Calendar', // Calendar with view switching
'CalendarEvent', // Calendar individual events
'Drawfast', // Drawfast quick sketching
'HolonBrowser', // Holon browser
'PrivateWorkspace', // Private workspace for Google Export
'GoogleItem', // Individual Google items
'WorkflowBlock', // Workflow builder blocks
]
// Combined set of all known shape types for validation
const KNOWN_SHAPE_TYPES = new Set([...DEFAULT_SHAPE_TYPES, ...CUSTOM_SHAPE_TYPES])
// Helper function to safely extract plain objects from Automerge proxies // Helper function to safely extract plain objects from Automerge proxies
// This handles cases where JSON.stringify fails due to functions or getters // This handles cases where JSON.stringify fails due to functions or getters
function safeExtractPlainObject(obj: any, visited = new WeakSet()): any { function safeExtractPlainObject(obj: any, visited = new WeakSet()): any {
@ -156,7 +116,6 @@ import { VideoChatShape } from "@/shapes/VideoChatShapeUtil"
import { EmbedShape } from "@/shapes/EmbedShapeUtil" import { EmbedShape } from "@/shapes/EmbedShapeUtil"
import { MarkdownShape } from "@/shapes/MarkdownShapeUtil" import { MarkdownShape } from "@/shapes/MarkdownShapeUtil"
import { MycrozineTemplateShape } from "@/shapes/MycrozineTemplateShapeUtil" import { MycrozineTemplateShape } from "@/shapes/MycrozineTemplateShapeUtil"
import { MycroZineGeneratorShape } from "@/shapes/MycroZineGeneratorShapeUtil"
import { SlideShape } from "@/shapes/SlideShapeUtil" import { SlideShape } from "@/shapes/SlideShapeUtil"
import { PromptShape } from "@/shapes/PromptShapeUtil" import { PromptShape } from "@/shapes/PromptShapeUtil"
import { TranscriptionShape } from "@/shapes/TranscriptionShapeUtil" import { TranscriptionShape } from "@/shapes/TranscriptionShapeUtil"
@ -170,29 +129,16 @@ import { VideoGenShape } from "@/shapes/VideoGenShapeUtil"
import { MultmuxShape } from "@/shapes/MultmuxShapeUtil" import { MultmuxShape } from "@/shapes/MultmuxShapeUtil"
// MycelialIntelligence moved to permanent UI bar - shape kept for backwards compatibility // MycelialIntelligence moved to permanent UI bar - shape kept for backwards compatibility
import { MycelialIntelligenceShape } from "@/shapes/MycelialIntelligenceShapeUtil" import { MycelialIntelligenceShape } from "@/shapes/MycelialIntelligenceShapeUtil"
// Open Mapping - OSM map shape for geographic visualization // Location shape removed - no longer needed
import { MapShape } from "@/shapes/MapShapeUtil"
// Calendar shape for calendar functionality
import { CalendarShape } from "@/shapes/CalendarShapeUtil"
import { CalendarEventShape } from "@/shapes/CalendarEventShapeUtil"
// Drawfast shape for quick drawing/sketching
import { DrawfastShape } from "@/shapes/DrawfastShapeUtil"
// Additional shapes from Board.tsx
import { HolonBrowserShape } from "@/shapes/HolonBrowserShapeUtil"
import { PrivateWorkspaceShape } from "@/shapes/PrivateWorkspaceShapeUtil"
import { GoogleItemShape } from "@/shapes/GoogleItemShapeUtil"
import { WorkflowBlockShape } from "@/shapes/WorkflowBlockShapeUtil"
export function useAutomergeStoreV2({ export function useAutomergeStoreV2({
handle, handle,
userId: _userId, userId: _userId,
adapter, adapter,
isNetworkOnline = true,
}: { }: {
handle: DocHandle<any> handle: DocHandle<any>
userId: string userId: string
adapter?: any adapter?: any
isNetworkOnline?: boolean
}): TLStoreWithStatus { }): TLStoreWithStatus {
// useAutomergeStoreV2 initializing // useAutomergeStoreV2 initializing
@ -205,7 +151,6 @@ export function useAutomergeStoreV2({
EmbedShape, EmbedShape,
MarkdownShape, MarkdownShape,
MycrozineTemplateShape, MycrozineTemplateShape,
MycroZineGeneratorShape,
SlideShape, SlideShape,
PromptShape, PromptShape,
TranscriptionShape, TranscriptionShape,
@ -217,20 +162,30 @@ export function useAutomergeStoreV2({
ImageGenShape, ImageGenShape,
VideoGenShape, VideoGenShape,
MultmuxShape, MultmuxShape,
MycelialIntelligenceShape, // AI-powered collaborative intelligence shape MycelialIntelligenceShape, // Deprecated - kept for backwards compatibility
MapShape, // Open Mapping - OSM map shape
CalendarShape, // Calendar with view switching
CalendarEventShape, // Calendar individual events
DrawfastShape, // Drawfast quick sketching
HolonBrowserShape, // Holon browser
PrivateWorkspaceShape, // Private workspace for Google Export
GoogleItemShape, // Individual Google items
WorkflowBlockShape, // Workflow builder blocks
] ]
// Use the module-level CUSTOM_SHAPE_TYPES constant // CRITICAL: Explicitly list ALL custom shape types to ensure they're registered
// This ensures schema registration stays in sync with the filtering logic // This is a fallback in case dynamic extraction from shape utils fails
const knownCustomShapeTypes = CUSTOM_SHAPE_TYPES const knownCustomShapeTypes = [
'ChatBox',
'VideoChat',
'Embed',
'Markdown',
'MycrozineTemplate',
'Slide',
'Prompt',
'Transcription',
'ObsNote',
'FathomNote',
'Holon',
'ObsidianBrowser',
'FathomMeetingsBrowser',
'ImageGen',
'VideoGen',
'Multmux',
'MycelialIntelligence', // Deprecated - kept for backwards compatibility
]
// Build schema with explicit entries for all custom shapes // Build schema with explicit entries for all custom shapes
const customShapeSchemas: Record<string, any> = {} const customShapeSchemas: Record<string, any> = {}
@ -316,7 +271,12 @@ export function useAutomergeStoreV2({
return return
} }
// Broadcasting changes via JSON sync (logging disabled for performance) // Broadcasting changes via JSON sync
const shapeRecords = addedOrUpdatedRecords.filter(r => r?.typeName === 'shape')
const deletedShapes = deletedRecordIds.filter(id => id.startsWith('shape:'))
if (shapeRecords.length > 0 || deletedShapes.length > 0) {
console.log(`📤 Broadcasting ${shapeRecords.length} shape changes and ${deletedShapes.length} deletions via JSON sync`)
}
if (adapter && typeof (adapter as any).send === 'function') { if (adapter && typeof (adapter as any).send === 'function') {
// Send changes to other clients via the network adapter // Send changes to other clients via the network adapter
@ -340,23 +300,50 @@ export function useAutomergeStoreV2({
// Listen for changes from Automerge and apply them to TLDraw // Listen for changes from Automerge and apply them to TLDraw
const automergeChangeHandler = (payload: DocHandleChangePayload<any>) => { const automergeChangeHandler = (payload: DocHandleChangePayload<any>) => {
const patchCount = payload.patches?.length || 0 const patchCount = payload.patches?.length || 0
const shapePatches = payload.patches?.filter((p: any) => {
const id = p.path?.[1]
return id && typeof id === 'string' && id.startsWith('shape:')
}) || []
// Debug logging for sync issues
console.log(`🔄 automergeChangeHandler: ${patchCount} patches (${shapePatches.length} shapes), pendingLocalChanges=${pendingLocalChanges}`)
// Skip echoes of our own local changes using a counter. // Skip echoes of our own local changes using a counter.
// Each local handle.change() increments the counter, and each echo decrements it. // Each local handle.change() increments the counter, and each echo decrements it.
// Only process changes when counter is 0 (those are remote changes from other clients). // Only process changes when counter is 0 (those are remote changes from other clients).
if (pendingLocalChanges > 0) { if (pendingLocalChanges > 0) {
console.log(`⏭️ Skipping echo (pendingLocalChanges was ${pendingLocalChanges}, now ${pendingLocalChanges - 1})`)
pendingLocalChanges-- pendingLocalChanges--
return return
} }
console.log(`✅ Processing ${patchCount} patches as REMOTE changes (${shapePatches.length} shape patches)`)
try { try {
// Apply patches from Automerge to TLDraw store // Apply patches from Automerge to TLDraw store
if (payload.patches && payload.patches.length > 0) { if (payload.patches && payload.patches.length > 0) {
// Debug: Check if patches contain shapes
if (shapePatches.length > 0) {
console.log(`📥 Applying ${shapePatches.length} shape patches from remote`)
}
try { try {
const recordsBefore = store.allRecords()
const shapesBefore = recordsBefore.filter((r: any) => r.typeName === 'shape')
// CRITICAL: Pass Automerge document to patch handler so it can read full records // CRITICAL: Pass Automerge document to patch handler so it can read full records
// This prevents coordinates from defaulting to 0,0 when patches create new records // This prevents coordinates from defaulting to 0,0 when patches create new records
const automergeDoc = handle.doc() const automergeDoc = handle.doc()
applyAutomergePatchesToTLStore(payload.patches, store, automergeDoc) applyAutomergePatchesToTLStore(payload.patches, store, automergeDoc)
const recordsAfter = store.allRecords()
const shapesAfter = recordsAfter.filter((r: any) => r.typeName === 'shape')
if (shapesAfter.length !== shapesBefore.length) {
// Patches applied
}
// Patches processed successfully
} catch (patchError) { } catch (patchError) {
console.error("Error applying patches batch, attempting individual patch application:", patchError) console.error("Error applying patches batch, attempting individual patch application:", patchError)
// Try applying patches one by one to identify problematic ones // Try applying patches one by one to identify problematic ones
@ -392,6 +379,7 @@ export function useAutomergeStoreV2({
if (existingRecord && (existingRecord as any).typeName === 'shape' && (existingRecord as any).type === 'geo') { if (existingRecord && (existingRecord as any).typeName === 'shape' && (existingRecord as any).type === 'geo') {
const geoRecord = existingRecord as any const geoRecord = existingRecord as any
if (!geoRecord.props || !geoRecord.props.geo) { if (!geoRecord.props || !geoRecord.props.geo) {
console.log(`🔧 Attempting to fix geo shape ${recordId} missing props.geo`)
// This won't help with the current patch, but might help future patches // This won't help with the current patch, but might help future patches
// The real fix should happen in AutomergeToTLStore sanitization // The real fix should happen in AutomergeToTLStore sanitization
} }
@ -449,6 +437,7 @@ export function useAutomergeStoreV2({
const storeShapeCount = store.allRecords().filter((r: any) => r.typeName === 'shape').length const storeShapeCount = store.allRecords().filter((r: any) => r.typeName === 'shape').length
if (docShapeCount > 0 && storeShapeCount === 0) { if (docShapeCount > 0 && storeShapeCount === 0) {
console.log(`🔧 Handler set up after data was written. Manually processing ${docShapeCount} shapes that were loaded before handler was ready...`)
// Since patches were already emitted when handle.change() was called in useAutomergeSyncRepo, // Since patches were already emitted when handle.change() was called in useAutomergeSyncRepo,
// we need to manually process the data that's already in the doc // we need to manually process the data that's already in the doc
try { try {
@ -475,31 +464,17 @@ export function useAutomergeStoreV2({
} }
}) })
// Filter out unknown/unsupported shape types to prevent validation errors // Filter out SharedPiano shapes since they're no longer supported
// This keeps the board functional even if some shapes can't be loaded
const unknownShapeTypes: string[] = []
const filteredRecords = allRecords.filter((record: any) => { const filteredRecords = allRecords.filter((record: any) => {
if (record.typeName === 'shape') { if (record.typeName === 'shape' && record.type === 'SharedPiano') {
const shapeType = record.type console.log(`⚠️ Filtering out deprecated SharedPiano shape: ${record.id}`)
if (!KNOWN_SHAPE_TYPES.has(shapeType)) {
// Track unknown types for error logging
if (!unknownShapeTypes.includes(shapeType)) {
unknownShapeTypes.push(shapeType)
}
return false return false
} }
}
return true return true
}) })
// Log errors for any unknown shape types that were filtered out
if (unknownShapeTypes.length > 0) {
console.error(`❌ Unknown shape types filtered out (shapes not loaded):`, unknownShapeTypes)
console.error(` These shapes exist in the document but are not registered in KNOWN_SHAPE_TYPES.`)
console.error(` To fix: Add these types to CUSTOM_SHAPE_TYPES in useAutomergeStoreV2.ts`)
}
if (filteredRecords.length > 0) { if (filteredRecords.length > 0) {
console.log(`🔧 Manually applying ${filteredRecords.length} records to store (patches were missed during initial load, filtered out ${allRecords.length - filteredRecords.length} SharedPiano shapes)`)
store.mergeRemoteChanges(() => { store.mergeRemoteChanges(() => {
const pageRecords = filteredRecords.filter(r => r.typeName === 'page') const pageRecords = filteredRecords.filter(r => r.typeName === 'page')
const shapeRecords = filteredRecords.filter(r => r.typeName === 'shape') const shapeRecords = filteredRecords.filter(r => r.typeName === 'shape')
@ -507,6 +482,7 @@ export function useAutomergeStoreV2({
const recordsToAdd = [...pageRecords, ...otherRecords, ...shapeRecords] const recordsToAdd = [...pageRecords, ...otherRecords, ...shapeRecords]
store.put(recordsToAdd) store.put(recordsToAdd)
}) })
console.log(`✅ Manually applied ${filteredRecords.length} records to store`)
} }
} catch (error) { } catch (error) {
console.error(`❌ Error manually processing initial data:`, error) console.error(`❌ Error manually processing initial data:`, error)
@ -601,91 +577,78 @@ export function useAutomergeStoreV2({
// Track recent eraser activity to detect active eraser drags // Track recent eraser activity to detect active eraser drags
let lastEraserActivity = 0 let lastEraserActivity = 0
let eraserToolSelected = false let eraserToolSelected = false
let lastEraserCheckTime = 0
let cachedEraserActive = false
const ERASER_ACTIVITY_THRESHOLD = 2000 // Increased to 2 seconds to handle longer eraser drags const ERASER_ACTIVITY_THRESHOLD = 2000 // Increased to 2 seconds to handle longer eraser drags
const ERASER_CHECK_CACHE_MS = 100 // Only refresh eraser state every 100ms to avoid expensive checks
let eraserChangeQueue: RecordsDiff<TLRecord> | null = null let eraserChangeQueue: RecordsDiff<TLRecord> | null = null
let eraserCheckInterval: NodeJS.Timeout | null = null let eraserCheckInterval: NodeJS.Timeout | null = null
// Helper to check if eraser tool is actively erasing (to prevent saves during eraser drag) // Helper to check if eraser tool is actively erasing (to prevent saves during eraser drag)
// OPTIMIZED: Uses cached state and only refreshes periodically to avoid expensive store.allRecords() calls
const isEraserActive = (): boolean => { const isEraserActive = (): boolean => {
const now = Date.now()
// Use cached result if checked recently
if (now - lastEraserCheckTime < ERASER_CHECK_CACHE_MS) {
return cachedEraserActive
}
lastEraserCheckTime = now
// If eraser was selected and recent activity, assume still active
if (eraserToolSelected && now - lastEraserActivity < ERASER_ACTIVITY_THRESHOLD) {
cachedEraserActive = true
return true
}
// If no recent eraser activity and not marked as selected, quickly return false
if (!eraserToolSelected && now - lastEraserActivity > ERASER_ACTIVITY_THRESHOLD) {
cachedEraserActive = false
return false
}
// Only do expensive check if eraser might be transitioning
try { try {
// Use store.get() for specific records instead of allRecords() for better performance const allRecords = store.allRecords()
const instancePageState = store.get('instance_page_state:page:page' as any)
// Check instance_page_state for erasingShapeIds (most reliable indicator) // Check instance_page_state for erasingShapeIds (most reliable indicator)
if (instancePageState && const instancePageState = allRecords.find((r: any) =>
(instancePageState as any).erasingShapeIds && r.typeName === 'instance_page_state' &&
Array.isArray((instancePageState as any).erasingShapeIds) && (r as any).erasingShapeIds &&
(instancePageState as any).erasingShapeIds.length > 0) { Array.isArray((r as any).erasingShapeIds) &&
lastEraserActivity = now (r as any).erasingShapeIds.length > 0
)
if (instancePageState) {
lastEraserActivity = Date.now()
eraserToolSelected = true eraserToolSelected = true
cachedEraserActive = true
return true // Eraser is actively erasing shapes return true // Eraser is actively erasing shapes
} }
// Check if eraser tool is selected // Check if eraser tool is selected
const instance = store.get('instance:instance' as any) const instance = allRecords.find((r: any) => r.typeName === 'instance')
const currentToolId = instance ? (instance as any).currentToolId : null const currentToolId = instance ? (instance as any).currentToolId : null
if (currentToolId === 'eraser') { if (currentToolId === 'eraser') {
eraserToolSelected = true eraserToolSelected = true
lastEraserActivity = now const now = Date.now()
cachedEraserActive = true // If eraser tool is selected, keep it active for longer to handle drags
// Also check if there was recent activity
if (now - lastEraserActivity < ERASER_ACTIVITY_THRESHOLD) {
return true
}
// If tool is selected but no recent activity, still consider it active
// (user might be mid-drag)
return true return true
} else { } else {
// Tool switched away - only consider active if very recent activity
eraserToolSelected = false eraserToolSelected = false
const now = Date.now()
if (now - lastEraserActivity < 300) {
return true // Very recent activity, might still be processing
}
} }
cachedEraserActive = false
return false return false
} catch (e) { } catch (e) {
// If we can't check, use last known state with timeout // If we can't check, use last known state with timeout
const now = Date.now()
if (eraserToolSelected && now - lastEraserActivity < ERASER_ACTIVITY_THRESHOLD) { if (eraserToolSelected && now - lastEraserActivity < ERASER_ACTIVITY_THRESHOLD) {
cachedEraserActive = true
return true return true
} }
cachedEraserActive = false
return false return false
} }
} }
// Track eraser activity from shape deletions // Track eraser activity from shape deletions
// OPTIMIZED: Only check for eraser tool when shapes are removed, and use cached tool state
const checkForEraserActivity = (changes: RecordsDiff<TLRecord>) => { const checkForEraserActivity = (changes: RecordsDiff<TLRecord>) => {
// If shapes are being removed and eraser tool might be active, mark activity // If shapes are being removed and eraser tool might be active, mark activity
if (changes.removed) { if (changes.removed) {
const removedKeys = Object.keys(changes.removed) const removedShapes = Object.values(changes.removed).filter((r: any) =>
// Quick check: if no shape keys, skip r && r.typeName === 'shape'
const hasRemovedShapes = removedKeys.some(key => key.startsWith('shape:')) )
if (hasRemovedShapes) { if (removedShapes.length > 0) {
// Use cached eraserToolSelected state if recent, avoid expensive allRecords() call // Check if eraser tool is currently selected
const now = Date.now() const allRecords = store.allRecords()
if (eraserToolSelected || now - lastEraserActivity < ERASER_ACTIVITY_THRESHOLD) { const instance = allRecords.find((r: any) => r.typeName === 'instance')
lastEraserActivity = now if (instance && (instance as any).currentToolId === 'eraser') {
lastEraserActivity = Date.now()
eraserToolSelected = true
} }
} }
} }
@ -722,6 +685,17 @@ export function useAutomergeStoreV2({
id.startsWith('pointer:') id.startsWith('pointer:')
) )
// DEBUG: Log why records are being filtered or not
const shouldFilter = (typeName && ephemeralTypes.includes(typeName)) || idMatchesEphemeral
if (shouldFilter) {
console.log(`🚫 Filtering out ephemeral record:`, {
id,
typeName,
idMatchesEphemeral,
typeNameMatches: typeName && ephemeralTypes.includes(typeName)
})
}
// Filter out if typeName matches OR if ID pattern matches ephemeral types // Filter out if typeName matches OR if ID pattern matches ephemeral types
if (typeName && ephemeralTypes.includes(typeName)) { if (typeName && ephemeralTypes.includes(typeName)) {
// Skip - this is an ephemeral record // Skip - this is an ephemeral record
@ -744,9 +718,183 @@ export function useAutomergeStoreV2({
removed: filterEphemeral(changes.removed), removed: filterEphemeral(changes.removed),
} }
// Calculate change counts (minimal, needed for early return) // DEBUG: Log all changes to see what's being detected
const totalChanges = Object.keys(changes.added || {}).length + Object.keys(changes.updated || {}).length + Object.keys(changes.removed || {}).length
const filteredTotalChanges = Object.keys(filteredChanges.added || {}).length + Object.keys(filteredChanges.updated || {}).length + Object.keys(filteredChanges.removed || {}).length const filteredTotalChanges = Object.keys(filteredChanges.added || {}).length + Object.keys(filteredChanges.updated || {}).length + Object.keys(filteredChanges.removed || {}).length
// DEBUG: Log ALL changes (before filtering) to see what's actually being updated
if (totalChanges > 0) {
const allChangedRecords: Array<{id: string, typeName: string, changeType: string}> = []
if (changes.added) {
Object.entries(changes.added).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
allChangedRecords.push({ id, typeName: recordObj?.typeName || 'unknown', changeType: 'added' })
})
}
if (changes.updated) {
Object.entries(changes.updated).forEach(([id, [_, record]]: [string, [any, any]]) => {
allChangedRecords.push({ id, typeName: record?.typeName || 'unknown', changeType: 'updated' })
})
}
if (changes.removed) {
Object.entries(changes.removed).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
allChangedRecords.push({ id, typeName: recordObj?.typeName || 'unknown', changeType: 'removed' })
})
}
console.log(`🔍 ALL changes detected (before filtering):`, {
total: totalChanges,
records: allChangedRecords,
// Also log the actual record objects to see their structure
recordDetails: allChangedRecords.map(r => {
let record: any = null
if (r.changeType === 'added' && changes.added) {
const rec = (changes.added as any)[r.id]
record = Array.isArray(rec) ? rec[1] : rec
} else if (r.changeType === 'updated' && changes.updated) {
const rec = (changes.updated as any)[r.id]
record = Array.isArray(rec) ? rec[1] : rec
} else if (r.changeType === 'removed' && changes.removed) {
const rec = (changes.removed as any)[r.id]
record = Array.isArray(rec) ? rec[1] : rec
}
return {
id: r.id,
typeName: r.typeName,
changeType: r.changeType,
hasTypeName: !!record?.typeName,
actualTypeName: record?.typeName,
recordKeys: record ? Object.keys(record).slice(0, 10) : []
}
})
})
}
// Log if we filtered out any ephemeral changes
if (totalChanges > 0 && filteredTotalChanges < totalChanges) {
const filteredCount = totalChanges - filteredTotalChanges
const filteredTypes = new Set<string>()
const filteredIds: string[] = []
if (changes.added) {
Object.entries(changes.added).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
if (recordObj && ephemeralTypes.includes(recordObj.typeName)) {
filteredTypes.add(recordObj.typeName)
filteredIds.push(id)
}
})
}
if (changes.updated) {
Object.entries(changes.updated).forEach(([id, [_, record]]: [string, [any, any]]) => {
if (ephemeralTypes.includes(record.typeName)) {
filteredTypes.add(record.typeName)
filteredIds.push(id)
}
})
}
if (changes.removed) {
Object.entries(changes.removed).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
if (recordObj && ephemeralTypes.includes(recordObj.typeName)) {
filteredTypes.add(recordObj.typeName)
filteredIds.push(id)
}
})
}
console.log(`🚫 Filtered out ${filteredCount} ephemeral change(s) (${Array.from(filteredTypes).join(', ')}) - not persisting`, {
filteredIds: filteredIds.slice(0, 5), // Show first 5 IDs
totalFiltered: filteredIds.length
})
}
if (filteredTotalChanges > 0) {
// Log what records are passing through the filter (shouldn't happen for ephemeral records)
const passingRecords: Array<{id: string, typeName: string, changeType: string}> = []
if (filteredChanges.added) {
Object.entries(filteredChanges.added).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
passingRecords.push({ id, typeName: recordObj?.typeName || 'unknown', changeType: 'added' })
})
}
if (filteredChanges.updated) {
Object.entries(filteredChanges.updated).forEach(([id, recordTuple]: [string, any]) => {
const record = Array.isArray(recordTuple) && recordTuple.length === 2 ? recordTuple[1] : recordTuple
passingRecords.push({ id, typeName: (record as any)?.typeName || 'unknown', changeType: 'updated' })
})
}
if (filteredChanges.removed) {
Object.entries(filteredChanges.removed).forEach(([id, record]: [string, any]) => {
const recordObj = Array.isArray(record) ? record[1] : record
passingRecords.push({ id, typeName: recordObj?.typeName || 'unknown', changeType: 'removed' })
})
}
console.log(`🔍 TLDraw store changes detected (source: ${source}):`, {
added: Object.keys(filteredChanges.added || {}).length,
updated: Object.keys(filteredChanges.updated || {}).length,
removed: Object.keys(filteredChanges.removed || {}).length,
source: source,
passingRecords: passingRecords // Show what's actually passing through
})
// DEBUG: Check for richText/text changes in updated records
if (filteredChanges.updated) {
Object.values(filteredChanges.updated).forEach((recordTuple: any) => {
const record = Array.isArray(recordTuple) && recordTuple.length === 2 ? recordTuple[1] : recordTuple
if ((record as any)?.typeName === 'shape') {
const rec = record as any
if (rec.type === 'geo' && rec.props?.richText) {
console.log(`🔍 Geo shape ${rec.id} richText change detected:`, {
hasRichText: !!rec.props.richText,
richTextType: typeof rec.props.richText,
source: source
})
}
if (rec.type === 'note' && rec.props?.richText) {
console.log(`🔍 Note shape ${rec.id} richText change detected:`, {
hasRichText: !!rec.props.richText,
richTextType: typeof rec.props.richText,
richTextContentLength: Array.isArray(rec.props.richText?.content)
? rec.props.richText.content.length
: 'not array',
source: source
})
}
if (rec.type === 'arrow' && rec.props?.text !== undefined) {
console.log(`🔍 Arrow shape ${rec.id} text change detected:`, {
hasText: !!rec.props.text,
textValue: rec.props.text,
source: source
})
}
if (rec.type === 'text' && rec.props?.richText) {
console.log(`🔍 Text shape ${rec.id} richText change detected:`, {
hasRichText: !!rec.props.richText,
richTextType: typeof rec.props.richText,
source: source
})
}
}
})
}
// DEBUG: Log added shapes to track what's being created
if (filteredChanges.added) {
Object.values(filteredChanges.added).forEach((record: any) => {
const rec = Array.isArray(record) ? record[1] : record
if (rec?.typeName === 'shape') {
console.log(`🔍 Shape added: ${rec.type} (${rec.id})`, {
type: rec.type,
id: rec.id,
hasRichText: !!rec.props?.richText,
hasText: !!rec.props?.text,
source: source
})
}
})
}
}
// Skip if no meaningful changes after filtering ephemeral records // Skip if no meaningful changes after filtering ephemeral records
if (filteredTotalChanges === 0) { if (filteredTotalChanges === 0) {
return return
@ -755,6 +903,7 @@ export function useAutomergeStoreV2({
// CRITICAL: Skip broadcasting changes that came from remote sources to prevent feedback loops // CRITICAL: Skip broadcasting changes that came from remote sources to prevent feedback loops
// Only broadcast changes that originated from user interactions (source === 'user') // Only broadcast changes that originated from user interactions (source === 'user')
if (source === 'remote') { if (source === 'remote') {
console.log('🔄 Skipping broadcast for remote change to prevent feedback loop')
return return
} }
@ -847,6 +996,7 @@ export function useAutomergeStoreV2({
// If only position changed (x/y), restore original coordinates // If only position changed (x/y), restore original coordinates
if (!otherPropsChanged && (newX !== originalX || newY !== originalY)) { if (!otherPropsChanged && (newX !== originalX || newY !== originalY)) {
console.log(`🚫 Filtering out x/y coordinate change for pinned shape ${id}: (${newX}, ${newY}) -> keeping original (${originalX}, ${originalY})`)
// Restore original coordinates // Restore original coordinates
const recordWithOriginalCoords = { const recordWithOriginalCoords = {
...record, ...record,
@ -891,6 +1041,38 @@ export function useAutomergeStoreV2({
// Check if this is a position-only update that should be throttled // Check if this is a position-only update that should be throttled
const isPositionOnly = isPositionOnlyUpdate(finalFilteredChanges) const isPositionOnly = isPositionOnlyUpdate(finalFilteredChanges)
// Log what type of change this is for debugging
const changeType = Object.keys(finalFilteredChanges.added || {}).length > 0 ? 'added' :
Object.keys(finalFilteredChanges.removed || {}).length > 0 ? 'removed' :
isPositionOnly ? 'position-only' : 'property-change'
// DEBUG: Log dimension changes for shapes
if (finalFilteredChanges.updated) {
Object.entries(finalFilteredChanges.updated).forEach(([id, recordTuple]: [string, any]) => {
const isTuple = Array.isArray(recordTuple) && recordTuple.length === 2
const oldRecord = isTuple ? recordTuple[0] : null
const newRecord = isTuple ? recordTuple[1] : recordTuple
if (newRecord?.typeName === 'shape') {
const oldProps = oldRecord?.props || {}
const newProps = newRecord?.props || {}
if (oldProps.w !== newProps.w || oldProps.h !== newProps.h) {
console.log(`🔍 Shape dimension change detected for ${newRecord.type} ${id}:`, {
oldDims: { w: oldProps.w, h: oldProps.h },
newDims: { w: newProps.w, h: newProps.h },
source
})
}
}
})
}
console.log(`🔍 Change detected: ${changeType}, will ${isPositionOnly ? 'throttle' : 'broadcast immediately'}`, {
added: Object.keys(finalFilteredChanges.added || {}).length,
updated: Object.keys(finalFilteredChanges.updated || {}).length,
removed: Object.keys(finalFilteredChanges.removed || {}).length,
source
})
if (isPositionOnly && positionUpdateQueue === null) { if (isPositionOnly && positionUpdateQueue === null) {
// Start a new queue for position updates // Start a new queue for position updates
positionUpdateQueue = finalFilteredChanges positionUpdateQueue = finalFilteredChanges
@ -1073,7 +1255,12 @@ export function useAutomergeStoreV2({
broadcastJsonSync(addedOrUpdatedRecords, deletedRecordIds) broadcastJsonSync(addedOrUpdatedRecords, deletedRecordIds)
} }
// Logging disabled for performance during continuous drawing // Only log if there are many changes or if debugging is needed
if (filteredTotalChanges > 3) {
console.log(`✅ Applied ${filteredTotalChanges} TLDraw changes to Automerge document`)
} else if (filteredTotalChanges > 0) {
console.log(`✅ Applied ${filteredTotalChanges} TLDraw change(s) to Automerge document`)
}
// Check if the document actually changed // Check if the document actually changed
const docAfter = handle.doc() const docAfter = handle.doc()
@ -1131,15 +1318,14 @@ export function useAutomergeStoreV2({
const existingStoreRecords = store.allRecords() const existingStoreRecords = store.allRecords()
const existingStoreShapes = existingStoreRecords.filter((r: any) => r.typeName === 'shape') const existingStoreShapes = existingStoreRecords.filter((r: any) => r.typeName === 'shape')
// Determine connection status based on network state
const connectionStatus = isNetworkOnline ? "online" : "offline"
if (doc.store) { if (doc.store) {
const storeKeys = Object.keys(doc.store) const storeKeys = Object.keys(doc.store)
const docShapes = Object.values(doc.store).filter((r: any) => r?.typeName === 'shape').length const docShapes = Object.values(doc.store).filter((r: any) => r?.typeName === 'shape').length
console.log(`📊 Patch-based initialization: doc has ${storeKeys.length} records (${docShapes} shapes), store has ${existingStoreRecords.length} records (${existingStoreShapes.length} shapes)`)
// If store already has shapes, patches have been applied (dev mode behavior) // If store already has shapes, patches have been applied (dev mode behavior)
if (existingStoreShapes.length > 0) { if (existingStoreShapes.length > 0) {
console.log(`✅ Store already populated from patches (${existingStoreShapes.length} shapes) - using patch-based loading like dev`)
// REMOVED: Aggressive shape refresh that was causing coordinate loss // REMOVED: Aggressive shape refresh that was causing coordinate loss
// Shapes should be visible through normal patch application // Shapes should be visible through normal patch application
@ -1148,65 +1334,7 @@ export function useAutomergeStoreV2({
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus, connectionStatus: "online",
})
return
}
// OFFLINE FAST PATH: When offline with local data, load immediately
// Don't wait for patches that will never come from the network
if (!isNetworkOnline && docShapes > 0) {
// Manually load data from Automerge doc since patches won't come through
try {
const allRecords: TLRecord[] = []
Object.entries(doc.store).forEach(([id, record]: [string, any]) => {
if (!record || !record.typeName || !record.id) return
if (record.typeName === 'obsidian_vault' || (typeof record.id === 'string' && record.id.startsWith('obsidian_vault:'))) return
try {
let cleanRecord: any
try {
cleanRecord = JSON.parse(JSON.stringify(record))
} catch {
cleanRecord = safeExtractPlainObject(record)
}
if (cleanRecord && typeof cleanRecord === 'object') {
const sanitized = sanitizeRecord(cleanRecord)
const plainSanitized = JSON.parse(JSON.stringify(sanitized))
allRecords.push(plainSanitized)
}
} catch (e) {
console.warn(`⚠️ Could not process record ${id}:`, e)
}
})
// Filter out SharedPiano shapes since they're no longer supported
const filteredRecords = allRecords.filter((record: any) => {
if (record.typeName === 'shape' && record.type === 'SharedPiano') {
return false
}
return true
})
if (filteredRecords.length > 0) {
store.mergeRemoteChanges(() => {
const pageRecords = filteredRecords.filter(r => r.typeName === 'page')
const shapeRecords = filteredRecords.filter(r => r.typeName === 'shape')
const otherRecords = filteredRecords.filter(r => r.typeName !== 'page' && r.typeName !== 'shape')
const recordsToAdd = [...pageRecords, ...otherRecords, ...shapeRecords]
store.put(recordsToAdd)
})
}
} catch (error) {
console.error(`❌ Error loading offline data:`, error)
}
setStoreWithStatus({
store,
status: "synced-remote", // Use synced-remote so Board renders
connectionStatus: "offline",
}) })
return return
} }
@ -1215,6 +1343,7 @@ export function useAutomergeStoreV2({
// The automergeChangeHandler (set up above) should process them automatically // The automergeChangeHandler (set up above) should process them automatically
// Just wait a bit for patches to be processed, then set status // Just wait a bit for patches to be processed, then set status
if (docShapes > 0 && existingStoreShapes.length === 0) { if (docShapes > 0 && existingStoreShapes.length === 0) {
console.log(`📊 Doc has ${docShapes} shapes but store is empty. Waiting for patches to be processed by handler...`)
// Wait briefly for patches to be processed by automergeChangeHandler // Wait briefly for patches to be processed by automergeChangeHandler
// The handler is already set up, so it should catch patches from the initial data load // The handler is already set up, so it should catch patches from the initial data load
@ -1227,6 +1356,7 @@ export function useAutomergeStoreV2({
const currentShapes = store.allRecords().filter((r: any) => r.typeName === 'shape') const currentShapes = store.allRecords().filter((r: any) => r.typeName === 'shape')
if (currentShapes.length > 0) { if (currentShapes.length > 0) {
console.log(`✅ Patches applied successfully: ${currentShapes.length} shapes loaded via patches`)
// REMOVED: Aggressive shape refresh that was causing coordinate loss // REMOVED: Aggressive shape refresh that was causing coordinate loss
// Shapes loaded via patches should be visible without forced refresh // Shapes loaded via patches should be visible without forced refresh
@ -1234,7 +1364,7 @@ export function useAutomergeStoreV2({
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus, connectionStatus: "online",
}) })
resolve() resolve()
} else if (attempts < maxAttempts) { } else if (attempts < maxAttempts) {
@ -1254,7 +1384,7 @@ export function useAutomergeStoreV2({
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus, connectionStatus: "online",
}) })
resolve() resolve()
} }
@ -1269,19 +1399,21 @@ export function useAutomergeStoreV2({
// If doc is empty, just set status // If doc is empty, just set status
if (docShapes === 0) { if (docShapes === 0) {
console.log(`📊 Empty document - starting fresh (patch-based loading)`)
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus, connectionStatus: "online",
}) })
return return
} }
} else { } else {
// No store in doc - empty document // No store in doc - empty document
console.log(`📊 No store in Automerge doc - starting fresh (patch-based loading)`)
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus: isNetworkOnline ? "online" : "offline", connectionStatus: "online",
}) })
return return
} }
@ -1290,7 +1422,7 @@ export function useAutomergeStoreV2({
setStoreWithStatus({ setStoreWithStatus({
store, store,
status: "synced-remote", status: "synced-remote",
connectionStatus: isNetworkOnline ? "online" : "offline", connectionStatus: "online",
}) })
} }
} }
@ -1300,7 +1432,7 @@ export function useAutomergeStoreV2({
return () => { return () => {
unsubs.forEach((unsub) => unsub()) unsubs.forEach((unsub) => unsub())
} }
}, [handle, store, isNetworkOnline]) }, [handle, store])
/* -------------------- Presence -------------------- */ /* -------------------- Presence -------------------- */
// Create a safe handle that won't cause null errors // Create a safe handle that won't cause null errors

View File

@ -1,6 +1,6 @@
import { useMemo, useEffect, useState, useCallback, useRef } from "react" import { useMemo, useEffect, useState, useCallback, useRef } from "react"
import { TLStoreSnapshot, InstancePresenceRecordType, getIndexAbove, IndexKey } from "@tldraw/tldraw" import { TLStoreSnapshot, InstancePresenceRecordType, getIndexAbove, IndexKey } from "@tldraw/tldraw"
import { CloudflareNetworkAdapter, ConnectionState } from "./CloudflareAdapter" import { CloudflareNetworkAdapter } from "./CloudflareAdapter"
import { useAutomergeStoreV2, useAutomergePresence } from "./useAutomergeStoreV2" import { useAutomergeStoreV2, useAutomergePresence } from "./useAutomergeStoreV2"
import { TLStoreWithStatus } from "@tldraw/tldraw" import { TLStoreWithStatus } from "@tldraw/tldraw"
import { Repo, parseAutomergeUrl, stringifyAutomergeUrl, AutomergeUrl, DocumentId } from "@automerge/automerge-repo" import { Repo, parseAutomergeUrl, stringifyAutomergeUrl, AutomergeUrl, DocumentId } from "@automerge/automerge-repo"
@ -68,6 +68,7 @@ function migrateStoreData(store: Record<string, any>): Record<string, any> {
return store return store
} }
console.log('🔄 Migrating store data: fixing invalid shape indices')
// Copy non-shape records as-is // Copy non-shape records as-is
for (const [id, record] of nonShapes) { for (const [id, record] of nonShapes) {
@ -98,6 +99,7 @@ function migrateStoreData(store: Record<string, any>): Record<string, any> {
migratedStore[id] = migratedRecord migratedStore[id] = migratedRecord
} }
console.log(`✅ Migrated ${shapes.length} shapes with new indices`)
return migratedStore return migratedStore
} }
@ -112,13 +114,7 @@ interface AutomergeSyncConfig {
} }
} }
export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus & { export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus & { handle: DocHandle<any> | null; presence: ReturnType<typeof useAutomergePresence> } {
handle: DocHandle<any> | null;
presence: ReturnType<typeof useAutomergePresence>;
connectionState: ConnectionState;
isNetworkOnline: boolean;
syncVersion: number;
} {
const { uri, user } = config const { uri, user } = config
// Extract roomId from URI (e.g., "https://worker.com/connect/room123" -> "room123") // Extract roomId from URI (e.g., "https://worker.com/connect/room123" -> "room123")
@ -134,13 +130,79 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const [handle, setHandle] = useState<any>(null) const [handle, setHandle] = useState<any>(null)
const [isLoading, setIsLoading] = useState(true) const [isLoading, setIsLoading] = useState(true)
const [connectionState, setConnectionState] = useState<ConnectionState>('connecting')
const [isNetworkOnline, setIsNetworkOnline] = useState(typeof navigator !== 'undefined' ? navigator.onLine : true)
// Sync version counter - increments when server data is merged, forces re-render
const [syncVersion, setSyncVersion] = useState(0)
const handleRef = useRef<any>(null) const handleRef = useRef<any>(null)
const storeRef = useRef<any>(null) const storeRef = useRef<any>(null)
const adapterRef = useRef<any>(null) const adapterRef = useRef<any>(null)
const lastSentHashRef = useRef<string | null>(null)
const isMouseActiveRef = useRef<boolean>(false)
const pendingSaveRef = useRef<boolean>(false)
const saveFunctionRef = useRef<(() => void) | null>(null)
// Generate a fast hash of the document state for change detection
// OPTIMIZED: Avoid expensive JSON.stringify, use lightweight checksums instead
const generateDocHash = useCallback((doc: any): string => {
if (!doc || !doc.store) return ''
const storeData = doc.store || {}
const storeKeys = Object.keys(storeData).sort()
// Fast hash using record IDs and lightweight checksums
// Instead of JSON.stringify, use a combination of ID, type, and key property values
let hash = 0
for (const key of storeKeys) {
// Skip ephemeral records
if (key.startsWith('instance:') ||
key.startsWith('instance_page_state:') ||
key.startsWith('instance_presence:') ||
key.startsWith('camera:') ||
key.startsWith('pointer:')) {
continue
}
const record = storeData[key]
if (!record) continue
// Use lightweight hash: ID + typeName + type (if shape) + key properties
let recordHash = key
if (record.typeName) recordHash += record.typeName
if (record.type) recordHash += record.type
// For shapes, include x, y, w, h for position/size changes
// Also include text content for shapes that have it (Markdown, ObsNote, etc.)
if (record.typeName === 'shape') {
if (typeof record.x === 'number') recordHash += `x${record.x}`
if (typeof record.y === 'number') recordHash += `y${record.y}`
if (typeof record.props?.w === 'number') recordHash += `w${record.props.w}`
if (typeof record.props?.h === 'number') recordHash += `h${record.props.h}`
// CRITICAL: Include text content in hash for Markdown and similar shapes
// This ensures text changes trigger R2 persistence
if (typeof record.props?.text === 'string' && record.props.text.length > 0) {
// Include text length and a sample of content for change detection
recordHash += `t${record.props.text.length}`
// Include first 100 chars and last 50 chars to detect changes anywhere in the text
recordHash += record.props.text.substring(0, 100)
if (record.props.text.length > 150) {
recordHash += record.props.text.substring(record.props.text.length - 50)
}
}
// Also include content for ObsNote shapes
if (typeof record.props?.content === 'string' && record.props.content.length > 0) {
recordHash += `c${record.props.content.length}`
recordHash += record.props.content.substring(0, 100)
if (record.props.content.length > 150) {
recordHash += record.props.content.substring(record.props.content.length - 50)
}
}
}
// Simple hash of the record string
for (let i = 0; i < recordHash.length; i++) {
const char = recordHash.charCodeAt(i)
hash = ((hash << 5) - hash) + char
hash = hash & hash
}
}
return hash.toString(36)
}, [])
// Update refs when handle/store changes // Update refs when handle/store changes
useEffect(() => { useEffect(() => {
@ -161,6 +223,22 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const deletedRecordIds = data.deleted || [] const deletedRecordIds = data.deleted || []
const deletedShapes = deletedRecordIds.filter(id => id.startsWith('shape:')) const deletedShapes = deletedRecordIds.filter(id => id.startsWith('shape:'))
// Log incoming sync data for debugging
console.log(`📥 Received JSON sync: ${changedRecordCount} records (${shapeRecords.length} shapes), ${deletedRecordIds.length} deletions (${deletedShapes.length} shapes)`)
if (shapeRecords.length > 0) {
shapeRecords.forEach((shape: any) => {
console.log(`📥 Shape update: ${shape.type} ${shape.id}`, {
x: shape.x,
y: shape.y,
w: shape.props?.w,
h: shape.props?.h
})
})
}
if (deletedShapes.length > 0) {
console.log(`📥 Shape deletions:`, deletedShapes)
}
// Apply changes to the Automerge document // Apply changes to the Automerge document
// This will trigger patches which will update the TLDraw store // This will trigger patches which will update the TLDraw store
// NOTE: We do NOT increment pendingLocalChanges here because these are REMOTE changes // NOTE: We do NOT increment pendingLocalChanges here because these are REMOTE changes
@ -185,31 +263,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
} }
}) })
}, []) console.log(`✅ Applied ${changedRecordCount} records and ${deletedRecordIds.length} deletions to Automerge document`)
// Presence update batching to prevent "Maximum update depth exceeded" errors
// We batch presence updates and apply them in a single mergeRemoteChanges call
const pendingPresenceUpdates = useRef<Map<string, any>>(new Map())
const presenceUpdateTimer = useRef<NodeJS.Timeout | null>(null)
const PRESENCE_BATCH_INTERVAL_MS = 16 // ~60fps, batch updates every frame
// Flush pending presence updates to the store
const flushPresenceUpdates = useCallback(() => {
const currentStore = storeRef.current
if (!currentStore || pendingPresenceUpdates.current.size === 0) {
return
}
const updates = Array.from(pendingPresenceUpdates.current.values())
pendingPresenceUpdates.current.clear()
try {
currentStore.mergeRemoteChanges(() => {
currentStore.put(updates)
})
} catch (error) {
console.error('❌ Error flushing presence updates:', error)
}
}, []) }, [])
// Presence update callback - applies presence from other clients // Presence update callback - applies presence from other clients
@ -265,45 +319,15 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
lastActivityTimestamp: Date.now() lastActivityTimestamp: Date.now()
}) })
// Queue the presence update for batched application // Apply the instance_presence record using mergeRemoteChanges for atomic updates
pendingPresenceUpdates.current.set(presenceId, instancePresence) currentStore.mergeRemoteChanges(() => {
currentStore.put([instancePresence])
// Schedule a flush if not already scheduled })
if (!presenceUpdateTimer.current) {
presenceUpdateTimer.current = setTimeout(() => {
presenceUpdateTimer.current = null
flushPresenceUpdates()
}, PRESENCE_BATCH_INTERVAL_MS)
}
// Presence applied for remote user
} catch (error) { } catch (error) {
console.error('❌ Error applying presence:', error) console.error('❌ Error applying presence:', error)
} }
}, [flushPresenceUpdates])
// Handle presence leave - remove the user's presence record from the store
const handlePresenceLeave = useCallback((sessionId: string) => {
const currentStore = storeRef.current
if (!currentStore) return
try {
// Find and remove the presence record for this session
// Presence IDs are formatted as "instance_presence:{sessionId}"
const presenceId = `instance_presence:${sessionId}`
// Check if this record exists before trying to remove it
const allRecords = currentStore.allRecords()
const presenceRecord = allRecords.find((r: any) =>
r.id === presenceId ||
r.id?.includes(sessionId)
)
if (presenceRecord) {
currentStore.remove([presenceRecord.id])
}
} catch (error) {
console.error('Error removing presence on leave:', error)
}
}, []) }, [])
const { repo, adapter, storageAdapter } = useMemo(() => { const { repo, adapter, storageAdapter } = useMemo(() => {
@ -311,8 +335,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
workerUrl, workerUrl,
roomId, roomId,
applyJsonSyncData, applyJsonSyncData,
applyPresenceUpdate, applyPresenceUpdate
handlePresenceLeave
) )
// Store adapter ref for use in callbacks // Store adapter ref for use in callbacks
@ -335,16 +358,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
}) })
return { repo, adapter, storageAdapter } return { repo, adapter, storageAdapter }
}, [workerUrl, roomId, applyJsonSyncData, applyPresenceUpdate, handlePresenceLeave]) }, [workerUrl, roomId, applyJsonSyncData, applyPresenceUpdate])
// Subscribe to connection state changes
useEffect(() => {
const unsubscribe = adapter.onConnectionStateChange((state) => {
setConnectionState(state)
setIsNetworkOnline(adapter.isNetworkOnline)
})
return unsubscribe
}, [adapter])
// Initialize Automerge document handle // Initialize Automerge document handle
useEffect(() => { useEffect(() => {
@ -352,8 +366,11 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const initializeHandle = async () => { const initializeHandle = async () => {
try { try {
// OFFLINE-FIRST: Load from IndexedDB immediately, don't wait for network // CRITICAL: Wait for the network adapter to be ready before creating document
// Network sync happens in the background after local data is loaded // This ensures the WebSocket connection is established for sync
await adapter.whenReady()
if (!mounted) return
let handle: DocHandle<TLStoreSnapshot> let handle: DocHandle<TLStoreSnapshot>
let loadedFromLocal = false let loadedFromLocal = false
@ -363,6 +380,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const storedDocumentId = await getDocumentId(roomId) const storedDocumentId = await getDocumentId(roomId)
if (storedDocumentId) { if (storedDocumentId) {
console.log(`Found stored document ID for room ${roomId}: ${storedDocumentId}`)
try { try {
// Parse the URL to get the DocumentId // Parse the URL to get the DocumentId
const parsed = parseAutomergeUrl(storedDocumentId as AutomergeUrl) const parsed = parseAutomergeUrl(storedDocumentId as AutomergeUrl)
@ -374,6 +392,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
let foundHandle: DocHandle<TLStoreSnapshot> let foundHandle: DocHandle<TLStoreSnapshot>
if (existingHandle) { if (existingHandle) {
console.log(`Document ${docId} already in repo cache, reusing handle`)
foundHandle = existingHandle foundHandle = existingHandle
} else { } else {
// Try to find the existing document in the repo (loads from IndexedDB) // Try to find the existing document in the repo (loads from IndexedDB)
@ -389,12 +408,14 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const localShapeCount = localDoc?.store ? Object.values(localDoc.store).filter((r: any) => r?.typeName === 'shape').length : 0 const localShapeCount = localDoc?.store ? Object.values(localDoc.store).filter((r: any) => r?.typeName === 'shape').length : 0
if (localRecordCount > 0) { if (localRecordCount > 0) {
console.log(`Loaded document from IndexedDB: ${localRecordCount} records, ${localShapeCount} shapes`)
// CRITICAL: Migrate local IndexedDB data to fix any invalid indices // CRITICAL: Migrate local IndexedDB data to fix any invalid indices
// This ensures shapes with old-format indices like "b1" are fixed // This ensures shapes with old-format indices like "b1" are fixed
if (localDoc?.store) { if (localDoc?.store) {
const migratedStore = migrateStoreData(localDoc.store) const migratedStore = migrateStoreData(localDoc.store)
if (migratedStore !== localDoc.store) { if (migratedStore !== localDoc.store) {
console.log('🔄 Applying index migration to local IndexedDB data')
handle.change((doc: any) => { handle.change((doc: any) => {
doc.store = migratedStore doc.store = migratedStore
}) })
@ -403,6 +424,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
loadedFromLocal = true loadedFromLocal = true
} else { } else {
console.log(`Document found in IndexedDB but is empty, will load from server`)
} }
} catch (error) { } catch (error) {
console.warn(`Failed to load document ${storedDocumentId} from IndexedDB:`, error) console.warn(`Failed to load document ${storedDocumentId} from IndexedDB:`, error)
@ -412,6 +434,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
// If we didn't load from local storage, create a new document // If we didn't load from local storage, create a new document
if (!loadedFromLocal || !handle!) { if (!loadedFromLocal || !handle!) {
console.log(`Creating new Automerge document for room ${roomId}`)
handle = repo.create<TLStoreSnapshot>() handle = repo.create<TLStoreSnapshot>()
await handle.whenReady() await handle.whenReady()
@ -419,48 +442,15 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const documentId = handle.url const documentId = handle.url
if (documentId) { if (documentId) {
await saveDocumentId(roomId, documentId) await saveDocumentId(roomId, documentId)
console.log(`Saved new document mapping: ${roomId} -> ${documentId}`)
} }
} }
if (!mounted) return if (!mounted) return
// OFFLINE-FIRST: Set the handle and mark as ready BEFORE network sync // Sync with server to get latest data (or upload local changes if offline was edited)
// This allows the UI to render immediately with local data // This ensures we're in sync even if we loaded from IndexedDB
if (handle.url) {
adapter.setDocumentId(handle.url)
}
// If we loaded from local, set handle immediately so UI can render
if (loadedFromLocal) {
const localDoc = handle.doc() as any
const localShapeCount = localDoc?.store ? Object.values(localDoc.store).filter((r: any) => r?.typeName === 'shape').length : 0
setHandle(handle)
setIsLoading(false)
}
// Sync with server in the background (non-blocking for offline-first)
// This runs in parallel - if it fails, we still have local data
const syncWithServer = async () => {
try { try {
// Wait for network adapter with a timeout
const networkReadyPromise = adapter.whenReady()
const timeoutPromise = new Promise<'timeout'>((resolve) =>
setTimeout(() => resolve('timeout'), 5000)
)
const result = await Promise.race([networkReadyPromise, timeoutPromise])
if (result === 'timeout') {
// If we haven't set the handle yet (no local data), set it now
if (!loadedFromLocal && mounted) {
setHandle(handle)
setIsLoading(false)
}
return
}
if (!mounted) return
const response = await fetch(`${workerUrl}/room/${roomId}`) const response = await fetch(`${workerUrl}/room/${roomId}`)
if (response.ok) { if (response.ok) {
let serverDoc = await response.json() as TLStoreSnapshot let serverDoc = await response.json() as TLStoreSnapshot
@ -481,84 +471,36 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const localRecordCount = localDoc?.store ? Object.keys(localDoc.store).length : 0 const localRecordCount = localDoc?.store ? Object.keys(localDoc.store).length : 0
// Merge server data with local data // Merge server data with local data
// Strategy: // Automerge handles conflict resolution automatically via CRDT
// 1. If local has NO SHAPES (only ephemeral records), use server data
// 2. If server has SIGNIFICANTLY MORE shapes (10x), prefer server (stale local cache)
// 3. Otherwise, only add server records that don't exist locally
// (preserve offline changes, let Automerge CRDT sync handle conflicts)
if (serverDoc.store && serverRecordCount > 0) { if (serverDoc.store && serverRecordCount > 0) {
// Track if we merged any data (needed outside the change callback)
let totalMerged = 0
handle.change((doc: any) => { handle.change((doc: any) => {
// Initialize store if it doesn't exist // Initialize store if it doesn't exist
if (!doc.store) { if (!doc.store) {
doc.store = {} doc.store = {}
} }
// Merge server records - Automerge will handle conflicts
// Count LOCAL SHAPES (not just records - ignore ephemeral camera/instance records)
const localShapeCount = Object.values(doc.store).filter((r: any) => r?.typeName === 'shape').length
const localIsEmpty = Object.keys(doc.store).length === 0
// Server has significantly more shapes - local is likely stale cache
// Use 10x threshold or server has shapes but local has none
const serverHasSignificantlyMore = (
localShapeCount === 0 && serverShapeCount > 0
) || (
serverShapeCount > 0 && localShapeCount > 0 && serverShapeCount >= localShapeCount * 10
)
// If local has no shapes but server does, or server has 10x more,
// replace local with server data (but keep local ephemeral records)
const shouldPreferServer = localIsEmpty || localShapeCount === 0 || serverHasSignificantlyMore
let addedFromServer = 0
let skippedExisting = 0
let replacedFromServer = 0
Object.entries(serverDoc.store).forEach(([id, record]) => { Object.entries(serverDoc.store).forEach(([id, record]) => {
if (shouldPreferServer) { // Only add if not already present locally (local changes take precedence)
// Prefer server data - bootstrap or replace stale local // This is a simple merge strategy - Automerge's CRDT will handle deeper conflicts
if (doc.store[id]) { if (!doc.store[id]) {
replacedFromServer++
} else {
addedFromServer++
}
doc.store[id] = record doc.store[id] = record
} else if (!doc.store[id]) {
// Local has data but missing this record - add from server
// This handles: shapes created on another device and synced to R2
doc.store[id] = record
addedFromServer++
} else {
// Record exists locally - preserve local version
// The Automerge binary sync will handle merging conflicts via CRDT
// This preserves offline edits to existing shapes
skippedExisting++
} }
}) })
totalMerged = addedFromServer + replacedFromServer
console.log(`🔄 Server sync: added=${addedFromServer}, replaced=${replacedFromServer}, skipped=${skippedExisting}, shouldPreferServer=${shouldPreferServer}`)
}) })
const finalDoc = handle.doc() const finalDoc = handle.doc()
const finalRecordCount = finalDoc?.store ? Object.keys(finalDoc.store).length : 0 const finalRecordCount = finalDoc?.store ? Object.keys(finalDoc.store).length : 0
console.log(`Merged server data: server had ${serverRecordCount}, local had ${localRecordCount}, final has ${finalRecordCount} records`)
// CRITICAL: Force React to re-render after merging server data
// The handle object reference doesn't change, so we increment syncVersion
if (totalMerged > 0 && mounted) {
console.log(`🔄 Forcing UI update after server sync (${totalMerged} records merged)`)
// Increment sync version to trigger React re-render
setSyncVersion(v => v + 1)
}
} else if (!loadedFromLocal) { } else if (!loadedFromLocal) {
// Server is empty and we didn't load from local - fresh start // Server is empty and we didn't load from local - fresh start
console.log(`Starting fresh - no data on server or locally`)
} }
} else if (response.status === 404) { } else if (response.status === 404) {
// No document found on server // No document found on server
if (loadedFromLocal) { if (loadedFromLocal) {
console.log(`No server document, but loaded ${handle.doc()?.store ? Object.keys(handle.doc()!.store).length : 0} records from local storage`)
} else { } else {
console.log(`No document found on server - starting fresh`)
} }
} else { } else {
console.warn(`Failed to load document from server: ${response.status} ${response.statusText}`) console.warn(`Failed to load document from server: ${response.status} ${response.statusText}`)
@ -566,6 +508,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
} catch (error) { } catch (error) {
// Network error - continue with local data if available // Network error - continue with local data if available
if (loadedFromLocal) { if (loadedFromLocal) {
console.log(`Offline mode: using local data from IndexedDB`)
} else { } else {
console.error("Error loading from server (offline?):", error) console.error("Error loading from server (offline?):", error)
} }
@ -575,17 +518,10 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const finalDoc = handle.doc() as any const finalDoc = handle.doc() as any
const finalStoreKeys = finalDoc?.store ? Object.keys(finalDoc.store).length : 0 const finalStoreKeys = finalDoc?.store ? Object.keys(finalDoc.store).length : 0
const finalShapeCount = finalDoc?.store ? Object.values(finalDoc.store).filter((r: any) => r?.typeName === 'shape').length : 0 const finalShapeCount = finalDoc?.store ? Object.values(finalDoc.store).filter((r: any) => r?.typeName === 'shape').length : 0
console.log(`Automerge handle ready: ${finalStoreKeys} records, ${finalShapeCount} shapes (loaded from ${loadedFromLocal ? 'IndexedDB' : 'server/new'})`)
// If we haven't set the handle yet (no local data), set it now after server sync
if (!loadedFromLocal && mounted) {
setHandle(handle) setHandle(handle)
setIsLoading(false) setIsLoading(false)
}
}
// Start server sync in background (don't await - non-blocking)
syncWithServer()
} catch (error) { } catch (error) {
console.error("Error initializing Automerge handle:", error) console.error("Error initializing Automerge handle:", error)
if (mounted) { if (mounted) {
@ -598,11 +534,6 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
return () => { return () => {
mounted = false mounted = false
// Clear any pending presence update timer
if (presenceUpdateTimer.current) {
clearTimeout(presenceUpdateTimer.current)
presenceUpdateTimer.current = null
}
// Disconnect adapter on unmount to clean up WebSocket connection // Disconnect adapter on unmount to clean up WebSocket connection
if (adapter) { if (adapter) {
adapter.disconnect?.() adapter.disconnect?.()
@ -610,22 +541,206 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
} }
}, [repo, adapter, roomId, workerUrl]) }, [repo, adapter, roomId, workerUrl])
// BINARY CRDT SYNC: The Automerge Repo now handles sync automatically via the NetworkAdapter // Track mouse state to prevent persistence during active mouse interactions
// The NetworkAdapter sends binary sync messages when documents change useEffect(() => {
// Local persistence is handled by IndexedDB via the storage adapter const handleMouseDown = () => {
// Server persistence is handled by the worker receiving binary sync messages isMouseActiveRef.current = true
// }
// We keep a lightweight change logger for debugging, but no HTTP POST sync
const handleMouseUp = () => {
isMouseActiveRef.current = false
// If there was a pending save, schedule it now that mouse is released
if (pendingSaveRef.current) {
pendingSaveRef.current = false
// Trigger save after a short delay to ensure mouse interaction is fully complete
setTimeout(() => {
// The save will be triggered by the next scheduled save or change event
// We just need to ensure the mouse state is cleared
}, 50)
}
}
// Also track touch events for mobile
const handleTouchStart = () => {
isMouseActiveRef.current = true
}
const handleTouchEnd = () => {
isMouseActiveRef.current = false
if (pendingSaveRef.current) {
pendingSaveRef.current = false
}
}
// Add event listeners to document to catch all mouse interactions
document.addEventListener('mousedown', handleMouseDown, { capture: true })
document.addEventListener('mouseup', handleMouseUp, { capture: true })
document.addEventListener('touchstart', handleTouchStart, { capture: true })
document.addEventListener('touchend', handleTouchEnd, { capture: true })
return () => {
document.removeEventListener('mousedown', handleMouseDown, { capture: true })
document.removeEventListener('mouseup', handleMouseUp, { capture: true })
document.removeEventListener('touchstart', handleTouchStart, { capture: true })
document.removeEventListener('touchend', handleTouchEnd, { capture: true })
}
}, [])
// Auto-save to Cloudflare on every change (with debouncing to prevent excessive calls)
// CRITICAL: This ensures new shapes are persisted to R2
useEffect(() => { useEffect(() => {
if (!handle) return if (!handle) return
// Listen for changes to log sync activity (debugging only) let saveTimeout: NodeJS.Timeout
const saveDocumentToWorker = async () => {
// CRITICAL: Don't save while mouse is active - this prevents interference with mouse interactions
if (isMouseActiveRef.current) {
console.log('⏸️ Deferring persistence - mouse is active')
pendingSaveRef.current = true
return
}
try {
const doc = handle.doc()
if (!doc || !doc.store) {
console.log("🔍 No document to save yet")
return
}
// Generate hash of current document state
const currentHash = generateDocHash(doc)
const lastHash = lastSentHashRef.current
// Skip save if document hasn't changed
if (currentHash === lastHash) {
console.log('⏭️ Skipping persistence - document unchanged (hash matches)')
return
}
// OPTIMIZED: Defer JSON.stringify to avoid blocking main thread
// Use requestIdleCallback to serialize when browser is idle
const storeKeys = Object.keys(doc.store).length
// Defer expensive serialization to avoid blocking
const serializedDoc = await new Promise<string>((resolve, reject) => {
const serialize = () => {
try {
// Direct JSON.stringify - browser optimizes this internally
// The key is doing it in an idle callback to not block interactions
const json = JSON.stringify(doc)
resolve(json)
} catch (error) {
reject(error)
}
}
// Use requestIdleCallback if available to serialize when browser is idle
if (typeof requestIdleCallback !== 'undefined') {
requestIdleCallback(serialize, { timeout: 200 })
} else {
// Fallback: use setTimeout to defer to next event loop tick
setTimeout(serialize, 0)
}
})
// CRITICAL: Always log saves to help debug persistence issues
const shapeCount = Object.values(doc.store).filter((r: any) => r?.typeName === 'shape').length
console.log(`💾 Persisting document to worker for R2 storage: ${storeKeys} records, ${shapeCount} shapes`)
// Send document state to worker via POST /room/:roomId
// This updates the worker's currentDoc so it can be persisted to R2
const response = await fetch(`${workerUrl}/room/${roomId}`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: serializedDoc,
})
if (!response.ok) {
throw new Error(`Failed to save to worker: ${response.statusText}`)
}
// Update last sent hash only after successful save
lastSentHashRef.current = currentHash
pendingSaveRef.current = false
// CRITICAL: Always log successful saves
const finalShapeCount = Object.values(doc.store).filter((r: any) => r?.typeName === 'shape').length
console.log(`✅ Successfully sent document state to worker for persistence (${finalShapeCount} shapes)`)
} catch (error) {
console.error('❌ Error saving document to worker:', error)
pendingSaveRef.current = false
}
}
// Store save function reference for mouse release handler
saveFunctionRef.current = saveDocumentToWorker
const scheduleSave = () => {
// Clear existing timeout
if (saveTimeout) clearTimeout(saveTimeout)
// CRITICAL: Check if mouse is active before scheduling save
if (isMouseActiveRef.current) {
console.log('⏸️ Deferring save scheduling - mouse is active')
pendingSaveRef.current = true
// Schedule a check for when mouse is released
const checkMouseState = () => {
if (!isMouseActiveRef.current && pendingSaveRef.current) {
pendingSaveRef.current = false
// Mouse is released, schedule the save now
requestAnimationFrame(() => {
saveTimeout = setTimeout(saveDocumentToWorker, 3000)
})
} else if (isMouseActiveRef.current) {
// Mouse still active, check again in 100ms
setTimeout(checkMouseState, 100)
}
}
setTimeout(checkMouseState, 100)
return
}
// CRITICAL: Use requestIdleCallback if available to defer saves until browser is idle
// This prevents saves from interrupting active interactions
const schedule = () => {
// Schedule save with a debounce (3 seconds) to batch rapid changes
saveTimeout = setTimeout(saveDocumentToWorker, 3000)
}
if (typeof requestIdleCallback !== 'undefined') {
requestIdleCallback(schedule, { timeout: 2000 })
} else {
requestAnimationFrame(schedule)
}
}
// Listen for changes to the Automerge document
const changeHandler = (payload: any) => { const changeHandler = (payload: any) => {
const patchCount = payload.patches?.length || 0 const patchCount = payload.patches?.length || 0
if (!patchCount) return if (!patchCount) {
// No patches, nothing to save
return
}
// Filter out ephemeral record changes for logging // CRITICAL: If mouse is active, defer all processing to avoid blocking mouse interactions
if (isMouseActiveRef.current) {
// Just mark that we have pending changes, process them when mouse is released
pendingSaveRef.current = true
return
}
// Process patches asynchronously to avoid blocking
requestAnimationFrame(() => {
// Double-check mouse state after animation frame
if (isMouseActiveRef.current) {
pendingSaveRef.current = true
return
}
// Filter out ephemeral record changes - these shouldn't trigger persistence
const ephemeralIdPatterns = [ const ephemeralIdPatterns = [
'instance:', 'instance:',
'instance_page_state:', 'instance_page_state:',
@ -634,25 +749,110 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
'pointer:' 'pointer:'
] ]
// Quick check for ephemeral changes (lightweight)
const hasOnlyEphemeralChanges = payload.patches.every((p: any) => { const hasOnlyEphemeralChanges = payload.patches.every((p: any) => {
const id = p.path?.[1] const id = p.path?.[1]
if (!id || typeof id !== 'string') return false if (!id || typeof id !== 'string') return false
return ephemeralIdPatterns.some(pattern => id.startsWith(pattern)) return ephemeralIdPatterns.some(pattern => id.startsWith(pattern))
}) })
// If all patches are for ephemeral records, skip persistence
if (hasOnlyEphemeralChanges) { if (hasOnlyEphemeralChanges) {
// Don't log ephemeral changes console.log('🚫 Skipping persistence - only ephemeral changes detected:', {
patchCount
})
return return
} }
// Check if patches contain shape changes (lightweight check)
const hasShapeChanges = payload.patches?.some((p: any) => {
const id = p.path?.[1]
return id && typeof id === 'string' && id.startsWith('shape:')
})
if (hasShapeChanges) {
// Check if ALL patches are only position updates (x/y) for pinned-to-view shapes
// These shouldn't trigger persistence since they're just keeping the shape in the same screen position
// NOTE: We defer doc access to avoid blocking, but do lightweight path checks
const allPositionUpdates = payload.patches.every((p: any) => {
const shapeId = p.path?.[1]
// If this is not a shape patch, it's not a position update
if (!shapeId || typeof shapeId !== 'string' || !shapeId.startsWith('shape:')) {
return false
}
// Check if this is a position update (x or y coordinate)
// Path format: ['store', 'shape:xxx', 'x'] or ['store', 'shape:xxx', 'y']
const pathLength = p.path?.length || 0
return pathLength === 3 && (p.path[2] === 'x' || p.path[2] === 'y')
})
// If all patches are position updates, check if they're for pinned shapes
// This requires doc access, so we defer it slightly
if (allPositionUpdates && payload.patches.length > 0) {
// Defer expensive doc access check
setTimeout(() => {
if (isMouseActiveRef.current) {
pendingSaveRef.current = true
return
}
const doc = handle.doc()
const allPinned = payload.patches.every((p: any) => {
const shapeId = p.path?.[1]
if (!shapeId || typeof shapeId !== 'string' || !shapeId.startsWith('shape:')) {
return false
}
if (doc?.store?.[shapeId]) {
const shape = doc.store[shapeId]
return shape?.props?.pinnedToView === true
}
return false
})
if (allPinned) {
console.log('🚫 Skipping persistence - only pinned-to-view position updates detected:', {
patchCount: payload.patches.length
})
return
}
// Not all pinned, schedule save
scheduleSave()
}, 0)
return
}
const shapePatches = payload.patches.filter((p: any) => {
const id = p.path?.[1]
return id && typeof id === 'string' && id.startsWith('shape:')
})
// CRITICAL: Always log shape changes to debug persistence
if (shapePatches.length > 0) {
console.log('🔍 Automerge document changed with shape patches:', {
patchCount: patchCount,
shapePatches: shapePatches.length
})
}
}
// Schedule save to worker for persistence (only for non-ephemeral changes)
scheduleSave()
})
} }
handle.on('change', changeHandler) handle.on('change', changeHandler)
// Don't save immediately on mount - only save when actual changes occur
// The initial document load from server is already persisted, so we don't need to re-persist it
return () => { return () => {
handle.off('change', changeHandler) handle.off('change', changeHandler)
if (saveTimeout) clearTimeout(saveTimeout)
} }
}, [handle]) }, [handle, roomId, workerUrl, generateDocHash])
// Generate a unique color for each user based on their userId // Generate a unique color for each user based on their userId
const generateUserColor = (userId: string): string => { const generateUserColor = (userId: string): string => {
@ -668,26 +868,20 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
} }
// Get user metadata for presence // Get user metadata for presence
// Color is generated from the username (name) for consistency across sessions,
// not from the unique session ID (userId) which changes per tab/session
const userMetadata: { userId: string; name: string; color: string } = (() => { const userMetadata: { userId: string; name: string; color: string } = (() => {
if (user && 'userId' in user) { if (user && 'userId' in user) {
const uid = (user as { userId: string; name: string; color?: string }).userId const uid = (user as { userId: string; name: string; color?: string }).userId
const name = (user as { userId: string; name: string; color?: string }).name
return { return {
userId: uid, userId: uid,
name: name, name: (user as { userId: string; name: string; color?: string }).name,
// Use name for color (consistent across sessions), fall back to uid if no name color: (user as { userId: string; name: string; color?: string }).color || generateUserColor(uid)
color: (user as { userId: string; name: string; color?: string }).color || generateUserColor(name || uid)
} }
} }
const uid = user?.id || 'anonymous' const uid = user?.id || 'anonymous'
const name = user?.name || 'Anonymous'
return { return {
userId: uid, userId: uid,
name: name, name: user?.name || 'Anonymous',
// Use name for color (consistent across sessions), fall back to uid if no name color: generateUserColor(uid)
color: generateUserColor(name !== 'Anonymous' ? name : uid)
} }
})() })()
@ -695,8 +889,7 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
const storeWithStatus = useAutomergeStoreV2({ const storeWithStatus = useAutomergeStoreV2({
handle: handle || null as any, handle: handle || null as any,
userId: userMetadata.userId, userId: userMetadata.userId,
adapter: adapter, // Pass adapter for JSON sync broadcasting adapter: adapter // Pass adapter for JSON sync broadcasting
isNetworkOnline // Pass network state for offline support
}) })
// Update store ref when store is available // Update store ref when store is available
@ -717,9 +910,6 @@ export function useAutomergeSync(config: AutomergeSyncConfig): TLStoreWithStatus
return { return {
...storeWithStatus, ...storeWithStatus,
handle, handle,
presence, presence
connectionState,
isNetworkOnline,
syncVersion // Increments when server data is merged, forces re-render
} }
} }

View File

@ -1,123 +0,0 @@
import React, { useState, useEffect } from 'react';
import { useParams } from 'react-router-dom';
import {
getActivityLog,
ActivityEntry,
formatActivityTime,
getShapeDisplayName,
groupActivitiesByDate,
} from '../lib/activityLogger';
import '../css/activity-panel.css';
interface ActivityPanelProps {
isOpen: boolean;
onClose: () => void;
}
export function ActivityPanel({ isOpen, onClose }: ActivityPanelProps) {
const { slug } = useParams<{ slug: string }>();
const [activities, setActivities] = useState<ActivityEntry[]>([]);
const [isLoading, setIsLoading] = useState(true);
// Load activities and refresh periodically
useEffect(() => {
if (!slug || !isOpen) return;
const loadActivities = () => {
const log = getActivityLog(slug, 50);
setActivities(log);
setIsLoading(false);
};
loadActivities();
// Refresh every 5 seconds when panel is open
const interval = setInterval(loadActivities, 5000);
return () => clearInterval(interval);
}, [slug, isOpen]);
if (!isOpen) return null;
const groupedActivities = groupActivitiesByDate(activities);
const getActionIcon = (action: string) => {
switch (action) {
case 'created': return '+';
case 'deleted': return '-';
case 'updated': return '~';
default: return '?';
}
};
const getActionClass = (action: string) => {
switch (action) {
case 'created': return 'activity-action-created';
case 'deleted': return 'activity-action-deleted';
case 'updated': return 'activity-action-updated';
default: return '';
}
};
return (
<div className="activity-panel">
<div className="activity-panel-header">
<h3>Activity</h3>
<button className="activity-panel-close" onClick={onClose} title="Close">
&times;
</button>
</div>
<div className="activity-panel-content">
{isLoading ? (
<div className="activity-loading">Loading...</div>
) : activities.length === 0 ? (
<div className="activity-empty">
<div className="activity-empty-icon">~</div>
<p>No activity yet</p>
<p className="activity-empty-hint">Actions will appear here as you work</p>
</div>
) : (
<div className="activity-list">
{Array.from(groupedActivities.entries()).map(([dateGroup, entries]) => (
<div key={dateGroup} className="activity-group">
<div className="activity-group-header">{dateGroup}</div>
{entries.map((entry) => (
<div key={entry.id} className="activity-item">
<span className={`activity-icon ${getActionClass(entry.action)}`}>
{getActionIcon(entry.action)}
</span>
<div className="activity-details">
<span className="activity-text">
<span className="activity-user">{entry.user}</span>
{' '}
{entry.action === 'created' ? 'added' :
entry.action === 'deleted' ? 'deleted' : 'updated'}
{' '}
<span className="activity-shape">{getShapeDisplayName(entry.shapeType)}</span>
</span>
<span className="activity-time">{formatActivityTime(entry.timestamp)}</span>
</div>
</div>
))}
</div>
))}
</div>
)}
</div>
</div>
);
}
// Toggle button component for the toolbar
export function ActivityToggleButton({ onClick, isActive }: { onClick: () => void; isActive: boolean }) {
return (
<button
className={`activity-toggle-btn ${isActive ? 'active' : ''}`}
onClick={onClick}
title="Activity Log"
>
<span className="activity-toggle-icon">~</span>
</button>
);
}

View File

@ -1,629 +0,0 @@
import React, { useState, useEffect, useRef } from 'react';
import { createPortal } from 'react-dom';
import { useParams } from 'react-router-dom';
import { useAuth } from '../context/AuthContext';
import { WORKER_URL } from '../constants/workerUrl';
import * as crypto from '../lib/auth/crypto';
interface BoardSettingsDropdownProps {
className?: string;
}
interface BoardInfo {
id: string;
name: string | null;
isProtected: boolean;
ownerUsername: string | null;
}
interface Editor {
userId: string;
username: string;
email: string;
permission: string;
grantedAt: string;
}
const BoardSettingsDropdown: React.FC<BoardSettingsDropdownProps> = ({ className = '' }) => {
const { slug } = useParams<{ slug: string }>();
const { session } = useAuth();
const [showDropdown, setShowDropdown] = useState(false);
const [boardInfo, setBoardInfo] = useState<BoardInfo | null>(null);
const [editors, setEditors] = useState<Editor[]>([]);
const [isAdmin, setIsAdmin] = useState(false);
const [isGlobalAdmin, setIsGlobalAdmin] = useState(false);
const [loading, setLoading] = useState(false);
const [updating, setUpdating] = useState(false);
const [requestingAdmin, setRequestingAdmin] = useState(false);
const [adminRequestSent, setAdminRequestSent] = useState(false);
const [adminRequestError, setAdminRequestError] = useState<string | null>(null);
const [inviteInput, setInviteInput] = useState('');
const [inviteStatus, setInviteStatus] = useState<'idle' | 'sending' | 'sent' | 'error'>('idle');
const dropdownRef = useRef<HTMLDivElement>(null);
const dropdownMenuRef = useRef<HTMLDivElement>(null);
const triggerRef = useRef<HTMLButtonElement>(null);
const [dropdownPosition, setDropdownPosition] = useState<{ top: number; right: number } | null>(null);
const boardId = slug || 'mycofi33';
// Get auth headers
const getAuthHeaders = (): Record<string, string> => {
const headers: Record<string, string> = {
'Content-Type': 'application/json',
};
if (session.authed && session.username) {
const publicKey = crypto.getPublicKey(session.username);
if (publicKey) {
headers['X-CryptID-PublicKey'] = publicKey;
}
}
return headers;
};
// Fetch board info and admin status
const fetchBoardData = async () => {
setLoading(true);
try {
const headers = getAuthHeaders();
// Fetch board info
const infoRes = await fetch(`${WORKER_URL}/boards/${boardId}/info`, { headers });
const infoData = await infoRes.json() as { board?: BoardInfo };
if (infoData.board) {
setBoardInfo(infoData.board);
}
// Fetch permission to check if admin
const permRes = await fetch(`${WORKER_URL}/boards/${boardId}/permission`, { headers });
const permData = await permRes.json() as { permission?: string; isGlobalAdmin?: boolean };
setIsAdmin(permData.permission === 'admin');
setIsGlobalAdmin(permData.isGlobalAdmin || false);
// If admin, fetch editors list
if (permData.permission === 'admin') {
const editorsRes = await fetch(`${WORKER_URL}/boards/${boardId}/editors`, { headers });
const editorsData = await editorsRes.json() as { editors?: Editor[] };
setEditors(editorsData.editors || []);
}
} catch (error) {
console.error('Failed to fetch board data:', error);
} finally {
setLoading(false);
}
};
// Toggle board protection
const toggleProtection = async () => {
if (!boardInfo || updating) return;
setUpdating(true);
try {
const headers = getAuthHeaders();
const res = await fetch(`${WORKER_URL}/boards/${boardId}`, {
method: 'PATCH',
headers,
body: JSON.stringify({ isProtected: !boardInfo.isProtected }),
});
if (res.ok) {
setBoardInfo(prev => prev ? { ...prev, isProtected: !prev.isProtected } : null);
}
} catch (error) {
console.error('Failed to toggle protection:', error);
} finally {
setUpdating(false);
}
};
// Request admin access
const requestAdminAccess = async () => {
if (requestingAdmin || adminRequestSent) return;
setRequestingAdmin(true);
setAdminRequestError(null);
try {
const headers = getAuthHeaders();
const res = await fetch(`${WORKER_URL}/admin/request`, {
method: 'POST',
headers,
body: JSON.stringify({ reason: `Requesting admin access for board: ${boardId}` }),
});
const data = await res.json() as { success?: boolean; message?: string; error?: string };
if (res.ok && data.success) {
setAdminRequestSent(true);
} else {
setAdminRequestError(data.error || data.message || 'Failed to send request');
}
} catch (error) {
console.error('Failed to request admin:', error);
setAdminRequestError('Network error - please try again');
} finally {
setRequestingAdmin(false);
}
};
// Invite user as editor
const inviteEditor = async () => {
if (!inviteInput.trim() || inviteStatus === 'sending') return;
setInviteStatus('sending');
try {
const headers = getAuthHeaders();
const res = await fetch(`${WORKER_URL}/boards/${boardId}/permissions`, {
method: 'POST',
headers,
body: JSON.stringify({
usernameOrEmail: inviteInput.trim(),
permission: 'edit',
}),
});
if (res.ok) {
setInviteStatus('sent');
setInviteInput('');
// Refresh editors list
fetchBoardData();
setTimeout(() => setInviteStatus('idle'), 2000);
} else {
setInviteStatus('error');
setTimeout(() => setInviteStatus('idle'), 3000);
}
} catch (error) {
console.error('Failed to invite editor:', error);
setInviteStatus('error');
setTimeout(() => setInviteStatus('idle'), 3000);
}
};
// Remove editor
const removeEditor = async (userId: string) => {
try {
const headers = getAuthHeaders();
await fetch(`${WORKER_URL}/boards/${boardId}/permissions/${userId}`, {
method: 'DELETE',
headers,
});
setEditors(prev => prev.filter(e => e.userId !== userId));
} catch (error) {
console.error('Failed to remove editor:', error);
}
};
// Update dropdown position when it opens
useEffect(() => {
if (showDropdown && triggerRef.current) {
const rect = triggerRef.current.getBoundingClientRect();
setDropdownPosition({
top: rect.bottom + 8,
right: window.innerWidth - rect.right,
});
fetchBoardData();
}
}, [showDropdown]);
// Close dropdown when clicking outside
useEffect(() => {
const handleClickOutside = (e: MouseEvent) => {
const target = e.target as Node;
const isInsideTrigger = dropdownRef.current && dropdownRef.current.contains(target);
const isInsideMenu = dropdownMenuRef.current && dropdownMenuRef.current.contains(target);
if (!isInsideTrigger && !isInsideMenu) {
setShowDropdown(false);
}
};
const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault();
e.stopPropagation();
setShowDropdown(false);
}
};
if (showDropdown) {
document.addEventListener('mousedown', handleClickOutside);
document.addEventListener('keydown', handleKeyDown, true);
}
return () => {
document.removeEventListener('mousedown', handleClickOutside);
document.removeEventListener('keydown', handleKeyDown, true);
};
}, [showDropdown]);
return (
<div ref={dropdownRef} style={{ pointerEvents: 'all' }}>
<button
ref={triggerRef}
onClick={() => setShowDropdown(!showDropdown)}
className={`board-settings-button ${className}`}
title="Board Settings"
style={{
background: showDropdown ? 'var(--color-muted-2)' : 'none',
border: 'none',
padding: '6px',
cursor: 'pointer',
borderRadius: '6px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: 'var(--color-text-1)',
opacity: showDropdown ? 1 : 0.7,
transition: 'opacity 0.15s, background 0.15s',
pointerEvents: 'all',
}}
onMouseEnter={(e) => {
e.currentTarget.style.opacity = '1';
e.currentTarget.style.background = 'var(--color-muted-2)';
}}
onMouseLeave={(e) => {
if (!showDropdown) {
e.currentTarget.style.opacity = '0.7';
e.currentTarget.style.background = 'none';
}
}}
>
{/* Settings gear icon */}
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
<circle cx="12" cy="12" r="3" />
<path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z" />
</svg>
</button>
{/* Dropdown Menu */}
{showDropdown && dropdownPosition && createPortal(
<div
ref={dropdownMenuRef}
style={{
position: 'fixed',
top: dropdownPosition.top,
right: dropdownPosition.right,
width: '320px',
maxHeight: '80vh',
overflowY: 'auto',
background: 'var(--color-panel)',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '12px',
boxShadow: '0 8px 32px rgba(0,0,0,0.2)',
zIndex: 100000,
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
}}
onWheel={(e) => e.stopPropagation()}
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
{/* Header */}
<div style={{
padding: '12px 14px',
borderBottom: '1px solid var(--color-panel-contrast)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}>
<span style={{ fontSize: '13px', fontWeight: 600, color: 'var(--color-text)', display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ fontSize: '14px' }}>&#9881;</span> Board Settings
</span>
<button
onClick={() => setShowDropdown(false)}
style={{
background: 'var(--color-muted-2)',
border: 'none',
cursor: 'pointer',
padding: '4px 8px',
color: 'var(--color-text-3)',
fontSize: '11px',
fontFamily: 'inherit',
borderRadius: '4px',
}}
>
&#10005;
</button>
</div>
{loading ? (
<div style={{ padding: '20px', textAlign: 'center', color: 'var(--color-text-3)' }}>
Loading...
</div>
) : (
<div style={{ display: 'flex', flexDirection: 'column' }}>
{/* Board Info Section */}
<div style={{ padding: '14px', background: 'var(--color-muted-2)', borderBottom: '1px solid var(--color-panel-contrast)' }}>
<div style={{
fontSize: '11px',
fontWeight: 700,
color: 'var(--color-text)',
marginBottom: '10px',
textTransform: 'uppercase',
letterSpacing: '0.5px',
display: 'flex',
alignItems: 'center',
gap: '6px',
}}>
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<circle cx="12" cy="12" r="10"/>
<line x1="12" y1="16" x2="12" y2="12"/>
<line x1="12" y1="8" x2="12.01" y2="8"/>
</svg>
Board Info
</div>
<div style={{ fontSize: '12px', color: 'var(--color-text-1)' }}>
<div style={{ marginBottom: '6px', display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ color: 'var(--color-text-3)', minWidth: '50px' }}>ID:</span>
<span style={{ fontFamily: 'monospace', fontSize: '11px' }}>{boardId}</span>
</div>
{boardInfo?.ownerUsername && (
<div style={{ marginBottom: '6px', display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ color: 'var(--color-text-3)', minWidth: '50px' }}>Owner:</span>
<span>@{boardInfo.ownerUsername}</span>
</div>
)}
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ color: 'var(--color-text-3)', minWidth: '50px' }}>Status:</span>
<span style={{
padding: '3px 10px',
borderRadius: '4px',
fontSize: '11px',
fontWeight: 500,
background: boardInfo?.isProtected ? '#fef3c7' : '#d1fae5',
color: boardInfo?.isProtected ? '#92400e' : '#065f46',
}}>
{boardInfo?.isProtected ? 'Protected' : 'Open'}
</span>
</div>
</div>
</div>
{/* Admin Section - Protection Settings */}
{isAdmin && (
<>
<div style={{ padding: '14px', background: 'var(--color-panel)', borderBottom: '1px solid var(--color-panel-contrast)' }}>
<div style={{
fontSize: '11px',
fontWeight: 700,
color: 'var(--color-text)',
marginBottom: '10px',
textTransform: 'uppercase',
letterSpacing: '0.5px',
display: 'flex',
alignItems: 'center',
gap: '6px',
}}>
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/>
</svg>
Protection {isGlobalAdmin && <span style={{ color: '#3b82f6', fontWeight: 500, fontSize: '10px' }}>(Global Admin)</span>}
</div>
{/* Protection Toggle */}
<div style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '10px 12px',
background: 'var(--color-muted-2)',
borderRadius: '8px',
}}>
<div>
<div style={{ fontSize: '12px', fontWeight: 500, color: 'var(--color-text)' }}>
View-only Mode
</div>
<div style={{ fontSize: '10px', color: 'var(--color-text-3)' }}>
Only listed editors can make changes
</div>
</div>
<button
onClick={toggleProtection}
disabled={updating}
style={{
width: '44px',
height: '24px',
borderRadius: '12px',
border: 'none',
cursor: updating ? 'not-allowed' : 'pointer',
background: boardInfo?.isProtected ? '#3b82f6' : '#d1d5db',
position: 'relative',
transition: 'background 0.2s',
}}
>
<div style={{
width: '20px',
height: '20px',
borderRadius: '10px',
background: 'white',
position: 'absolute',
top: '2px',
left: boardInfo?.isProtected ? '22px' : '2px',
transition: 'left 0.2s',
boxShadow: '0 1px 3px rgba(0,0,0,0.2)',
}} />
</button>
</div>
</div>
{/* Editor Management (only when protected) */}
{boardInfo?.isProtected && (
<div style={{ padding: '14px', background: 'var(--color-muted-2)', borderBottom: '1px solid var(--color-panel-contrast)' }}>
<div style={{
fontSize: '11px',
fontWeight: 700,
color: 'var(--color-text)',
marginBottom: '10px',
textTransform: 'uppercase',
letterSpacing: '0.5px',
display: 'flex',
alignItems: 'center',
gap: '6px',
}}>
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/>
<circle cx="9" cy="7" r="4"/>
<path d="M23 21v-2a4 4 0 0 0-3-3.87"/>
<path d="M16 3.13a4 4 0 0 1 0 7.75"/>
</svg>
Editors ({editors.length})
</div>
{/* Add Editor Input */}
<div style={{ display: 'flex', gap: '8px', marginBottom: '10px' }}>
<input
type="text"
placeholder="Username or email..."
value={inviteInput}
onChange={(e) => setInviteInput(e.target.value)}
onKeyDown={(e) => {
e.stopPropagation();
if (e.key === 'Enter') inviteEditor();
}}
style={{
flex: 1,
padding: '8px 12px',
fontSize: '12px',
fontFamily: 'inherit',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '6px',
background: 'var(--color-panel)',
color: 'var(--color-text)',
outline: 'none',
}}
/>
<button
onClick={inviteEditor}
disabled={!inviteInput.trim() || inviteStatus === 'sending'}
style={{
padding: '8px 14px',
backgroundColor: inviteStatus === 'sent' ? '#10b981' : '#3b82f6',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: !inviteInput.trim() || inviteStatus === 'sending' ? 'not-allowed' : 'pointer',
fontSize: '11px',
fontWeight: 500,
fontFamily: 'inherit',
opacity: !inviteInput.trim() ? 0.5 : 1,
}}
>
{inviteStatus === 'sending' ? '...' : inviteStatus === 'sent' ? 'Added' : 'Add'}
</button>
</div>
{/* Editor List */}
<div style={{ maxHeight: '150px', overflowY: 'auto' }}>
{editors.length === 0 ? (
<div style={{ fontSize: '11px', color: 'var(--color-text-3)', textAlign: 'center', padding: '10px' }}>
No editors added yet
</div>
) : (
editors.map((editor) => (
<div
key={editor.userId}
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '8px 10px',
borderRadius: '6px',
marginBottom: '4px',
background: 'var(--color-panel)',
}}
>
<div>
<div style={{ fontSize: '12px', fontWeight: 500, color: 'var(--color-text)' }}>
@{editor.username}
</div>
<div style={{ fontSize: '10px', color: 'var(--color-text-3)' }}>
{editor.permission}
</div>
</div>
<button
onClick={() => removeEditor(editor.userId)}
style={{
background: 'none',
border: 'none',
cursor: 'pointer',
color: '#ef4444',
fontSize: '14px',
padding: '4px',
}}
title="Remove editor"
>
&#10005;
</button>
</div>
))
)}
</div>
</div>
)}
</>
)}
{/* Request Admin Access (for non-admins) */}
{!isAdmin && session.authed && (
<div style={{ padding: '14px', background: 'var(--color-panel)', borderBottom: '1px solid var(--color-panel-contrast)' }}>
<div style={{
fontSize: '11px',
fontWeight: 700,
color: 'var(--color-text)',
marginBottom: '10px',
textTransform: 'uppercase',
letterSpacing: '0.5px',
display: 'flex',
alignItems: 'center',
gap: '6px',
}}>
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/>
<circle cx="8.5" cy="7" r="4"/>
<line x1="20" y1="8" x2="20" y2="14"/>
<line x1="23" y1="11" x2="17" y2="11"/>
</svg>
Admin Access
</div>
<button
onClick={requestAdminAccess}
disabled={requestingAdmin || adminRequestSent}
style={{
width: '100%',
padding: '10px',
backgroundColor: adminRequestSent ? '#10b981' : adminRequestError ? '#ef4444' : 'var(--color-muted-2)',
color: adminRequestSent || adminRequestError ? 'white' : 'var(--color-text)',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '8px',
cursor: requestingAdmin || adminRequestSent ? 'not-allowed' : 'pointer',
fontSize: '12px',
fontWeight: 500,
fontFamily: 'inherit',
}}
>
{requestingAdmin ? 'Sending request...' : adminRequestSent ? 'Request Sent!' : adminRequestError ? 'Retry Request' : 'Request Admin Access'}
</button>
{adminRequestError && (
<div style={{ fontSize: '10px', color: '#ef4444', marginTop: '6px', textAlign: 'center' }}>
{adminRequestError}
</div>
)}
<div style={{ fontSize: '10px', color: 'var(--color-text-3)', marginTop: '6px', textAlign: 'center' }}>
Admin requests are sent to jeffemmett@gmail.com
</div>
</div>
)}
{/* Sign in prompt for anonymous users */}
{!session.authed && (
<div style={{ padding: '14px', background: 'var(--color-muted-2)', textAlign: 'center' }}>
<div style={{ fontSize: '11px', color: 'var(--color-text-3)' }}>
Sign in to access board settings
</div>
</div>
)}
</div>
)}
</div>,
document.body
)}
</div>
);
};
export default BoardSettingsDropdown;

View File

@ -1,670 +0,0 @@
// Calendar Panel - Month/Week view with event list
// Used inside CalendarBrowserShape
import React, { useState, useMemo, useCallback } from "react"
import {
useCalendarEvents,
type DecryptedCalendarEvent,
} from "@/hooks/useCalendarEvents"
interface CalendarPanelProps {
onClose?: () => void
onEventSelect?: (event: DecryptedCalendarEvent) => void
shapeMode?: boolean
initialView?: "month" | "week"
initialDate?: Date
}
type ViewMode = "month" | "week"
// Helper functions
const getDaysInMonth = (year: number, month: number) => {
return new Date(year, month + 1, 0).getDate()
}
const getFirstDayOfMonth = (year: number, month: number) => {
const day = new Date(year, month, 1).getDay()
// Convert Sunday (0) to 7 for Monday-first week
return day === 0 ? 6 : day - 1
}
const formatMonthYear = (date: Date) => {
return date.toLocaleDateString("en-US", { month: "long", year: "numeric" })
}
const isSameDay = (date1: Date, date2: Date) => {
return (
date1.getFullYear() === date2.getFullYear() &&
date1.getMonth() === date2.getMonth() &&
date1.getDate() === date2.getDate()
)
}
const isToday = (date: Date) => {
return isSameDay(date, new Date())
}
export function CalendarPanel({
onClose: _onClose,
onEventSelect,
shapeMode: _shapeMode = false,
initialView = "month",
initialDate,
}: CalendarPanelProps) {
const [viewMode, setViewMode] = useState<ViewMode>(initialView)
const [currentDate, setCurrentDate] = useState(initialDate || new Date())
const [selectedDate, setSelectedDate] = useState<Date | null>(null)
// Detect dark mode
const isDarkMode =
typeof document !== "undefined" &&
document.documentElement.classList.contains("dark")
// Get calendar events for the visible range
const startOfVisibleRange = useMemo(() => {
const year = currentDate.getFullYear()
const month = currentDate.getMonth()
// Start from previous month to show leading days
return new Date(year, month - 1, 1)
}, [currentDate])
const endOfVisibleRange = useMemo(() => {
const year = currentDate.getFullYear()
const month = currentDate.getMonth()
// End at next month to show trailing days
return new Date(year, month + 2, 0)
}, [currentDate])
const { events, loading, error, refresh, getEventsForDate, getUpcoming } =
useCalendarEvents({
startDate: startOfVisibleRange,
endDate: endOfVisibleRange,
})
// Colors
const colors = isDarkMode
? {
bg: "#1a1a1a",
cardBg: "#252525",
headerBg: "#22c55e",
text: "#e4e4e7",
textMuted: "#a1a1aa",
border: "#404040",
todayBg: "#22c55e20",
selectedBg: "#3b82f620",
eventDot: "#3b82f6",
buttonBg: "#374151",
buttonHover: "#4b5563",
}
: {
bg: "#ffffff",
cardBg: "#f9fafb",
headerBg: "#22c55e",
text: "#1f2937",
textMuted: "#6b7280",
border: "#e5e7eb",
todayBg: "#22c55e15",
selectedBg: "#3b82f615",
eventDot: "#3b82f6",
buttonBg: "#f3f4f6",
buttonHover: "#e5e7eb",
}
// Navigation handlers
const goToPrevious = () => {
if (viewMode === "month") {
setCurrentDate(
new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1)
)
} else {
const newDate = new Date(currentDate)
newDate.setDate(newDate.getDate() - 7)
setCurrentDate(newDate)
}
}
const goToNext = () => {
if (viewMode === "month") {
setCurrentDate(
new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 1)
)
} else {
const newDate = new Date(currentDate)
newDate.setDate(newDate.getDate() + 7)
setCurrentDate(newDate)
}
}
const goToToday = () => {
setCurrentDate(new Date())
setSelectedDate(new Date())
}
// Generate month grid
const monthGrid = useMemo(() => {
const year = currentDate.getFullYear()
const month = currentDate.getMonth()
const daysInMonth = getDaysInMonth(year, month)
const firstDay = getFirstDayOfMonth(year, month)
const days: { date: Date; isCurrentMonth: boolean }[] = []
// Previous month days
const prevMonth = month === 0 ? 11 : month - 1
const prevYear = month === 0 ? year - 1 : year
const daysInPrevMonth = getDaysInMonth(prevYear, prevMonth)
for (let i = firstDay - 1; i >= 0; i--) {
days.push({
date: new Date(prevYear, prevMonth, daysInPrevMonth - i),
isCurrentMonth: false,
})
}
// Current month days
for (let i = 1; i <= daysInMonth; i++) {
days.push({
date: new Date(year, month, i),
isCurrentMonth: true,
})
}
// Next month days to complete grid
const nextMonth = month === 11 ? 0 : month + 1
const nextYear = month === 11 ? year + 1 : year
const remainingDays = 42 - days.length // 6 rows * 7 days
for (let i = 1; i <= remainingDays; i++) {
days.push({
date: new Date(nextYear, nextMonth, i),
isCurrentMonth: false,
})
}
return days
}, [currentDate])
// Format event time
const formatEventTime = (event: DecryptedCalendarEvent) => {
if (event.isAllDay) return "All day"
return event.startTime.toLocaleTimeString("en-US", {
hour: "numeric",
minute: "2-digit",
hour12: true,
})
}
// Upcoming events for sidebar
const upcomingEvents = useMemo(() => {
return getUpcoming(10)
}, [getUpcoming])
// Events for selected date
const selectedDateEvents = useMemo(() => {
if (!selectedDate) return []
return getEventsForDate(selectedDate)
}, [selectedDate, getEventsForDate])
// Day cell component
const DayCell = ({
date,
isCurrentMonth,
}: {
date: Date
isCurrentMonth: boolean
}) => {
const dayEvents = getEventsForDate(date)
const isSelectedDate = selectedDate && isSameDay(date, selectedDate)
const isTodayDate = isToday(date)
return (
<div
onClick={() => setSelectedDate(date)}
style={{
padding: "4px",
minHeight: "60px",
cursor: "pointer",
backgroundColor: isSelectedDate
? colors.selectedBg
: isTodayDate
? colors.todayBg
: "transparent",
borderRadius: "4px",
border: isTodayDate
? `2px solid ${colors.headerBg}`
: "1px solid transparent",
transition: "background-color 0.15s ease",
}}
onMouseEnter={(e) => {
if (!isSelectedDate && !isTodayDate) {
e.currentTarget.style.backgroundColor = colors.buttonBg
}
}}
onMouseLeave={(e) => {
if (!isSelectedDate && !isTodayDate) {
e.currentTarget.style.backgroundColor = "transparent"
}
}}
>
<div
style={{
fontSize: "12px",
fontWeight: isTodayDate ? "700" : "500",
color: isCurrentMonth ? colors.text : colors.textMuted,
marginBottom: "4px",
}}
>
{date.getDate()}
</div>
<div style={{ display: "flex", flexWrap: "wrap", gap: "2px" }}>
{dayEvents.slice(0, 3).map((event) => (
<div
key={event.id}
style={{
width: "6px",
height: "6px",
borderRadius: "50%",
backgroundColor: colors.eventDot,
}}
title={event.summary}
/>
))}
{dayEvents.length > 3 && (
<div
style={{
fontSize: "9px",
color: colors.textMuted,
}}
>
+{dayEvents.length - 3}
</div>
)}
</div>
</div>
)
}
// Event list item
const EventItem = ({ event }: { event: DecryptedCalendarEvent }) => (
<div
onClick={() => onEventSelect?.(event)}
style={{
padding: "10px 12px",
backgroundColor: colors.cardBg,
borderRadius: "8px",
cursor: "pointer",
borderLeft: `3px solid ${colors.eventDot}`,
transition: "background-color 0.15s ease",
}}
onMouseEnter={(e) => {
e.currentTarget.style.backgroundColor = colors.buttonBg
}}
onMouseLeave={(e) => {
e.currentTarget.style.backgroundColor = colors.cardBg
}}
>
<div
style={{
fontSize: "13px",
fontWeight: "600",
color: colors.text,
marginBottom: "4px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
}}
>
{event.summary}
</div>
<div
style={{
fontSize: "11px",
color: colors.textMuted,
display: "flex",
alignItems: "center",
gap: "8px",
}}
>
<span>{formatEventTime(event)}</span>
{event.location && (
<>
<span>|</span>
<span
style={{
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
}}
>
{event.location}
</span>
</>
)}
</div>
</div>
)
// Loading state
if (loading) {
return (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100%",
color: colors.textMuted,
}}
>
<div style={{ textAlign: "center" }}>
<div style={{ fontSize: "24px", marginBottom: "8px" }}>Loading...</div>
<div style={{ fontSize: "12px" }}>Fetching calendar events</div>
</div>
</div>
)
}
// Error state
if (error) {
return (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100%",
color: colors.textMuted,
}}
>
<div style={{ textAlign: "center", padding: "20px" }}>
<div style={{ fontSize: "24px", marginBottom: "8px" }}>Error</div>
<div style={{ fontSize: "12px", marginBottom: "16px" }}>{error}</div>
<button
onClick={refresh}
style={{
padding: "8px 16px",
backgroundColor: colors.headerBg,
color: "#fff",
border: "none",
borderRadius: "6px",
cursor: "pointer",
fontSize: "13px",
}}
>
Retry
</button>
</div>
</div>
)
}
// No events state
if (events.length === 0) {
return (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100%",
color: colors.textMuted,
}}
>
<div style={{ textAlign: "center", padding: "20px" }}>
<div style={{ fontSize: "48px", marginBottom: "16px" }}>📅</div>
<div style={{ fontSize: "16px", fontWeight: "600", marginBottom: "8px" }}>
No Calendar Events
</div>
<div style={{ fontSize: "12px", marginBottom: "16px" }}>
Import your Google Calendar to see events here.
</div>
</div>
</div>
)
}
return (
<div
style={{
display: "flex",
height: "100%",
backgroundColor: colors.bg,
color: colors.text,
}}
>
{/* Main Calendar Area */}
<div
style={{
flex: 1,
display: "flex",
flexDirection: "column",
borderRight: `1px solid ${colors.border}`,
}}
>
{/* Navigation Header */}
<div
style={{
padding: "12px 16px",
display: "flex",
alignItems: "center",
gap: "12px",
borderBottom: `1px solid ${colors.border}`,
}}
>
<button
onClick={goToPrevious}
style={{
padding: "6px 12px",
backgroundColor: colors.buttonBg,
color: colors.text,
border: "none",
borderRadius: "6px",
cursor: "pointer",
fontSize: "14px",
}}
>
&lt;
</button>
<div
style={{
flex: 1,
textAlign: "center",
fontSize: "16px",
fontWeight: "600",
}}
>
{formatMonthYear(currentDate)}
</div>
<button
onClick={goToNext}
style={{
padding: "6px 12px",
backgroundColor: colors.buttonBg,
color: colors.text,
border: "none",
borderRadius: "6px",
cursor: "pointer",
fontSize: "14px",
}}
>
&gt;
</button>
<button
onClick={goToToday}
style={{
padding: "6px 12px",
backgroundColor: colors.headerBg,
color: "#fff",
border: "none",
borderRadius: "6px",
cursor: "pointer",
fontSize: "12px",
fontWeight: "600",
}}
>
Today
</button>
{/* View toggle */}
<div
style={{
display: "flex",
backgroundColor: colors.buttonBg,
borderRadius: "6px",
overflow: "hidden",
}}
>
<button
onClick={() => setViewMode("month")}
style={{
padding: "6px 12px",
backgroundColor:
viewMode === "month" ? colors.headerBg : "transparent",
color: viewMode === "month" ? "#fff" : colors.text,
border: "none",
cursor: "pointer",
fontSize: "12px",
}}
>
Month
</button>
<button
onClick={() => setViewMode("week")}
style={{
padding: "6px 12px",
backgroundColor:
viewMode === "week" ? colors.headerBg : "transparent",
color: viewMode === "week" ? "#fff" : colors.text,
border: "none",
cursor: "pointer",
fontSize: "12px",
}}
>
Week
</button>
</div>
</div>
{/* Calendar Grid */}
<div style={{ flex: 1, padding: "12px", overflow: "auto" }}>
{/* Day headers */}
<div
style={{
display: "grid",
gridTemplateColumns: "repeat(7, 1fr)",
gap: "4px",
marginBottom: "8px",
}}
>
{["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"].map((day) => (
<div
key={day}
style={{
textAlign: "center",
fontSize: "11px",
fontWeight: "600",
color: colors.textMuted,
padding: "4px",
}}
>
{day}
</div>
))}
</div>
{/* Day cells */}
<div
style={{
display: "grid",
gridTemplateColumns: "repeat(7, 1fr)",
gap: "4px",
}}
>
{monthGrid.map(({ date, isCurrentMonth }, i) => (
<DayCell key={i} date={date} isCurrentMonth={isCurrentMonth} />
))}
</div>
</div>
</div>
{/* Sidebar - Events */}
<div
style={{
width: "280px",
display: "flex",
flexDirection: "column",
}}
>
{/* Selected Date Events or Upcoming */}
<div
style={{
flex: 1,
padding: "12px",
overflow: "auto",
}}
>
<div
style={{
fontSize: "12px",
fontWeight: "600",
color: colors.textMuted,
marginBottom: "12px",
textTransform: "uppercase",
letterSpacing: "0.5px",
}}
>
{selectedDate
? selectedDate.toLocaleDateString("en-US", {
weekday: "long",
month: "long",
day: "numeric",
})
: "Upcoming Events"}
</div>
<div style={{ display: "flex", flexDirection: "column", gap: "8px" }}>
{(selectedDate ? selectedDateEvents : upcomingEvents).map(
(event) => (
<EventItem key={event.id} event={event} />
)
)}
{(selectedDate ? selectedDateEvents : upcomingEvents).length ===
0 && (
<div
style={{
textAlign: "center",
padding: "20px",
color: colors.textMuted,
fontSize: "12px",
}}
>
{selectedDate
? "No events on this day"
: "No upcoming events"}
</div>
)}
</div>
</div>
{/* Click hint */}
{onEventSelect && (
<div
style={{
padding: "12px",
borderTop: `1px solid ${colors.border}`,
fontSize: "11px",
color: colors.textMuted,
textAlign: "center",
}}
>
Click an event to add it to the canvas
</div>
)}
</div>
</div>
)
}
export default CalendarPanel

View File

@ -1,262 +0,0 @@
import { useState, useEffect } from 'react'
import { ConnectionState } from '../automerge/CloudflareAdapter'
interface ConnectionStatusIndicatorProps {
connectionState: ConnectionState
isNetworkOnline: boolean
}
export function ConnectionStatusIndicator({
connectionState,
isNetworkOnline
}: ConnectionStatusIndicatorProps) {
const [showDetails, setShowDetails] = useState(false)
const [isVisible, setIsVisible] = useState(false)
// Determine if we're truly offline (no network OR disconnected for a while)
const isOffline = !isNetworkOnline || connectionState === 'disconnected'
const isReconnecting = connectionState === 'reconnecting' || connectionState === 'connecting'
// Don't show anything when connected and online
useEffect(() => {
if (connectionState === 'connected' && isNetworkOnline) {
// Fade out
setIsVisible(false)
setShowDetails(false)
} else {
// Fade in
setIsVisible(true)
}
}, [connectionState, isNetworkOnline])
if (!isVisible && connectionState === 'connected' && isNetworkOnline) {
return null
}
const getStatusInfo = () => {
if (!isNetworkOnline) {
return {
label: 'Working Offline',
color: '#8b5cf6', // Purple - calm, not alarming
icon: '🍄',
pulse: false,
description: 'Viewing locally saved canvas',
detailedMessage: `You're viewing your locally cached canvas. All your previous work is safely stored in your browser. Any changes you make will be saved locally and automatically synced when you reconnect — no data will be lost.`,
}
}
switch (connectionState) {
case 'connecting':
return {
label: 'Connecting',
color: '#f59e0b', // amber
icon: '🌱',
pulse: true,
description: 'Establishing secure connection...',
detailedMessage: 'Connecting to the collaborative canvas. Your local changes are safely stored.',
}
case 'reconnecting':
return {
label: 'Reconnecting',
color: '#f59e0b', // amber
icon: '🔄',
pulse: true,
description: 'Re-establishing connection...',
detailedMessage: 'Connection interrupted. Attempting to reconnect. All your changes are saved locally and will sync automatically once the connection is restored.',
}
case 'disconnected':
return {
label: 'Disconnected',
color: '#8b5cf6', // Purple
icon: '🍄',
pulse: false,
description: 'Working in local mode',
detailedMessage: `Your canvas is stored securely in your browser using encrypted local storage. All changes are preserved with your personal encryption key. When connectivity is restored, your work will automatically merge with the shared canvas.`,
}
default:
return null
}
}
const status = getStatusInfo()
if (!status) return null
return (
<>
<div
onClick={() => setShowDetails(!showDetails)}
style={{
position: 'fixed',
bottom: '16px',
left: '50%',
transform: 'translateX(-50%)',
zIndex: 9999,
display: 'flex',
alignItems: 'center',
gap: '10px',
padding: showDetails ? '12px 16px' : '10px 16px',
backgroundColor: 'rgba(30, 30, 30, 0.95)',
color: 'white',
borderRadius: showDetails ? '16px' : '24px',
fontSize: '14px',
fontFamily: "'Inter', system-ui, -apple-system, sans-serif",
boxShadow: '0 8px 32px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(255,255,255,0.1)',
backdropFilter: 'blur(12px)',
WebkitBackdropFilter: 'blur(12px)',
cursor: 'pointer',
transition: 'all 0.3s ease',
maxWidth: showDetails ? '380px' : '320px',
opacity: isVisible ? 1 : 0,
animation: status.pulse ? 'gentlePulse 3s infinite' : undefined,
}}
>
{/* Status indicator dot */}
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
flexShrink: 0,
}}>
<span style={{ fontSize: '18px' }}>{status.icon}</span>
<span
style={{
width: '8px',
height: '8px',
borderRadius: '50%',
backgroundColor: status.color,
boxShadow: `0 0 8px ${status.color}`,
animation: status.pulse ? 'blink 1.5s infinite' : undefined,
}}
/>
</div>
{/* Main content */}
<div style={{
display: 'flex',
flexDirection: 'column',
gap: '4px',
flex: 1,
minWidth: 0,
}}>
<div style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
}}>
<span style={{
fontWeight: 600,
color: status.color,
letterSpacing: '-0.01em',
}}>
{status.label}
</span>
<span style={{
opacity: 0.7,
fontSize: '12px',
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}>
{status.description}
</span>
</div>
{/* Detailed message when expanded */}
{showDetails && (
<div style={{
fontSize: '12px',
lineHeight: '1.5',
opacity: 0.85,
marginTop: '6px',
paddingTop: '8px',
borderTop: '1px solid rgba(255,255,255,0.1)',
}}>
{status.detailedMessage}
{/* Data sovereignty badges */}
<div style={{
display: 'flex',
gap: '8px',
marginTop: '10px',
flexWrap: 'wrap',
}}>
<span style={{
display: 'inline-flex',
alignItems: 'center',
gap: '4px',
padding: '4px 8px',
backgroundColor: 'rgba(139, 92, 246, 0.2)',
borderRadius: '8px',
fontSize: '10px',
fontWeight: 500,
color: '#a78bfa',
}}>
🔐 Encrypted Locally
</span>
<span style={{
display: 'inline-flex',
alignItems: 'center',
gap: '4px',
padding: '4px 8px',
backgroundColor: 'rgba(16, 185, 129, 0.2)',
borderRadius: '8px',
fontSize: '10px',
fontWeight: 500,
color: '#6ee7b7',
}}>
💾 Auto-Saved
</span>
<span style={{
display: 'inline-flex',
alignItems: 'center',
gap: '4px',
padding: '4px 8px',
backgroundColor: 'rgba(59, 130, 246, 0.2)',
borderRadius: '8px',
fontSize: '10px',
fontWeight: 500,
color: '#93c5fd',
}}>
🔄 Will Auto-Sync
</span>
</div>
</div>
)}
</div>
{/* Expand indicator */}
<svg
width="16"
height="16"
viewBox="0 0 24 24"
fill="currentColor"
style={{
opacity: 0.5,
transform: showDetails ? 'rotate(180deg)' : 'rotate(0deg)',
transition: 'transform 0.2s ease',
flexShrink: 0,
}}
>
<path d="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z"/>
</svg>
</div>
<style>{`
@keyframes gentlePulse {
0%, 100% {
opacity: 1;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(255,255,255,0.1);
}
50% {
opacity: 0.9;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(255,255,255,0.15);
}
}
@keyframes blink {
0%, 100% { opacity: 1; }
50% { opacity: 0.4; }
}
`}</style>
</>
)
}

View File

@ -0,0 +1,300 @@
import React, { useState, useEffect, useCallback } from 'react';
import { useEditor, TLShapeId } from 'tldraw';
import { useAuth } from '../context/AuthContext';
import { useParams } from 'react-router-dom';
import {
getDeletedShapes,
removeDeletedShape,
DeletedShape,
formatRelativeTime,
} from '../lib/versionHistory';
import { usePermissions } from '../hooks/usePermissions';
interface DeletedShapesOverlayProps {
show?: boolean;
}
/**
* DeletedShapesOverlay - Shows ghost representations of deleted shapes
* and provides a floating indicator with restore options
*/
export const DeletedShapesOverlay: React.FC<DeletedShapesOverlayProps> = ({
show = true,
}) => {
const editor = useEditor();
const { session } = useAuth();
const { slug } = useParams<{ slug: string }>();
const { canRestoreDeleted } = usePermissions(slug || '');
const [deletedShapes, setDeletedShapes] = useState<DeletedShape[]>([]);
const [showPanel, setShowPanel] = useState(false);
const [visible, setVisible] = useState(show);
// Load deleted shapes
useEffect(() => {
if (!session.authed || !session.username || !slug) return;
const deleted = getDeletedShapes(session.username, slug);
setDeletedShapes(deleted);
}, [session.authed, session.username, slug]);
// Listen for toggle events
useEffect(() => {
const handleToggle = (event: CustomEvent<boolean>) => {
setVisible(event.detail);
};
const handleShapeRestored = (event: CustomEvent<TLShapeId>) => {
if (!session.username || !slug) return;
removeDeletedShape(session.username, slug, event.detail);
setDeletedShapes(prev => prev.filter(s => s.id !== event.detail));
};
window.addEventListener('toggle-deleted-shapes', handleToggle as EventListener);
window.addEventListener('shape-restored', handleShapeRestored as EventListener);
return () => {
window.removeEventListener('toggle-deleted-shapes', handleToggle as EventListener);
window.removeEventListener('shape-restored', handleShapeRestored as EventListener);
};
}, [session.username, slug]);
// Restore a deleted shape
const handleRestore = useCallback((deletedShape: DeletedShape) => {
if (!editor || !session.username || !slug) return;
try {
editor.createShape({
id: deletedShape.id,
type: deletedShape.type,
x: deletedShape.x,
y: deletedShape.y,
props: deletedShape.props,
} as any);
// Remove from deleted list
removeDeletedShape(session.username, slug, deletedShape.id);
setDeletedShapes(prev => prev.filter(s => s.id !== deletedShape.id));
// Close panel if no more deleted shapes
if (deletedShapes.length <= 1) {
setShowPanel(false);
}
} catch (error) {
console.error('Error restoring shape:', error);
}
}, [editor, session.username, slug, deletedShapes.length]);
// Restore all deleted shapes
const handleRestoreAll = useCallback(() => {
if (!editor || !session.username || !slug) return;
deletedShapes.forEach(deletedShape => {
try {
editor.createShape({
id: deletedShape.id,
type: deletedShape.type,
x: deletedShape.x,
y: deletedShape.y,
props: deletedShape.props,
} as any);
removeDeletedShape(session.username, slug, deletedShape.id);
} catch (error) {
console.error('Error restoring shape:', error);
}
});
setDeletedShapes([]);
setShowPanel(false);
}, [editor, session.username, slug, deletedShapes]);
// Dismiss all deleted shapes (clear from storage)
const handleDismissAll = useCallback(() => {
if (!session.username || !slug) return;
deletedShapes.forEach(d => {
removeDeletedShape(session.username!, slug!, d.id);
});
setDeletedShapes([]);
setShowPanel(false);
}, [session.username, slug, deletedShapes]);
// Don't render if no deleted shapes or not visible
if (!visible || deletedShapes.length === 0 || !session.authed) {
return null;
}
return (
<>
{/* Floating Indicator */}
<button
className="deleted-shapes-floating-indicator"
onClick={() => setShowPanel(!showPanel)}
title={`${deletedShapes.length} deleted shape${deletedShapes.length > 1 ? 's' : ''} can be restored`}
>
<svg viewBox="0 0 16 16" fill="currentColor">
<path d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5ZM11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H2.506a.58.58 0 0 0-.01 0H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1h-.995a.59.59 0 0 0-.01 0H11Zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5h9.916Zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47ZM8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5Z"/>
</svg>
<span>{deletedShapes.length} deleted</span>
</button>
{/* Restore Panel */}
{showPanel && (
<>
{/* Backdrop */}
<div
style={{
position: 'fixed',
inset: 0,
zIndex: 9999,
}}
onClick={() => setShowPanel(false)}
/>
{/* Panel */}
<div
style={{
position: 'fixed',
bottom: '130px',
right: '20px',
width: '280px',
maxHeight: '400px',
backgroundColor: 'var(--bg-color, #fff)',
border: '1px solid var(--border-color, #e1e4e8)',
borderRadius: '12px',
boxShadow: '0 8px 24px rgba(0,0,0,0.15)',
zIndex: 10001,
overflow: 'hidden',
display: 'flex',
flexDirection: 'column',
}}
>
{/* Header */}
<div
style={{
padding: '12px 16px',
borderBottom: '1px solid var(--border-color, #e1e4e8)',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
<h3 style={{ margin: 0, fontSize: '14px', fontWeight: 600 }}>
Deleted Shapes
</h3>
<button
onClick={() => setShowPanel(false)}
style={{
background: 'none',
border: 'none',
cursor: 'pointer',
padding: '4px',
opacity: 0.6,
}}
>
<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor">
<path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg>
</button>
</div>
{/* Deleted shapes list */}
<div style={{ flex: 1, overflow: 'auto', padding: '12px' }}>
<div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
{deletedShapes.map((deleted) => (
<div
key={deleted.id}
style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
padding: '8px 10px',
border: '1px solid #ef4444',
borderRadius: '6px',
backgroundColor: 'rgba(239, 68, 68, 0.05)',
}}
>
<span style={{ fontSize: '14px', opacity: 0.5 }}>
{deleted.type === 'draw' ? '✏️' :
deleted.type === 'text' ? '📝' :
deleted.type === 'image' ? '🖼️' :
deleted.type === 'embed' ? '🔗' :
'📦'}
</span>
<div style={{ flex: 1, minWidth: 0 }}>
<p style={{ fontSize: '12px', margin: 0, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>
{deleted.type}
</p>
<p style={{ fontSize: '10px', color: '#666', margin: '2px 0 0 0' }}>
{formatRelativeTime(deleted.deletedAt)}
</p>
</div>
{canRestoreDeleted && (
<button
onClick={() => handleRestore(deleted)}
style={{
padding: '4px 8px',
fontSize: '10px',
backgroundColor: '#10b981',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer',
flexShrink: 0,
}}
>
Restore
</button>
)}
</div>
))}
</div>
</div>
{/* Actions */}
<div
style={{
padding: '12px',
borderTop: '1px solid var(--border-color, #e1e4e8)',
display: 'flex',
gap: '8px',
}}
>
{canRestoreDeleted && (
<button
onClick={handleRestoreAll}
style={{
flex: 1,
padding: '8px',
fontSize: '12px',
backgroundColor: '#10b981',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: 'pointer',
fontWeight: 500,
}}
>
Restore All
</button>
)}
<button
onClick={handleDismissAll}
style={{
padding: '8px 12px',
fontSize: '12px',
backgroundColor: 'transparent',
color: '#666',
border: '1px solid #ddd',
borderRadius: '6px',
cursor: 'pointer',
flex: canRestoreDeleted ? undefined : 1,
}}
>
Dismiss
</button>
</div>
</div>
</>
)}
</>
);
};

View File

@ -80,6 +80,7 @@ export function FathomMeetingsPanel({ onClose, onMeetingSelect, shapeMode = fals
} }
}) })
} catch (error) { } catch (error) {
console.log('Production worker failed, trying local worker...')
response = await fetch(`${LOCAL_WORKER_URL}/fathom/meetings`, { response = await fetch(`${LOCAL_WORKER_URL}/fathom/meetings`, {
headers: { headers: {
'X-Api-Key': key, 'X-Api-Key': key,
@ -149,6 +150,13 @@ export function FathomMeetingsPanel({ onClose, onMeetingSelect, shapeMode = fals
// Handler for individual data type buttons - creates shapes directly // Handler for individual data type buttons - creates shapes directly
const handleDataButtonClick = async (meeting: FathomMeeting, dataType: 'summary' | 'transcript' | 'actionItems' | 'video') => { const handleDataButtonClick = async (meeting: FathomMeeting, dataType: 'summary' | 'transcript' | 'actionItems' | 'video') => {
// Log to verify the correct meeting is being used
console.log('🔵 handleDataButtonClick called with meeting:', {
recording_id: meeting.recording_id,
title: meeting.title,
dataType
})
if (!onMeetingSelect) { if (!onMeetingSelect) {
// Fallback for non-browser mode // Fallback for non-browser mode
const options = { const options = {
@ -243,6 +251,7 @@ export function FathomMeetingsPanel({ onClose, onMeetingSelect, shapeMode = fals
(callId ? `https://fathom.video/calls/${callId}` : null) (callId ? `https://fathom.video/calls/${callId}` : null)
if (videoUrl) { if (videoUrl) {
console.log('Opening Fathom video URL:', videoUrl, 'for meeting:', { callId, recording_id: meeting.recording_id })
window.open(videoUrl, '_blank', 'noopener,noreferrer') window.open(videoUrl, '_blank', 'noopener,noreferrer')
} else { } else {
console.error('Could not determine Fathom video URL for meeting:', meeting) console.error('Could not determine Fathom video URL for meeting:', meeting)
@ -263,6 +272,7 @@ export function FathomMeetingsPanel({ onClose, onMeetingSelect, shapeMode = fals
} }
}) })
} catch (error) { } catch (error) {
console.log('Production worker failed, trying local worker...')
response = await fetch(`${LOCAL_WORKER_URL}/fathom/meetings/${meeting.recording_id}${includeTranscript ? '?include_transcript=true' : ''}`, { response = await fetch(`${LOCAL_WORKER_URL}/fathom/meetings/${meeting.recording_id}${includeTranscript ? '?include_transcript=true' : ''}`, {
headers: { headers: {
'X-Api-Key': apiKey, 'X-Api-Key': apiKey,

View File

@ -1,467 +0,0 @@
// Simple test component for Google Data Sovereignty OAuth flow
import { useState, useEffect } from 'react';
import {
initiateGoogleAuth,
handleGoogleCallback,
parseCallbackParams,
isGoogleAuthenticated,
getGrantedScopes,
generateMasterKey,
importGmail,
importDrive,
importPhotos,
importCalendar,
gmailStore,
driveStore,
photosStore,
calendarStore,
deleteDatabase,
createShareService,
type GoogleService,
type ImportProgress,
type ShareableItem
} from '../lib/google';
export function GoogleDataTest() {
const [status, setStatus] = useState<string>('Initializing...');
const [isAuthed, setIsAuthed] = useState(false);
const [scopes, setScopes] = useState<string[]>([]);
const [masterKey, setMasterKey] = useState<CryptoKey | null>(null);
const [error, setError] = useState<string | null>(null);
const [importProgress, setImportProgress] = useState<ImportProgress | null>(null);
const [storedCounts, setStoredCounts] = useState<{gmail: number; drive: number; photos: number; calendar: number}>({
gmail: 0, drive: 0, photos: 0, calendar: 0
});
const [logs, setLogs] = useState<string[]>([]);
const [viewingService, setViewingService] = useState<GoogleService | null>(null);
const [viewItems, setViewItems] = useState<ShareableItem[]>([]);
const addLog = (msg: string) => {
setLogs(prev => [...prev.slice(-20), `${new Date().toLocaleTimeString()}: ${msg}`]);
};
// Initialize on mount
useEffect(() => {
initializeService();
}, []);
// Check for OAuth callback - wait for masterKey to be ready
useEffect(() => {
const url = window.location.href;
if (url.includes('/oauth/google/callback') && masterKey) {
handleCallback(url);
}
}, [masterKey]); // Re-run when masterKey becomes available
async function initializeService() {
try {
// Generate or load master key
const key = await generateMasterKey();
setMasterKey(key);
// Check if already authenticated
const authed = await isGoogleAuthenticated();
setIsAuthed(authed);
if (authed) {
const grantedScopes = await getGrantedScopes();
setScopes(grantedScopes);
setStatus('Authenticated with Google');
} else {
setStatus('Ready to connect to Google');
}
} catch (err) {
setError(err instanceof Error ? err.message : 'Initialization failed');
setStatus('Error');
}
}
async function handleCallback(url: string) {
setStatus('Processing OAuth callback...');
const params = parseCallbackParams(url);
if (params.error) {
setError(`OAuth error: ${params.error_description || params.error}`);
setStatus('Error');
return;
}
if (params.code && params.state && masterKey) {
const result = await handleGoogleCallback(params.code, params.state, masterKey);
if (result.success) {
setIsAuthed(true);
setScopes(result.scopes);
setStatus('Successfully connected to Google!');
// Clean up URL
window.history.replaceState({}, '', '/');
} else {
setError(result.error || 'Callback failed');
setStatus('Error');
}
}
}
async function connectGoogle() {
setStatus('Redirecting to Google...');
const services: GoogleService[] = ['gmail', 'drive', 'photos', 'calendar'];
await initiateGoogleAuth(services);
}
async function resetAndReconnect() {
addLog('Resetting: Clearing all data...');
try {
await deleteDatabase();
addLog('Resetting: Database cleared');
setIsAuthed(false);
setScopes([]);
setStoredCounts({ gmail: 0, drive: 0, photos: 0, calendar: 0 });
setError(null);
setStatus('Database cleared. Click Connect to re-authenticate.');
addLog('Resetting: Done. Please re-connect to Google.');
} catch (err) {
addLog(`Resetting: ERROR - ${err}`);
}
}
async function viewData(service: GoogleService) {
if (!masterKey) return;
addLog(`Viewing ${service} data...`);
try {
const shareService = createShareService(masterKey);
const items = await shareService.listShareableItems(service, 20);
addLog(`Found ${items.length} ${service} items`);
setViewItems(items);
setViewingService(service);
} catch (err) {
addLog(`View error: ${err}`);
setError(err instanceof Error ? err.message : String(err));
}
}
async function refreshCounts() {
const [gmail, drive, photos, calendar] = await Promise.all([
gmailStore.count(),
driveStore.count(),
photosStore.count(),
calendarStore.count()
]);
setStoredCounts({ gmail, drive, photos, calendar });
}
async function testImportGmail() {
addLog('Gmail: Starting...');
if (!masterKey) {
addLog('Gmail: ERROR - No master key');
setError('No master key available');
return;
}
setError(null);
setImportProgress(null);
setStatus('Importing Gmail (max 10 messages)...');
try {
addLog('Gmail: Calling importGmail...');
const result = await importGmail(masterKey, {
maxMessages: 10,
onProgress: (p) => {
addLog(`Gmail: Progress ${p.imported}/${p.total} - ${p.status}`);
setImportProgress(p);
}
});
addLog(`Gmail: Result - ${result.status}, ${result.imported} items`);
setImportProgress(result);
if (result.status === 'error') {
addLog(`Gmail: ERROR - ${result.errorMessage}`);
setError(result.errorMessage || 'Unknown error');
setStatus('Gmail import failed');
} else {
setStatus(`Gmail import ${result.status}: ${result.imported} messages`);
}
await refreshCounts();
} catch (err) {
const errorMsg = err instanceof Error ? `${err.name}: ${err.message}` : String(err);
addLog(`Gmail: EXCEPTION - ${errorMsg}`);
setError(errorMsg);
setStatus('Gmail import error');
}
}
async function testImportDrive() {
if (!masterKey) return;
setError(null);
setStatus('Importing Drive (max 10 files)...');
try {
const result = await importDrive(masterKey, {
maxFiles: 10,
onProgress: (p) => setImportProgress(p)
});
setImportProgress(result);
setStatus(`Drive import ${result.status}: ${result.imported} files`);
await refreshCounts();
} catch (err) {
setError(err instanceof Error ? err.message : 'Import failed');
setStatus('Error');
}
}
async function testImportPhotos() {
if (!masterKey) return;
setError(null);
setStatus('Importing Photos (max 10 thumbnails)...');
try {
const result = await importPhotos(masterKey, {
maxPhotos: 10,
onProgress: (p) => setImportProgress(p)
});
setImportProgress(result);
setStatus(`Photos import ${result.status}: ${result.imported} photos`);
await refreshCounts();
} catch (err) {
setError(err instanceof Error ? err.message : 'Import failed');
setStatus('Error');
}
}
async function testImportCalendar() {
if (!masterKey) return;
setError(null);
setStatus('Importing Calendar (max 20 events)...');
try {
const result = await importCalendar(masterKey, {
maxEvents: 20,
onProgress: (p) => setImportProgress(p)
});
setImportProgress(result);
setStatus(`Calendar import ${result.status}: ${result.imported} events`);
await refreshCounts();
} catch (err) {
setError(err instanceof Error ? err.message : 'Import failed');
setStatus('Error');
}
}
const buttonStyle = {
padding: '10px 16px',
fontSize: '14px',
background: '#1a73e8',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer',
marginRight: '10px',
marginBottom: '10px'
};
return (
<div style={{
padding: '20px',
fontFamily: 'system-ui, sans-serif',
maxWidth: '600px',
margin: '40px auto'
}}>
<h1>Google Data Sovereignty Test</h1>
<div style={{
padding: '15px',
background: error ? '#fee' : '#f0f0f0',
borderRadius: '8px',
marginBottom: '20px'
}}>
<strong>Status:</strong> {status}
{error && (
<div style={{
color: 'red',
marginTop: '10px',
padding: '10px',
background: '#fdd',
borderRadius: '4px',
fontFamily: 'monospace',
fontSize: '12px',
whiteSpace: 'pre-wrap',
wordBreak: 'break-all'
}}>
<strong>Error:</strong> {error}
</div>
)}
</div>
{!isAuthed ? (
<button
onClick={connectGoogle}
style={{
padding: '12px 24px',
fontSize: '16px',
background: '#4285f4',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer'
}}
>
Connect Google Account
</button>
) : (
<div>
<h3 style={{ color: 'green' }}>Connected!</h3>
<p><strong>Granted scopes:</strong></p>
<ul>
{scopes.map(scope => (
<li key={scope} style={{ fontSize: '12px', fontFamily: 'monospace' }}>
{scope.replace('https://www.googleapis.com/auth/', '')}
</li>
))}
</ul>
<h3>Test Import (Small Batches)</h3>
<div style={{ marginBottom: '20px' }}>
<button style={buttonStyle} onClick={testImportGmail}>
Import Gmail (10)
</button>
<button style={buttonStyle} onClick={testImportDrive}>
Import Drive (10)
</button>
<button style={buttonStyle} onClick={testImportPhotos}>
Import Photos (10)
</button>
<button style={buttonStyle} onClick={testImportCalendar}>
Import Calendar (20)
</button>
</div>
{importProgress && (
<div style={{
padding: '10px',
background: importProgress.status === 'error' ? '#fee' :
importProgress.status === 'completed' ? '#efe' : '#fff3e0',
borderRadius: '4px',
marginBottom: '15px'
}}>
<strong>{importProgress.service}:</strong> {importProgress.status}
{importProgress.status === 'importing' && (
<span> - {importProgress.imported}/{importProgress.total}</span>
)}
{importProgress.status === 'completed' && (
<span> - {importProgress.imported} items imported</span>
)}
{importProgress.errorMessage && (
<div style={{ color: 'red', marginTop: '5px' }}>{importProgress.errorMessage}</div>
)}
</div>
)}
<h3>Stored Data (Encrypted in IndexedDB)</h3>
<table style={{ width: '100%', borderCollapse: 'collapse' }}>
<tbody>
<tr>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd' }}>Gmail</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>{storedCounts.gmail} messages</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>
{storedCounts.gmail > 0 && <button onClick={() => viewData('gmail')} style={{ fontSize: '12px', padding: '4px 8px' }}>View</button>}
</td>
</tr>
<tr>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd' }}>Drive</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>{storedCounts.drive} files</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>
{storedCounts.drive > 0 && <button onClick={() => viewData('drive')} style={{ fontSize: '12px', padding: '4px 8px' }}>View</button>}
</td>
</tr>
<tr>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd' }}>Photos</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>{storedCounts.photos} photos</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>
{storedCounts.photos > 0 && <button onClick={() => viewData('photos')} style={{ fontSize: '12px', padding: '4px 8px' }}>View</button>}
</td>
</tr>
<tr>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd' }}>Calendar</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>{storedCounts.calendar} events</td>
<td style={{ padding: '8px', borderBottom: '1px solid #ddd', textAlign: 'right' }}>
{storedCounts.calendar > 0 && <button onClick={() => viewData('calendar')} style={{ fontSize: '12px', padding: '4px 8px' }}>View</button>}
</td>
</tr>
</tbody>
</table>
{viewingService && viewItems.length > 0 && (
<div style={{ marginTop: '20px' }}>
<h4>
{viewingService.charAt(0).toUpperCase() + viewingService.slice(1)} Items (Decrypted)
<button onClick={() => { setViewingService(null); setViewItems([]); }} style={{ marginLeft: '10px', fontSize: '12px' }}>Close</button>
</h4>
<div style={{ maxHeight: '300px', overflow: 'auto', border: '1px solid #ddd', borderRadius: '4px' }}>
{viewItems.map((item, i) => (
<div key={item.id} style={{
padding: '10px',
borderBottom: '1px solid #eee',
background: i % 2 === 0 ? '#fff' : '#f9f9f9'
}}>
<strong>{item.title}</strong>
<div style={{ fontSize: '12px', color: '#666' }}>
{new Date(item.date).toLocaleString()}
</div>
{item.preview && (
<div style={{ fontSize: '12px', color: '#888', marginTop: '4px' }}>
{item.preview.substring(0, 100)}...
</div>
)}
</div>
))}
</div>
</div>
)}
<button
onClick={refreshCounts}
style={{ ...buttonStyle, background: '#666', marginTop: '10px' }}
>
Refresh Counts
</button>
<button
onClick={resetAndReconnect}
style={{ ...buttonStyle, background: '#c00', marginTop: '10px' }}
>
Reset & Clear All Data
</button>
</div>
)}
<hr style={{ margin: '30px 0' }} />
<h3>Activity Log</h3>
<div style={{
background: '#1a1a1a',
color: '#0f0',
padding: '10px',
borderRadius: '4px',
fontFamily: 'monospace',
fontSize: '11px',
height: '150px',
overflow: 'auto',
marginBottom: '20px'
}}>
{logs.length === 0 ? (
<span style={{ color: '#666' }}>Click an import button to see activity...</span>
) : (
logs.map((log, i) => <div key={i}>{log}</div>)
)}
</div>
<details>
<summary style={{ cursor: 'pointer' }}>Debug Info</summary>
<pre style={{ fontSize: '11px', background: '#f5f5f5', padding: '10px', overflow: 'auto' }}>
{JSON.stringify({
isAuthed,
hasMasterKey: !!masterKey,
scopeCount: scopes.length,
storedCounts,
importProgress,
currentUrl: typeof window !== 'undefined' ? window.location.href : 'N/A'
}, null, 2)}
</pre>
</details>
</div>
);
}
export default GoogleDataTest;

View File

@ -1,584 +0,0 @@
import { useState, useEffect, useRef } from 'react';
import { GoogleDataService, type GoogleService, type ShareableItem } from '../lib/google';
interface GoogleExportBrowserProps {
isOpen: boolean;
onClose: () => void;
onAddToCanvas: (items: ShareableItem[], position: { x: number; y: number }) => void;
isDarkMode: boolean;
}
const SERVICE_ICONS: Record<GoogleService, string> = {
gmail: '📧',
drive: '📁',
photos: '📷',
calendar: '📅',
};
const SERVICE_NAMES: Record<GoogleService, string> = {
gmail: 'Gmail',
drive: 'Drive',
photos: 'Photos',
calendar: 'Calendar',
};
export function GoogleExportBrowser({
isOpen,
onClose,
onAddToCanvas,
isDarkMode,
}: GoogleExportBrowserProps) {
const modalRef = useRef<HTMLDivElement>(null);
const [activeTab, setActiveTab] = useState<GoogleService>('gmail');
const [items, setItems] = useState<ShareableItem[]>([]);
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
const [loading, setLoading] = useState(false);
const [searchQuery, setSearchQuery] = useState('');
const [serviceCounts, setServiceCounts] = useState<Record<GoogleService, number>>({
gmail: 0,
drive: 0,
photos: 0,
calendar: 0,
});
// Dark mode aware colors
const colors = isDarkMode ? {
bg: '#1a1a1a',
cardBg: '#252525',
cardBorder: '#404040',
text: '#e4e4e4',
textMuted: '#a1a1aa',
textHeading: '#f4f4f5',
hoverBg: '#333333',
selectedBg: 'rgba(99, 102, 241, 0.2)',
selectedBorder: 'rgba(99, 102, 241, 0.5)',
tabActiveBg: '#3b82f6',
tabActiveText: '#ffffff',
tabInactiveBg: '#333333',
tabInactiveText: '#a1a1aa',
inputBg: '#333333',
inputBorder: '#404040',
btnPrimaryBg: '#6366f1',
btnPrimaryText: '#ffffff',
btnSecondaryBg: '#333333',
btnSecondaryText: '#e4e4e4',
} : {
bg: '#ffffff',
cardBg: '#f9fafb',
cardBorder: '#e5e7eb',
text: '#374151',
textMuted: '#6b7280',
textHeading: '#1f2937',
hoverBg: '#f3f4f6',
selectedBg: 'rgba(99, 102, 241, 0.1)',
selectedBorder: 'rgba(99, 102, 241, 0.4)',
tabActiveBg: '#3b82f6',
tabActiveText: '#ffffff',
tabInactiveBg: '#f3f4f6',
tabInactiveText: '#6b7280',
inputBg: '#ffffff',
inputBorder: '#e5e7eb',
btnPrimaryBg: '#6366f1',
btnPrimaryText: '#ffffff',
btnSecondaryBg: '#f3f4f6',
btnSecondaryText: '#374151',
};
// Load items when tab changes
useEffect(() => {
if (!isOpen) return;
const loadItems = async () => {
setLoading(true);
setItems([]);
setSelectedIds(new Set());
try {
const service = GoogleDataService.getInstance();
const shareService = service.getShareService();
if (shareService) {
const shareableItems = await shareService.listShareableItems(activeTab, 100);
setItems(shareableItems);
}
// Also update counts
const counts = await service.getStoredCounts();
setServiceCounts(counts);
} catch (error) {
console.error('Failed to load items:', error);
} finally {
setLoading(false);
}
};
loadItems();
}, [isOpen, activeTab]);
// Handle escape key and click outside
useEffect(() => {
if (!isOpen) return;
const handleEscape = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
onClose();
}
};
const handleClickOutside = (e: MouseEvent) => {
if (modalRef.current && !modalRef.current.contains(e.target as Node)) {
onClose();
}
};
document.addEventListener('keydown', handleEscape);
document.addEventListener('mousedown', handleClickOutside);
return () => {
document.removeEventListener('keydown', handleEscape);
document.removeEventListener('mousedown', handleClickOutside);
};
}, [isOpen, onClose]);
// Toggle item selection
const toggleSelection = (id: string) => {
setSelectedIds((prev) => {
const next = new Set(prev);
if (next.has(id)) {
next.delete(id);
} else {
next.add(id);
}
return next;
});
};
// Select/deselect all
const selectAll = () => {
if (selectedIds.size === filteredItems.length) {
setSelectedIds(new Set());
} else {
setSelectedIds(new Set(filteredItems.map((i) => i.id)));
}
};
// Filter items by search query
const filteredItems = items.filter((item) => {
if (!searchQuery.trim()) return true;
const query = searchQuery.toLowerCase();
return (
item.title.toLowerCase().includes(query) ||
(item.preview && item.preview.toLowerCase().includes(query))
);
});
// Handle add to canvas
const handleAddToCanvas = () => {
const selectedItems = items.filter((i) => selectedIds.has(i.id));
if (selectedItems.length === 0) return;
// Calculate center of viewport for placement
const position = { x: 200, y: 200 }; // Default position, will be adjusted by caller
onAddToCanvas(selectedItems, position);
onClose();
};
// Format date
const formatDate = (timestamp: number) => {
const date = new Date(timestamp);
const now = new Date();
const diffDays = Math.floor((now.getTime() - date.getTime()) / (1000 * 60 * 60 * 24));
if (diffDays === 0) return 'Today';
if (diffDays === 1) return 'Yesterday';
if (diffDays < 7) return `${diffDays} days ago`;
return date.toLocaleDateString();
};
if (!isOpen) return null;
return (
<div
style={{
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: 'rgba(0, 0, 0, 0.6)',
backdropFilter: 'blur(4px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 100002,
}}
>
<div
ref={modalRef}
style={{
backgroundColor: colors.bg,
borderRadius: '12px',
width: '90%',
maxWidth: '600px',
maxHeight: '80vh',
display: 'flex',
flexDirection: 'column',
boxShadow: '0 25px 50px -12px rgba(0, 0, 0, 0.25)',
border: `1px solid ${colors.cardBorder}`,
}}
>
{/* Header */}
<div
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '16px 20px',
borderBottom: `1px solid ${colors.cardBorder}`,
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ fontSize: '20px' }}>🔐</span>
<h2 style={{ fontSize: '16px', fontWeight: '600', color: colors.textHeading, margin: 0 }}>
Your Private Data
</h2>
</div>
<button
onClick={onClose}
style={{
background: 'none',
border: 'none',
fontSize: '20px',
cursor: 'pointer',
color: colors.textMuted,
padding: '4px',
}}
>
×
</button>
</div>
{/* Service tabs */}
<div
style={{
display: 'flex',
gap: '8px',
padding: '12px 20px',
borderBottom: `1px solid ${colors.cardBorder}`,
}}
>
{(['gmail', 'drive', 'photos', 'calendar'] as GoogleService[]).map((service) => (
<button
key={service}
onClick={() => setActiveTab(service)}
style={{
display: 'flex',
alignItems: 'center',
gap: '6px',
padding: '8px 12px',
borderRadius: '8px',
border: 'none',
cursor: 'pointer',
fontSize: '13px',
fontWeight: '500',
backgroundColor: activeTab === service ? colors.tabActiveBg : colors.tabInactiveBg,
color: activeTab === service ? colors.tabActiveText : colors.tabInactiveText,
transition: 'all 0.15s ease',
}}
>
<span>{SERVICE_ICONS[service]}</span>
<span>{SERVICE_NAMES[service]}</span>
{serviceCounts[service] > 0 && (
<span
style={{
fontSize: '11px',
padding: '2px 6px',
borderRadius: '10px',
backgroundColor: activeTab === service ? 'rgba(255,255,255,0.2)' : colors.cardBorder,
}}
>
{serviceCounts[service]}
</span>
)}
</button>
))}
</div>
{/* Search and actions */}
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '12px',
padding: '12px 20px',
borderBottom: `1px solid ${colors.cardBorder}`,
}}
>
<div style={{ flex: 1, position: 'relative' }}>
<span
style={{
position: 'absolute',
left: '12px',
top: '50%',
transform: 'translateY(-50%)',
fontSize: '14px',
}}
>
🔍
</span>
<input
type="text"
placeholder="Search..."
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
style={{
width: '100%',
padding: '8px 12px 8px 36px',
borderRadius: '8px',
border: `1px solid ${colors.inputBorder}`,
backgroundColor: colors.inputBg,
color: colors.text,
fontSize: '13px',
outline: 'none',
}}
/>
</div>
<button
onClick={selectAll}
style={{
padding: '8px 12px',
borderRadius: '8px',
border: `1px solid ${colors.cardBorder}`,
backgroundColor: colors.btnSecondaryBg,
color: colors.btnSecondaryText,
fontSize: '12px',
cursor: 'pointer',
}}
>
{selectedIds.size === filteredItems.length && filteredItems.length > 0
? 'Clear'
: 'Select All'}
</button>
</div>
{/* Items list */}
<div
style={{
flex: 1,
overflowY: 'auto',
padding: '8px 12px',
}}
>
{loading ? (
<div
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
padding: '40px',
color: colors.textMuted,
}}
>
Loading...
</div>
) : filteredItems.length === 0 ? (
<div
style={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
padding: '40px',
color: colors.textMuted,
}}
>
<span style={{ fontSize: '32px', marginBottom: '12px' }}>{SERVICE_ICONS[activeTab]}</span>
<p style={{ fontSize: '14px' }}>No {SERVICE_NAMES[activeTab]} data imported yet</p>
<a
href="/google"
style={{ fontSize: '13px', color: '#3b82f6', marginTop: '8px' }}
>
Import data
</a>
</div>
) : (
<div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
{filteredItems.map((item) => (
<div
key={item.id}
onClick={() => toggleSelection(item.id)}
style={{
display: 'flex',
alignItems: 'center',
gap: '12px',
padding: '10px 12px',
borderRadius: '8px',
cursor: 'pointer',
backgroundColor: selectedIds.has(item.id) ? colors.selectedBg : 'transparent',
border: selectedIds.has(item.id)
? `1px solid ${colors.selectedBorder}`
: '1px solid transparent',
transition: 'all 0.15s ease',
}}
onMouseEnter={(e) => {
if (!selectedIds.has(item.id)) {
e.currentTarget.style.backgroundColor = colors.hoverBg;
}
}}
onMouseLeave={(e) => {
if (!selectedIds.has(item.id)) {
e.currentTarget.style.backgroundColor = 'transparent';
}
}}
>
{/* Checkbox */}
<div
style={{
width: '18px',
height: '18px',
borderRadius: '4px',
border: `2px solid ${selectedIds.has(item.id) ? '#6366f1' : colors.cardBorder}`,
backgroundColor: selectedIds.has(item.id) ? '#6366f1' : 'transparent',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
flexShrink: 0,
}}
>
{selectedIds.has(item.id) && (
<svg
width="12"
height="12"
viewBox="0 0 12 12"
fill="none"
stroke="white"
strokeWidth="2"
>
<path d="M2 6l3 3 5-6" />
</svg>
)}
</div>
{/* Content */}
<div style={{ flex: 1, minWidth: 0 }}>
<div
style={{
fontSize: '13px',
fontWeight: '500',
color: colors.text,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
}}
>
{item.title}
</div>
{item.preview && (
<div
style={{
fontSize: '12px',
color: colors.textMuted,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
marginTop: '2px',
}}
>
{item.preview}
</div>
)}
</div>
{/* Date */}
<div
style={{
fontSize: '11px',
color: colors.textMuted,
flexShrink: 0,
}}
>
{formatDate(item.date)}
</div>
</div>
))}
</div>
)}
</div>
{/* Footer */}
<div
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
padding: '16px 20px',
borderTop: `1px solid ${colors.cardBorder}`,
}}
>
<div style={{ fontSize: '13px', color: colors.textMuted }}>
{selectedIds.size > 0 ? `${selectedIds.size} item${selectedIds.size > 1 ? 's' : ''} selected` : 'Select items to add'}
</div>
<div style={{ display: 'flex', gap: '8px' }}>
<button
onClick={onClose}
style={{
padding: '10px 16px',
borderRadius: '8px',
border: `1px solid ${colors.cardBorder}`,
backgroundColor: colors.btnSecondaryBg,
color: colors.btnSecondaryText,
fontSize: '13px',
fontWeight: '500',
cursor: 'pointer',
}}
>
Cancel
</button>
<button
onClick={handleAddToCanvas}
disabled={selectedIds.size === 0}
style={{
display: 'flex',
alignItems: 'center',
gap: '6px',
padding: '10px 16px',
borderRadius: '8px',
border: 'none',
backgroundColor: selectedIds.size > 0 ? colors.btnPrimaryBg : colors.btnSecondaryBg,
color: selectedIds.size > 0 ? colors.btnPrimaryText : colors.textMuted,
fontSize: '13px',
fontWeight: '500',
cursor: selectedIds.size > 0 ? 'pointer' : 'not-allowed',
opacity: selectedIds.size > 0 ? 1 : 0.6,
}}
>
<span>🔒</span>
Add to Private Workspace
</button>
</div>
</div>
{/* Privacy note */}
<div
style={{
padding: '12px 20px',
backgroundColor: colors.cardBg,
borderTop: `1px solid ${colors.cardBorder}`,
borderRadius: '0 0 12px 12px',
}}
>
<p
style={{
fontSize: '11px',
color: colors.textMuted,
textAlign: 'center',
margin: 0,
}}
>
🔒 Private = Only you can see (encrypted in browser) Drag outside Private Workspace to share
</p>
</div>
</div>
</div>
);
}

View File

@ -1,5 +1,5 @@
import React, { useState, useEffect, useRef } from 'react' import React, { useState, useEffect, useRef } from 'react'
import { holosphereService, HoloSphereService, HolonData, HolonLens, HOLON_ENABLED } from '@/lib/HoloSphereService' import { holosphereService, HoloSphereService, HolonData, HolonLens } from '@/lib/HoloSphereService'
import * as h3 from 'h3-js' import * as h3 from 'h3-js'
interface HolonBrowserProps { interface HolonBrowserProps {
@ -32,66 +32,6 @@ export function HolonBrowser({ isOpen, onClose, onSelectHolon, shapeMode = false
const [isLoadingData, setIsLoadingData] = useState(false) const [isLoadingData, setIsLoadingData] = useState(false)
const inputRef = useRef<HTMLInputElement>(null) const inputRef = useRef<HTMLInputElement>(null)
// If Holon functionality is disabled, show a disabled message
if (!HOLON_ENABLED) {
if (!isOpen) return null
const disabledContent = (
<div style={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
padding: '40px',
height: '100%',
textAlign: 'center'
}}>
<div style={{ fontSize: '64px', marginBottom: '24px' }}>🌐</div>
<h2 style={{ fontSize: '20px', fontWeight: '600', color: '#374151', marginBottom: '12px' }}>
Holon Browser Disabled
</h2>
<p style={{ fontSize: '14px', color: '#6b7280', maxWidth: '400px' }}>
Holon functionality is currently disabled while awaiting Nostr integration.
This feature will be re-enabled in a future update.
</p>
{!shapeMode && (
<button
onClick={onClose}
style={{
marginTop: '24px',
padding: '8px 16px',
backgroundColor: '#6b7280',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: 'pointer'
}}
>
Close
</button>
)}
</div>
)
if (shapeMode) {
return disabledContent
}
return (
<div
className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-[9999]"
onClick={onClose}
>
<div
className="bg-white rounded-lg shadow-xl max-w-md w-full mx-4 overflow-hidden z-[10000]"
onClick={(e) => e.stopPropagation()}
>
{disabledContent}
</div>
</div>
)
}
useEffect(() => { useEffect(() => {
if (isOpen && inputRef.current) { if (isOpen && inputRef.current) {
inputRef.current.focus() inputRef.current.focus()
@ -142,6 +82,7 @@ export function HolonBrowser({ isOpen, onClose, onSelectHolon, shapeMode = false
try { try {
metadata = await holosphereService.getData(holonId, 'metadata') metadata = await holosphereService.getData(holonId, 'metadata')
} catch (error) { } catch (error) {
console.log('No metadata found for holon')
} }
// Get available lenses by trying to fetch data from common lens types // Get available lenses by trying to fetch data from common lens types
@ -160,6 +101,7 @@ export function HolonBrowser({ isOpen, onClose, onSelectHolon, shapeMode = false
const data = await holosphereService.getDataWithWait(holonId, lens, 1000) const data = await holosphereService.getDataWithWait(holonId, lens, 1000)
if (data && (Array.isArray(data) ? data.length > 0 : Object.keys(data).length > 0)) { if (data && (Array.isArray(data) ? data.length > 0 : Object.keys(data).length > 0)) {
availableLenses.push(lens) availableLenses.push(lens)
console.log(`✓ Found lens: ${lens} with ${Object.keys(data).length} keys`)
} }
} catch (error) { } catch (error) {
// Lens doesn't exist or is empty, skip // Lens doesn't exist or is empty, skip
@ -205,6 +147,7 @@ export function HolonBrowser({ isOpen, onClose, onSelectHolon, shapeMode = false
// Use getDataWithWait for better Gun data retrieval // Use getDataWithWait for better Gun data retrieval
const data = await holosphereService.getDataWithWait(holonInfo.id, lens, 2000) const data = await holosphereService.getDataWithWait(holonInfo.id, lens, 2000)
setLensData(data) setLensData(data)
console.log(`📊 Loaded lens data for ${lens}:`, data)
} catch (error) { } catch (error) {
console.error('Error loading lens data:', error) console.error('Error loading lens data:', error)
setLensData(null) setLensData(null)

View File

@ -1,477 +0,0 @@
/**
* Miro Import Dialog
*
* A dialog component for importing Miro boards into the tldraw canvas.
* Supports both JSON file upload and pasting JSON directly.
*/
import { useState, useCallback, useRef } from 'react'
import { useEditor } from 'tldraw'
import { importMiroJson, isValidMiroUrl, MiroImportResult } from '@/lib/miroImport'
interface MiroImportDialogProps {
isOpen: boolean
onClose: () => void
}
type ImportMethod = 'json-file' | 'json-paste'
export function MiroImportDialog({ isOpen, onClose }: MiroImportDialogProps) {
const editor = useEditor()
const fileInputRef = useRef<HTMLInputElement>(null)
const [importMethod, setImportMethod] = useState<ImportMethod>('json-file')
const [jsonText, setJsonText] = useState('')
const [isImporting, setIsImporting] = useState(false)
const [progress, setProgress] = useState({ stage: '', percent: 0 })
const [result, setResult] = useState<MiroImportResult | null>(null)
const [error, setError] = useState<string | null>(null)
const resetState = useCallback(() => {
setJsonText('')
setIsImporting(false)
setProgress({ stage: '', percent: 0 })
setResult(null)
setError(null)
}, [])
const handleClose = useCallback(() => {
resetState()
onClose()
}, [onClose, resetState])
const handleImport = useCallback(async (jsonString: string) => {
setIsImporting(true)
setError(null)
setResult(null)
try {
// Get current viewport center for import offset
const viewportBounds = editor.getViewportPageBounds()
const offset = {
x: viewportBounds.x + viewportBounds.w / 2,
y: viewportBounds.y + viewportBounds.h / 2,
}
const importResult = await importMiroJson(
jsonString,
{
migrateAssets: true,
offset,
},
{
onProgress: (stage, percent) => {
setProgress({ stage, percent: Math.round(percent * 100) })
},
}
)
setResult(importResult)
if (importResult.success && importResult.shapes.length > 0) {
// Create assets first
if (importResult.assets.length > 0) {
for (const asset of importResult.assets) {
try {
editor.createAssets([asset])
} catch (e) {
console.warn('Failed to create asset:', e)
}
}
}
// Create shapes
editor.createShapes(importResult.shapes)
// Select and zoom to imported shapes
const shapeIds = importResult.shapes.map((s: any) => s.id)
editor.setSelectedShapes(shapeIds)
editor.zoomToSelection()
}
} catch (e) {
console.error('Import error:', e)
setError(e instanceof Error ? e.message : 'Failed to import Miro board')
} finally {
setIsImporting(false)
}
}, [editor])
const handleFileSelect = useCallback(async (event: React.ChangeEvent<HTMLInputElement>) => {
const file = event.target.files?.[0]
if (!file) return
try {
const text = await file.text()
await handleImport(text)
} catch (e) {
setError('Failed to read file')
}
// Reset file input
if (fileInputRef.current) {
fileInputRef.current.value = ''
}
}, [handleImport])
const handlePasteImport = useCallback(() => {
if (!jsonText.trim()) {
setError('Please paste Miro JSON data')
return
}
handleImport(jsonText)
}, [jsonText, handleImport])
if (!isOpen) return null
return (
<div className="miro-import-overlay" onClick={handleClose}>
<div className="miro-import-dialog" onClick={(e) => e.stopPropagation()}>
<div className="miro-import-header">
<h2>Import from Miro</h2>
<button className="miro-import-close" onClick={handleClose}>
&times;
</button>
</div>
<div className="miro-import-content">
{/* Import Method Tabs */}
<div className="miro-import-tabs">
<button
className={`miro-import-tab ${importMethod === 'json-file' ? 'active' : ''}`}
onClick={() => setImportMethod('json-file')}
disabled={isImporting}
>
Upload JSON File
</button>
<button
className={`miro-import-tab ${importMethod === 'json-paste' ? 'active' : ''}`}
onClick={() => setImportMethod('json-paste')}
disabled={isImporting}
>
Paste JSON
</button>
</div>
{/* JSON File Upload */}
{importMethod === 'json-file' && (
<div className="miro-import-section">
<p className="miro-import-help">
Upload a JSON file exported from Miro using the{' '}
<a href="https://github.com/jolle/miro-export" target="_blank" rel="noopener noreferrer">
miro-export
</a>{' '}
CLI tool:
</p>
<pre className="miro-import-code">
npx miro-export -b YOUR_BOARD_ID -e json -o board.json
</pre>
<input
ref={fileInputRef}
type="file"
accept=".json"
onChange={handleFileSelect}
disabled={isImporting}
className="miro-import-file-input"
/>
<button
className="miro-import-button"
onClick={() => fileInputRef.current?.click()}
disabled={isImporting}
>
Choose JSON File
</button>
</div>
)}
{/* JSON Paste */}
{importMethod === 'json-paste' && (
<div className="miro-import-section">
<p className="miro-import-help">
Paste your Miro board JSON data below:
</p>
<textarea
className="miro-import-textarea"
value={jsonText}
onChange={(e) => setJsonText(e.target.value)}
placeholder='[{"type":"sticky_note","id":"...","x":0,"y":0,...}]'
disabled={isImporting}
rows={10}
/>
<button
className="miro-import-button"
onClick={handlePasteImport}
disabled={isImporting || !jsonText.trim()}
>
Import
</button>
</div>
)}
{/* Progress */}
{isImporting && (
<div className="miro-import-progress">
<div className="miro-import-progress-bar">
<div
className="miro-import-progress-fill"
style={{ width: `${progress.percent}%` }}
/>
</div>
<p className="miro-import-progress-text">{progress.stage}</p>
</div>
)}
{/* Error */}
{error && (
<div className="miro-import-error">
<strong>Error:</strong> {error}
</div>
)}
{/* Result */}
{result && (
<div className={`miro-import-result ${result.success ? 'success' : 'failed'}`}>
{result.success ? (
<>
<p>Successfully imported {result.shapesCreated} shapes!</p>
{result.assetsUploaded > 0 && (
<p>Migrated {result.assetsUploaded} images to local storage.</p>
)}
{result.errors.length > 0 && (
<p className="miro-import-warnings">
Warnings: {result.errors.join(', ')}
</p>
)}
<button className="miro-import-button" onClick={handleClose}>
Done
</button>
</>
) : (
<>
<p>Import failed: {result.errors.join(', ')}</p>
<button className="miro-import-button" onClick={resetState}>
Try Again
</button>
</>
)}
</div>
)}
</div>
</div>
<style>{`
.miro-import-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 10000;
}
.miro-import-dialog {
background: var(--color-panel, white);
border-radius: 12px;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.2);
width: 90%;
max-width: 500px;
max-height: 90vh;
overflow-y: auto;
}
.miro-import-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 16px 20px;
border-bottom: 1px solid var(--color-divider, #eee);
}
.miro-import-header h2 {
margin: 0;
font-size: 18px;
font-weight: 600;
}
.miro-import-close {
background: none;
border: none;
font-size: 24px;
cursor: pointer;
color: var(--color-text, #333);
padding: 0;
line-height: 1;
}
.miro-import-content {
padding: 20px;
}
.miro-import-tabs {
display: flex;
gap: 8px;
margin-bottom: 20px;
}
.miro-import-tab {
flex: 1;
padding: 10px 16px;
border: 1px solid var(--color-divider, #ddd);
background: var(--color-background, #f5f5f5);
border-radius: 8px;
cursor: pointer;
font-size: 14px;
transition: all 0.2s;
}
.miro-import-tab:hover:not(:disabled) {
background: var(--color-muted-1, #e0e0e0);
}
.miro-import-tab.active {
background: var(--color-primary, #2563eb);
color: white;
border-color: var(--color-primary, #2563eb);
}
.miro-import-tab:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.miro-import-section {
display: flex;
flex-direction: column;
gap: 12px;
}
.miro-import-help {
margin: 0;
font-size: 14px;
color: var(--color-text-1, #666);
line-height: 1.5;
}
.miro-import-help a {
color: var(--color-primary, #2563eb);
}
.miro-import-code {
background: var(--color-background, #f5f5f5);
padding: 12px;
border-radius: 6px;
font-family: monospace;
font-size: 12px;
overflow-x: auto;
margin: 0;
}
.miro-import-file-input {
display: none;
}
.miro-import-textarea {
width: 100%;
padding: 12px;
border: 1px solid var(--color-divider, #ddd);
border-radius: 8px;
font-family: monospace;
font-size: 12px;
resize: vertical;
background: var(--color-background, white);
color: var(--color-text, #333);
}
.miro-import-textarea:focus {
outline: none;
border-color: var(--color-primary, #2563eb);
}
.miro-import-button {
padding: 12px 24px;
background: var(--color-primary, #2563eb);
color: white;
border: none;
border-radius: 8px;
font-size: 14px;
font-weight: 500;
cursor: pointer;
transition: background 0.2s;
}
.miro-import-button:hover:not(:disabled) {
background: var(--color-primary-dark, #1d4ed8);
}
.miro-import-button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.miro-import-progress {
margin-top: 20px;
}
.miro-import-progress-bar {
height: 8px;
background: var(--color-background, #f0f0f0);
border-radius: 4px;
overflow: hidden;
}
.miro-import-progress-fill {
height: 100%;
background: var(--color-primary, #2563eb);
transition: width 0.3s ease;
}
.miro-import-progress-text {
margin: 8px 0 0;
font-size: 13px;
color: var(--color-text-1, #666);
text-align: center;
}
.miro-import-error {
margin-top: 16px;
padding: 12px;
background: #fee2e2;
color: #dc2626;
border-radius: 8px;
font-size: 14px;
}
.miro-import-result {
margin-top: 20px;
padding: 16px;
border-radius: 8px;
text-align: center;
}
.miro-import-result.success {
background: #dcfce7;
color: #16a34a;
}
.miro-import-result.failed {
background: #fee2e2;
color: #dc2626;
}
.miro-import-result p {
margin: 0 0 12px;
}
.miro-import-warnings {
font-size: 12px;
opacity: 0.8;
}
`}</style>
</div>
)
}
export default MiroImportDialog

View File

@ -1,884 +0,0 @@
/**
* Miro Integration Modal
*
* Allows users to import Miro boards into their canvas.
* Supports two methods:
* 1. Paste JSON from miro-export CLI tool (recommended for casual use)
* 2. Connect Miro API for direct imports (power users)
*/
import React, { useState, useCallback, useRef } from 'react';
import { useEditor } from 'tldraw';
import { importMiroJson } from '@/lib/miroImport';
import {
getMiroApiKey,
saveMiroApiKey,
removeMiroApiKey,
isMiroApiKeyConfigured,
extractMiroBoardId,
isValidMiroBoardUrl,
} from '@/lib/miroApiKey';
interface MiroIntegrationModalProps {
isOpen: boolean;
onClose: () => void;
username: string;
isDarkMode?: boolean;
}
type Tab = 'import' | 'api-setup' | 'help';
export function MiroIntegrationModal({
isOpen,
onClose,
username,
isDarkMode: _isDarkMode = false,
}: MiroIntegrationModalProps) {
const editor = useEditor();
const fileInputRef = useRef<HTMLInputElement>(null);
const [activeTab, setActiveTab] = useState<Tab>('import');
const [jsonText, setJsonText] = useState('');
const [boardUrl, setBoardUrl] = useState('');
const [apiKeyInput, setApiKeyInput] = useState('');
const [isImporting, setIsImporting] = useState(false);
const [progress, setProgress] = useState({ stage: '', percent: 0 });
const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState<string | null>(null);
const hasApiKey = isMiroApiKeyConfigured(username);
const resetState = useCallback(() => {
setJsonText('');
setBoardUrl('');
setIsImporting(false);
setProgress({ stage: '', percent: 0 });
setError(null);
setSuccess(null);
}, []);
const handleClose = useCallback(() => {
resetState();
onClose();
}, [onClose, resetState]);
// Import from JSON string
const handleJsonImport = useCallback(async (json: string) => {
setIsImporting(true);
setError(null);
setSuccess(null);
try {
const viewportBounds = editor.getViewportPageBounds();
const offset = {
x: viewportBounds.x + viewportBounds.w / 2,
y: viewportBounds.y + viewportBounds.h / 2,
};
const result = await importMiroJson(
json,
{ migrateAssets: true, offset },
{
onProgress: (stage, percent) => {
setProgress({ stage, percent: Math.round(percent * 100) });
},
}
);
if (result.success && result.shapes.length > 0) {
// Create assets first
for (const asset of result.assets) {
try {
editor.createAssets([asset]);
} catch (e) {
console.warn('Failed to create asset:', e);
}
}
// Create shapes
editor.createShapes(result.shapes);
// Select and zoom to imported shapes
const shapeIds = result.shapes.map((s: any) => s.id);
editor.setSelectedShapes(shapeIds);
editor.zoomToSelection();
setSuccess(`Imported ${result.shapesCreated} shapes${result.assetsUploaded > 0 ? ` and ${result.assetsUploaded} images` : ''}!`);
// Auto-close after success
setTimeout(() => handleClose(), 2000);
} else {
setError(result.errors.join(', ') || 'No shapes found in the import');
}
} catch (e) {
console.error('Import error:', e);
setError(e instanceof Error ? e.message : 'Failed to import Miro board');
} finally {
setIsImporting(false);
}
}, [editor, handleClose]);
// Handle file upload
const handleFileSelect = useCallback(async (event: React.ChangeEvent<HTMLInputElement>) => {
const file = event.target.files?.[0];
if (!file) return;
try {
const text = await file.text();
await handleJsonImport(text);
} catch (e) {
setError('Failed to read file');
}
if (fileInputRef.current) {
fileInputRef.current.value = '';
}
}, [handleJsonImport]);
// Handle paste import
const handlePasteImport = useCallback(() => {
if (!jsonText.trim()) {
setError('Please paste Miro JSON data');
return;
}
handleJsonImport(jsonText);
}, [jsonText, handleJsonImport]);
// Save API key
const handleSaveApiKey = useCallback(() => {
if (!apiKeyInput.trim()) {
setError('Please enter your Miro API token');
return;
}
saveMiroApiKey(apiKeyInput.trim(), username);
setApiKeyInput('');
setSuccess('Miro API token saved!');
setTimeout(() => setSuccess(null), 2000);
}, [apiKeyInput, username]);
// Disconnect API
const handleDisconnectApi = useCallback(() => {
removeMiroApiKey(username);
setSuccess('Miro API disconnected');
setTimeout(() => setSuccess(null), 2000);
}, [username]);
if (!isOpen) return null;
return (
<div
className="miro-modal-overlay"
style={{
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: 'rgba(0, 0, 0, 0.7)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 999999,
isolation: 'isolate',
}}
onClick={(e) => {
if (e.target === e.currentTarget) handleClose();
}}
>
<div
className="miro-modal"
style={{
backgroundColor: 'var(--color-panel, #ffffff)',
borderRadius: '16px',
width: '520px',
maxWidth: '95vw',
maxHeight: '90vh',
overflow: 'hidden',
display: 'flex',
flexDirection: 'column',
boxShadow: '0 25px 80px rgba(0, 0, 0, 0.5)',
position: 'relative',
zIndex: 1000000,
}}
onClick={(e) => e.stopPropagation()}
>
{/* Header */}
<div style={{
padding: '20px 24px',
borderBottom: '1px solid var(--color-panel-contrast)',
display: 'flex',
alignItems: 'center',
gap: '12px',
}}>
<div style={{
width: '40px',
height: '40px',
borderRadius: '10px',
background: 'linear-gradient(135deg, #FFD02F 0%, #F2CA00 100%)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '20px',
}}>
📋
</div>
<div style={{ flex: 1 }}>
<h2 style={{ margin: 0, fontSize: '18px', fontWeight: 600, color: 'var(--color-text)' }}>
Import from Miro
</h2>
<p style={{ margin: 0, fontSize: '12px', color: 'var(--color-text-3)' }}>
Bring your Miro boards into the canvas
</p>
</div>
<button
onClick={handleClose}
style={{
background: '#f3f4f6',
border: '2px solid #e5e7eb',
borderRadius: '8px',
fontSize: '18px',
cursor: 'pointer',
color: '#6b7280',
padding: '6px 10px',
fontWeight: 600,
transition: 'all 0.15s ease',
}}
onMouseEnter={(e) => {
e.currentTarget.style.background = '#e5e7eb';
e.currentTarget.style.borderColor = '#d1d5db';
e.currentTarget.style.color = '#374151';
}}
onMouseLeave={(e) => {
e.currentTarget.style.background = '#f3f4f6';
e.currentTarget.style.borderColor = '#e5e7eb';
e.currentTarget.style.color = '#6b7280';
}}
>
×
</button>
</div>
{/* Tabs */}
<div style={{
display: 'flex',
borderBottom: '1px solid var(--color-panel-contrast)',
padding: '0 16px',
}}>
{[
{ id: 'import', label: 'Import Board' },
{ id: 'api-setup', label: 'API Setup' },
{ id: 'help', label: 'How It Works' },
].map((tab) => (
<button
key={tab.id}
onClick={() => setActiveTab(tab.id as Tab)}
style={{
padding: '12px 16px',
fontSize: '13px',
fontWeight: 500,
background: 'none',
border: 'none',
borderBottom: activeTab === tab.id ? '2px solid #FFD02F' : '2px solid transparent',
color: activeTab === tab.id ? 'var(--color-text)' : 'var(--color-text-3)',
cursor: 'pointer',
transition: 'all 0.15s',
}}
>
{tab.label}
</button>
))}
</div>
{/* Content */}
<div style={{
padding: '20px 24px',
overflowY: 'auto',
flex: 1,
}}>
{/* Import Tab */}
{activeTab === 'import' && (
<div>
{/* Method 1: JSON Upload */}
<div style={{ marginBottom: '24px' }}>
<h3 style={{
margin: '0 0 8px 0',
fontSize: '14px',
fontWeight: 600,
color: 'var(--color-text)',
display: 'flex',
alignItems: 'center',
gap: '8px',
}}>
<span style={{
width: '20px',
height: '20px',
borderRadius: '50%',
background: '#FFD02F',
color: '#000',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '11px',
fontWeight: 700,
}}>1</span>
Upload JSON File
</h3>
<p style={{ margin: '0 0 12px 0', fontSize: '12px', color: 'var(--color-text-3)', lineHeight: 1.5 }}>
Export your board using the miro-export CLI, then upload the JSON file here.
</p>
<input
ref={fileInputRef}
type="file"
accept=".json"
onChange={handleFileSelect}
style={{ display: 'none' }}
/>
<button
onClick={() => fileInputRef.current?.click()}
disabled={isImporting}
style={{
width: '100%',
padding: '16px',
fontSize: '14px',
fontWeight: 600,
borderRadius: '8px',
border: '2px dashed #9ca3af',
background: '#f9fafb',
color: '#374151',
cursor: isImporting ? 'wait' : 'pointer',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
gap: '10px',
transition: 'all 0.15s',
}}
onMouseEnter={(e) => {
if (!isImporting) {
e.currentTarget.style.borderColor = '#FFD02F';
e.currentTarget.style.background = '#fffbeb';
}
}}
onMouseLeave={(e) => {
e.currentTarget.style.borderColor = '#9ca3af';
e.currentTarget.style.background = '#f9fafb';
}}
>
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2">
<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/>
<polyline points="17 8 12 3 7 8"/>
<line x1="12" y1="3" x2="12" y2="15"/>
</svg>
Choose JSON File
</button>
</div>
{/* Divider */}
<div style={{
display: 'flex',
alignItems: 'center',
gap: '12px',
margin: '20px 0',
}}>
<div style={{ flex: 1, height: '1px', background: 'var(--color-panel-contrast)' }} />
<span style={{ fontSize: '11px', color: 'var(--color-text-3)', textTransform: 'uppercase' }}>or</span>
<div style={{ flex: 1, height: '1px', background: 'var(--color-panel-contrast)' }} />
</div>
{/* Method 2: Paste JSON */}
<div>
<h3 style={{
margin: '0 0 8px 0',
fontSize: '14px',
fontWeight: 600,
color: 'var(--color-text)',
display: 'flex',
alignItems: 'center',
gap: '8px',
}}>
<span style={{
width: '20px',
height: '20px',
borderRadius: '50%',
background: '#FFD02F',
color: '#000',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '11px',
fontWeight: 700,
}}>2</span>
Paste JSON
</h3>
<textarea
value={jsonText}
onChange={(e) => setJsonText(e.target.value)}
placeholder='[{"type":"sticky_note","id":"..."}]'
disabled={isImporting}
style={{
width: '100%',
height: '120px',
padding: '12px',
fontSize: '12px',
fontFamily: 'monospace',
borderRadius: '8px',
border: '2px solid #d1d5db',
background: '#ffffff',
color: '#1f2937',
resize: 'vertical',
marginBottom: '12px',
outline: 'none',
boxSizing: 'border-box',
}}
onFocus={(e) => {
e.currentTarget.style.borderColor = '#FFD02F';
e.currentTarget.style.boxShadow = '0 0 0 3px rgba(255, 208, 47, 0.2)';
}}
onBlur={(e) => {
e.currentTarget.style.borderColor = '#d1d5db';
e.currentTarget.style.boxShadow = 'none';
}}
/>
<button
onClick={handlePasteImport}
disabled={isImporting || !jsonText.trim()}
style={{
width: '100%',
padding: '14px 16px',
fontSize: '14px',
fontWeight: 600,
borderRadius: '8px',
border: jsonText.trim() ? '2px solid #e6b800' : '2px solid #d1d5db',
background: jsonText.trim() ? 'linear-gradient(135deg, #FFD02F 0%, #F2CA00 100%)' : '#f3f4f6',
color: jsonText.trim() ? '#000' : '#9ca3af',
cursor: isImporting || !jsonText.trim() ? 'not-allowed' : 'pointer',
boxShadow: jsonText.trim() ? '0 2px 8px rgba(255, 208, 47, 0.3)' : 'none',
transition: 'all 0.15s ease',
}}
>
{isImporting ? 'Importing...' : 'Import to Canvas'}
</button>
</div>
{/* Progress */}
{isImporting && (
<div style={{ marginTop: '16px' }}>
<div style={{
height: '4px',
background: 'var(--color-muted-2)',
borderRadius: '2px',
overflow: 'hidden',
}}>
<div style={{
height: '100%',
width: `${progress.percent}%`,
background: '#FFD02F',
transition: 'width 0.3s',
}} />
</div>
<p style={{ margin: '8px 0 0', fontSize: '12px', color: 'var(--color-text-3)', textAlign: 'center' }}>
{progress.stage}
</p>
</div>
)}
{/* Error/Success messages */}
{error && (
<div style={{
marginTop: '16px',
padding: '12px',
borderRadius: '8px',
background: '#fee2e2',
color: '#dc2626',
fontSize: '13px',
}}>
{error}
</div>
)}
{success && (
<div style={{
marginTop: '16px',
padding: '12px',
borderRadius: '8px',
background: '#dcfce7',
color: '#16a34a',
fontSize: '13px',
}}>
{success}
</div>
)}
</div>
)}
{/* API Setup Tab */}
{activeTab === 'api-setup' && (
<div>
<div style={{
padding: '16px',
borderRadius: '8px',
background: hasApiKey ? 'rgba(34, 197, 94, 0.1)' : 'var(--color-muted-1)',
marginBottom: '20px',
display: 'flex',
alignItems: 'center',
gap: '12px',
}}>
<span style={{ fontSize: '24px' }}>{hasApiKey ? '✅' : '🔑'}</span>
<div style={{ flex: 1 }}>
<div style={{ fontSize: '14px', fontWeight: 600, color: 'var(--color-text)' }}>
{hasApiKey ? 'Miro API Connected' : 'Connect Miro API'}
</div>
<div style={{ fontSize: '12px', color: 'var(--color-text-3)' }}>
{hasApiKey
? 'You can import boards directly from Miro'
: 'For power users who want direct board imports'}
</div>
</div>
</div>
{!hasApiKey ? (
<>
<div style={{ marginBottom: '16px' }}>
<label style={{
display: 'block',
fontSize: '13px',
fontWeight: 500,
color: 'var(--color-text)',
marginBottom: '8px',
}}>
Miro API Access Token
</label>
<input
type="password"
value={apiKeyInput}
onChange={(e) => setApiKeyInput(e.target.value)}
placeholder="Enter your Miro access token..."
style={{
width: '100%',
padding: '14px',
fontSize: '14px',
borderRadius: '8px',
border: '2px solid #d1d5db',
background: '#ffffff',
color: '#1f2937',
outline: 'none',
boxSizing: 'border-box',
}}
onFocus={(e) => {
e.currentTarget.style.borderColor = '#FFD02F';
e.currentTarget.style.boxShadow = '0 0 0 3px rgba(255, 208, 47, 0.2)';
}}
onBlur={(e) => {
e.currentTarget.style.borderColor = '#d1d5db';
e.currentTarget.style.boxShadow = 'none';
}}
onKeyDown={(e) => {
if (e.key === 'Enter') handleSaveApiKey();
}}
/>
</div>
<button
onClick={handleSaveApiKey}
style={{
width: '100%',
padding: '14px 16px',
fontSize: '14px',
fontWeight: 600,
borderRadius: '8px',
border: '2px solid #e6b800',
background: 'linear-gradient(135deg, #FFD02F 0%, #F2CA00 100%)',
color: '#000',
cursor: 'pointer',
transition: 'all 0.15s ease',
}}
onMouseEnter={(e) => {
e.currentTarget.style.transform = 'translateY(-1px)';
e.currentTarget.style.boxShadow = '0 4px 12px rgba(255, 208, 47, 0.4)';
}}
onMouseLeave={(e) => {
e.currentTarget.style.transform = 'translateY(0)';
e.currentTarget.style.boxShadow = 'none';
}}
>
Save API Token
</button>
</>
) : (
<button
onClick={handleDisconnectApi}
style={{
width: '100%',
padding: '14px 16px',
fontSize: '14px',
fontWeight: 600,
borderRadius: '8px',
border: '2px solid #fca5a5',
background: '#fee2e2',
color: '#dc2626',
cursor: 'pointer',
transition: 'all 0.15s ease',
}}
onMouseEnter={(e) => {
e.currentTarget.style.background = '#fecaca';
e.currentTarget.style.borderColor = '#f87171';
}}
onMouseLeave={(e) => {
e.currentTarget.style.background = '#fee2e2';
e.currentTarget.style.borderColor = '#fca5a5';
}}
>
Disconnect Miro API
</button>
)}
{/* API Setup Instructions */}
<div style={{
marginTop: '24px',
padding: '16px',
borderRadius: '8px',
background: 'var(--color-muted-1)',
border: '1px solid var(--color-panel-contrast)',
}}>
<h4 style={{ margin: '0 0 12px', fontSize: '13px', fontWeight: 600, color: 'var(--color-text)' }}>
How to get your Miro API Token
</h4>
<ol style={{
margin: 0,
paddingLeft: '20px',
fontSize: '12px',
color: 'var(--color-text-3)',
lineHeight: 1.8,
}}>
<li>Go to <a href="https://miro.com/app/settings/user-profile/apps" target="_blank" rel="noopener noreferrer" style={{ color: '#FFD02F' }}>Miro Developer Settings</a></li>
<li>Click "Create new app"</li>
<li>Give it a name (e.g., "Canvas Import")</li>
<li>Under "Permissions", enable:
<ul style={{ margin: '4px 0', paddingLeft: '16px' }}>
<li>boards:read</li>
<li>boards:write (optional)</li>
</ul>
</li>
<li>Click "Install app and get OAuth token"</li>
<li>Select your team and authorize</li>
<li>Copy the access token and paste it above</li>
</ol>
<p style={{ margin: '12px 0 0', fontSize: '11px', color: 'var(--color-text-3)' }}>
Note: This is a one-time setup. Your token is stored locally and never sent to our servers.
</p>
</div>
{error && (
<div style={{
marginTop: '16px',
padding: '12px',
borderRadius: '8px',
background: '#fee2e2',
color: '#dc2626',
fontSize: '13px',
}}>
{error}
</div>
)}
{success && (
<div style={{
marginTop: '16px',
padding: '12px',
borderRadius: '8px',
background: '#dcfce7',
color: '#16a34a',
fontSize: '13px',
}}>
{success}
</div>
)}
</div>
)}
{/* Help Tab */}
{activeTab === 'help' && (
<div>
<div style={{
padding: '16px',
borderRadius: '8px',
background: 'linear-gradient(135deg, rgba(255, 208, 47, 0.1) 0%, rgba(242, 202, 0, 0.1) 100%)',
border: '1px solid rgba(255, 208, 47, 0.3)',
marginBottom: '20px',
}}>
<h3 style={{ margin: '0 0 8px', fontSize: '14px', fontWeight: 600, color: 'var(--color-text)' }}>
Quick Start (Recommended)
</h3>
<p style={{ margin: 0, fontSize: '13px', color: 'var(--color-text-3)', lineHeight: 1.6 }}>
The easiest way to import a Miro board is using the <code style={{
background: 'var(--color-muted-2)',
padding: '2px 6px',
borderRadius: '4px',
fontSize: '12px',
}}>miro-export</code> CLI tool. This runs on your computer and exports your board as JSON.
</p>
</div>
<h4 style={{ margin: '0 0 12px', fontSize: '14px', fontWeight: 600, color: 'var(--color-text)' }}>
Step-by-Step Instructions
</h4>
<div style={{ display: 'flex', flexDirection: 'column', gap: '16px' }}>
{/* Step 1 */}
<div style={{ display: 'flex', gap: '12px' }}>
<div style={{
width: '28px',
height: '28px',
borderRadius: '50%',
background: '#FFD02F',
color: '#000',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '13px',
fontWeight: 700,
flexShrink: 0,
}}>1</div>
<div>
<div style={{ fontSize: '13px', fontWeight: 600, color: 'var(--color-text)', marginBottom: '4px' }}>
Find your Miro Board ID
</div>
<p style={{ margin: 0, fontSize: '12px', color: 'var(--color-text-3)', lineHeight: 1.5 }}>
Open your board in Miro. The Board ID is in the URL:
</p>
<code style={{
display: 'block',
margin: '8px 0',
padding: '8px 12px',
background: 'var(--color-muted-1)',
borderRadius: '6px',
fontSize: '11px',
color: 'var(--color-text)',
wordBreak: 'break-all',
}}>
miro.com/app/board/<span style={{ background: '#FFD02F', color: '#000', padding: '0 4px', borderRadius: '2px' }}>uXjVLxxxxxxxx=</span>/
</code>
</div>
</div>
{/* Step 2 */}
<div style={{ display: 'flex', gap: '12px' }}>
<div style={{
width: '28px',
height: '28px',
borderRadius: '50%',
background: '#FFD02F',
color: '#000',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '13px',
fontWeight: 700,
flexShrink: 0,
}}>2</div>
<div>
<div style={{ fontSize: '13px', fontWeight: 600, color: 'var(--color-text)', marginBottom: '4px' }}>
Run the Export Command
</div>
<p style={{ margin: 0, fontSize: '12px', color: 'var(--color-text-3)', lineHeight: 1.5 }}>
Open your terminal and run:
</p>
<code style={{
display: 'block',
margin: '8px 0',
padding: '8px 12px',
background: 'var(--color-muted-1)',
borderRadius: '6px',
fontSize: '11px',
color: 'var(--color-text)',
wordBreak: 'break-all',
}}>
npx miro-export -b YOUR_BOARD_ID -e json -o board.json
</code>
<p style={{ margin: '4px 0 0', fontSize: '11px', color: 'var(--color-text-3)' }}>
This will open Miro in a browser window. Sign in if prompted.
</p>
</div>
</div>
{/* Step 3 */}
<div style={{ display: 'flex', gap: '12px' }}>
<div style={{
width: '28px',
height: '28px',
borderRadius: '50%',
background: '#FFD02F',
color: '#000',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '13px',
fontWeight: 700,
flexShrink: 0,
}}>3</div>
<div>
<div style={{ fontSize: '13px', fontWeight: 600, color: 'var(--color-text)', marginBottom: '4px' }}>
Upload the JSON
</div>
<p style={{ margin: 0, fontSize: '12px', color: 'var(--color-text-3)', lineHeight: 1.5 }}>
Go to the "Import Board" tab and upload your <code style={{
background: 'var(--color-muted-2)',
padding: '1px 4px',
borderRadius: '3px',
fontSize: '11px',
}}>board.json</code> file. That's it!
</p>
</div>
</div>
</div>
{/* What Gets Imported */}
<div style={{
marginTop: '24px',
padding: '16px',
borderRadius: '8px',
background: 'var(--color-muted-1)',
}}>
<h4 style={{ margin: '0 0 12px', fontSize: '13px', fontWeight: 600, color: 'var(--color-text)' }}>
What Gets Imported
</h4>
<div style={{
display: 'grid',
gridTemplateColumns: 'repeat(2, 1fr)',
gap: '8px',
fontSize: '12px',
}}>
{[
{ icon: '📝', label: 'Sticky Notes' },
{ icon: '🔷', label: 'Shapes' },
{ icon: '📄', label: 'Text' },
{ icon: '🖼️', label: 'Images' },
{ icon: '🔗', label: 'Connectors' },
{ icon: '🖼️', label: 'Frames' },
{ icon: '🃏', label: 'Cards' },
].map((item) => (
<div key={item.label} style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
color: 'var(--color-text-3)',
}}>
<span style={{ fontSize: '14px' }}>{item.icon}</span>
{item.label}
</div>
))}
</div>
<p style={{
margin: '12px 0 0',
fontSize: '11px',
color: 'var(--color-text-3)',
fontStyle: 'italic',
}}>
Images are automatically downloaded and stored locally, so they'll persist even if you lose Miro access.
</p>
</div>
</div>
)}
</div>
</div>
</div>
);
}
export default MiroIntegrationModal;

View File

@ -82,14 +82,16 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
// Save vault to Automerge store // Save vault to Automerge store
const saveVaultToAutomerge = (vault: ObsidianVault) => { const saveVaultToAutomerge = (vault: ObsidianVault) => {
if (!automergeHandle) { if (!automergeHandle) {
console.warn('⚠️ Automerge handle not available, saving to localStorage only')
try { try {
const vaultRecord = importer.vaultToRecord(vault) const vaultRecord = importer.vaultToRecord(vault)
localStorage.setItem(`obsidian_vault_cache:${vault.name}`, JSON.stringify({ localStorage.setItem(`obsidian_vault_cache:${vault.name}`, JSON.stringify({
...vaultRecord, ...vaultRecord,
lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported
})) }))
console.log('🔧 Saved vault to localStorage (Automerge handle not available):', vaultRecord.id)
} catch (localStorageError) { } catch (localStorageError) {
console.warn('Could not save vault to localStorage:', localStorageError) console.warn('⚠️ Could not save vault to localStorage:', localStorageError)
} }
return return
} }
@ -98,11 +100,15 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const vaultRecord = importer.vaultToRecord(vault) const vaultRecord = importer.vaultToRecord(vault)
// Save directly to Automerge, bypassing TLDraw store validation // Save directly to Automerge, bypassing TLDraw store validation
// This allows us to save custom record types like obsidian_vault
automergeHandle.change((doc: any) => { automergeHandle.change((doc: any) => {
// Ensure doc.store exists
if (!doc.store) { if (!doc.store) {
doc.store = {} doc.store = {}
} }
// Save the vault record directly to Automerge store
// Convert Date to ISO string for serialization
const recordToSave = { const recordToSave = {
...vaultRecord, ...vaultRecord,
lastImported: vaultRecord.lastImported instanceof Date lastImported: vaultRecord.lastImported instanceof Date
@ -113,17 +119,21 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
doc.store[vaultRecord.id] = recordToSave doc.store[vaultRecord.id] = recordToSave
}) })
console.log('🔧 Saved vault to Automerge:', vaultRecord.id)
// Also save to localStorage as a backup // Also save to localStorage as a backup
try { try {
localStorage.setItem(`obsidian_vault_cache:${vault.name}`, JSON.stringify({ localStorage.setItem(`obsidian_vault_cache:${vault.name}`, JSON.stringify({
...vaultRecord, ...vaultRecord,
lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported
})) }))
console.log('🔧 Saved vault to localStorage as backup:', vaultRecord.id)
} catch (localStorageError) { } catch (localStorageError) {
// Silent fail for backup console.warn('⚠️ Could not save vault to localStorage:', localStorageError)
} }
} catch (error) { } catch (error) {
console.error('Error saving vault to Automerge:', error) console.error('❌ Error saving vault to Automerge:', error)
// Don't throw - allow vault loading to continue even if saving fails
// Try localStorage as fallback // Try localStorage as fallback
try { try {
const vaultRecord = importer.vaultToRecord(vault) const vaultRecord = importer.vaultToRecord(vault)
@ -131,8 +141,9 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
...vaultRecord, ...vaultRecord,
lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported lastImported: vaultRecord.lastImported instanceof Date ? vaultRecord.lastImported.toISOString() : vaultRecord.lastImported
})) }))
console.log('🔧 Saved vault to localStorage as fallback:', vaultRecord.id)
} catch (localStorageError) { } catch (localStorageError) {
console.warn('Could not save vault to localStorage:', localStorageError) console.warn('⚠️ Could not save vault to localStorage:', localStorageError)
} }
} }
} }
@ -148,6 +159,8 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const vaultRecord = doc.store[vaultId] as ObsidianVaultRecord | undefined const vaultRecord = doc.store[vaultId] as ObsidianVaultRecord | undefined
if (vaultRecord && vaultRecord.typeName === 'obsidian_vault') { if (vaultRecord && vaultRecord.typeName === 'obsidian_vault') {
console.log('🔧 Loaded vault from Automerge:', vaultId)
// Convert date string back to Date object if needed
const recordCopy = JSON.parse(JSON.stringify(vaultRecord)) const recordCopy = JSON.parse(JSON.stringify(vaultRecord))
if (typeof recordCopy.lastImported === 'string') { if (typeof recordCopy.lastImported === 'string') {
recordCopy.lastImported = new Date(recordCopy.lastImported) recordCopy.lastImported = new Date(recordCopy.lastImported)
@ -156,7 +169,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
} }
} }
} catch (error) { } catch (error) {
// Fall through to localStorage console.warn('⚠️ Could not load vault from Automerge:', error)
} }
} }
@ -166,6 +179,8 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
if (cached) { if (cached) {
const vaultRecord = JSON.parse(cached) as ObsidianVaultRecord const vaultRecord = JSON.parse(cached) as ObsidianVaultRecord
if (vaultRecord && vaultRecord.typeName === 'obsidian_vault') { if (vaultRecord && vaultRecord.typeName === 'obsidian_vault') {
console.log('🔧 Loaded vault from localStorage cache:', vaultName)
// Convert date string back to Date object
if (typeof vaultRecord.lastImported === 'string') { if (typeof vaultRecord.lastImported === 'string') {
vaultRecord.lastImported = new Date(vaultRecord.lastImported) vaultRecord.lastImported = new Date(vaultRecord.lastImported)
} }
@ -173,7 +188,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
} }
} }
} catch (e) { } catch (e) {
// Silent fail console.warn('⚠️ Could not load vault from localStorage:', e)
} }
return null return null
@ -183,15 +198,28 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
useEffect(() => { useEffect(() => {
// Prevent multiple loads if already loading or already loaded once // Prevent multiple loads if already loading or already loaded once
if (isLoadingVault || hasLoadedOnce) { if (isLoadingVault || hasLoadedOnce) {
console.log('🔧 ObsidianVaultBrowser: Skipping load - already loading or loaded once')
return return
} }
console.log('🔧 ObsidianVaultBrowser: Component mounted, checking user identity for vault...')
console.log('🔧 Current session vault data:', {
path: session.obsidianVaultPath,
name: session.obsidianVaultName,
authed: session.authed,
username: session.username
})
// FIRST PRIORITY: Try to load from user's configured vault in session (user identity) // FIRST PRIORITY: Try to load from user's configured vault in session (user identity)
if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') { if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') {
console.log('✅ Found configured vault in user identity:', session.obsidianVaultPath)
console.log('🔧 Loading vault from user identity...')
// First try to load from Automerge cache for faster loading // First try to load from Automerge cache for faster loading
if (session.obsidianVaultName) { if (session.obsidianVaultName) {
const cachedVault = loadVaultFromAutomerge(session.obsidianVaultName) const cachedVault = loadVaultFromAutomerge(session.obsidianVaultName)
if (cachedVault) { if (cachedVault) {
console.log('✅ Loaded vault from Automerge cache')
setVault(cachedVault) setVault(cachedVault)
setIsLoading(false) setIsLoading(false)
setHasLoadedOnce(true) setHasLoadedOnce(true)
@ -200,14 +228,17 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
} }
// If not in cache, load from source (Quartz URL or local path) // If not in cache, load from source (Quartz URL or local path)
console.log('🔧 Loading vault from source:', session.obsidianVaultPath)
loadVault(session.obsidianVaultPath) loadVault(session.obsidianVaultPath)
} else if (session.obsidianVaultPath === 'folder-selected' && session.obsidianVaultName) { } else if (session.obsidianVaultPath === 'folder-selected' && session.obsidianVaultName) {
console.log('🔧 Vault was previously selected via folder picker, showing reselect interface')
// For folder-selected vaults, we can't reload them, so show a special reselect interface // For folder-selected vaults, we can't reload them, so show a special reselect interface
setVault(null) setVault(null)
setShowFolderReselect(true) setShowFolderReselect(true)
setIsLoading(false) setIsLoading(false)
setHasLoadedOnce(true) setHasLoadedOnce(true)
} else { } else {
console.log('⚠️ No vault configured in user identity, showing empty state...')
setVault(null) setVault(null)
setIsLoading(false) setIsLoading(false)
setHasLoadedOnce(true) setHasLoadedOnce(true)
@ -222,7 +253,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
// If vault is already loaded and values haven't changed, don't do anything // If vault is already loaded and values haven't changed, don't do anything
if (hasLoadedOnce && !vaultPathChanged && !vaultNameChanged) { if (hasLoadedOnce && !vaultPathChanged && !vaultNameChanged) {
return return // Already loaded and nothing changed, no need to reload
} }
// Update refs to current values // Update refs to current values
@ -231,16 +262,18 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
// Only proceed if values actually changed and we haven't loaded yet // Only proceed if values actually changed and we haven't loaded yet
if (!vaultPathChanged && !vaultNameChanged) { if (!vaultPathChanged && !vaultNameChanged) {
return return // Values haven't changed, no need to reload
} }
if (hasLoadedOnce || isLoadingVault) { if (hasLoadedOnce || isLoadingVault) {
return return // Don't reload if we've already loaded or are currently loading
} }
if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') { if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') {
console.log('🔧 Session vault path changed, loading vault:', session.obsidianVaultPath)
loadVault(session.obsidianVaultPath) loadVault(session.obsidianVaultPath)
} else if (session.obsidianVaultPath === 'folder-selected' && session.obsidianVaultName) { } else if (session.obsidianVaultPath === 'folder-selected' && session.obsidianVaultName) {
console.log('🔧 Session shows folder-selected vault, showing reselect interface')
setVault(null) setVault(null)
setShowFolderReselect(true) setShowFolderReselect(true)
setIsLoading(false) setIsLoading(false)
@ -251,6 +284,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
// Auto-open folder picker if requested // Auto-open folder picker if requested
useEffect(() => { useEffect(() => {
if (autoOpenFolderPicker) { if (autoOpenFolderPicker) {
console.log('Auto-opening folder picker...')
handleFolderPicker() handleFolderPicker()
} }
}, [autoOpenFolderPicker]) }, [autoOpenFolderPicker])
@ -278,6 +312,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
useEffect(() => { useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => { const handleKeyDown = (event: KeyboardEvent) => {
if (event.key === 'Escape') { if (event.key === 'Escape') {
console.log('🔧 ESC key pressed, closing vault browser')
onClose() onClose()
} }
} }
@ -291,6 +326,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const loadVault = async (path?: string) => { const loadVault = async (path?: string) => {
// Prevent concurrent loading operations // Prevent concurrent loading operations
if (isLoadingVault) { if (isLoadingVault) {
console.log('🔧 loadVault: Already loading, skipping concurrent request')
return return
} }
@ -302,27 +338,45 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
if (path) { if (path) {
// Check if it's a Quartz URL // Check if it's a Quartz URL
if (path.startsWith('http') || path.includes('quartz') || path.includes('.xyz') || path.includes('.com')) { if (path.startsWith('http') || path.includes('quartz') || path.includes('.xyz') || path.includes('.com')) {
// Load from Quartz URL - always get latest data
console.log('🔧 Loading Quartz vault from URL (getting latest data):', path)
const loadedVault = await importer.importFromQuartzUrl(path) const loadedVault = await importer.importFromQuartzUrl(path)
console.log('Loaded Quartz vault from URL:', loadedVault)
setVault(loadedVault) setVault(loadedVault)
setShowVaultInput(false) setShowVaultInput(false)
setShowFolderReselect(false) setShowFolderReselect(false)
// Save the vault path and name to user session
console.log('🔧 Saving Quartz vault to session:', { path, name: loadedVault.name })
updateSession({ updateSession({
obsidianVaultPath: path, obsidianVaultPath: path,
obsidianVaultName: loadedVault.name obsidianVaultName: loadedVault.name
}) })
console.log('🔧 Quartz vault saved to session successfully')
// Save vault to Automerge for persistence
saveVaultToAutomerge(loadedVault) saveVaultToAutomerge(loadedVault)
} else { } else {
// Load from local directory
console.log('🔧 Loading vault from local directory:', path)
const loadedVault = await importer.importFromDirectory(path) const loadedVault = await importer.importFromDirectory(path)
console.log('Loaded vault from path:', loadedVault)
setVault(loadedVault) setVault(loadedVault)
setShowVaultInput(false) setShowVaultInput(false)
setShowFolderReselect(false) setShowFolderReselect(false)
// Save the vault path and name to user session
console.log('🔧 Saving vault to session:', { path, name: loadedVault.name })
updateSession({ updateSession({
obsidianVaultPath: path, obsidianVaultPath: path,
obsidianVaultName: loadedVault.name obsidianVaultName: loadedVault.name
}) })
console.log('🔧 Vault saved to session successfully')
// Save vault to Automerge for persistence
saveVaultToAutomerge(loadedVault) saveVaultToAutomerge(loadedVault)
} }
} else { } else {
// No vault configured - show empty state
console.log('No vault configured, showing empty state...')
setVault(null) setVault(null)
setShowVaultInput(false) setShowVaultInput(false)
} }
@ -330,6 +384,8 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
console.error('Failed to load vault:', err) console.error('Failed to load vault:', err)
setError('Failed to load Obsidian vault. Please try again.') setError('Failed to load Obsidian vault. Please try again.')
setVault(null) setVault(null)
// Don't show vault input if user already has a vault configured
// Only show vault input if this is a fresh attempt
if (!session.obsidianVaultPath) { if (!session.obsidianVaultPath) {
setShowVaultInput(true) setShowVaultInput(true)
} }
@ -346,7 +402,10 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
return return
} }
console.log('📝 Submitting vault path:', vaultPath.trim(), 'Method:', inputMethod)
if (inputMethod === 'quartz') { if (inputMethod === 'quartz') {
// Handle Quartz URL
try { try {
setIsLoading(true) setIsLoading(true)
setError(null) setError(null)
@ -354,22 +413,31 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
setVault(loadedVault) setVault(loadedVault)
setShowVaultInput(false) setShowVaultInput(false)
setShowFolderReselect(false) setShowFolderReselect(false)
// Save Quartz vault to user identity (session)
console.log('🔧 Saving Quartz vault to user identity:', {
path: vaultPath.trim(),
name: loadedVault.name
})
updateSession({ updateSession({
obsidianVaultPath: vaultPath.trim(), obsidianVaultPath: vaultPath.trim(),
obsidianVaultName: loadedVault.name obsidianVaultName: loadedVault.name
}) })
} catch (error) { } catch (error) {
console.error('Error loading Quartz vault:', error) console.error('Error loading Quartz vault:', error)
setError(error instanceof Error ? error.message : 'Failed to load Quartz vault') setError(error instanceof Error ? error.message : 'Failed to load Quartz vault')
} finally { } finally {
setIsLoading(false) setIsLoading(false)
} }
} else { } else {
// Handle regular vault path (local folder or URL)
loadVault(vaultPath.trim()) loadVault(vaultPath.trim())
} }
} }
const handleFolderPicker = async () => { const handleFolderPicker = async () => {
console.log('📁 Folder picker button clicked')
if (!('showDirectoryPicker' in window)) { if (!('showDirectoryPicker' in window)) {
setError('File System Access API is not supported in this browser. Please use "Enter Path" instead.') setError('File System Access API is not supported in this browser. Please use "Enter Path" instead.')
setShowVaultInput(true) setShowVaultInput(true)
@ -379,24 +447,36 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
try { try {
setIsLoading(true) setIsLoading(true)
setError(null) setError(null)
console.log('📁 Opening directory picker...')
const loadedVault = await importer.importFromFileSystem() const loadedVault = await importer.importFromFileSystem()
console.log('✅ Vault loaded from folder picker:', loadedVault.name)
setVault(loadedVault) setVault(loadedVault)
setShowVaultInput(false) setShowVaultInput(false)
setShowFolderReselect(false) setShowFolderReselect(false)
// Note: We can't get the actual path from importFromFileSystem,
// but we can save a flag that a folder was selected
console.log('🔧 Saving folder-selected vault to user identity:', {
path: 'folder-selected',
name: loadedVault.name
})
updateSession({ updateSession({
obsidianVaultPath: 'folder-selected', obsidianVaultPath: 'folder-selected',
obsidianVaultName: loadedVault.name obsidianVaultName: loadedVault.name
}) })
console.log('✅ Folder-selected vault saved to user identity successfully')
// Save vault to Automerge for persistence
saveVaultToAutomerge(loadedVault) saveVaultToAutomerge(loadedVault)
} catch (err) { } catch (err) {
console.error('❌ Failed to load vault from folder picker:', err)
if ((err as any).name === 'AbortError') { if ((err as any).name === 'AbortError') {
setError(null) // User cancelled the folder picker
console.log('📁 User cancelled folder picker')
setError(null) // Don't show error for cancellation
} else { } else {
console.error('Failed to load vault from folder picker:', err)
setError('Failed to load Obsidian vault. Please try again.') setError('Failed to load Obsidian vault. Please try again.')
} }
} finally { } finally {
@ -434,21 +514,39 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const folderNotes = importer.getAllNotesFromTree(folder) const folderNotes = importer.getAllNotesFromTree(folder)
obs_notes = obs_notes.filter(note => folderNotes.some(folderNote => folderNote.id === note.id)) obs_notes = obs_notes.filter(note => folderNotes.some(folderNote => folderNote.id === note.id))
} }
} else if (viewMode === 'tree' && selectedFolder === null) {
// In tree view but no folder selected, show all notes
// This allows users to see all notes when no specific folder is selected
} }
// Debug logging
console.log('Search query:', debouncedSearchQuery)
console.log('View mode:', viewMode)
console.log('Selected folder:', selectedFolder)
console.log('Total notes:', vault.obs_notes.length)
console.log('Filtered notes:', obs_notes.length)
return obs_notes return obs_notes
}, [vault, debouncedSearchQuery, viewMode, selectedFolder, folderTree, importer]) }, [vault, debouncedSearchQuery, viewMode, selectedFolder, folderTree, importer])
// Listen for trigger-obsnote-creation event from CustomToolbar // Listen for trigger-obsnote-creation event from CustomToolbar
useEffect(() => { useEffect(() => {
const handleTriggerCreation = () => { const handleTriggerCreation = () => {
console.log('🎯 ObsidianVaultBrowser: Received trigger-obsnote-creation event')
if (selectedNotes.size > 0) { if (selectedNotes.size > 0) {
// Create shapes from currently selected notes
const selectedObsNotes = filteredObsNotes.filter(obs_note => selectedNotes.has(obs_note.id)) const selectedObsNotes = filteredObsNotes.filter(obs_note => selectedNotes.has(obs_note.id))
console.log('🎯 Creating shapes from selected notes:', selectedObsNotes.length)
onObsNotesSelect(selectedObsNotes) onObsNotesSelect(selectedObsNotes)
} else { } else {
// If no notes are selected, select all visible notes
const allVisibleNotes = filteredObsNotes const allVisibleNotes = filteredObsNotes
if (allVisibleNotes.length > 0) { if (allVisibleNotes.length > 0) {
console.log('🎯 No notes selected, creating shapes from all visible notes:', allVisibleNotes.length)
onObsNotesSelect(allVisibleNotes) onObsNotesSelect(allVisibleNotes)
} else {
console.log('🎯 No notes available to create shapes from')
} }
} }
} }
@ -565,6 +663,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
} }
const handleObsNoteClick = (obs_note: ObsidianObsNote) => { const handleObsNoteClick = (obs_note: ObsidianObsNote) => {
console.log('🎯 ObsidianVaultBrowser: handleObsNoteClick called with:', obs_note)
onObsNoteSelect(obs_note) onObsNoteSelect(obs_note)
} }
@ -580,6 +679,7 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const handleBulkImport = () => { const handleBulkImport = () => {
const selectedObsNotes = filteredObsNotes.filter(obs_note => selectedNotes.has(obs_note.id)) const selectedObsNotes = filteredObsNotes.filter(obs_note => selectedNotes.has(obs_note.id))
console.log('🎯 ObsidianVaultBrowser: handleBulkImport called with:', selectedObsNotes.length, 'notes')
onObsNotesSelect(selectedObsNotes) onObsNotesSelect(selectedObsNotes)
setSelectedNotes(new Set()) setSelectedNotes(new Set())
} }
@ -630,11 +730,13 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
const handleDisconnectVault = () => { const handleDisconnectVault = () => {
// Clear the vault from session
updateSession({ updateSession({
obsidianVaultPath: undefined, obsidianVaultPath: undefined,
obsidianVaultName: undefined obsidianVaultName: undefined
}) })
// Reset component state
setVault(null) setVault(null)
setSearchQuery('') setSearchQuery('')
setDebouncedSearchQuery('') setDebouncedSearchQuery('')
@ -644,6 +746,8 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
setError(null) setError(null)
setHasLoadedOnce(false) setHasLoadedOnce(false)
setIsLoadingVault(false) setIsLoadingVault(false)
console.log('🔧 Vault disconnected successfully')
} }
const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => { const handleBackdropClick = (e: React.MouseEvent<HTMLDivElement>) => {
@ -738,13 +842,18 @@ export const ObsidianVaultBrowser: React.FC<ObsidianVaultBrowserProps> = ({
<p>Choose how you'd like to load your Obsidian vault:</p> <p>Choose how you'd like to load your Obsidian vault:</p>
<div className="vault-options"> <div className="vault-options">
<button <button
onClick={handleFolderPicker} onClick={() => {
console.log('📁 Select Folder button clicked')
handleFolderPicker()
}}
className="load-vault-button primary" className="load-vault-button primary"
> >
📁 Select Folder 📁 Select Folder
</button> </button>
<button <button
onClick={() => { onClick={() => {
console.log('📝 Enter Path button clicked')
// Pre-populate with session vault path if available
if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') { if (session.obsidianVaultPath && session.obsidianVaultPath !== 'folder-selected') {
setVaultPath(session.obsidianVaultPath) setVaultPath(session.obsidianVaultPath)
} }

View File

@ -1,67 +0,0 @@
// Connection status for UI display (maps from ConnectionState)
export type ConnectionStatus = 'online' | 'offline' | 'syncing'
interface OfflineIndicatorProps {
connectionStatus: ConnectionStatus
isOfflineReady: boolean
}
export function OfflineIndicator({ connectionStatus, isOfflineReady }: OfflineIndicatorProps) {
// Don't show indicator when online and everything is working normally
if (connectionStatus === 'online') {
return null
}
const getStatusConfig = () => {
switch (connectionStatus) {
case 'offline':
return {
icon: '📴',
text: isOfflineReady ? 'Offline (changes saved locally)' : 'Offline',
bgColor: '#fef3c7', // warm yellow
textColor: '#92400e',
borderColor: '#f59e0b'
}
case 'syncing':
return {
icon: '🔄',
text: 'Syncing...',
bgColor: '#dbeafe', // light blue
textColor: '#1e40af',
borderColor: '#3b82f6'
}
default:
return null
}
}
const config = getStatusConfig()
if (!config) return null
return (
<div
style={{
position: 'fixed',
bottom: '16px',
left: '50%',
transform: 'translateX(-50%)',
backgroundColor: config.bgColor,
color: config.textColor,
padding: '8px 16px',
borderRadius: '8px',
border: `1px solid ${config.borderColor}`,
boxShadow: '0 2px 8px rgba(0, 0, 0, 0.15)',
display: 'flex',
alignItems: 'center',
gap: '8px',
zIndex: 9999,
fontSize: '14px',
fontFamily: 'system-ui, -apple-system, sans-serif',
pointerEvents: 'none'
}}
>
<span style={{ fontSize: '16px' }}>{config.icon}</span>
<span>{config.text}</span>
</div>
)
}

View File

@ -1,22 +0,0 @@
import { useEditor } from 'tldraw'
import { usePrivateWorkspace } from '../hooks/usePrivateWorkspace'
/**
* Component that manages the Private Workspace zone for Google Export data.
* Listens for 'add-google-items-to-canvas' events and creates items in the workspace.
*
* Must be rendered inside a Tldraw context.
*/
export function PrivateWorkspaceManager() {
const editor = useEditor()
// This hook handles:
// - Creating/showing the private workspace zone
// - Listening for 'add-google-items-to-canvas' events
// - Adding items to the workspace when triggered
usePrivateWorkspace({ editor })
// This component doesn't render anything visible
// It just manages the workspace logic
return null
}

View File

@ -1,632 +0,0 @@
import React, { useState, useEffect, useRef } from 'react';
import { createPortal } from 'react-dom';
import { useParams } from 'react-router-dom';
import { QRCodeSVG } from 'qrcode.react';
interface ShareBoardButtonProps {
className?: string;
}
type PermissionType = 'view' | 'edit' | 'admin';
const PERMISSION_LABELS: Record<PermissionType, { label: string; description: string; color: string }> = {
view: { label: 'View', description: 'Can view but not edit', color: '#6b7280' },
edit: { label: 'Edit', description: 'Can view and edit', color: '#3b82f6' },
admin: { label: 'Admin', description: 'Full control', color: '#10b981' },
};
const ShareBoardButton: React.FC<ShareBoardButtonProps> = ({ className = '' }) => {
const { slug } = useParams<{ slug: string }>();
const [showDropdown, setShowDropdown] = useState(false);
// Detect dark mode
const [isDarkMode, setIsDarkMode] = useState(
typeof document !== 'undefined' && document.documentElement.classList.contains('dark')
);
useEffect(() => {
const observer = new MutationObserver((mutations) => {
mutations.forEach((mutation) => {
if (mutation.attributeName === 'class') {
setIsDarkMode(document.documentElement.classList.contains('dark'));
}
});
});
observer.observe(document.documentElement, { attributes: true });
return () => observer.disconnect();
}, []);
const [copied, setCopied] = useState(false);
const [permission, setPermission] = useState<PermissionType>('edit');
const [nfcStatus, setNfcStatus] = useState<'idle' | 'writing' | 'success' | 'error' | 'unsupported'>('idle');
const [nfcMessage, setNfcMessage] = useState('');
const [showAdvanced, setShowAdvanced] = useState(false);
const [inviteInput, setInviteInput] = useState('');
const [inviteStatus, setInviteStatus] = useState<'idle' | 'sending' | 'sent' | 'error'>('idle');
const dropdownRef = useRef<HTMLDivElement>(null);
const dropdownMenuRef = useRef<HTMLDivElement>(null);
const triggerRef = useRef<HTMLButtonElement>(null);
const [dropdownPosition, setDropdownPosition] = useState<{ top: number; right: number } | null>(null);
const boardSlug = slug || 'mycofi33';
const boardUrl = `${window.location.origin}/board/${boardSlug}`;
// Update dropdown position when it opens
useEffect(() => {
if (showDropdown && triggerRef.current) {
const rect = triggerRef.current.getBoundingClientRect();
setDropdownPosition({
top: rect.bottom + 8,
right: window.innerWidth - rect.right,
});
}
}, [showDropdown]);
// Generate URL with permission parameter
const getShareUrl = () => {
const url = new URL(boardUrl);
url.searchParams.set('access', permission);
return url.toString();
};
// Check NFC support on mount
useEffect(() => {
if (!('NDEFReader' in window)) {
setNfcStatus('unsupported');
}
}, []);
// Close dropdown when clicking outside or pressing ESC
useEffect(() => {
const handleClickOutside = (e: MouseEvent) => {
const target = e.target as Node;
// Check if click is inside trigger OR the portal dropdown menu
const isInsideTrigger = dropdownRef.current && dropdownRef.current.contains(target);
const isInsideMenu = dropdownMenuRef.current && dropdownMenuRef.current.contains(target);
if (!isInsideTrigger && !isInsideMenu) {
setShowDropdown(false);
}
};
const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault();
e.stopPropagation();
setShowDropdown(false);
}
};
if (showDropdown) {
document.addEventListener('mousedown', handleClickOutside);
document.addEventListener('keydown', handleKeyDown, true);
}
return () => {
document.removeEventListener('mousedown', handleClickOutside);
document.removeEventListener('keydown', handleKeyDown, true);
};
}, [showDropdown]);
const handleCopyUrl = async () => {
try {
await navigator.clipboard.writeText(getShareUrl());
setCopied(true);
setTimeout(() => setCopied(false), 2000);
} catch (err) {
console.error('Failed to copy URL:', err);
}
};
const handleInvite = async () => {
if (!inviteInput.trim()) return;
setInviteStatus('sending');
try {
// TODO: Implement actual invite API call
// For now, simulate sending invite
await new Promise(resolve => setTimeout(resolve, 1000));
setInviteStatus('sent');
setInviteInput('');
setTimeout(() => setInviteStatus('idle'), 3000);
} catch (err) {
console.error('Failed to send invite:', err);
setInviteStatus('error');
setTimeout(() => setInviteStatus('idle'), 3000);
}
};
const handleNfcWrite = async () => {
if (!('NDEFReader' in window)) {
setNfcStatus('unsupported');
setNfcMessage('NFC is not supported on this device');
return;
}
try {
setNfcStatus('writing');
setNfcMessage('Hold your NFC tag near the device...');
const ndef = new (window as any).NDEFReader();
await ndef.write({
records: [
{ recordType: "url", data: getShareUrl() }
]
});
setNfcStatus('success');
setNfcMessage('Board URL written to NFC tag!');
setTimeout(() => {
setNfcStatus('idle');
setNfcMessage('');
}, 3000);
} catch (err: any) {
console.error('NFC write error:', err);
setNfcStatus('error');
if (err.name === 'NotAllowedError') {
setNfcMessage('NFC permission denied. Please allow NFC access.');
} else if (err.name === 'NotSupportedError') {
setNfcMessage('NFC is not supported on this device');
} else {
setNfcMessage(`Failed to write NFC tag: ${err.message || 'Unknown error'}`);
}
}
};
// Detect if we're in share-panel (compact) vs toolbar (full button)
const isCompact = className.includes('share-panel-btn');
if (isCompact) {
// Icon-only version for the top-right share panel with dropdown
return (
<div ref={dropdownRef} style={{ pointerEvents: 'all' }}>
<button
ref={triggerRef}
onClick={() => setShowDropdown(!showDropdown)}
className={`share-board-button ${className}`}
title="Invite others to this board"
style={{
background: showDropdown ? 'var(--color-muted-2)' : 'none',
border: 'none',
padding: '6px',
cursor: 'pointer',
borderRadius: '6px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: 'var(--color-text-1)',
opacity: showDropdown ? 1 : 0.7,
transition: 'opacity 0.15s, background 0.15s',
pointerEvents: 'all',
}}
onMouseEnter={(e) => {
e.currentTarget.style.opacity = '1';
e.currentTarget.style.background = 'var(--color-muted-2)';
}}
onMouseLeave={(e) => {
if (!showDropdown) {
e.currentTarget.style.opacity = '0.7';
e.currentTarget.style.background = 'none';
}
}}
>
{/* User with plus icon (invite/add person) */}
<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
{/* User outline */}
<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2" />
<circle cx="9" cy="7" r="4" />
{/* Plus sign */}
<line x1="19" y1="8" x2="19" y2="14" />
<line x1="16" y1="11" x2="22" y2="11" />
</svg>
</button>
{/* Dropdown - rendered via portal to break out of parent container */}
{showDropdown && dropdownPosition && createPortal(
<div
ref={dropdownMenuRef}
style={{
position: 'fixed',
top: dropdownPosition.top,
right: dropdownPosition.right,
width: '340px',
background: isDarkMode ? '#2d2d2d' : '#ffffff',
backgroundColor: isDarkMode ? '#2d2d2d' : '#ffffff',
backdropFilter: 'none',
opacity: 1,
border: `1px solid ${isDarkMode ? '#404040' : '#e5e5e5'}`,
borderRadius: '12px',
boxShadow: isDarkMode ? '0 8px 32px rgba(0,0,0,0.5)' : '0 8px 32px rgba(0,0,0,0.2)',
zIndex: 100000,
overflow: 'hidden',
pointerEvents: 'all',
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
}}
onWheel={(e) => e.stopPropagation()}
onPointerDown={(e) => e.stopPropagation()}
onClick={(e) => e.stopPropagation()}
>
{/* Compact Header */}
<div style={{
padding: '12px 14px',
borderBottom: '1px solid var(--color-panel-contrast)',
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
}}>
<span style={{ fontSize: '13px', fontWeight: 600, color: 'var(--color-text)', display: 'flex', alignItems: 'center', gap: '8px' }}>
<span style={{ fontSize: '14px' }}>👥</span> Share Board
</span>
<button
onClick={() => setShowDropdown(false)}
onPointerDown={(e) => e.stopPropagation()}
style={{
background: 'var(--color-muted-2)',
border: 'none',
cursor: 'pointer',
padding: '4px 8px',
color: 'var(--color-text-3)',
fontSize: '11px',
fontFamily: 'inherit',
lineHeight: 1,
borderRadius: '4px',
}}
>
</button>
</div>
<div style={{ padding: '12px 14px', display: 'flex', flexDirection: 'column', gap: '12px' }}>
{/* Invite by username/email */}
<div>
<div style={{
display: 'flex',
gap: '8px',
}}>
<input
type="text"
placeholder="Username or email..."
value={inviteInput}
onChange={(e) => setInviteInput(e.target.value)}
onKeyDown={(e) => {
e.stopPropagation();
if (e.key === 'Enter') handleInvite();
}}
onPointerDown={(e) => e.stopPropagation()}
onFocus={(e) => e.stopPropagation()}
style={{
flex: 1,
padding: '8px 12px',
fontSize: '12px',
fontFamily: 'inherit',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '6px',
background: 'var(--color-panel)',
color: 'var(--color-text)',
outline: 'none',
}}
/>
<button
onClick={handleInvite}
onPointerDown={(e) => e.stopPropagation()}
disabled={!inviteInput.trim() || inviteStatus === 'sending'}
style={{
padding: '8px 14px',
backgroundColor: inviteStatus === 'sent' ? '#10b981' : '#3b82f6',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: !inviteInput.trim() || inviteStatus === 'sending' ? 'not-allowed' : 'pointer',
fontSize: '11px',
fontWeight: 500,
fontFamily: 'inherit',
opacity: !inviteInput.trim() ? 0.5 : 1,
transition: 'all 0.15s ease',
whiteSpace: 'nowrap',
}}
>
{inviteStatus === 'sending' ? '...' : inviteStatus === 'sent' ? '✓ Sent' : 'Invite'}
</button>
</div>
{inviteStatus === 'error' && (
<p style={{ fontSize: '11px', color: '#ef4444', marginTop: '4px' }}>
Failed to send invite. Please try again.
</p>
)}
</div>
{/* Divider with "or share link" */}
<div style={{
display: 'flex',
alignItems: 'center',
gap: '10px',
}}>
<div style={{ flex: 1, height: '1px', background: 'var(--color-panel-contrast)' }} />
<span style={{ fontSize: '11px', color: 'var(--color-text-3)', fontWeight: 500 }}>or share link</span>
<div style={{ flex: 1, height: '1px', background: 'var(--color-panel-contrast)' }} />
</div>
{/* Permission selector - pill style */}
<div style={{ display: 'flex', gap: '6px' }}>
{(['view', 'edit', 'admin'] as PermissionType[]).map((perm) => {
const isActive = permission === perm;
const { label, description } = PERMISSION_LABELS[perm];
return (
<button
key={perm}
onClick={() => setPermission(perm)}
onPointerDown={(e) => e.stopPropagation()}
title={description}
style={{
flex: 1,
padding: '8px 6px',
border: 'none',
background: isActive ? '#3b82f6' : 'var(--color-muted-2)',
borderRadius: '6px',
cursor: 'pointer',
fontSize: '11px',
fontWeight: 500,
fontFamily: 'inherit',
color: isActive ? 'white' : 'var(--color-text)',
transition: 'all 0.15s ease',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: '2px',
}}
>
<span>{label}</span>
<span style={{
fontSize: '9px',
fontWeight: 400,
opacity: 0.8,
color: isActive ? 'rgba(255,255,255,0.9)' : 'var(--color-text-3)',
}}>
{perm === 'view' ? 'Read only' : perm === 'edit' ? 'Can edit' : 'Full access'}
</span>
</button>
);
})}
</div>
{/* QR Code and URL - larger and side by side */}
<div style={{
display: 'flex',
gap: '14px',
padding: '14px',
backgroundColor: 'var(--color-muted-2)',
borderRadius: '10px',
}}>
{/* QR Code - larger */}
<div style={{
padding: '10px',
backgroundColor: 'white',
borderRadius: '8px',
flexShrink: 0,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
}}>
<QRCodeSVG
value={getShareUrl()}
size={100}
level="M"
includeMargin={false}
/>
</div>
{/* URL and Copy - stacked */}
<div style={{ flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'center', gap: '10px' }}>
<div style={{
padding: '10px 12px',
backgroundColor: 'var(--color-panel)',
borderRadius: '6px',
border: '1px solid var(--color-panel-contrast)',
wordBreak: 'break-all',
fontSize: '11px',
fontFamily: 'monospace',
color: 'var(--color-text)',
lineHeight: 1.4,
}}>
{getShareUrl()}
</div>
<button
onClick={handleCopyUrl}
onPointerDown={(e) => e.stopPropagation()}
style={{
padding: '8px 12px',
backgroundColor: copied ? '#10b981' : '#3b82f6',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: 'pointer',
fontSize: '11px',
fontWeight: 500,
fontFamily: 'inherit',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
gap: '6px',
transition: 'all 0.15s ease',
}}
>
{copied ? (
<> Copied!</>
) : (
<>
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
<rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect>
<path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path>
</svg>
Copy Link
</>
)}
</button>
</div>
</div>
{/* Advanced options (collapsible) */}
<div>
<button
onClick={() => setShowAdvanced(!showAdvanced)}
onPointerDown={(e) => e.stopPropagation()}
style={{
width: '100%',
background: 'none',
border: 'none',
cursor: 'pointer',
fontSize: '11px',
fontFamily: 'inherit',
color: 'var(--color-text-3)',
padding: '6px 0',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
gap: '6px',
}}
>
<span style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
width: '16px',
height: '16px',
borderRadius: '4px',
background: 'var(--color-muted-2)',
}}>
<svg
width="10"
height="10"
viewBox="0 0 16 16"
fill="currentColor"
style={{ transform: showAdvanced ? 'rotate(180deg)' : 'rotate(0deg)', transition: 'transform 0.2s' }}
>
<path d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/>
</svg>
</span>
More options
</button>
{showAdvanced && (
<div style={{ marginTop: '8px', display: 'flex', gap: '8px' }}>
{/* NFC Button */}
<button
onClick={handleNfcWrite}
onPointerDown={(e) => e.stopPropagation()}
disabled={nfcStatus === 'unsupported' || nfcStatus === 'writing'}
style={{
flex: 1,
padding: '10px',
fontFamily: 'inherit',
backgroundColor: nfcStatus === 'unsupported' ? 'var(--color-muted-2)' :
nfcStatus === 'success' ? '#d1fae5' :
nfcStatus === 'error' ? '#fee2e2' :
nfcStatus === 'writing' ? '#e0e7ff' : 'var(--color-panel)',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '6px',
cursor: nfcStatus === 'unsupported' || nfcStatus === 'writing' ? 'not-allowed' : 'pointer',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: '4px',
opacity: nfcStatus === 'unsupported' ? 0.5 : 1,
}}
>
<span style={{ fontSize: '16px' }}>
{nfcStatus === 'success' ? '✓' : nfcStatus === 'error' ? '!' : '📡'}
</span>
<span style={{ fontSize: '10px', color: 'var(--color-text)', fontWeight: 500 }}>
{nfcStatus === 'writing' ? 'Writing...' :
nfcStatus === 'success' ? 'Written!' :
nfcStatus === 'unsupported' ? 'NFC N/A' :
'NFC Tag'}
</span>
</button>
{/* Audio Button (coming soon) */}
<button
disabled
onPointerDown={(e) => e.stopPropagation()}
style={{
flex: 1,
padding: '10px',
fontFamily: 'inherit',
backgroundColor: 'var(--color-muted-2)',
border: '1px solid var(--color-panel-contrast)',
borderRadius: '6px',
cursor: 'not-allowed',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: '4px',
opacity: 0.5,
}}
>
<span style={{ fontSize: '16px' }}>🔊</span>
<span style={{ fontSize: '10px', color: 'var(--color-text)', fontWeight: 500 }}>
Audio (Soon)
</span>
</button>
</div>
)}
{nfcMessage && (
<p style={{
marginTop: '6px',
fontSize: '10px',
color: nfcStatus === 'error' ? '#ef4444' :
nfcStatus === 'success' ? '#10b981' : 'var(--color-text-3)',
textAlign: 'center',
}}>
{nfcMessage}
</p>
)}
</div>
</div>
</div>,
document.body
)}
</div>
);
}
// Full button version for other contexts (toolbar, etc.)
return (
<div ref={dropdownRef} style={{ position: 'relative' }}>
<button
onClick={() => setShowDropdown(!showDropdown)}
className={`share-board-button ${className}`}
title="Invite others to this board"
style={{
padding: "4px 8px",
borderRadius: "4px",
background: "#3b82f6",
color: "white",
border: "none",
cursor: "pointer",
fontWeight: 500,
transition: "background 0.2s ease",
boxShadow: "0 2px 4px rgba(0,0,0,0.1)",
whiteSpace: "nowrap",
userSelect: "none",
display: "flex",
alignItems: "center",
gap: "4px",
height: "22px",
minHeight: "22px",
boxSizing: "border-box",
fontSize: "0.75rem",
}}
onMouseEnter={(e) => {
e.currentTarget.style.background = "#2563eb";
}}
onMouseLeave={(e) => {
e.currentTarget.style.background = "#3b82f6";
}}
>
{/* User with plus icon (invite/add person) */}
<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
<path d="M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2" />
<circle cx="9" cy="7" r="4" />
<line x1="19" y1="8" x2="19" y2="14" />
<line x1="16" y1="11" x2="22" y2="11" />
</svg>
</button>
</div>
);
};
export default ShareBoardButton;

View File

@ -44,10 +44,6 @@ export interface StandardizedToolWrapperProps {
onMinimize?: () => void onMinimize?: () => void
/** Whether the tool is minimized */ /** Whether the tool is minimized */
isMinimized?: boolean isMinimized?: boolean
/** Callback when maximize button is clicked */
onMaximize?: () => void
/** Whether the tool is maximized (fullscreen) */
isMaximized?: boolean
/** Optional custom header content */ /** Optional custom header content */
headerContent?: ReactNode headerContent?: ReactNode
/** Editor instance for shape selection */ /** Editor instance for shape selection */
@ -80,8 +76,6 @@ export const StandardizedToolWrapper: React.FC<StandardizedToolWrapperProps> = (
onClose, onClose,
onMinimize, onMinimize,
isMinimized = false, isMinimized = false,
onMaximize,
isMaximized = false,
headerContent, headerContent,
editor, editor,
shapeId, shapeId,
@ -97,22 +91,6 @@ export const StandardizedToolWrapper: React.FC<StandardizedToolWrapperProps> = (
const tagInputRef = useRef<HTMLInputElement>(null) const tagInputRef = useRef<HTMLInputElement>(null)
const isDarkMode = useIsDarkMode() const isDarkMode = useIsDarkMode()
// Handle Esc key to exit maximize mode
useEffect(() => {
if (!isMaximized || !onMaximize) return
const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
e.preventDefault()
e.stopPropagation()
onMaximize()
}
}
window.addEventListener('keydown', handleKeyDown, true)
return () => window.removeEventListener('keydown', handleKeyDown, true)
}, [isMaximized, onMaximize])
// Dark mode aware colors // Dark mode aware colors
const colors = useMemo(() => isDarkMode ? { const colors = useMemo(() => isDarkMode ? {
contentBg: '#1a1a1a', contentBg: '#1a1a1a',
@ -188,7 +166,7 @@ export const StandardizedToolWrapper: React.FC<StandardizedToolWrapperProps> = (
fontFamily: "Inter, sans-serif", fontFamily: "Inter, sans-serif",
position: 'relative', position: 'relative',
pointerEvents: 'auto', pointerEvents: 'auto',
transition: isPinnedToView ? 'box-shadow 0.2s ease' : 'height 0.2s ease, box-shadow 0.2s ease', transition: 'height 0.2s ease, box-shadow 0.2s ease',
boxSizing: 'border-box', boxSizing: 'border-box',
} }
@ -265,25 +243,16 @@ export const StandardizedToolWrapper: React.FC<StandardizedToolWrapperProps> = (
color: isSelected ? 'white' : primaryColor, color: isSelected ? 'white' : primaryColor,
} }
const maximizeButtonStyle: React.CSSProperties = {
...buttonBaseStyle,
backgroundColor: isMaximized
? (isSelected ? 'rgba(255,255,255,0.4)' : primaryColor)
: (isSelected ? 'rgba(255,255,255,0.2)' : `${primaryColor}20`),
color: isMaximized
? (isSelected ? 'white' : 'white')
: (isSelected ? 'white' : primaryColor),
}
const contentStyle: React.CSSProperties = { const contentStyle: React.CSSProperties = {
width: '100%', width: '100%',
minHeight: 0, // Allow flex shrinking height: isMinimized ? 0 : 'calc(100% - 40px)',
overflow: 'auto', overflow: 'auto',
position: 'relative', position: 'relative',
pointerEvents: 'auto', pointerEvents: 'auto',
transition: 'height 0.2s ease',
display: 'flex', display: 'flex',
flexDirection: 'column', flexDirection: 'column',
flex: 1, // Take remaining space after header and tags flex: 1,
} }
const tagsContainerStyle: React.CSSProperties = { const tagsContainerStyle: React.CSSProperties = {
@ -519,20 +488,6 @@ export const StandardizedToolWrapper: React.FC<StandardizedToolWrapperProps> = (
> >
_ _
</button> </button>
{onMaximize && (
<button
style={maximizeButtonStyle}
onClick={(e) => handleButtonClick(e, onMaximize)}
onPointerDown={(e) => e.stopPropagation()}
onMouseDown={(e) => e.stopPropagation()}
onTouchStart={(e) => handleButtonTouch(e, onMaximize)}
onTouchEnd={(e) => e.stopPropagation()}
title={isMaximized ? "Exit fullscreen (Esc)" : "Maximize"}
aria-label={isMaximized ? "Exit fullscreen" : "Maximize"}
>
{isMaximized ? '⊡' : '⤢'}
</button>
)}
<button <button
style={closeButtonStyle} style={closeButtonStyle}
onClick={(e) => handleButtonClick(e, onClose)} onClick={(e) => handleButtonClick(e, onClose)}

View File

@ -41,7 +41,7 @@ const StarBoardButton: React.FC<StarBoardButtonProps> = ({ className = '' }) =>
const handleStarToggle = async () => { const handleStarToggle = async () => {
if (!session.authed || !session.username || !slug) { if (!session.authed || !session.username || !slug) {
showPopupMessage('Please log in to star boards', 'error'); addNotification('Please log in to star boards', 'warning');
return; return;
} }
@ -75,75 +75,9 @@ const StarBoardButton: React.FC<StarBoardButtonProps> = ({ className = '' }) =>
} }
}; };
// Detect if we're in share-panel (compact) vs toolbar (full button) // Don't show the button if user is not authenticated
const isCompact = className.includes('share-panel-btn'); if (!session.authed) {
return null;
if (isCompact) {
// Icon-only version for the top-right share panel
return (
<div style={{ position: 'relative' }}>
<button
onClick={handleStarToggle}
disabled={isLoading}
className={`star-board-button ${className} ${isStarred ? 'starred' : ''}`}
title={!session.authed ? 'Log in to star boards' : isStarred ? 'Remove from starred boards' : 'Add to starred boards'}
style={{
background: 'none',
border: 'none',
padding: '6px',
cursor: 'pointer',
borderRadius: '6px',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: isStarred ? '#f59e0b' : 'var(--color-text-1)',
opacity: isStarred ? 1 : 0.7,
transition: 'opacity 0.15s, background 0.15s, color 0.15s',
pointerEvents: 'all',
}}
onMouseEnter={(e) => {
e.currentTarget.style.opacity = '1';
e.currentTarget.style.background = 'var(--color-muted-2)';
}}
onMouseLeave={(e) => {
e.currentTarget.style.opacity = isStarred ? '1' : '0.7';
e.currentTarget.style.background = 'none';
}}
>
{isLoading ? (
<svg width="18" height="18" viewBox="0 0 16 16" fill="currentColor" className="loading-spinner">
<path d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
</svg>
) : (
<svg width="18" height="18" viewBox="0 0 16 16" fill="currentColor">
{isStarred ? (
<path d="M3.612 15.443c-.386.198-.824-.149-.746-.592l.83-4.73L.173 6.765c-.329-.314-.158-.888.283-.95l4.898-.696L7.538.792c.197-.39.73-.39.927 0l2.184 4.327 4.898.696c.441.062.612.636.282.95l-3.522 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256z"/>
) : (
<path d="M2.866 14.85c-.078.444.36.791.746.593l4.39-2.256 4.389 2.256c.386.198.824-.149.746-.592l-.83-4.73 3.522-3.356c.33-.314.16-.888-.282-.95l-4.898-.696L8.465.792a.513.513 0 0 0-.927 0L5.354 5.12l-4.898.696c-.441.062-.612.636-.283.95l3.523 3.356-.83 4.73zm4.905-2.767-3.686 1.894.694-3.957a.565.565 0 0 0-.163-.505L1.71 6.745l4.052-.576a.525.525 0 0 0 .393-.288L8 2.223l1.847 3.658a.525.525 0 0 0 .393.288l4.052.575-2.906 2.77a.565.565 0 0 0-.163.506l.694 3.957-3.686-1.894a.503.503 0 0 0-.461 0z"/>
)}
</svg>
)}
</button>
{/* Custom popup notification */}
{showPopup && (
<div
className={`star-popup star-popup-${popupType}`}
style={{
position: 'absolute',
top: '40px',
left: '50%',
transform: 'translateX(-50%)',
zIndex: 100001,
whiteSpace: 'nowrap',
pointerEvents: 'none',
}}
>
{popupMessage}
</div>
)}
</div>
);
} }
return ( return (
@ -152,14 +86,14 @@ const StarBoardButton: React.FC<StarBoardButtonProps> = ({ className = '' }) =>
onClick={handleStarToggle} onClick={handleStarToggle}
disabled={isLoading} disabled={isLoading}
className={`toolbar-btn star-board-button ${className} ${isStarred ? 'starred' : ''}`} className={`toolbar-btn star-board-button ${className} ${isStarred ? 'starred' : ''}`}
title={!session.authed ? 'Log in to star boards' : isStarred ? 'Remove from starred boards' : 'Add to starred boards'} title={isStarred ? 'Remove from starred boards' : 'Add to starred boards'}
> >
{isLoading ? ( {isLoading ? (
<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" className="loading-spinner"> <svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" className="loading-spinner">
<path d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/> <path d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
</svg> </svg>
) : ( ) : (
<svg width="14" height="14" viewBox="0 0 16 16" fill={isStarred ? '#f59e0b' : 'currentColor'}> <svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor">
{isStarred ? ( {isStarred ? (
<path d="M3.612 15.443c-.386.198-.824-.149-.746-.592l.83-4.73L.173 6.765c-.329-.314-.158-.888.283-.95l4.898-.696L7.538.792c.197-.39.73-.39.927 0l2.184 4.327 4.898.696c.441.062.612.636.282.95l-3.522 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256z"/> <path d="M3.612 15.443c-.386.198-.824-.149-.746-.592l.83-4.73L.173 6.765c-.329-.314-.158-.888.283-.95l4.898-.696L7.538.792c.197-.39.73-.39.927 0l2.184 4.327 4.898.696c.441.062.612.636.282.95l-3.522 3.356.83 4.73c.078.443-.36.79-.746.592L8 13.187l-4.389 2.256z"/>
) : ( ) : (

View File

@ -0,0 +1,130 @@
import React, { useState, useEffect, useRef } from 'react';
import { useParams } from 'react-router-dom';
import { useAuth } from '../context/AuthContext';
import { useEditor } from 'tldraw';
import { VersionHistoryPanel } from './VersionHistoryPanel';
interface VersionHistoryButtonProps {
className?: string;
}
/**
* Version History Button - displays next to the star button
* Opens a popup panel showing historical versions and diff controls
*/
const VersionHistoryButton: React.FC<VersionHistoryButtonProps> = ({ className = '' }) => {
const { slug } = useParams<{ slug: string }>();
const { session } = useAuth();
const editor = useEditor();
const [showPanel, setShowPanel] = useState(false);
const [hasNewChanges, setHasNewChanges] = useState(false);
const buttonRef = useRef<HTMLButtonElement>(null);
const panelRef = useRef<HTMLDivElement>(null);
// Check for new changes indicator
useEffect(() => {
if (!session.authed || !session.username || !slug) return;
// Check if there are unseen changes
const lastSeenKey = `canvas_version_state_${session.username}_${slug}`;
const lastSeen = localStorage.getItem(lastSeenKey);
if (lastSeen) {
try {
const state = JSON.parse(lastSeen);
const currentShapes = editor?.getCurrentPageShapes() || [];
// If shape count differs, there are changes
if (currentShapes.length !== state.shapeIds.length) {
setHasNewChanges(true);
}
} catch {
// Ignore parse errors
}
}
}, [session.authed, session.username, slug, editor]);
// Close panel when clicking outside
useEffect(() => {
const handleClickOutside = (event: MouseEvent) => {
if (
panelRef.current &&
!panelRef.current.contains(event.target as Node) &&
buttonRef.current &&
!buttonRef.current.contains(event.target as Node)
) {
setShowPanel(false);
}
};
if (showPanel) {
document.addEventListener('mousedown', handleClickOutside);
}
return () => {
document.removeEventListener('mousedown', handleClickOutside);
};
}, [showPanel]);
// Don't show if not authenticated
if (!session.authed) {
return null;
}
const handleToggle = () => {
setShowPanel(!showPanel);
if (!showPanel) {
// Clear new changes indicator when opening
setHasNewChanges(false);
}
};
return (
<div style={{ position: 'relative' }}>
<button
ref={buttonRef}
onClick={handleToggle}
className={`toolbar-btn version-history-button ${className} ${showPanel ? 'active' : ''}`}
title="Version History"
style={{ position: 'relative' }}
>
{/* Time rewind icon */}
<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor">
<path d="M8.515 1.019A7 7 0 0 0 8 1V0a8 8 0 0 1 .589.022l-.074.997zm2.004.45a7.003 7.003 0 0 0-.985-.299l.219-.976c.383.086.76.2 1.126.342l-.36.933zm1.37.71a7.01 7.01 0 0 0-.439-.27l.493-.87a8.025 8.025 0 0 1 .979.654l-.615.789a6.996 6.996 0 0 0-.418-.302zm1.834 1.79a6.99 6.99 0 0 0-.653-.796l.724-.69c.27.285.52.59.747.91l-.818.576zm.744 1.352a7.08 7.08 0 0 0-.214-.468l.893-.45a7.976 7.976 0 0 1 .45 1.088l-.95.313a7.023 7.023 0 0 0-.179-.483zm.53 2.507a6.991 6.991 0 0 0-.1-1.025l.985-.17c.067.386.106.778.116 1.17l-1 .025zm-.131 1.538c.033-.17.06-.339.081-.51l.993.123a7.957 7.957 0 0 1-.23 1.155l-.964-.267c.046-.165.086-.332.12-.501zm-.952 2.379c.184-.29.346-.594.486-.908l.914.405c-.16.36-.345.706-.555 1.038l-.845-.535zm-.964 1.205c.122-.122.239-.248.35-.378l.758.653a8.073 8.073 0 0 1-.401.432l-.707-.707z"/>
<path d="M8 1a7 7 0 1 0 4.95 11.95l.707.707A8.001 8.001 0 1 1 8 0v1z"/>
<path d="M7.5 3a.5.5 0 0 1 .5.5v5.21l3.248 1.856a.5.5 0 0 1-.496.868l-3.5-2A.5.5 0 0 1 7 9V3.5a.5.5 0 0 1 .5-.5z"/>
</svg>
{/* New changes indicator dot */}
{hasNewChanges && (
<span
style={{
position: 'absolute',
top: '-2px',
right: '-2px',
width: '8px',
height: '8px',
borderRadius: '50%',
backgroundColor: '#fbbf24',
border: '1px solid white',
boxShadow: '0 0 4px rgba(251, 191, 36, 0.5)',
}}
/>
)}
</button>
{/* Version History Panel */}
{showPanel && (
<div ref={panelRef}>
<VersionHistoryPanel
boardId={slug || ''}
userId={session.username || ''}
onClose={() => setShowPanel(false)}
/>
</div>
)}
</div>
);
};
export default VersionHistoryButton;

View File

@ -0,0 +1,511 @@
import React, { useState, useEffect, useMemo } from 'react';
import { useEditor, TLShape, TLShapeId } from 'tldraw';
import {
computeShapeDiff,
getDeletedShapes,
saveLastSeenState,
formatRelativeTime,
formatTimestamp,
DeletedShape,
VersionSnapshot,
} from '../lib/versionHistory';
import { WORKER_URL } from '../constants/workerUrl';
import { usePermissions } from '../hooks/usePermissions';
interface VersionHistoryPanelProps {
boardId: string;
userId: string;
onClose: () => void;
}
type TabType = 'changes' | 'versions' | 'deleted';
/**
* Version History Panel - shows recent changes, version snapshots, and deleted shapes
*/
export const VersionHistoryPanel: React.FC<VersionHistoryPanelProps> = ({
boardId,
userId,
onClose,
}) => {
const editor = useEditor();
const { canRevert, canRestoreDeleted, canMarkAsSeen, role } = usePermissions(boardId);
const [activeTab, setActiveTab] = useState<TabType>('changes');
const [versions, setVersions] = useState<VersionSnapshot[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [showNewShapeGlow, setShowNewShapeGlow] = useState(true);
const [showDeletedShapes, setShowDeletedShapes] = useState(true);
// Compute current diff
const diff = useMemo(() => {
if (!editor) return { newShapes: [], deletedShapes: [], modifiedShapes: [] };
const shapes = editor.getCurrentPageShapes();
return computeShapeDiff(userId, boardId, shapes);
}, [editor, userId, boardId]);
// Get deleted shapes
const deletedShapes = useMemo(() => {
return getDeletedShapes(userId, boardId);
}, [userId, boardId]);
// Fetch R2 version snapshots
useEffect(() => {
const fetchVersions = async () => {
setIsLoading(true);
try {
const response = await fetch(`${WORKER_URL}/api/versions/${boardId}`);
if (response.ok) {
const data = await response.json() as { versions?: VersionSnapshot[] };
setVersions(data.versions || []);
}
} catch (error) {
console.error('Error fetching versions:', error);
} finally {
setIsLoading(false);
}
};
if (activeTab === 'versions') {
fetchVersions();
}
}, [boardId, activeTab]);
// Toggle new shape highlighting
const handleToggleNewShapeGlow = () => {
setShowNewShapeGlow(!showNewShapeGlow);
// Dispatch event to toggle visual effects
window.dispatchEvent(new CustomEvent('toggle-new-shape-glow', { detail: !showNewShapeGlow }));
};
// Toggle deleted shape visibility
const handleToggleDeletedShapes = () => {
setShowDeletedShapes(!showDeletedShapes);
window.dispatchEvent(new CustomEvent('toggle-deleted-shapes', { detail: !showDeletedShapes }));
};
// Mark current state as "seen"
const handleMarkAsSeen = () => {
if (!editor) return;
const shapes = editor.getCurrentPageShapes();
saveLastSeenState(userId, boardId, shapes);
// Force re-render by closing and reopening
onClose();
};
// Restore a deleted shape
const handleRestoreShape = (deletedShape: DeletedShape) => {
if (!editor) return;
try {
// Create a new shape with the deleted shape's properties
editor.createShape({
id: deletedShape.id,
type: deletedShape.type,
x: deletedShape.x,
y: deletedShape.y,
props: deletedShape.props,
} as any);
// Remove from deleted list
window.dispatchEvent(new CustomEvent('shape-restored', { detail: deletedShape.id }));
} catch (error) {
console.error('Error restoring shape:', error);
}
};
// Navigate to a shape
const handleNavigateToShape = (shapeId: TLShapeId) => {
if (!editor) return;
const shape = editor.getShape(shapeId);
if (!shape) return;
// Center viewport on the shape
const bounds = editor.getShapePageBounds(shape);
if (bounds) {
editor.zoomToBounds(bounds, {
animation: { duration: 300 },
inset: 100,
});
}
// Select the shape
editor.setSelectedShapes([shapeId]);
};
// Revert to a version
const handleRevertToVersion = async (version: VersionSnapshot) => {
if (!editor || !version) return;
const confirmRevert = window.confirm(
`Revert to version from ${formatTimestamp(version.timestamp)}?\n\nThis will replace the current board state with the selected version.`
);
if (!confirmRevert) return;
try {
setIsLoading(true);
const response = await fetch(`${WORKER_URL}/api/versions/${boardId}/${version.id}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'revert' }),
});
if (response.ok) {
// Reload the page to get the reverted state
window.location.reload();
} else {
console.error('Failed to revert version');
}
} catch (error) {
console.error('Error reverting to version:', error);
} finally {
setIsLoading(false);
}
};
return (
<div
className="version-history-panel"
style={{
position: 'absolute',
top: 'calc(100% + 8px)',
right: 0,
width: '320px',
maxHeight: '70vh',
backgroundColor: 'var(--bg-color, #fff)',
border: '1px solid var(--border-color, #e1e4e8)',
borderRadius: '12px',
boxShadow: '0 8px 24px rgba(0,0,0,0.15)',
zIndex: 100000,
overflow: 'hidden',
display: 'flex',
flexDirection: 'column',
}}
>
{/* Header */}
<div
style={{
padding: '12px 16px',
borderBottom: '1px solid var(--border-color, #e1e4e8)',
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
<h3 style={{ margin: 0, fontSize: '14px', fontWeight: 600 }}>
Version History
</h3>
<span
style={{
fontSize: '10px',
padding: '2px 6px',
borderRadius: '4px',
backgroundColor: role === 'admin' ? '#8b5cf6' : role === 'editor' ? '#3b82f6' : '#6b7280',
color: 'white',
textTransform: 'capitalize',
}}
>
{role}
</span>
</div>
<button
onClick={onClose}
style={{
background: 'none',
border: 'none',
cursor: 'pointer',
padding: '4px',
opacity: 0.6,
}}
>
<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor">
<path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg>
</button>
</div>
{/* Tabs */}
<div
style={{
display: 'flex',
borderBottom: '1px solid var(--border-color, #e1e4e8)',
}}
>
{(['changes', 'versions', 'deleted'] as TabType[]).map((tab) => (
<button
key={tab}
onClick={() => setActiveTab(tab)}
style={{
flex: 1,
padding: '10px',
border: 'none',
background: activeTab === tab ? 'var(--color-muted-2, #f5f5f5)' : 'transparent',
borderBottom: activeTab === tab ? '2px solid var(--color-primary, #3b82f6)' : '2px solid transparent',
cursor: 'pointer',
fontSize: '12px',
fontWeight: activeTab === tab ? 600 : 400,
textTransform: 'capitalize',
}}
>
{tab}
{tab === 'changes' && diff.newShapes.length > 0 && (
<span
style={{
marginLeft: '4px',
backgroundColor: '#fbbf24',
color: '#000',
borderRadius: '10px',
padding: '2px 6px',
fontSize: '10px',
}}
>
{diff.newShapes.length}
</span>
)}
{tab === 'deleted' && deletedShapes.length > 0 && (
<span
style={{
marginLeft: '4px',
backgroundColor: '#ef4444',
color: '#fff',
borderRadius: '10px',
padding: '2px 6px',
fontSize: '10px',
}}
>
{deletedShapes.length}
</span>
)}
</button>
))}
</div>
{/* Tab Content */}
<div style={{ flex: 1, overflow: 'auto', padding: '12px' }}>
{/* Changes Tab */}
{activeTab === 'changes' && (
<div>
{/* Controls */}
<div style={{ marginBottom: '12px' }}>
<label
style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
fontSize: '12px',
cursor: 'pointer',
marginBottom: '8px',
}}
>
<input
type="checkbox"
checked={showNewShapeGlow}
onChange={handleToggleNewShapeGlow}
/>
Highlight new shapes
</label>
<label
style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
fontSize: '12px',
cursor: 'pointer',
}}
>
<input
type="checkbox"
checked={showDeletedShapes}
onChange={handleToggleDeletedShapes}
/>
Show deleted shapes
</label>
</div>
{/* New Shapes */}
{diff.newShapes.length > 0 ? (
<div style={{ marginBottom: '16px' }}>
<h4 style={{ fontSize: '11px', color: '#666', marginBottom: '8px', textTransform: 'uppercase' }}>
New Shapes ({diff.newShapes.length})
</h4>
<div style={{ display: 'flex', flexDirection: 'column', gap: '4px' }}>
{diff.newShapes.map((shapeId) => {
const shape = editor?.getShape(shapeId);
return (
<button
key={shapeId}
onClick={() => handleNavigateToShape(shapeId)}
style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
padding: '8px 10px',
border: '1px solid #fbbf24',
borderRadius: '6px',
backgroundColor: 'rgba(251, 191, 36, 0.1)',
cursor: 'pointer',
textAlign: 'left',
}}
>
<span style={{ fontSize: '14px' }}>
{shape?.type === 'draw' ? '✏️' :
shape?.type === 'text' ? '📝' :
shape?.type === 'image' ? '🖼️' :
shape?.type === 'embed' ? '🔗' :
'📦'}
</span>
<span style={{ fontSize: '12px', flex: 1 }}>
{shape?.type || 'Shape'}
</span>
<span style={{ fontSize: '10px', color: '#666' }}></span>
</button>
);
})}
</div>
</div>
) : (
<p style={{ fontSize: '12px', color: '#666', textAlign: 'center', padding: '20px' }}>
No new shapes since your last visit
</p>
)}
{/* Mark as Seen Button */}
{canMarkAsSeen && (
<button
onClick={handleMarkAsSeen}
style={{
width: '100%',
padding: '10px',
backgroundColor: 'var(--color-primary, #3b82f6)',
color: 'white',
border: 'none',
borderRadius: '6px',
cursor: 'pointer',
fontSize: '12px',
fontWeight: 500,
}}
>
Mark All as Seen
</button>
)}
</div>
)}
{/* Versions Tab */}
{activeTab === 'versions' && (
<div>
{isLoading ? (
<p style={{ fontSize: '12px', color: '#666', textAlign: 'center', padding: '20px' }}>
Loading versions...
</p>
) : versions.length > 0 ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
{versions.map((version) => (
<div
key={version.id}
style={{
padding: '10px 12px',
border: '1px solid var(--border-color, #e1e4e8)',
borderRadius: '8px',
backgroundColor: 'var(--color-muted-2, #f9f9f9)',
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
<div>
<p style={{ fontSize: '12px', fontWeight: 500, margin: 0 }}>
{formatRelativeTime(version.timestamp)}
</p>
<p style={{ fontSize: '10px', color: '#666', margin: '2px 0 0 0' }}>
{formatTimestamp(version.timestamp)} {version.shapeCount} shapes
</p>
</div>
{canRevert && (
<button
onClick={() => handleRevertToVersion(version)}
style={{
padding: '4px 8px',
fontSize: '10px',
backgroundColor: 'white',
border: '1px solid #ddd',
borderRadius: '4px',
cursor: 'pointer',
}}
>
Revert
</button>
)}
</div>
</div>
))}
</div>
) : (
<p style={{ fontSize: '12px', color: '#666', textAlign: 'center', padding: '20px' }}>
No saved versions available
</p>
)}
</div>
)}
{/* Deleted Tab */}
{activeTab === 'deleted' && (
<div>
{deletedShapes.length > 0 ? (
<div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
{deletedShapes.map((deleted) => (
<div
key={deleted.id}
style={{
display: 'flex',
alignItems: 'center',
gap: '8px',
padding: '10px 12px',
border: '1px solid #ef4444',
borderRadius: '8px',
backgroundColor: 'rgba(239, 68, 68, 0.05)',
}}
>
<span style={{ fontSize: '14px', opacity: 0.5 }}>
{deleted.type === 'draw' ? '✏️' :
deleted.type === 'text' ? '📝' :
deleted.type === 'image' ? '🖼️' :
deleted.type === 'embed' ? '🔗' :
'📦'}
</span>
<div style={{ flex: 1 }}>
<p style={{ fontSize: '12px', margin: 0 }}>{deleted.type}</p>
<p style={{ fontSize: '10px', color: '#666', margin: '2px 0 0 0' }}>
Deleted {formatRelativeTime(deleted.deletedAt)}
</p>
</div>
{canRestoreDeleted && (
<button
onClick={() => handleRestoreShape(deleted)}
style={{
padding: '4px 10px',
fontSize: '10px',
backgroundColor: '#10b981',
color: 'white',
border: 'none',
borderRadius: '4px',
cursor: 'pointer',
}}
>
Restore
</button>
)}
</div>
))}
</div>
) : (
<p style={{ fontSize: '12px', color: '#666', textAlign: 'center', padding: '20px' }}>
No recently deleted shapes
</p>
)}
</div>
)}
</div>
</div>
);
};

View File

@ -1,200 +0,0 @@
import { useState, useEffect, useCallback } from 'react'
import { useEditor, TLShapeId } from 'tldraw'
import { VisibilityChangeModal, shouldSkipVisibilityPrompt, setSkipVisibilityPrompt } from './VisibilityChangeModal'
import { updateItemVisibility, ItemVisibility } from '../shapes/GoogleItemShapeUtil'
import { findPrivateWorkspace, isShapeInPrivateWorkspace } from '../shapes/PrivateWorkspaceShapeUtil'
interface PendingChange {
shapeId: TLShapeId
currentVisibility: ItemVisibility
newVisibility: ItemVisibility
title: string
}
export function VisibilityChangeManager() {
const editor = useEditor()
const [pendingChange, setPendingChange] = useState<PendingChange | null>(null)
const [isDarkMode, setIsDarkMode] = useState(false)
// Detect dark mode
useEffect(() => {
const checkDarkMode = () => {
setIsDarkMode(document.documentElement.classList.contains('dark'))
}
checkDarkMode()
// Watch for class changes
const observer = new MutationObserver(checkDarkMode)
observer.observe(document.documentElement, {
attributes: true,
attributeFilter: ['class']
})
return () => observer.disconnect()
}, [])
// Handle visibility change requests from GoogleItem shapes
useEffect(() => {
const handleVisibilityChangeRequest = (event: CustomEvent<{
shapeId: TLShapeId
currentVisibility: ItemVisibility
newVisibility: ItemVisibility
title: string
}>) => {
const { shapeId, currentVisibility, newVisibility, title } = event.detail
// Check if user has opted to skip prompts
if (shouldSkipVisibilityPrompt()) {
// Apply change immediately
updateItemVisibility(editor, shapeId, newVisibility)
return
}
// Show confirmation modal
setPendingChange({
shapeId,
currentVisibility,
newVisibility,
title,
})
}
window.addEventListener('request-visibility-change', handleVisibilityChangeRequest as EventListener)
return () => {
window.removeEventListener('request-visibility-change', handleVisibilityChangeRequest as EventListener)
}
}, [editor])
// Handle drag detection - check when items leave the Private Workspace
// Track GoogleItem positions to detect when they move outside workspace
useEffect(() => {
if (!editor) return
// Track which GoogleItems were inside workspace at start of drag
const wasInWorkspace = new Map<TLShapeId, boolean>()
let isDragging = false
// Record initial positions when pointer goes down
const handlePointerDown = () => {
const workspace = findPrivateWorkspace(editor)
if (!workspace) return
const selectedIds = editor.getSelectedShapeIds()
wasInWorkspace.clear()
for (const id of selectedIds) {
const shape = editor.getShape(id)
if (shape && shape.type === 'GoogleItem') {
const inWorkspace = isShapeInPrivateWorkspace(editor, id, workspace.id)
wasInWorkspace.set(id, inWorkspace)
}
}
isDragging = true
}
// Check for visibility changes when pointer goes up
const handlePointerUp = () => {
if (!isDragging || wasInWorkspace.size === 0) {
isDragging = false
return
}
const workspace = findPrivateWorkspace(editor)
if (!workspace) {
wasInWorkspace.clear()
isDragging = false
return
}
// Check each tracked shape
wasInWorkspace.forEach((wasIn, id) => {
const shape = editor.getShape(id)
if (!shape || shape.type !== 'GoogleItem') return
const isNowIn = isShapeInPrivateWorkspace(editor, id, workspace.id)
// If shape was in workspace and is now outside, trigger visibility change
if (wasIn && !isNowIn) {
const itemShape = shape as any // GoogleItem shape
if (itemShape.props.visibility === 'local') {
// Trigger visibility change request
window.dispatchEvent(new CustomEvent('request-visibility-change', {
detail: {
shapeId: id,
currentVisibility: 'local',
newVisibility: 'shared',
title: itemShape.props.title || 'Untitled',
}
}))
}
}
})
wasInWorkspace.clear()
isDragging = false
}
// Use DOM events for pointer tracking (more reliable with tldraw)
const canvas = document.querySelector('.tl-canvas')
if (canvas) {
canvas.addEventListener('pointerdown', handlePointerDown)
canvas.addEventListener('pointerup', handlePointerUp)
}
return () => {
if (canvas) {
canvas.removeEventListener('pointerdown', handlePointerDown)
canvas.removeEventListener('pointerup', handlePointerUp)
}
}
}, [editor])
// Handle modal confirmation
const handleConfirm = useCallback((dontAskAgain: boolean) => {
if (!pendingChange) return
// Update the shape visibility
updateItemVisibility(editor, pendingChange.shapeId, pendingChange.newVisibility)
// Save preference if requested
if (dontAskAgain) {
setSkipVisibilityPrompt(true)
}
setPendingChange(null)
}, [editor, pendingChange])
// Handle modal cancellation
const handleCancel = useCallback(() => {
if (!pendingChange) return
// If this was triggered by drag, move the shape back inside the workspace
const workspace = findPrivateWorkspace(editor)
if (workspace) {
const shape = editor.getShape(pendingChange.shapeId)
if (shape) {
// Move shape back inside workspace bounds
editor.updateShape({
id: pendingChange.shapeId,
type: shape.type,
x: workspace.x + 20,
y: workspace.y + 60,
})
}
}
setPendingChange(null)
}, [editor, pendingChange])
return (
<VisibilityChangeModal
isOpen={pendingChange !== null}
itemTitle={pendingChange?.title || ''}
currentVisibility={pendingChange?.currentVisibility || 'local'}
newVisibility={pendingChange?.newVisibility || 'shared'}
onConfirm={handleConfirm}
onCancel={handleCancel}
isDarkMode={isDarkMode}
/>
)
}

View File

@ -1,360 +0,0 @@
import { useState, useEffect, useRef } from 'react'
interface VisibilityChangeModalProps {
isOpen: boolean
itemTitle: string
currentVisibility: 'local' | 'shared'
newVisibility: 'local' | 'shared'
onConfirm: (dontAskAgain: boolean) => void
onCancel: () => void
isDarkMode: boolean
}
export function VisibilityChangeModal({
isOpen,
itemTitle,
currentVisibility,
newVisibility,
onConfirm,
onCancel,
isDarkMode,
}: VisibilityChangeModalProps) {
const [dontAskAgain, setDontAskAgain] = useState(false)
const modalRef = useRef<HTMLDivElement>(null)
// Handle escape key
useEffect(() => {
if (!isOpen) return
const handleEscape = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
onCancel()
}
}
document.addEventListener('keydown', handleEscape)
return () => document.removeEventListener('keydown', handleEscape)
}, [isOpen, onCancel])
// Dark mode colors
const colors = isDarkMode ? {
bg: '#1f2937',
cardBg: '#252525',
cardBorder: '#404040',
text: '#e4e4e7',
textMuted: '#a1a1aa',
textHeading: '#f4f4f5',
warningBg: 'rgba(251, 191, 36, 0.15)',
warningBorder: 'rgba(251, 191, 36, 0.3)',
warningText: '#fbbf24',
btnPrimaryBg: '#6366f1',
btnPrimaryText: '#ffffff',
btnSecondaryBg: '#333333',
btnSecondaryText: '#e4e4e4',
checkboxBg: '#333333',
checkboxBorder: '#555555',
localColor: '#6366f1',
sharedColor: '#22c55e',
} : {
bg: '#ffffff',
cardBg: '#f9fafb',
cardBorder: '#e5e7eb',
text: '#374151',
textMuted: '#6b7280',
textHeading: '#1f2937',
warningBg: 'rgba(251, 191, 36, 0.1)',
warningBorder: 'rgba(251, 191, 36, 0.3)',
warningText: '#92400e',
btnPrimaryBg: '#6366f1',
btnPrimaryText: '#ffffff',
btnSecondaryBg: '#f3f4f6',
btnSecondaryText: '#374151',
checkboxBg: '#ffffff',
checkboxBorder: '#d1d5db',
localColor: '#6366f1',
sharedColor: '#22c55e',
}
if (!isOpen) return null
const isSharing = currentVisibility === 'local' && newVisibility === 'shared'
return (
<div
style={{
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: 'rgba(0, 0, 0, 0.6)',
backdropFilter: 'blur(4px)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 100010,
}}
onClick={onCancel}
>
<div
ref={modalRef}
onClick={(e) => e.stopPropagation()}
style={{
backgroundColor: colors.bg,
borderRadius: '12px',
width: '90%',
maxWidth: '420px',
boxShadow: '0 25px 50px -12px rgba(0, 0, 0, 0.25)',
border: `1px solid ${colors.cardBorder}`,
overflow: 'hidden',
}}
>
{/* Header */}
<div
style={{
padding: '20px 24px 16px',
display: 'flex',
alignItems: 'center',
gap: '12px',
}}
>
<span style={{ fontSize: '24px' }}>
{isSharing ? '⚠️' : '🔒'}
</span>
<h2
style={{
fontSize: '18px',
fontWeight: '600',
color: colors.textHeading,
margin: 0,
}}
>
{isSharing ? 'Change Visibility?' : 'Make Private?'}
</h2>
</div>
{/* Content */}
<div style={{ padding: '0 24px 20px' }}>
<p style={{ fontSize: '14px', color: colors.text, margin: '0 0 16px 0', lineHeight: '1.5' }}>
{isSharing
? "You're about to make this item visible to others:"
: "You're about to make this item private:"}
</p>
{/* Item preview */}
<div
style={{
backgroundColor: colors.cardBg,
padding: '12px 14px',
borderRadius: '8px',
border: `1px solid ${colors.cardBorder}`,
marginBottom: '16px',
display: 'flex',
alignItems: 'center',
gap: '10px',
}}
>
<span style={{ fontSize: '18px' }}>📄</span>
<span
style={{
fontSize: '14px',
fontWeight: '500',
color: colors.text,
overflow: 'hidden',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
}}
>
{itemTitle}
</span>
</div>
{/* Current vs New state */}
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '12px',
fontSize: '13px',
marginBottom: '16px',
}}
>
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '6px',
padding: '6px 10px',
backgroundColor: isSharing ? `${colors.localColor}20` : `${colors.sharedColor}20`,
borderRadius: '6px',
color: isSharing ? colors.localColor : colors.sharedColor,
}}
>
<span>{isSharing ? '🔒' : '🌐'}</span>
<span>{isSharing ? 'Private' : 'Shared'}</span>
</div>
<span style={{ color: colors.textMuted }}></span>
<div
style={{
display: 'flex',
alignItems: 'center',
gap: '6px',
padding: '6px 10px',
backgroundColor: isSharing ? `${colors.sharedColor}20` : `${colors.localColor}20`,
borderRadius: '6px',
color: isSharing ? colors.sharedColor : colors.localColor,
}}
>
<span>{isSharing ? '🌐' : '🔒'}</span>
<span>{isSharing ? 'Shared' : 'Private'}</span>
</div>
</div>
{/* Warning for sharing */}
{isSharing && (
<div
style={{
backgroundColor: colors.warningBg,
border: `1px solid ${colors.warningBorder}`,
borderRadius: '8px',
padding: '12px 14px',
marginBottom: '16px',
}}
>
<p
style={{
fontSize: '12px',
color: colors.warningText,
margin: 0,
lineHeight: '1.5',
}}
>
<strong>Note:</strong> Shared items will be visible to all collaborators
on this board and may be uploaded to cloud storage.
</p>
</div>
)}
{/* Info for making private */}
{!isSharing && (
<div
style={{
backgroundColor: isDarkMode ? 'rgba(99, 102, 241, 0.15)' : 'rgba(99, 102, 241, 0.1)',
border: `1px solid ${isDarkMode ? 'rgba(99, 102, 241, 0.3)' : 'rgba(99, 102, 241, 0.3)'}`,
borderRadius: '8px',
padding: '12px 14px',
marginBottom: '16px',
}}
>
<p
style={{
fontSize: '12px',
color: isDarkMode ? '#a5b4fc' : '#4f46e5',
margin: 0,
lineHeight: '1.5',
}}
>
<strong>Note:</strong> Private items are only visible to you and remain
encrypted in your browser. Other collaborators won't be able to see this item.
</p>
</div>
)}
{/* Don't ask again checkbox */}
<label
style={{
display: 'flex',
alignItems: 'center',
gap: '10px',
cursor: 'pointer',
fontSize: '13px',
color: colors.textMuted,
}}
>
<input
type="checkbox"
checked={dontAskAgain}
onChange={(e) => setDontAskAgain(e.target.checked)}
style={{
width: '16px',
height: '16px',
cursor: 'pointer',
}}
/>
Don't ask again for this session
</label>
</div>
{/* Actions */}
<div
style={{
display: 'flex',
justifyContent: 'flex-end',
gap: '10px',
padding: '16px 24px',
borderTop: `1px solid ${colors.cardBorder}`,
backgroundColor: colors.cardBg,
}}
>
<button
onClick={onCancel}
style={{
padding: '10px 18px',
borderRadius: '8px',
border: `1px solid ${colors.cardBorder}`,
backgroundColor: colors.btnSecondaryBg,
color: colors.btnSecondaryText,
fontSize: '14px',
fontWeight: '500',
cursor: 'pointer',
}}
>
Cancel
</button>
<button
onClick={() => onConfirm(dontAskAgain)}
style={{
padding: '10px 18px',
borderRadius: '8px',
border: 'none',
backgroundColor: isSharing ? colors.sharedColor : colors.localColor,
color: '#ffffff',
fontSize: '14px',
fontWeight: '500',
cursor: 'pointer',
display: 'flex',
alignItems: 'center',
gap: '6px',
}}
>
<span>{isSharing ? '🌐' : '🔒'}</span>
{isSharing ? 'Make Shared' : 'Make Private'}
</button>
</div>
</div>
</div>
)
}
// Session storage key for "don't ask again" preference
const DONT_ASK_KEY = 'visibility-change-dont-ask'
export function shouldSkipVisibilityPrompt(): boolean {
try {
return sessionStorage.getItem(DONT_ASK_KEY) === 'true'
} catch {
return false
}
}
export function setSkipVisibilityPrompt(skip: boolean): void {
try {
if (skip) {
sessionStorage.setItem(DONT_ASK_KEY, 'true')
} else {
sessionStorage.removeItem(DONT_ASK_KEY)
}
} catch {
// Ignore storage errors
}
}

View File

@ -1,521 +0,0 @@
/**
* WalletLinkPanel - UI for connecting and linking Web3 wallets to enCryptID
*
* Features:
* - Connect wallet (MetaMask, WalletConnect, etc.)
* - Link wallet to enCryptID account via signature
* - View and manage linked wallets
* - Set primary wallet
* - Unlink wallets
*/
import React, { useState } from 'react';
import {
useWalletConnection,
useWalletLink,
useLinkedWallets,
formatAddress,
LinkedWallet,
} from '../hooks/useWallet';
import { useAuth } from '../context/AuthContext';
// =============================================================================
// Styles (inline for simplicity - can be moved to CSS/Tailwind)
// =============================================================================
const styles = {
container: {
padding: '16px',
fontFamily: 'system-ui, -apple-system, sans-serif',
} as React.CSSProperties,
section: {
marginBottom: '24px',
} as React.CSSProperties,
sectionTitle: {
fontSize: '14px',
fontWeight: 600,
marginBottom: '12px',
color: '#374151',
} as React.CSSProperties,
card: {
background: '#f9fafb',
borderRadius: '8px',
padding: '12px',
marginBottom: '8px',
} as React.CSSProperties,
button: {
background: '#4f46e5',
color: 'white',
border: 'none',
borderRadius: '6px',
padding: '8px 16px',
cursor: 'pointer',
fontSize: '14px',
fontWeight: 500,
} as React.CSSProperties,
buttonSecondary: {
background: '#e5e7eb',
color: '#374151',
border: 'none',
borderRadius: '6px',
padding: '8px 16px',
cursor: 'pointer',
fontSize: '14px',
fontWeight: 500,
} as React.CSSProperties,
buttonDanger: {
background: '#ef4444',
color: 'white',
border: 'none',
borderRadius: '6px',
padding: '6px 12px',
cursor: 'pointer',
fontSize: '12px',
fontWeight: 500,
} as React.CSSProperties,
buttonSmall: {
padding: '4px 8px',
fontSize: '12px',
} as React.CSSProperties,
flexRow: {
display: 'flex',
alignItems: 'center',
gap: '8px',
} as React.CSSProperties,
flexBetween: {
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
} as React.CSSProperties,
address: {
fontFamily: 'monospace',
fontSize: '13px',
color: '#6b7280',
} as React.CSSProperties,
badge: {
background: '#dbeafe',
color: '#1d4ed8',
padding: '2px 6px',
borderRadius: '4px',
fontSize: '11px',
fontWeight: 500,
} as React.CSSProperties,
badgePrimary: {
background: '#dcfce7',
color: '#166534',
} as React.CSSProperties,
error: {
color: '#ef4444',
fontSize: '13px',
marginTop: '8px',
} as React.CSSProperties,
success: {
color: '#22c55e',
fontSize: '13px',
marginTop: '8px',
} as React.CSSProperties,
input: {
width: '100%',
padding: '8px 12px',
border: '1px solid #d1d5db',
borderRadius: '6px',
fontSize: '14px',
marginBottom: '8px',
} as React.CSSProperties,
connectorButton: {
display: 'flex',
alignItems: 'center',
gap: '8px',
width: '100%',
padding: '12px',
background: 'white',
border: '1px solid #e5e7eb',
borderRadius: '8px',
cursor: 'pointer',
marginBottom: '8px',
transition: 'border-color 0.2s',
} as React.CSSProperties,
walletIcon: {
width: '24px',
height: '24px',
borderRadius: '6px',
background: '#f3f4f6',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
fontSize: '14px',
} as React.CSSProperties,
};
// =============================================================================
// Sub-components
// =============================================================================
interface ConnectWalletSectionProps {
onConnect: (connectorId?: string) => void;
connectors: Array<{ id: string; name: string; type: string }>;
isConnecting: boolean;
}
function ConnectWalletSection({ onConnect, connectors, isConnecting }: ConnectWalletSectionProps) {
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Connect Wallet</div>
{connectors.map((connector) => (
<button
key={connector.id}
onClick={() => onConnect(connector.id)}
disabled={isConnecting}
style={styles.connectorButton}
>
<div style={styles.walletIcon}>
{connector.name === 'MetaMask' ? '🦊' :
connector.name === 'WalletConnect' ? '🔗' :
connector.name === 'Coinbase Wallet' ? '🔵' : '👛'}
</div>
<span>{connector.name}</span>
{isConnecting && <span style={{ marginLeft: 'auto', color: '#9ca3af' }}>Connecting...</span>}
</button>
))}
</div>
);
}
interface ConnectedWalletSectionProps {
address: string;
ensName: string | null;
chainId: number;
connectorName: string | undefined;
onDisconnect: () => void;
isDisconnecting: boolean;
}
function ConnectedWalletSection({
address,
ensName,
chainId,
connectorName,
onDisconnect,
isDisconnecting,
}: ConnectedWalletSectionProps) {
const chainNames: Record<number, string> = {
1: 'Ethereum',
10: 'Optimism',
137: 'Polygon',
42161: 'Arbitrum',
8453: 'Base',
};
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Connected Wallet</div>
<div style={styles.card}>
<div style={styles.flexBetween}>
<div>
<div style={{ fontWeight: 500, marginBottom: '4px' }}>
{ensName || formatAddress(address)}
</div>
<div style={styles.address}>{formatAddress(address, 6)}</div>
</div>
<div style={{ textAlign: 'right' }}>
<div style={styles.badge}>{chainNames[chainId] || `Chain ${chainId}`}</div>
{connectorName && (
<div style={{ fontSize: '11px', color: '#9ca3af', marginTop: '4px' }}>
via {connectorName}
</div>
)}
</div>
</div>
<div style={{ marginTop: '12px' }}>
<button
onClick={onDisconnect}
disabled={isDisconnecting}
style={styles.buttonSecondary}
>
{isDisconnecting ? 'Disconnecting...' : 'Disconnect'}
</button>
</div>
</div>
</div>
);
}
interface LinkWalletSectionProps {
address: string;
isLinking: boolean;
linkError: string | null;
onLink: (label?: string) => Promise<{ success: boolean; error?: string }>;
isAuthenticated: boolean;
}
function LinkWalletSection({
address: _address,
isLinking,
linkError,
onLink,
isAuthenticated,
}: LinkWalletSectionProps) {
const [label, setLabel] = useState('');
const [success, setSuccess] = useState(false);
const handleLink = async () => {
setSuccess(false);
const result = await onLink(label || undefined);
if (result.success) {
setSuccess(true);
setLabel('');
}
};
if (!isAuthenticated) {
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Link to enCryptID</div>
<div style={{ ...styles.card, color: '#6b7280' }}>
Please sign in with enCryptID to link your wallet.
</div>
</div>
);
}
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Link to enCryptID</div>
<div style={styles.card}>
<p style={{ fontSize: '13px', color: '#6b7280', marginBottom: '12px' }}>
Link this wallet to your enCryptID account. You'll be asked to sign a message
to prove ownership.
</p>
<input
type="text"
placeholder="Label (optional, e.g., 'Main Wallet')"
value={label}
onChange={(e) => setLabel(e.target.value)}
style={styles.input}
/>
<button
onClick={handleLink}
disabled={isLinking}
style={styles.button}
>
{isLinking ? 'Signing...' : 'Link Wallet'}
</button>
{linkError && <div style={styles.error}>{linkError}</div>}
{success && <div style={styles.success}>Wallet linked successfully!</div>}
</div>
</div>
);
}
interface LinkedWalletItemProps {
wallet: LinkedWallet;
onSetPrimary: () => Promise<boolean>;
onUnlink: () => Promise<boolean>;
}
function LinkedWalletItem({ wallet, onSetPrimary, onUnlink }: LinkedWalletItemProps) {
const [isUpdating, setIsUpdating] = useState(false);
const handleSetPrimary = async () => {
setIsUpdating(true);
await onSetPrimary();
setIsUpdating(false);
};
const handleUnlink = async () => {
if (!confirm('Are you sure you want to unlink this wallet?')) return;
setIsUpdating(true);
await onUnlink();
setIsUpdating(false);
};
return (
<div style={styles.card}>
<div style={styles.flexBetween}>
<div>
<div style={styles.flexRow}>
<span style={{ fontWeight: 500 }}>
{wallet.ensName || wallet.label || formatAddress(wallet.address)}
</span>
{wallet.isPrimary && (
<span style={{ ...styles.badge, ...styles.badgePrimary }}>Primary</span>
)}
<span style={styles.badge}>{wallet.type.toUpperCase()}</span>
</div>
<div style={{ ...styles.address, marginTop: '4px' }}>
{formatAddress(wallet.address, 8)}
</div>
</div>
<div style={{ ...styles.flexRow, gap: '4px' }}>
{!wallet.isPrimary && (
<button
onClick={handleSetPrimary}
disabled={isUpdating}
style={{ ...styles.buttonSecondary, ...styles.buttonSmall }}
>
Set Primary
</button>
)}
<button
onClick={handleUnlink}
disabled={isUpdating}
style={{ ...styles.buttonDanger, ...styles.buttonSmall }}
>
Unlink
</button>
</div>
</div>
</div>
);
}
interface LinkedWalletsSectionProps {
wallets: LinkedWallet[];
isLoading: boolean;
error: string | null;
onUpdateWallet: (address: string, updates: { isPrimary?: boolean }) => Promise<boolean>;
onUnlinkWallet: (address: string) => Promise<boolean>;
}
function LinkedWalletsSection({
wallets,
isLoading,
error,
onUpdateWallet,
onUnlinkWallet,
}: LinkedWalletsSectionProps) {
if (isLoading) {
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Linked Wallets</div>
<div style={{ color: '#9ca3af', fontSize: '13px' }}>Loading...</div>
</div>
);
}
if (error) {
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Linked Wallets</div>
<div style={styles.error}>{error}</div>
</div>
);
}
if (wallets.length === 0) {
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Linked Wallets</div>
<div style={{ color: '#9ca3af', fontSize: '13px' }}>
No wallets linked yet. Connect a wallet and link it above.
</div>
</div>
);
}
return (
<div style={styles.section}>
<div style={styles.sectionTitle}>Linked Wallets ({wallets.length})</div>
{wallets.map((wallet) => (
<LinkedWalletItem
key={wallet.id}
wallet={wallet}
onSetPrimary={() => onUpdateWallet(wallet.address, { isPrimary: true })}
onUnlink={() => onUnlinkWallet(wallet.address)}
/>
))}
</div>
);
}
// =============================================================================
// Main Component
// =============================================================================
export function WalletLinkPanel() {
const { session } = useAuth();
const {
address,
isConnected,
isConnecting,
chainId,
connectorName,
ensName,
connect,
disconnect,
isDisconnecting,
connectors,
} = useWalletConnection();
const { isLinking, linkError, linkWallet, clearError } = useWalletLink();
const {
wallets,
isLoading: isLoadingWallets,
error: walletsError,
updateWallet,
unlinkWallet,
refetch: refetchWallets,
} = useLinkedWallets();
// Check if the connected wallet is already linked
const isCurrentWalletLinked = address
? wallets.some(w => w.address.toLowerCase() === address.toLowerCase())
: false;
const handleLink = async (label?: string) => {
clearError();
const result = await linkWallet(label);
if (result.success) {
await refetchWallets();
}
return result;
};
return (
<div style={styles.container}>
<h3 style={{ margin: '0 0 16px 0', fontSize: '18px', fontWeight: 600 }}>
Web3 Wallet
</h3>
{!isConnected ? (
<ConnectWalletSection
onConnect={connect}
connectors={connectors}
isConnecting={isConnecting}
/>
) : (
<>
<ConnectedWalletSection
address={address!}
ensName={ensName}
chainId={chainId}
connectorName={connectorName}
onDisconnect={disconnect}
isDisconnecting={isDisconnecting}
/>
{!isCurrentWalletLinked && (
<LinkWalletSection
address={address!}
isLinking={isLinking}
linkError={linkError}
onLink={handleLink}
isAuthenticated={session.authed}
/>
)}
</>
)}
<LinkedWalletsSection
wallets={wallets}
isLoading={isLoadingWallets}
error={walletsError}
onUpdateWallet={updateWallet}
onUnlinkWallet={unlinkWallet}
/>
</div>
);
}
export default WalletLinkPanel;

View File

@ -1,420 +0,0 @@
// Year View Panel - KalNext-style 12-month yearly overview
// Shows all months in a 4x3 grid with event density indicators
import React, { useState, useMemo } from "react"
import { useCalendarEvents, type DecryptedCalendarEvent } from "@/hooks/useCalendarEvents"
interface YearViewPanelProps {
onClose?: () => void
onMonthSelect?: (year: number, month: number) => void
shapeMode?: boolean
initialYear?: number
}
// Helper functions
const getDaysInMonth = (year: number, month: number) => {
return new Date(year, month + 1, 0).getDate()
}
const getFirstDayOfMonth = (year: number, month: number) => {
const day = new Date(year, month, 1).getDay()
return day === 0 ? 6 : day - 1 // Monday-first
}
const isSameDay = (date1: Date, date2: Date) => {
return (
date1.getFullYear() === date2.getFullYear() &&
date1.getMonth() === date2.getMonth() &&
date1.getDate() === date2.getDate()
)
}
const MONTH_NAMES = [
"January", "February", "March", "April",
"May", "June", "July", "August",
"September", "October", "November", "December"
]
const SHORT_MONTH_NAMES = [
"Jan", "Feb", "Mar", "Apr",
"May", "Jun", "Jul", "Aug",
"Sep", "Oct", "Nov", "Dec"
]
export const YearViewPanel: React.FC<YearViewPanelProps> = ({
onClose: _onClose,
onMonthSelect,
shapeMode: _shapeMode = false,
initialYear,
}) => {
const [currentYear, setCurrentYear] = useState(initialYear || new Date().getFullYear())
// Detect dark mode
const isDarkMode =
typeof document !== "undefined" &&
document.documentElement.classList.contains("dark")
// Fetch all events for the current year
const yearStart = new Date(currentYear, 0, 1)
const yearEnd = new Date(currentYear, 11, 31, 23, 59, 59)
const { events, loading, getEventsForDate } = useCalendarEvents({
startDate: yearStart,
endDate: yearEnd,
})
// Colors
const colors = isDarkMode
? {
bg: "#1f2937",
text: "#e4e4e7",
textMuted: "#a1a1aa",
border: "#374151",
monthBg: "#252525",
todayBg: "#22c55e30",
todayBorder: "#22c55e",
eventDot1: "#3b82f620", // 1 event
eventDot2: "#3b82f640", // 2 events
eventDot3: "#3b82f680", // 3+ events
eventDotMax: "#3b82f6", // 5+ events
headerBg: "#22c55e",
}
: {
bg: "#f9fafb",
text: "#1f2937",
textMuted: "#6b7280",
border: "#e5e7eb",
monthBg: "#ffffff",
todayBg: "#22c55e20",
todayBorder: "#22c55e",
eventDot1: "#3b82f620",
eventDot2: "#3b82f640",
eventDot3: "#3b82f680",
eventDotMax: "#3b82f6",
headerBg: "#22c55e",
}
// Get event count for a specific date
const getEventCount = (date: Date) => {
return getEventsForDate(date).length
}
// Get background color based on event density
const getEventDensityColor = (count: number) => {
if (count === 0) return "transparent"
if (count === 1) return colors.eventDot1
if (count === 2) return colors.eventDot2
if (count <= 4) return colors.eventDot3
return colors.eventDotMax
}
// Navigation
const goToPrevYear = () => setCurrentYear((y) => y - 1)
const goToNextYear = () => setCurrentYear((y) => y + 1)
const goToCurrentYear = () => setCurrentYear(new Date().getFullYear())
const today = new Date()
// Generate mini calendar for a month
const renderMiniMonth = (month: number) => {
const daysInMonth = getDaysInMonth(currentYear, month)
const firstDay = getFirstDayOfMonth(currentYear, month)
const days: { day: number | null; date: Date | null }[] = []
// Leading empty cells
for (let i = 0; i < firstDay; i++) {
days.push({ day: null, date: null })
}
// Days of month
for (let i = 1; i <= daysInMonth; i++) {
days.push({ day: i, date: new Date(currentYear, month, i) })
}
// Trailing empty cells to complete grid (6 rows max)
while (days.length < 42) {
days.push({ day: null, date: null })
}
return (
<div
key={month}
style={{
backgroundColor: colors.monthBg,
borderRadius: "8px",
padding: "8px",
border: `1px solid ${colors.border}`,
cursor: onMonthSelect ? "pointer" : "default",
}}
onClick={() => onMonthSelect?.(currentYear, month)}
onPointerDown={(e) => e.stopPropagation()}
>
{/* Month name */}
<div
style={{
fontSize: "11px",
fontWeight: "600",
color: colors.text,
marginBottom: "6px",
textAlign: "center",
}}
>
{SHORT_MONTH_NAMES[month]}
</div>
{/* Day headers */}
<div
style={{
display: "grid",
gridTemplateColumns: "repeat(7, 1fr)",
gap: "1px",
marginBottom: "2px",
}}
>
{["M", "T", "W", "T", "F", "S", "S"].map((day, i) => (
<div
key={i}
style={{
textAlign: "center",
fontSize: "7px",
fontWeight: "500",
color: colors.textMuted,
}}
>
{day}
</div>
))}
</div>
{/* Days grid */}
<div
style={{
display: "grid",
gridTemplateColumns: "repeat(7, 1fr)",
gap: "1px",
}}
>
{days.slice(0, 42).map(({ day, date }, i) => {
const isToday = date && isSameDay(date, today)
const eventCount = date ? getEventCount(date) : 0
const densityColor = getEventDensityColor(eventCount)
return (
<div
key={i}
style={{
textAlign: "center",
fontSize: "8px",
padding: "2px 0",
borderRadius: "2px",
backgroundColor: isToday ? colors.todayBg : densityColor,
border: isToday ? `1px solid ${colors.todayBorder}` : "1px solid transparent",
color: day ? colors.text : "transparent",
fontWeight: isToday ? "700" : "400",
minHeight: "14px",
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
{day}
</div>
)
})}
</div>
</div>
)
}
return (
<div
style={{
width: "100%",
height: "100%",
backgroundColor: colors.bg,
display: "flex",
flexDirection: "column",
overflow: "hidden",
}}
>
{/* Header with year navigation */}
<div
style={{
padding: "12px 16px",
display: "flex",
alignItems: "center",
justifyContent: "space-between",
borderBottom: `1px solid ${colors.border}`,
backgroundColor: colors.headerBg,
}}
>
<button
onClick={goToPrevYear}
onPointerDown={(e) => e.stopPropagation()}
style={{
background: "rgba(255, 255, 255, 0.2)",
border: "none",
color: "#fff",
width: "32px",
height: "32px",
borderRadius: "6px",
cursor: "pointer",
fontSize: "14px",
fontWeight: "600",
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
&lt;
</button>
<div style={{ display: "flex", alignItems: "center", gap: "12px" }}>
<span
style={{
fontSize: "18px",
fontWeight: "700",
color: "#fff",
}}
>
{currentYear}
</span>
{currentYear !== new Date().getFullYear() && (
<button
onClick={goToCurrentYear}
onPointerDown={(e) => e.stopPropagation()}
style={{
background: "rgba(255, 255, 255, 0.2)",
border: "none",
color: "#fff",
padding: "4px 10px",
borderRadius: "4px",
cursor: "pointer",
fontSize: "11px",
fontWeight: "500",
}}
>
Today
</button>
)}
</div>
<button
onClick={goToNextYear}
onPointerDown={(e) => e.stopPropagation()}
style={{
background: "rgba(255, 255, 255, 0.2)",
border: "none",
color: "#fff",
width: "32px",
height: "32px",
borderRadius: "6px",
cursor: "pointer",
fontSize: "14px",
fontWeight: "600",
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
&gt;
</button>
</div>
{/* 12-month grid (4x3 layout) */}
<div
style={{
flex: 1,
padding: "12px",
overflow: "auto",
}}
>
{loading ? (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
height: "100%",
color: colors.textMuted,
fontSize: "13px",
}}
>
Loading calendar data...
</div>
) : (
<div
style={{
display: "grid",
gridTemplateColumns: "repeat(4, 1fr)",
gridTemplateRows: "repeat(3, 1fr)",
gap: "10px",
height: "100%",
}}
>
{Array.from({ length: 12 }, (_, month) => renderMiniMonth(month))}
</div>
)}
</div>
{/* Legend */}
<div
style={{
padding: "10px 16px",
borderTop: `1px solid ${colors.border}`,
display: "flex",
alignItems: "center",
justifyContent: "center",
gap: "16px",
}}
>
<div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
<div
style={{
width: "12px",
height: "12px",
borderRadius: "2px",
backgroundColor: colors.todayBg,
border: `1px solid ${colors.todayBorder}`,
}}
/>
<span style={{ fontSize: "10px", color: colors.textMuted }}>Today</span>
</div>
<div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
<div
style={{
width: "12px",
height: "12px",
borderRadius: "2px",
backgroundColor: colors.eventDot1,
}}
/>
<span style={{ fontSize: "10px", color: colors.textMuted }}>1 event</span>
</div>
<div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
<div
style={{
width: "12px",
height: "12px",
borderRadius: "2px",
backgroundColor: colors.eventDot3,
}}
/>
<span style={{ fontSize: "10px", color: colors.textMuted }}>3+ events</span>
</div>
<div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
<div
style={{
width: "12px",
height: "12px",
borderRadius: "2px",
backgroundColor: colors.eventDotMax,
}}
/>
<span style={{ fontSize: "10px", color: colors.textMuted }}>5+ events</span>
</div>
</div>
</div>
)
}

View File

@ -1,199 +0,0 @@
import React, { useState } from 'react';
import { createPortal } from 'react-dom';
import CryptID from './CryptID';
import '../../css/anonymous-banner.css';
interface AnonymousViewerBannerProps {
/** Callback when user successfully signs up/logs in */
onAuthenticated?: () => void;
/** Whether the banner was triggered by an edit attempt */
triggeredByEdit?: boolean;
}
/**
* Banner shown to anonymous (unauthenticated) users viewing a board.
* Explains CryptID and provides a smooth sign-up flow.
*
* Note: This component should only be rendered when user is NOT authenticated.
* The parent component (Board.tsx) handles the auth check via:
* {(!session.authed || showEditPrompt) && <AnonymousViewerBanner ... />}
*/
const AnonymousViewerBanner: React.FC<AnonymousViewerBannerProps> = ({
onAuthenticated,
triggeredByEdit = false
}) => {
const [isDismissed, setIsDismissed] = useState(false);
const [showSignUp, setShowSignUp] = useState(false);
// Note: We intentionally do NOT persist banner dismissal across page loads.
// The banner should appear on each new page load for anonymous users
// to remind them about CryptID. Only dismiss within the current component lifecycle.
//
// Previous implementation used sessionStorage to remember dismissal, but this caused
// issues where users who dismissed once would never see it again until they closed
// their browser entirely - even if they logged out or their session expired.
//
// If triggeredByEdit is true, always show regardless of dismiss state.
// If dismissed and not triggered by edit, don't show
if (isDismissed && !triggeredByEdit) {
return null;
}
const handleDismiss = () => {
// Just set local state - don't persist to sessionStorage
// This allows the banner to show again on page refresh
setIsDismissed(true);
};
const handleSignUpClick = () => {
setShowSignUp(true);
};
const handleSignUpSuccess = () => {
setShowSignUp(false);
// Dismiss the banner when user signs in successfully
// No need to persist - the parent condition (!session.authed) will hide us
setIsDismissed(true);
if (onAuthenticated) {
onAuthenticated();
}
};
const handleSignUpCancel = () => {
setShowSignUp(false);
};
return (
<div className={`anonymous-viewer-banner ${triggeredByEdit ? 'edit-triggered' : ''}`}>
{/* Dismiss button in top-right corner */}
{!triggeredByEdit && (
<button
className="banner-dismiss-btn"
onClick={handleDismiss}
title="Dismiss"
>
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" fill="currentColor"/>
</svg>
</button>
)}
<div className="banner-content">
<div className="banner-header">
<div className="banner-icon">
<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z" fill="currentColor"/>
</svg>
</div>
<div className="banner-text">
{triggeredByEdit ? (
<p className="banner-headline">
<strong>Sign in to edit</strong>
</p>
) : (
<p className="banner-headline">
<strong>Viewing anonymously</strong>
</p>
)}
<p className="banner-summary">
Sign in with enCryptID to edit
</p>
</div>
</div>
{/* Action button */}
<div className="banner-actions">
<button
className="banner-signup-btn"
onClick={handleSignUpClick}
>
Sign in
</button>
</div>
</div>
{triggeredByEdit && (
<div className="banner-edit-notice">
<svg width="10" height="10" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z" fill="currentColor"/>
</svg>
<span>Read-only for anonymous viewers</span>
</div>
)}
{/* CryptID Sign In Modal - same as CryptIDDropdown */}
{showSignUp && createPortal(
<div
className="cryptid-modal-overlay"
style={{
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
backgroundColor: 'rgba(0, 0, 0, 0.6)',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
zIndex: 999999,
}}
onClick={(e) => {
if (e.target === e.currentTarget) {
handleSignUpCancel();
}
}}
>
<div
className="cryptid-modal"
style={{
backgroundColor: 'var(--color-panel, #ffffff)',
borderRadius: '16px',
padding: '0',
maxWidth: '580px',
width: '95vw',
maxHeight: '90vh',
boxShadow: '0 25px 80px rgba(0, 0, 0, 0.4)',
overflow: 'auto',
position: 'relative',
}}
onClick={(e) => e.stopPropagation()}
>
{/* Close button */}
<button
onClick={handleSignUpCancel}
style={{
position: 'absolute',
top: '12px',
right: '12px',
background: 'var(--color-muted-2, #f3f4f6)',
border: 'none',
borderRadius: '50%',
width: '28px',
height: '28px',
cursor: 'pointer',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: 'var(--color-text-2, #6b7280)',
fontSize: '16px',
zIndex: 1,
}}
>
×
</button>
<CryptID
onSuccess={handleSignUpSuccess}
onCancel={handleSignUpCancel}
/>
</div>
</div>,
document.body
)}
</div>
);
};
export default AnonymousViewerBanner;

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More