Compare commits
127
Commits
f886ded054
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2a216906da | ||
|
|
130a1c660b | ||
|
|
4baeee159e | ||
|
|
8cbec8d601 | ||
|
|
7bce6a3a36 | ||
|
|
2d58cd993e | ||
|
|
87ebcd156b | ||
|
|
4aca21812e | ||
|
|
9f90ea516a | ||
|
|
0553960a57 | ||
|
|
1e51bdec7c | ||
|
|
f986a41ccc | ||
|
|
48b5907f4c | ||
|
|
89d84d3538 | ||
|
|
29e818ac64 | ||
|
|
53ce58a5aa | ||
|
|
72a7c7c7cc | ||
|
|
1dfffa5d6d | ||
|
|
d83de30d6d | ||
|
|
d50f9fe789 | ||
|
|
8e738ed9d4 | ||
|
|
c934673c4a | ||
|
|
6fa42eb267 | ||
|
|
5c9e9254d1 | ||
|
|
59be08a8f8 | ||
|
|
be7eb1523e | ||
|
|
4c3954d989 | ||
|
|
82b2ebc15f | ||
|
|
883640e20c | ||
|
|
be28080439 | ||
|
|
c07340a3ec | ||
|
|
d052fb5f9d | ||
|
|
b9d610b612 | ||
|
|
d925070a36 | ||
|
|
e086db0c2c | ||
|
|
670f125627 | ||
|
|
c2485b1307 | ||
|
|
b08bdbaeb2 | ||
|
|
0e3088db9a | ||
|
|
29f92dbf9e | ||
|
|
d5ebbab6a5 | ||
|
|
c9749352ec | ||
|
|
412dc527a3 | ||
|
|
27cc3f98ac | ||
|
|
64be9257f2 | ||
|
|
0022f64c50 | ||
|
|
d2f7b98e6c | ||
|
|
8020ddc787 | ||
|
|
87ce038b19 | ||
|
|
ccba2932c2 | ||
|
|
f2a33a9164 | ||
|
|
41272bd9ce | ||
|
|
d31e186bd9 | ||
|
|
0ac0e34012 | ||
|
|
dce8fa4211 | ||
|
|
8cd6015cad | ||
|
|
6aa555cc6a | ||
|
|
0fd97e5d71 | ||
|
|
9267c7c6a1 | ||
|
|
52da9abd44 | ||
|
|
044caae447 | ||
|
|
618a787b36 | ||
|
|
81d9ce0e87 | ||
|
|
bfd5420981 | ||
|
|
fa3a6c2501 | ||
|
|
1a889ea435 | ||
|
|
1d6499e5dd | ||
|
|
b7f450e41f | ||
|
|
6cd00f9660 | ||
|
|
4a668b7fc4 | ||
|
|
1966f8f4c0 | ||
|
|
26f95ba079 | ||
|
|
39e94b8015 | ||
|
|
69ad2c7e71 | ||
|
|
ae974314f9 | ||
|
|
3b7c7cf5ac | ||
|
|
ca47052768 | ||
|
|
002562b1d3 | ||
|
|
3cca14a3c6 | ||
|
|
7e2b130434 | ||
|
|
2169c1de1b | ||
|
|
b9bd294c90 | ||
|
|
6c0ca4373b | ||
|
|
9f85e484c4 | ||
|
|
b9345a410f | ||
|
|
00d14b3015 | ||
|
|
f465306c1d | ||
|
|
527305355c | ||
|
|
04b52ecc19 | ||
|
|
c5bf8b0407 | ||
|
|
d5f44370b6 | ||
|
|
88ad208714 | ||
|
|
d3d9355191 | ||
|
|
ee192a15e7 | ||
|
|
22a43fdef7 | ||
|
|
bbfe968ff1 | ||
|
|
d1b26e625a | ||
|
|
838dfe2a6e | ||
|
|
3078906548 | ||
|
|
3eb5202aac | ||
|
|
c04eac06c4 | ||
|
|
bf81d046e6 | ||
|
|
195b0e343f | ||
|
|
ce6ca73ea0 | ||
|
|
088c225202 | ||
|
|
88108ecc1b | ||
|
|
b459159b0f | ||
|
|
7c113fd5ab | ||
|
|
c8835825e7 | ||
|
|
56c90225cb | ||
|
|
c16659c2ad | ||
|
|
a67bedc6f2 | ||
|
|
923de0cdd6 | ||
|
|
285e3b4abe | ||
|
|
9b4869812f | ||
|
|
7f08dc1a0d | ||
|
|
08f73dfd19 | ||
|
|
2059e50ce3 | ||
|
|
fe3399a44b | ||
|
|
f6cf7b4358 | ||
|
|
c8fe15b0c9 | ||
|
|
43c15b81a3 | ||
|
|
ccd0477841 | ||
|
|
ff3e0e8736 | ||
|
|
26ffa0e71f | ||
|
|
a29708df85 | ||
|
|
2aec2d8f44 |
No files matched your search
@@ -8,3 +8,11 @@
|
|||||||
*.swo
|
*.swo
|
||||||
.DS_Store
|
.DS_Store
|
||||||
*.zip
|
*.zip
|
||||||
|
electron/node_modules
|
||||||
|
data/hyprcrd.db-shm
|
||||||
|
data/hyprcrd.db-wal
|
||||||
|
|
||||||
|
/oumta-dashboard/
|
||||||
|
/oumta-dashboard-ui/
|
||||||
|
|
||||||
|
relay/data
|
||||||
@@ -23,6 +23,22 @@ Open `http://localhost:8080` and set your password on first visit.
|
|||||||
|
|
||||||
The `-v hyprcrd-data:/var/www/html/data` flag persists the database across container restarts.
|
The `-v hyprcrd-data:/var/www/html/data` flag persists the database across container restarts.
|
||||||
|
|
||||||
|
### Via docker compose
|
||||||
|
|
||||||
|
If you prefer compose, the bundled `docker-compose.yml` starts the app alone by default:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d # just the app on :8088
|
||||||
|
```
|
||||||
|
|
||||||
|
To also bring up a local relay (for multi-tenant messaging / collab / chat), opt in via the `relay` profile:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose --profile relay up -d # app on :8088 + relay on :8081
|
||||||
|
```
|
||||||
|
|
||||||
|
Most installs talk to a remote relay, so the app-only default keeps the local setup minimal.
|
||||||
|
|
||||||
## Manual Installation
|
## Manual Installation
|
||||||
|
|
||||||
### 1. Clone
|
### 1. Clone
|
||||||
@@ -110,10 +126,23 @@ hyprcrd/
|
|||||||
│ │ └── vendor/ # marked.js, DOMPurify
|
│ │ └── vendor/ # marked.js, DOMPurify
|
||||||
│ ├── plugins/ # Optional, drop-in plugin folders
|
│ ├── plugins/ # Optional, drop-in plugin folders
|
||||||
│ │ ├── canvas/ # ASCII art canvas editor
|
│ │ ├── canvas/ # ASCII art canvas editor
|
||||||
|
│ │ ├── chat/ # Encrypted relay chat
|
||||||
|
│ │ ├── collab-buckets/ # Collaborative bucket sync
|
||||||
|
│ │ ├── email/ # Email overlay
|
||||||
|
│ │ ├── gitea/ # Gitea issue integration
|
||||||
|
│ │ ├── logseq-import/ # Logseq markdown importer
|
||||||
|
│ │ ├── slideshow/ # Presentation mode
|
||||||
│ │ └── tests/ # UI + state test runner
|
│ │ └── tests/ # UI + state test runner
|
||||||
│ └── uploads/ # User media (writable)
|
│ └── uploads/ # User media (writable)
|
||||||
├── relay/ # Relay service (mobile inbox + card sharing)
|
├── electron/ # Electron desktop app wrapper
|
||||||
│ ├── index.php # Single-file API + Mobile UI
|
│ ├── main.js # Spawns PHP, creates BrowserWindow
|
||||||
|
│ ├── router.php # PHP built-in server router
|
||||||
|
│ ├── fetch-php.sh # Downloads static PHP binaries
|
||||||
|
│ └── php-bin/ # Platform-specific PHP binaries
|
||||||
|
├── relay/ # Relay service (multi-tenant messaging + collab)
|
||||||
|
│ ├── index.php # Entry point + API dispatch
|
||||||
|
│ ├── inc/ # Backend modules (bootstrap, crypto, auth, routes)
|
||||||
|
│ ├── ui/ # Frontend (layout.php, style.css, app.js)
|
||||||
│ ├── .htaccess # URL rewriting + data protection
|
│ ├── .htaccess # URL rewriting + data protection
|
||||||
│ ├── Dockerfile
|
│ ├── Dockerfile
|
||||||
│ └── dist.sh # Build relay distribution ZIP
|
│ └── dist.sh # Build relay distribution ZIP
|
||||||
@@ -128,7 +157,7 @@ hyprcrd/
|
|||||||
- **Tags** written as `#tagname` or hierarchical `#parent/child` in card body, extracted automatically
|
- **Tags** written as `#tagname` or hierarchical `#parent/child` in card body, extracted automatically
|
||||||
- **Markdown** with `[[Card Title]]` wiki-links, ```` ```gallery ```` image galleries, ```` ```tree ```` list views, ```` ```ascii ```` art canvas (via canvas plugin)
|
- **Markdown** with `[[Card Title]]` wiki-links, ```` ```gallery ```` image galleries, ```` ```tree ```` list views, ```` ```ascii ```` art canvas (via canvas plugin)
|
||||||
- **Search** combining text and `#tag` filters (e.g. `#project meeting notes`)
|
- **Search** combining text and `#tag` filters (e.g. `#project meeting notes`)
|
||||||
- **Image gallery** with orphan detection and fullscreen viewer
|
- **Assets gallery** (images, audio, PDFs) with orphan detection and fullscreen viewer
|
||||||
- **Split view** showing tag-related and content-related cards
|
- **Split view** showing tag-related and content-related cards
|
||||||
- **Import/Export** as JSON+media ZIP or Obsidian/Logseq-compatible markdown vault
|
- **Import/Export** as JSON+media ZIP or Obsidian/Logseq-compatible markdown vault
|
||||||
- **Drag & drop** card reordering and grouping
|
- **Drag & drop** card reordering and grouping
|
||||||
@@ -141,7 +170,14 @@ hyprcrd/
|
|||||||
- **Notification banner** for upcoming events, birthdays, overdue tasks
|
- **Notification banner** for upcoming events, birthdays, overdue tasks
|
||||||
- **Board split view** with side-by-side preview
|
- **Board split view** with side-by-side preview
|
||||||
- **Superview** compact multi-column list with hover cards
|
- **Superview** compact multi-column list with hover cards
|
||||||
- **Keyboard shortcuts**: `Ctrl+K` search, `F1` help, `Shift+scroll` zoom, arrow keys in autocomplete
|
- **Super-buckets** — nest buckets one level deep with a dropdown for children
|
||||||
|
- **Card groups** — drag-to-group, join multiple cards, dissolve
|
||||||
|
- **Context menu** — color, tags, copy text, mark done, join cards, make ticket (gitea)
|
||||||
|
- **Find & replace** — in-card (Ctrl+H) and across all cards (Ctrl+Shift+H via search)
|
||||||
|
- **Arrow key navigation** on the board with Enter to open
|
||||||
|
- **PDF upload** in the editor toolbar
|
||||||
|
- **Keyboard shortcuts**: `Ctrl+K` search, `F1` help, `?` shortcut reference, arrow keys, 1–9 bucket switch
|
||||||
|
- **Electron desktop app** — standalone AppImage/DMG/NSIS with bundled PHP, no server needed
|
||||||
|
|
||||||
## Plugins
|
## Plugins
|
||||||
|
|
||||||
@@ -150,7 +186,13 @@ hyprcrd has a drop-in plugin system. A plugin is just a folder under `public/plu
|
|||||||
### Bundled plugins
|
### Bundled plugins
|
||||||
|
|
||||||
- **`canvas/`** — ASCII art canvas editor. Adds a toolbar button + ` ```ascii ` fenced block. Draw with brush, line, rectangle, ellipse, fill, and text tools using a monospace character grid.
|
- **`canvas/`** — ASCII art canvas editor. Adds a toolbar button + ` ```ascii ` fenced block. Draw with brush, line, rectangle, ellipse, fill, and text tools using a monospace character grid.
|
||||||
- **`tests/`** — UI + state test runner (40+ test files). Loaded only when `?test` is in the URL or `Ctrl+Shift+T` is pressed, so production users pay no cost for it.
|
- **`chat/`** — Encrypted chat between relay tenants. Footer flyout with delivery + read receipts.
|
||||||
|
- **`collab-buckets/`** — Collaborative buckets shared between relay tenants with exclusive card locking and E2E encrypted sync.
|
||||||
|
- **`email/`** — Email overlay (toggled with `M` key).
|
||||||
|
- **`gitea/`** — Gitea integration: create issues from cards, link to repos.
|
||||||
|
- **`slideshow/`** — Slideshow presentation mode for cards with `slide-image` blocks.
|
||||||
|
- **`logseq-import/`** — Import Logseq markdown journals and pages.
|
||||||
|
- **`tests/`** — UI + state test runner (40+ test files). Loaded only when `Ctrl+Shift+Alt+T` is pressed, so production users pay no cost for it.
|
||||||
|
|
||||||
### Plugin layout
|
### Plugin layout
|
||||||
|
|
||||||
@@ -392,6 +434,8 @@ access via `.htaccess`).
|
|||||||
|
|
||||||
Starts hyprcrd on `http://localhost:8088` and the relay on `http://localhost:8081` in the same Docker network. Source files are bind-mounted — changes are live without rebuilding. From inside the hyprcrd container, the relay is reachable at `http://relay:80`.
|
Starts hyprcrd on `http://localhost:8088` and the relay on `http://localhost:8081` in the same Docker network. Source files are bind-mounted — changes are live without rebuilding. From inside the hyprcrd container, the relay is reachable at `http://relay:80`.
|
||||||
|
|
||||||
|
Under the hood this runs `docker compose --profile relay up --build`. The relay service lives behind the `relay` compose profile, so a plain `docker compose up` brings up only the app — handy when you're developing against a remote relay.
|
||||||
|
|
||||||
### Setup workflow
|
### Setup workflow
|
||||||
|
|
||||||
1. Open the relay URL **from a desktop browser** — the setup wizard
|
1. Open the relay URL **from a desktop browser** — the setup wizard
|
||||||
@@ -417,9 +461,8 @@ Starts hyprcrd on `http://localhost:8088` and the relay on `http://localhost:808
|
|||||||
master key lives outside the DB in a chmod-600 file
|
master key lives outside the DB in a chmod-600 file
|
||||||
- **24-hour ephemeral**: messages and attachments auto-delete after a
|
- **24-hour ephemeral**: messages and attachments auto-delete after a
|
||||||
day. Cards extracted in hyprcrd are the long-term store
|
day. Cards extracted in hyprcrd are the long-term store
|
||||||
- **Future: end-to-end encrypted chat** between tenants is planned and
|
- **Encrypted chat**: tenant-to-tenant chat with delivery + read receipts
|
||||||
will require per-pair key exchange — see `relay/README.md` for the
|
(via chat plugin). Per-pair E2E key exchange is on the roadmap
|
||||||
roadmap
|
|
||||||
|
|
||||||
### Relay Security
|
### Relay Security
|
||||||
|
|
||||||
@@ -451,6 +494,26 @@ your next visit. You'll need to:
|
|||||||
The old `relay_key` was bcrypt-hashed and cannot be recovered, so all
|
The old `relay_key` was bcrypt-hashed and cannot be recovered, so all
|
||||||
client secrets need to be reissued.
|
client secrets need to be reissued.
|
||||||
|
|
||||||
|
## Electron Desktop App
|
||||||
|
|
||||||
|
hyprcrd can run as a standalone desktop app via Electron — no web server needed.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd electron
|
||||||
|
./fetch-php.sh # download static PHP binary (~20MB)
|
||||||
|
npm install
|
||||||
|
npm start # dev mode
|
||||||
|
npm run dist # build AppImage / DMG / NSIS
|
||||||
|
```
|
||||||
|
|
||||||
|
The app bundles a static PHP binary per platform and stores user data (database + uploads) outside the app bundle:
|
||||||
|
|
||||||
|
- **Linux**: `~/.config/hyprcrd/data/`
|
||||||
|
- **macOS**: `~/Library/Application Support/hyprcrd/data/`
|
||||||
|
- **Windows**: `%APPDATA%/hyprcrd/data/`
|
||||||
|
|
||||||
|
See [`electron/README.md`](electron/README.md) for details.
|
||||||
|
|
||||||
## Rebuilding Tailwind CSS
|
## Rebuilding Tailwind CSS
|
||||||
|
|
||||||
After changing Tailwind utility classes in HTML or JS files:
|
After changing Tailwind utility classes in HTML or JS files:
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Bump version in config.php + electron/package.json
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
|
||||||
|
echo "Usage: ./bump.sh [--patch|--minor|--major]"
|
||||||
|
echo ""
|
||||||
|
echo " --patch bump patch version (default) 1.3.5 → 1.3.6"
|
||||||
|
echo " --minor bump minor version 1.3.6 → 1.4.0"
|
||||||
|
echo " --major bump major version 1.4.0 → 2.0.0"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
CURRENT=$(grep "APP_VERSION" config.php | grep -oP "'[^']+'" | tail -1 | tr -d "'")
|
||||||
|
IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
|
||||||
|
|
||||||
|
case "${1:---patch}" in
|
||||||
|
--major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
|
||||||
|
--minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
|
||||||
|
*) PATCH=$((PATCH + 1)) ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
VERSION="${MAJOR}.${MINOR}.${PATCH}"
|
||||||
|
|
||||||
|
# config.php
|
||||||
|
sed -i "s/APP_VERSION', '${CURRENT}'/APP_VERSION', '${VERSION}'/" config.php
|
||||||
|
|
||||||
|
# electron/package.json
|
||||||
|
if [ -f electron/package.json ]; then
|
||||||
|
sed -i "s/\"version\": \"${CURRENT}\"/\"version\": \"${VERSION}\"/" electron/package.json
|
||||||
|
fi
|
||||||
|
|
||||||
|
# website footer
|
||||||
|
if [ -f website/index.html ]; then
|
||||||
|
sed -i "s/v${CURRENT}/v${VERSION}/g" website/index.html
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "${CURRENT} → ${VERSION}"
|
||||||
+16
-2
@@ -1,10 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
define('APP_NAME', 'hyprcrd');
|
define('APP_NAME', 'hyprcrd');
|
||||||
define('APP_VERSION', '0.7.1');
|
define('APP_VERSION', '2.0.16');
|
||||||
|
|
||||||
|
// APP_DEBUG: gates verbose error responses (curl traces, upstream bodies).
|
||||||
|
// Off by default; enable via env for local troubleshooting only.
|
||||||
|
define('APP_DEBUG', getenv('APP_DEBUG') === '1' || getenv('APP_DEBUG') === 'true');
|
||||||
|
|
||||||
// Database path — writable directory, outside webroot
|
// Database path — writable directory, outside webroot
|
||||||
define('DB_PATH', __DIR__ . '/data/hyprcrd.db');
|
// DB_PATH / UPLOAD_DIR can be pre-defined by the Electron router for app isolation
|
||||||
|
if (!defined('DB_PATH')) define('DB_PATH', __DIR__ . '/data/hyprcrd.db');
|
||||||
|
if (!defined('UPLOAD_DIR')) define('UPLOAD_DIR', __DIR__ . '/public/uploads');
|
||||||
|
|
||||||
// Base URL auto-detection (works in Docker and hosted environments)
|
// Base URL auto-detection (works in Docker and hosted environments)
|
||||||
$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
|
$protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
|
||||||
@@ -12,3 +18,11 @@ $host = $_SERVER['HTTP_HOST'] ?? 'localhost';
|
|||||||
$scriptDir = dirname($_SERVER['SCRIPT_NAME']);
|
$scriptDir = dirname($_SERVER['SCRIPT_NAME']);
|
||||||
$basePath = ($scriptDir === '/' || $scriptDir === '\\') ? '' : $scriptDir;
|
$basePath = ($scriptDir === '/' || $scriptDir === '\\') ? '' : $scriptDir;
|
||||||
define('BASE_URL', $protocol . '://' . $host . $basePath);
|
define('BASE_URL', $protocol . '://' . $host . $basePath);
|
||||||
|
|
||||||
|
// Oumta dashboard upstream. The browser only talks to /api/dashboard/*
|
||||||
|
// same-origin; the PHP proxy below forwards to this URL. Override via env
|
||||||
|
// for remote deployments. Inside Docker on Linux, localhost points at the
|
||||||
|
// container itself — use http://host.docker.internal:8085 (needs
|
||||||
|
// extra_hosts) or a routable URL to reach a host-side dashboard.
|
||||||
|
define('OUMTA_DASHBOARD_URL', getenv('OUMTA_DASHBOARD_URL') ?: 'http://localhost:8085');
|
||||||
|
define('OUMTA_DASHBOARD_TOKEN', getenv('OUMTA_DASHBOARD_TOKEN') ?: '');
|
||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"disabled": [
|
"disabled": [
|
||||||
"logseq-import"
|
"logseq-import",
|
||||||
|
"example-content"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Executable
+38
@@ -0,0 +1,38 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Tear down the full dev stack and wipe the support-relay data (DB +
|
||||||
|
# master key). Hyprcrd and the main relay keep their data — this is
|
||||||
|
# meant for iterating on support-relay setup / API-key rotation.
|
||||||
|
#
|
||||||
|
# Usage: ./dev-down.sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
# If the stand-alone support-relay/docker-compose.yml was used earlier
|
||||||
|
# (before we folded it into the main compose), stop that too.
|
||||||
|
if [ -f support-relay/docker-compose.yml ]; then
|
||||||
|
( cd support-relay && docker compose down --remove-orphans ) 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Stop main dev stack across all profiles. `down` without -v preserves
|
||||||
|
# the named volumes (hyprcrd + relay data).
|
||||||
|
docker compose --profile relay --profile support down --remove-orphans
|
||||||
|
|
||||||
|
# Wipe support-relay storage — both the compose-managed named volume
|
||||||
|
# and the stand-alone bind-mount location. Match volumes by suffix so
|
||||||
|
# whatever compose-project-name was in effect (hyprcrd / something else)
|
||||||
|
# we find it.
|
||||||
|
for vol in $(docker volume ls -q | grep -E '(^|_)support-relay-data$' || true); do
|
||||||
|
docker volume rm -f "$vol" >/dev/null
|
||||||
|
echo " wiped volume: $vol"
|
||||||
|
done
|
||||||
|
if [ -d support-relay/data ]; then
|
||||||
|
rm -f support-relay/data/*.db support-relay/data/*.db-* support-relay/data/master.key 2>/dev/null || true
|
||||||
|
echo " wiped bind-mount: support-relay/data/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo " all containers stopped."
|
||||||
|
echo " support-relay data gone — next boot runs the setup wizard again"
|
||||||
|
echo " and mints a fresh API key."
|
||||||
|
echo " hyprcrd + relay data preserved."
|
||||||
@@ -1,13 +1,21 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Start hyprcrd + relay for local development
|
# Start hyprcrd + relay + support-relay for local development. Both
|
||||||
|
# auxiliary services sit behind compose profiles — this script opts
|
||||||
|
# into all of them so a dev can exercise the full sync + support flows
|
||||||
|
# without juggling profile flags.
|
||||||
|
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
docker compose up -d --build
|
#docker compose --profile relay --profile support up -d --build
|
||||||
|
docker compose --profile support up -d --build
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo " hyprcrd: http://localhost:8088"
|
echo " hyprcrd: http://localhost:8088"
|
||||||
echo " relay: http://localhost:8081"
|
#echo " relay: http://localhost:8081"
|
||||||
|
echo " support-relay: http://localhost:8090"
|
||||||
echo ""
|
echo ""
|
||||||
echo " relay from hyprcrd container: http://relay:80"
|
#echo " relay from hyprcrd container: http://relay:80"
|
||||||
|
echo " support-relay from hyprcrd container: http://support-relay:80"
|
||||||
|
echo ""
|
||||||
|
echo " (for app-only, drop the profiles: docker compose up -d)"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -1,35 +1,21 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Build hyprcrd distribution ZIP with version bump + minification
|
# Build hyprcrd distribution ZIP (no version bump — use ./bump.sh first)
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
|
if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
|
||||||
echo "Usage: ./dist.sh [--patch|--minor|--major]"
|
echo "Usage: ./dist.sh"
|
||||||
echo ""
|
echo ""
|
||||||
echo " --patch bump patch version (default) 0.1.1 → 0.1.2"
|
echo "Builds Tailwind CSS, minifies JS/CSS, and creates"
|
||||||
echo " --minor bump minor version 0.1.2 → 0.2.0"
|
echo "hyprcrd-{version}.zip ready for deployment."
|
||||||
echo " --major bump major version 0.2.0 → 1.0.0"
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Builds Tailwind CSS, minifies JS/CSS, bumps version in config.php,"
|
echo "To bump the version first: ./bump.sh [--patch|--minor|--major]"
|
||||||
echo "and creates hyprcrd-{version}.zip ready for deployment."
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
# Read current version
|
VERSION=$(grep "APP_VERSION" config.php | grep -oP "'[^']+'" | tail -1 | tr -d "'")
|
||||||
CURRENT=$(grep "APP_VERSION" config.php | grep -oP "'[^']+'" | tail -1 | tr -d "'")
|
echo "Building v${VERSION}"
|
||||||
IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT"
|
|
||||||
|
|
||||||
# Bump: --major, --minor, or patch (default)
|
|
||||||
case "${1:-patch}" in
|
|
||||||
--major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
|
|
||||||
--minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
|
|
||||||
*) PATCH=$((PATCH + 1)) ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
VERSION="${MAJOR}.${MINOR}.${PATCH}"
|
|
||||||
sed -i "s/APP_VERSION', '${CURRENT}'/APP_VERSION', '${VERSION}'/" config.php
|
|
||||||
echo "Version: ${CURRENT} → ${VERSION}"
|
|
||||||
|
|
||||||
DIST="hyprcrd-${VERSION}.zip"
|
DIST="hyprcrd-${VERSION}.zip"
|
||||||
STAGE="/tmp/hyprcrd-stage-$$"
|
STAGE="/tmp/hyprcrd-stage-$$"
|
||||||
|
|||||||
@@ -3,14 +3,27 @@ services:
|
|||||||
build: .
|
build: .
|
||||||
ports:
|
ports:
|
||||||
- "8088:80"
|
- "8088:80"
|
||||||
|
environment:
|
||||||
|
# `host.docker.internal` resolves to the Docker host via the
|
||||||
|
# extra_hosts mapping below, so the PHP proxy can reach a dashboard
|
||||||
|
# running directly on the host. Swap to a routable URL when the
|
||||||
|
# dashboard moves to a remote server.
|
||||||
|
OUMTA_DASHBOARD_URL: http://host.docker.internal:8085
|
||||||
|
# OUMTA_DASHBOARD_TOKEN: "" # Keycloak bearer, when auth is on
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/var/www/html/data
|
- ./data:/var/www/html/data
|
||||||
- ./src:/var/www/html/src
|
- ./src:/var/www/html/src
|
||||||
- ./public:/var/www/html/public
|
- ./public:/var/www/html/public
|
||||||
- ./config.php:/var/www/html/config.php
|
- ./config.php:/var/www/html/config.php
|
||||||
|
|
||||||
|
# Relay is opt-in via the `relay` profile. Plain `docker compose up`
|
||||||
|
# starts just the app; use `docker compose --profile relay up` when
|
||||||
|
# you want to develop against a local relay instead of a remote one.
|
||||||
relay:
|
relay:
|
||||||
build: ./relay
|
build: ./relay
|
||||||
|
profiles: ["relay"]
|
||||||
ports:
|
ports:
|
||||||
- "8081:80"
|
- "8081:80"
|
||||||
volumes:
|
volumes:
|
||||||
@@ -21,5 +34,19 @@ services:
|
|||||||
- ./relay/ui:/var/www/html/ui
|
- ./relay/ui:/var/www/html/ui
|
||||||
- relay-data:/var/www/html/data
|
- relay-data:/var/www/html/data
|
||||||
|
|
||||||
|
# Support-relay also opt-in via its own profile. Shares the compose
|
||||||
|
# network with the app so hyprcrd's support plugin can reach it at
|
||||||
|
# `http://support-relay:80` (container-to-container, no host port
|
||||||
|
# needed). Port 8090 is still published so you can open the public
|
||||||
|
# form in a browser.
|
||||||
|
support-relay:
|
||||||
|
build: ./support-relay
|
||||||
|
profiles: ["support"]
|
||||||
|
ports:
|
||||||
|
- "8090:80"
|
||||||
|
volumes:
|
||||||
|
- support-relay-data:/var/www/html/data
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
relay-data:
|
relay-data:
|
||||||
|
support-relay-data:
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
node_modules/
|
||||||
|
dist/
|
||||||
|
appdata/
|
||||||
|
php-bin/linux/php
|
||||||
|
php-bin/darwin/php
|
||||||
|
php-bin/win32/php.exe
|
||||||
|
php-bin/win32/*.dll
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
# hyprcrd — Electron Desktop App
|
||||||
|
|
||||||
|
Wraps the PHP backend in an Electron shell. A static PHP binary is bundled
|
||||||
|
per platform so users don't need PHP installed.
|
||||||
|
|
||||||
|
## How it works
|
||||||
|
|
||||||
|
1. On launch, the app starts PHP's built-in server on a random port (`127.0.0.1`)
|
||||||
|
2. `router.php` replaces Apache's `.htaccess` rewrite rules
|
||||||
|
3. A `BrowserWindow` loads `http://127.0.0.1:<port>/`
|
||||||
|
4. On quit, the PHP process is killed cleanly
|
||||||
|
|
||||||
|
User data (database + uploads) is stored **outside** the app bundle so it
|
||||||
|
survives updates:
|
||||||
|
|
||||||
|
- **Dev**: `electron/appdata/`
|
||||||
|
- **Linux**: `~/.config/hyprcrd/data/`
|
||||||
|
- **macOS**: `~/Library/Application Support/hyprcrd/data/`
|
||||||
|
- **Windows**: `%APPDATA%/hyprcrd/data/`
|
||||||
|
|
||||||
|
## Development
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd electron
|
||||||
|
npm install
|
||||||
|
npm start # launches the app using system or bundled PHP
|
||||||
|
```
|
||||||
|
|
||||||
|
Requires PHP 8.1+ with `pdo_sqlite` and `zip` extensions — either on
|
||||||
|
the system PATH or as a static binary in `php-bin/<platform>/`.
|
||||||
|
|
||||||
|
## Bundling PHP
|
||||||
|
|
||||||
|
Static PHP binaries are not checked into git. Fetch them before building:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./fetch-php.sh # downloads ~20MB per platform from static-php-cli
|
||||||
|
```
|
||||||
|
|
||||||
|
Or place them manually (see `php-bin/README.md` for sources):
|
||||||
|
|
||||||
|
php-bin/linux/php
|
||||||
|
php-bin/darwin/php
|
||||||
|
php-bin/win32/php.exe
|
||||||
|
|
||||||
|
The app prefers the bundled binary. If none is found, it falls back to
|
||||||
|
system PHP. If neither exists, a dialog tells the user what to install.
|
||||||
|
|
||||||
|
## Building distributables
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run dist
|
||||||
|
```
|
||||||
|
|
||||||
|
Uses `electron-builder`. Output:
|
||||||
|
|
||||||
|
| Platform | Format | Location |
|
||||||
|
|----------|----------|-------------------|
|
||||||
|
| macOS | `.dmg` | `dist/` |
|
||||||
|
| Windows | NSIS | `dist/` |
|
||||||
|
| Linux | AppImage | `dist/` |
|
||||||
|
|
||||||
|
## File structure
|
||||||
|
|
||||||
|
```
|
||||||
|
electron/
|
||||||
|
main.js Electron main process — spawns PHP, creates window
|
||||||
|
preload.js Exposes window.hyprcrdElectron (platform, isElectron)
|
||||||
|
router.php PHP built-in server router (replaces .htaccess)
|
||||||
|
fetch-php.sh Downloads static PHP binaries for all platforms
|
||||||
|
php-bin/ Platform-specific PHP binaries (gitignored)
|
||||||
|
```
|
||||||
Executable
+38
@@ -0,0 +1,38 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Download static PHP binaries for all platforms.
|
||||||
|
# Run from the electron/ directory.
|
||||||
|
set -e
|
||||||
|
cd "$(dirname "$0")/php-bin"
|
||||||
|
|
||||||
|
BASE="https://dl.static-php.dev/static-php-cli/common"
|
||||||
|
|
||||||
|
# Find latest 8.3.x version
|
||||||
|
echo "Finding latest PHP 8.3 version..."
|
||||||
|
VERSION=$(curl -sL "$BASE/" | grep -oP 'php-8\.3\.\d+-cli-linux-x86_64' | sort -V | tail -1 | grep -oP '8\.3\.\d+')
|
||||||
|
if [ -z "$VERSION" ]; then
|
||||||
|
echo "ERROR: Could not determine latest PHP 8.3 version."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Using PHP $VERSION"
|
||||||
|
|
||||||
|
# Linux x86_64
|
||||||
|
echo " linux..."
|
||||||
|
curl -fSL "$BASE/php-${VERSION}-cli-linux-x86_64.tar.gz" -o /tmp/php-linux.tar.gz
|
||||||
|
tar -xzf /tmp/php-linux.tar.gz -C linux/
|
||||||
|
chmod +x linux/php
|
||||||
|
rm /tmp/php-linux.tar.gz
|
||||||
|
|
||||||
|
# macOS arm64
|
||||||
|
echo " darwin..."
|
||||||
|
curl -fSL "$BASE/php-${VERSION}-cli-macos-aarch64.tar.gz" -o /tmp/php-darwin.tar.gz
|
||||||
|
tar -xzf /tmp/php-darwin.tar.gz -C darwin/
|
||||||
|
chmod +x darwin/php
|
||||||
|
rm /tmp/php-darwin.tar.gz
|
||||||
|
|
||||||
|
# Windows — static-php-cli doesn't ship Windows builds,
|
||||||
|
# so we skip it here. For Windows, bundle PHP from https://windows.php.net/download/
|
||||||
|
echo " win32: skipped (no static build available — use windows.php.net)"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Done: PHP $VERSION"
|
||||||
|
ls -lh linux/php darwin/php 2>/dev/null
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
const { app, BrowserWindow, dialog, shell } = require('electron');
|
||||||
|
const { spawn, execFileSync } = require('child_process');
|
||||||
|
const path = require('path');
|
||||||
|
const net = require('net');
|
||||||
|
const fs = require('fs');
|
||||||
|
|
||||||
|
let phpProcess = null;
|
||||||
|
let mainWindow = null;
|
||||||
|
let serverPort = 0;
|
||||||
|
|
||||||
|
const isDev = !app.isPackaged;
|
||||||
|
|
||||||
|
function resolvePath(rel) {
|
||||||
|
if (isDev) return path.join(__dirname, '..', rel);
|
||||||
|
return path.join(process.resourcesPath, rel);
|
||||||
|
}
|
||||||
|
|
||||||
|
function findBundledPhp() {
|
||||||
|
const exe = process.platform === 'win32' ? 'php.exe' : 'php';
|
||||||
|
const bundled = isDev
|
||||||
|
? path.join(__dirname, 'php-bin', process.platform, exe)
|
||||||
|
: path.join(process.resourcesPath, 'php-bin', exe);
|
||||||
|
if (fs.existsSync(bundled)) {
|
||||||
|
try {
|
||||||
|
execFileSync(bundled, ['-v'], { stdio: 'ignore', timeout: 3000 });
|
||||||
|
return bundled;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function findSystemPhp() {
|
||||||
|
const candidates = process.platform === 'win32'
|
||||||
|
? ['php.exe', 'C:\\php\\php.exe', 'C:\\xampp\\php\\php.exe']
|
||||||
|
: ['php', '/usr/bin/php', '/usr/local/bin/php', '/opt/homebrew/bin/php'];
|
||||||
|
for (const bin of candidates) {
|
||||||
|
try {
|
||||||
|
execFileSync(bin, ['-v'], { stdio: 'ignore', timeout: 3000 });
|
||||||
|
return bin;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function findPhp() {
|
||||||
|
return findBundledPhp() || findSystemPhp();
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkPhpExtensions(phpBin) {
|
||||||
|
try {
|
||||||
|
const mods = execFileSync(phpBin, ['-m'], { timeout: 3000 }).toString().toLowerCase();
|
||||||
|
const missing = [];
|
||||||
|
for (const ext of ['pdo_sqlite', 'zip']) {
|
||||||
|
if (!mods.includes(ext)) missing.push(ext);
|
||||||
|
}
|
||||||
|
return missing;
|
||||||
|
} catch { return []; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function getFreePort() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const srv = net.createServer();
|
||||||
|
srv.listen(0, '127.0.0.1', () => {
|
||||||
|
const port = srv.address().port;
|
||||||
|
srv.close(() => resolve(port));
|
||||||
|
});
|
||||||
|
srv.on('error', reject);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function getDataDir() {
|
||||||
|
if (isDev) return path.join(__dirname, 'appdata');
|
||||||
|
return path.join(app.getPath('userData'), 'data');
|
||||||
|
}
|
||||||
|
|
||||||
|
function ensureDataDir() {
|
||||||
|
const dataDir = getDataDir();
|
||||||
|
if (!fs.existsSync(dataDir)) fs.mkdirSync(dataDir, { recursive: true });
|
||||||
|
return dataDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function startPhpServer() {
|
||||||
|
const phpBin = findPhp();
|
||||||
|
if (!phpBin) {
|
||||||
|
dialog.showErrorBox('PHP not found',
|
||||||
|
'hyprcrd needs PHP 8.1+ with pdo_sqlite.\n\n' +
|
||||||
|
'Install PHP and make sure it\'s in your PATH.\n\n' +
|
||||||
|
(process.platform === 'darwin' ? 'brew install php' :
|
||||||
|
process.platform === 'win32' ? 'https://windows.php.net/download/' :
|
||||||
|
'sudo apt install php php-sqlite3'));
|
||||||
|
app.quit();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const missing = checkPhpExtensions(phpBin);
|
||||||
|
if (missing.length) {
|
||||||
|
dialog.showErrorBox('Missing PHP extensions',
|
||||||
|
`hyprcrd needs these PHP extensions: ${missing.join(', ')}\n\n` +
|
||||||
|
(process.platform === 'darwin' ? 'They are included with "brew install php".' :
|
||||||
|
process.platform === 'win32' ? 'Enable them in php.ini (uncomment extension=...).' :
|
||||||
|
`Install with: sudo apt install ${missing.map(e => 'php-' + e.replace('pdo_', '')).join(' ')}`));
|
||||||
|
app.quit();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const dataDir = ensureDataDir();
|
||||||
|
serverPort = await getFreePort();
|
||||||
|
|
||||||
|
const docRoot = resolvePath('public');
|
||||||
|
const routerFile = isDev
|
||||||
|
? path.join(__dirname, 'router.php')
|
||||||
|
: path.join(process.resourcesPath, 'router.php');
|
||||||
|
|
||||||
|
console.log('[hyprcrd] PHP:', phpBin);
|
||||||
|
console.log('[hyprcrd] docRoot:', docRoot);
|
||||||
|
console.log('[hyprcrd] router:', routerFile);
|
||||||
|
console.log('[hyprcrd] data:', dataDir);
|
||||||
|
console.log('[hyprcrd] port:', serverPort);
|
||||||
|
|
||||||
|
phpProcess = spawn(phpBin, [
|
||||||
|
'-d', 'upload_max_filesize=64M',
|
||||||
|
'-d', 'post_max_size=66M',
|
||||||
|
'-d', 'display_errors=0',
|
||||||
|
'-S', `127.0.0.1:${serverPort}`,
|
||||||
|
'-t', docRoot,
|
||||||
|
routerFile,
|
||||||
|
], {
|
||||||
|
cwd: resolvePath('.'),
|
||||||
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
|
env: { ...process.env, PHP_CLI_SERVER_WORKERS: '2', HYPRCRD_DATA_DIR: dataDir },
|
||||||
|
});
|
||||||
|
|
||||||
|
phpProcess.stderr.on('data', (d) => {
|
||||||
|
const line = d.toString().trim();
|
||||||
|
if (line && !line.includes('Accepted') && !line.includes('Closing'))
|
||||||
|
console.log('[php]', line);
|
||||||
|
});
|
||||||
|
|
||||||
|
phpProcess.on('exit', (code) => {
|
||||||
|
console.log(`[php] exited with code ${code}`);
|
||||||
|
phpProcess = null;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Wait for the server to accept connections
|
||||||
|
for (let i = 0; i < 50; i++) {
|
||||||
|
const ok = await new Promise(resolve => {
|
||||||
|
const sock = net.createConnection(serverPort, '127.0.0.1');
|
||||||
|
sock.on('connect', () => { sock.destroy(); resolve(true); });
|
||||||
|
sock.on('error', () => resolve(false));
|
||||||
|
});
|
||||||
|
if (ok) return serverPort;
|
||||||
|
await new Promise(r => setTimeout(r, 100));
|
||||||
|
}
|
||||||
|
|
||||||
|
dialog.showErrorBox('Server failed', 'PHP server did not start in time.');
|
||||||
|
app.quit();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function createWindow() {
|
||||||
|
mainWindow = new BrowserWindow({
|
||||||
|
width: 1280,
|
||||||
|
height: 820,
|
||||||
|
minWidth: 1150,
|
||||||
|
minHeight: 500,
|
||||||
|
title: 'hyprcrd',
|
||||||
|
backgroundColor: '#0f172a',
|
||||||
|
autoHideMenuBar: true,
|
||||||
|
webPreferences: {
|
||||||
|
preload: path.join(__dirname, 'preload.js'),
|
||||||
|
contextIsolation: true,
|
||||||
|
nodeIntegration: false,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
mainWindow.loadURL(`http://127.0.0.1:${serverPort}/`);
|
||||||
|
|
||||||
|
mainWindow.webContents.on('did-fail-load', (e, code, desc) => {
|
||||||
|
console.log(`[hyprcrd] load failed: ${code} ${desc}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
|
||||||
|
if (url.startsWith('http://127.0.0.1')) return { action: 'allow' };
|
||||||
|
shell.openExternal(url);
|
||||||
|
return { action: 'deny' };
|
||||||
|
});
|
||||||
|
|
||||||
|
mainWindow.webContents.on('before-input-event', (e, input) => {
|
||||||
|
if (input.key === 'F12') mainWindow.webContents.toggleDevTools();
|
||||||
|
if (input.key === 'r' && (input.control || input.meta)) mainWindow.webContents.reload();
|
||||||
|
});
|
||||||
|
|
||||||
|
mainWindow.on('closed', () => { mainWindow = null; });
|
||||||
|
}
|
||||||
|
|
||||||
|
app.on('ready', async () => {
|
||||||
|
const port = await startPhpServer();
|
||||||
|
if (port) createWindow();
|
||||||
|
});
|
||||||
|
|
||||||
|
app.on('window-all-closed', () => { app.quit(); });
|
||||||
|
|
||||||
|
app.on('before-quit', () => {
|
||||||
|
if (phpProcess) {
|
||||||
|
phpProcess.kill('SIGTERM');
|
||||||
|
phpProcess = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
app.on('activate', () => {
|
||||||
|
if (!mainWindow && serverPort) createWindow();
|
||||||
|
});
|
||||||
Generated
+4896
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,84 @@
|
|||||||
|
{
|
||||||
|
"name": "hyprcrd",
|
||||||
|
"version": "2.0.14",
|
||||||
|
"description": "hyprcrd — self-hosted card manager",
|
||||||
|
"main": "main.js",
|
||||||
|
"scripts": {
|
||||||
|
"start": "electron .",
|
||||||
|
"dist": "electron-builder"
|
||||||
|
},
|
||||||
|
"author": "th",
|
||||||
|
"license": "UNLICENSED",
|
||||||
|
"devDependencies": {
|
||||||
|
"electron": "^41.2.0",
|
||||||
|
"electron-builder": "^26.0.0"
|
||||||
|
},
|
||||||
|
"build": {
|
||||||
|
"appId": "com.hyprcrd.app",
|
||||||
|
"productName": "hyprcrd",
|
||||||
|
"files": [
|
||||||
|
"main.js",
|
||||||
|
"preload.js"
|
||||||
|
],
|
||||||
|
"extraResources": [
|
||||||
|
{
|
||||||
|
"from": "router.php",
|
||||||
|
"to": "router.php"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": "../public",
|
||||||
|
"to": "public",
|
||||||
|
"filter": [
|
||||||
|
"**/*"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": "../src",
|
||||||
|
"to": "src",
|
||||||
|
"filter": [
|
||||||
|
"**/*"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": "../config.php",
|
||||||
|
"to": "config.php"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": "../data",
|
||||||
|
"to": "data",
|
||||||
|
"filter": [
|
||||||
|
".gitkeep"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"mac": {
|
||||||
|
"target": "dmg",
|
||||||
|
"category": "public.app-category.productivity",
|
||||||
|
"extraResources": [
|
||||||
|
{
|
||||||
|
"from": "php-bin/darwin",
|
||||||
|
"to": "php-bin"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"win": {
|
||||||
|
"target": "nsis",
|
||||||
|
"extraResources": [
|
||||||
|
{
|
||||||
|
"from": "php-bin/win32",
|
||||||
|
"to": "php-bin"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"linux": {
|
||||||
|
"target": "AppImage",
|
||||||
|
"category": "Office",
|
||||||
|
"extraResources": [
|
||||||
|
{
|
||||||
|
"from": "php-bin/linux",
|
||||||
|
"to": "php-bin"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
linux/php
|
||||||
|
darwin/php
|
||||||
|
win32/php.exe
|
||||||
|
win32/*.dll
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Bundled PHP binaries
|
||||||
|
|
||||||
|
Place a static PHP binary for each target platform here. The Electron
|
||||||
|
app will use the bundled binary instead of requiring a system-wide PHP
|
||||||
|
installation.
|
||||||
|
|
||||||
|
## Download
|
||||||
|
|
||||||
|
Get static builds from https://dl.static-php.dev/static-php-cli/common/
|
||||||
|
(look for `php-8.3.*-cli-*` files). Required extensions: pdo_sqlite, zip, session.
|
||||||
|
|
||||||
|
linux/php — x86_64 Linux ELF binary
|
||||||
|
darwin/php — macOS aarch64 binary
|
||||||
|
win32/php.exe — Windows PE binary (not available from static-php-cli; use windows.php.net)
|
||||||
|
|
||||||
|
## Quick fetch
|
||||||
|
|
||||||
|
Use the included script from the `electron/` directory:
|
||||||
|
|
||||||
|
./fetch-php.sh
|
||||||
|
|
||||||
|
This auto-detects the latest PHP 8.3 version and downloads Linux + macOS binaries.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
const { contextBridge } = require('electron');
|
||||||
|
|
||||||
|
contextBridge.exposeInMainWorld('hyprcrdElectron', {
|
||||||
|
platform: process.platform,
|
||||||
|
isElectron: true,
|
||||||
|
});
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
// Router for PHP's built-in server (replaces .htaccess rewrite rules).
|
||||||
|
// Static files are served directly; everything else goes to index.php.
|
||||||
|
|
||||||
|
// docRoot is set via `php -S ... -t <docRoot>` in main.js
|
||||||
|
$docRoot = $_SERVER['DOCUMENT_ROOT'];
|
||||||
|
|
||||||
|
// Electron passes HYPRCRD_DATA_DIR so the app stores all user data
|
||||||
|
// outside the app bundle (survives updates).
|
||||||
|
$dataDir = getenv('HYPRCRD_DATA_DIR');
|
||||||
|
if ($dataDir) {
|
||||||
|
define('DB_PATH', $dataDir . '/hyprcrd.db');
|
||||||
|
define('UPLOAD_DIR', $dataDir . '/uploads');
|
||||||
|
if (!is_dir($dataDir . '/uploads')) {
|
||||||
|
mkdir($dataDir . '/uploads', 0755, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
|
||||||
|
$file = $docRoot . $path;
|
||||||
|
if ($path !== '/' && is_file($file)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Serve uploaded files from the external data dir
|
||||||
|
if ($dataDir && str_starts_with($path, '/uploads/')) {
|
||||||
|
$extFile = $dataDir . $path;
|
||||||
|
if (is_file($extFile)) {
|
||||||
|
$mime = mime_content_type($extFile) ?: 'application/octet-stream';
|
||||||
|
header('Content-Type: ' . $mime);
|
||||||
|
readfile($extFile);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
require $docRoot . '/index.php';
|
||||||
+24
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="60.122112mm"
|
||||||
|
height="60.122108mm"
|
||||||
|
viewBox="0 0 60.122112 60.122108"
|
||||||
|
version="1.1"
|
||||||
|
id="svg1"
|
||||||
|
xml:space="preserve"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||||
|
id="defs1" /><g
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(-8.2147047,-118.8156)"><rect
|
||||||
|
style="fill:#06080f;fill-opacity:1;stroke-width:1.5875"
|
||||||
|
id="rect4"
|
||||||
|
width="60.122112"
|
||||||
|
height="60.122112"
|
||||||
|
x="8.2147045"
|
||||||
|
y="118.81558" /><path
|
||||||
|
id="rect1"
|
||||||
|
style="fill:#15bff6;fill-opacity:1;stroke-width:1.5875"
|
||||||
|
d="m 41.162784,130.18519 v 37.02565 h 20.35844 v -37.02565 z m -25.209835,4.34547 v 23.45335 h 5.000729 v -9.22631 h 8.928654 v 9.22631 h 5.000212 v -23.45335 h -5.000212 v 9.22683 h -8.928654 v -9.22683 z" /></g></svg>
|
||||||
|
After Width: | Height: | Size: 926 B |
+520
-46
@@ -1,7 +1,34 @@
|
|||||||
body { font-family: var(--t-font-content, 'JetBrains Mono', monospace); }
|
body { font-family: var(--t-font-content, 'JetBrains Mono', monospace); }
|
||||||
|
|
||||||
|
/* Tooltip system */
|
||||||
|
#tooltip {
|
||||||
|
display: none;
|
||||||
|
position: fixed;
|
||||||
|
z-index: 9999;
|
||||||
|
max-width: 280px;
|
||||||
|
padding: 4px 8px;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
line-height: 1.5;
|
||||||
|
color: var(--t-bright);
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
box-shadow: 0 4px 12px rgba(0,0,0,0.4);
|
||||||
|
pointer-events: none;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
#tooltip.tooltip-help {
|
||||||
|
white-space: normal;
|
||||||
|
padding: 8px 12px;
|
||||||
|
font-size: 10px;
|
||||||
|
max-width: 320px;
|
||||||
|
font-family: var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
color: var(--t-muted);
|
||||||
|
border-left: 3px solid var(--t-accent);
|
||||||
|
}
|
||||||
.font-pixel { font-family: var(--t-font-ui, var(--t-font-pixel, 'Silkscreen', cursive)) !important; }
|
.font-pixel { font-family: var(--t-font-ui, var(--t-font-pixel, 'Silkscreen', cursive)) !important; }
|
||||||
.brand { font-family: 'Silkscreen', cursive !important; }
|
.brand { font-family: 'Silkscreen', cursive !important; }
|
||||||
body.no-scanlines::after { display: none !important; }
|
|
||||||
#dialog-msg { white-space: pre-line; word-break: break-word; }
|
#dialog-msg { white-space: pre-line; word-break: break-word; }
|
||||||
|
|
||||||
/* ── User-customizable design tokens ── */
|
/* ── User-customizable design tokens ── */
|
||||||
@@ -26,7 +53,12 @@ body.no-scanlines::after { display: none !important; }
|
|||||||
}
|
}
|
||||||
|
|
||||||
#main-header { box-shadow: var(--ui-shadow-header); }
|
#main-header { box-shadow: var(--ui-shadow-header); }
|
||||||
#main-footer { box-shadow: var(--ui-shadow-footer); }
|
#main-footer { box-shadow: var(--ui-shadow-footer); position: relative; }
|
||||||
|
#footer-count { flex-shrink: 0; }
|
||||||
|
@media (min-width: 1450px) {
|
||||||
|
#footer-count { position: absolute; left: 50%; translate: -50% 0; }
|
||||||
|
}
|
||||||
|
html { min-width: 1150px; }
|
||||||
|
|
||||||
/* Cards: geometry & shadow driven by design tokens */
|
/* Cards: geometry & shadow driven by design tokens */
|
||||||
.board-card {
|
.board-card {
|
||||||
@@ -77,18 +109,25 @@ select[class*="border-t-accent"] {
|
|||||||
.prose img { border-radius: var(--ui-radius-image); }
|
.prose img { border-radius: var(--ui-radius-image); }
|
||||||
.board-card.card-has-cover { border-radius: var(--ui-radius-card); }
|
.board-card.card-has-cover { border-radius: var(--ui-radius-card); }
|
||||||
|
|
||||||
/* Modal containers (the inner box of each overlay) */
|
/* Modal containers (the inner box of each overlay). Only for floating /
|
||||||
#modal > div,
|
* framed modals — the fullscreen overlays (modal, detail, search, tasks,
|
||||||
#detail > div,
|
* calendar, gallery, and the support / plugin overlays) fill the whole
|
||||||
|
* viewport now and don't want the rounded-corner + overflow:hidden
|
||||||
|
* combo, which would clip the top color bar and soften the edge-to-edge
|
||||||
|
* look. */
|
||||||
#settings-overlay > div,
|
#settings-overlay > div,
|
||||||
#help > div,
|
|
||||||
#search > div,
|
|
||||||
#tasks > div,
|
|
||||||
#calendar > div,
|
|
||||||
#gallery > div,
|
|
||||||
#dialog > div {
|
#dialog > div {
|
||||||
border-radius: var(--ui-radius-modal);
|
border-radius: var(--ui-radius-modal);
|
||||||
box-shadow: var(--ui-shadow-modal);
|
box-shadow: var(--ui-shadow-modal);
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The help dialog scrolls its own body — keep the border-radius and
|
||||||
|
shadow but drop overflow:hidden so the Tailwind overflow-y-auto on
|
||||||
|
the same element actually takes effect. */
|
||||||
|
#help > div {
|
||||||
|
border-radius: var(--ui-radius-modal);
|
||||||
|
box-shadow: var(--ui-shadow-modal);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Overlay backdrop blur (applies to anything that's already an .overlay) */
|
/* Overlay backdrop blur (applies to anything that's already an .overlay) */
|
||||||
@@ -107,13 +146,35 @@ body.anim-slow *, body.anim-slow *::before, body.anim-slow *::after {
|
|||||||
transition-duration: 400ms !important;
|
transition-duration: 400ms !important;
|
||||||
animation-duration: 600ms !important;
|
animation-duration: 600ms !important;
|
||||||
}
|
}
|
||||||
|
/* Blink / pulse animations are status indicators with deliberate cadences
|
||||||
|
(cursor, overdue bar, unread chat button, new collab bucket 3-pulse).
|
||||||
|
Speeding them up makes them useless strobes, so they ignore the global
|
||||||
|
anim-* override via higher-specificity rules. */
|
||||||
|
body.anim-fast .cursor-blink::after,
|
||||||
|
body.anim-slow .cursor-blink::after {
|
||||||
|
animation: blink 1s step-end infinite !important;
|
||||||
|
animation-duration: 1s !important;
|
||||||
|
}
|
||||||
|
body.anim-fast .card-bar-pulse,
|
||||||
|
body.anim-slow .card-bar-pulse {
|
||||||
|
animation: pulse-glow 2s ease-in-out infinite !important;
|
||||||
|
animation-duration: 2s !important;
|
||||||
|
}
|
||||||
|
body.anim-fast .board-card:has(.card-bar-pulse) .card-bar-pulse ~ * .text-t-danger,
|
||||||
|
body.anim-slow .board-card:has(.card-bar-pulse) .card-bar-pulse ~ * .text-t-danger {
|
||||||
|
animation-duration: 2s !important;
|
||||||
|
}
|
||||||
|
body.anim-fast .card-spinner,
|
||||||
|
body.anim-slow .card-spinner {
|
||||||
|
animation: spin 0.8s linear infinite !important;
|
||||||
|
animation-duration: 0.8s !important;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Theme preview (settings) ── */
|
/* ── Theme preview (settings) ── */
|
||||||
.theme-preview {
|
.theme-preview {
|
||||||
position: relative; padding: 14px; overflow: hidden;
|
position: relative; padding: 14px; overflow: hidden;
|
||||||
background: var(--t-bg); border: 1px solid var(--t-border); border-radius: 3px;
|
background: var(--t-bg); border: 1px solid var(--t-border); border-radius: 3px;
|
||||||
}
|
}
|
||||||
.theme-preview .tp-scan { position: absolute; inset: 0; pointer-events: none; background: repeating-linear-gradient(0deg, transparent, transparent 2px, var(--t-scanline, rgba(0,0,0,0.04)) 2px, var(--t-scanline, rgba(0,0,0,0.04)) 4px); }
|
|
||||||
.theme-preview .tp-row { display: flex; gap: 12px; align-items: stretch; position: relative; z-index: 1; }
|
.theme-preview .tp-row { display: flex; gap: 12px; align-items: stretch; position: relative; z-index: 1; }
|
||||||
.theme-preview .tp-card {
|
.theme-preview .tp-card {
|
||||||
flex: 1; min-width: 0;
|
flex: 1; min-width: 0;
|
||||||
@@ -168,7 +229,7 @@ body.anim-slow *, body.anim-slow *::before, body.anim-slow *::after {
|
|||||||
.design-row { display: flex; align-items: center; gap: 10px; padding: 2px 0; }
|
.design-row { display: flex; align-items: center; gap: 10px; padding: 2px 0; }
|
||||||
.design-row > label { flex: 0 0 88px; font-size: 11px; color: var(--t-muted); }
|
.design-row > label { flex: 0 0 88px; font-size: 11px; color: var(--t-muted); }
|
||||||
.design-row > select { width: 110px; }
|
.design-row > select { width: 110px; }
|
||||||
.design-row > .design-val { font-family: var(--t-font-pixel); font-size: 9px; color: var(--t-dim); width: 36px; text-align: right; flex-shrink: 0; }
|
.design-row > .design-val { font-size: 11px; color: var(--t-muted); width: 44px; text-align: right; flex-shrink: 0; }
|
||||||
.design-section-label { font-family: var(--t-font-pixel); font-size: 9px; text-transform: uppercase; letter-spacing: 0.05em; color: var(--t-dim); margin: 12px 0 4px; }
|
.design-section-label { font-family: var(--t-font-pixel); font-size: 9px; text-transform: uppercase; letter-spacing: 0.05em; color: var(--t-dim); margin: 12px 0 4px; }
|
||||||
.design-section-label:first-child { margin-top: 0; }
|
.design-section-label:first-child { margin-top: 0; }
|
||||||
#design-advanced > summary { list-style: none; }
|
#design-advanced > summary { list-style: none; }
|
||||||
@@ -240,16 +301,6 @@ body.settings-peeking #settings-overlay > div { pointer-events: auto; }
|
|||||||
*::-webkit-scrollbar-thumb:hover { background: var(--t-dim); }
|
*::-webkit-scrollbar-thumb:hover { background: var(--t-dim); }
|
||||||
*::-webkit-scrollbar-corner { background: transparent; }
|
*::-webkit-scrollbar-corner { background: transparent; }
|
||||||
|
|
||||||
/* Scanlines */
|
|
||||||
body::after {
|
|
||||||
content: '';
|
|
||||||
position: fixed;
|
|
||||||
inset: 0;
|
|
||||||
pointer-events: none;
|
|
||||||
z-index: 9999;
|
|
||||||
background: repeating-linear-gradient(0deg, transparent, transparent 2px, var(--t-scanline, rgba(0,0,0,0.04)) 2px, var(--t-scanline, rgba(0,0,0,0.04)) 4px);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Blinking cursor */
|
/* Blinking cursor */
|
||||||
.cursor-blink::after { content: '_'; animation: blink 1s step-end infinite; }
|
.cursor-blink::after { content: '_'; animation: blink 1s step-end infinite; }
|
||||||
@keyframes blink { 50% { opacity: 0; } }
|
@keyframes blink { 50% { opacity: 0; } }
|
||||||
@@ -261,13 +312,61 @@ body::after {
|
|||||||
.line-clamp-5 { -webkit-line-clamp: 5; }
|
.line-clamp-5 { -webkit-line-clamp: 5; }
|
||||||
|
|
||||||
/* Superview */
|
/* Superview */
|
||||||
.superview-grid { column-gap: 12px; padding: 1rem 1.5rem 6rem; }
|
/* Single-column list view (toggled via #superview-toggle). Each row is
|
||||||
.superview-item { padding: 3px 0; display: flex; align-items: center; gap: 6px; cursor: pointer; break-inside: avoid; transition: color 0.1s; }
|
a flex line with: color dot · optional icon · title (flex-grows) ·
|
||||||
.superview-item:hover { color: var(--t-bright); }
|
tag chips · bucket · date. Title ellipsizes when narrow. */
|
||||||
.superview-dot { width: 6px; height: 6px; border-radius: 50%; flex-shrink: 0; }
|
.superview-grid { padding: 1rem 1.5rem 6rem; max-width: 1100px; margin: 0 auto; display: flex; flex-direction: column; gap: 1px; }
|
||||||
.superview-title { font-size: 11px; color: var(--t-text); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
.superview-item {
|
||||||
|
padding: 8px 12px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.1s, color 0.1s;
|
||||||
|
border-bottom: 1px solid color-mix(in srgb, var(--t-border) 50%, transparent);
|
||||||
|
}
|
||||||
|
.superview-item:hover { background: color-mix(in srgb, var(--t-raised) 60%, transparent); color: var(--t-bright); }
|
||||||
|
.superview-dot { width: 8px; height: 8px; border-radius: 50%; flex-shrink: 0; }
|
||||||
|
.superview-icon { font-size: 14px; flex-shrink: 0; }
|
||||||
|
.superview-title {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--t-text);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
flex: 1 1 0;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
.superview-item:hover .superview-title { color: var(--t-bright); }
|
.superview-item:hover .superview-title { color: var(--t-bright); }
|
||||||
.superview-icon { font-size: 10px; flex-shrink: 0; }
|
.superview-tags { display: flex; gap: 4px; flex-shrink: 0; }
|
||||||
|
.superview-tag {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-accent);
|
||||||
|
background: color-mix(in srgb, var(--t-accent) 12%, transparent);
|
||||||
|
padding: 1px 6px;
|
||||||
|
border-radius: var(--ui-radius-tag, 2px);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.superview-tag-more { color: var(--t-dim); background: transparent; }
|
||||||
|
.superview-bucket {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-muted);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.superview-bucket i { font-size: 12px; }
|
||||||
|
.superview-date {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
flex-shrink: 0;
|
||||||
|
min-width: 80px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
.board-card.preview-active { border-color: var(--t-accent) !important; box-shadow: 0 0 0 1px var(--t-accent), 0 0 12px -2px color-mix(in srgb, var(--t-accent) 30%, transparent); }
|
.board-card.preview-active { border-color: var(--t-accent) !important; box-shadow: 0 0 0 1px var(--t-accent), 0 0 12px -2px color-mix(in srgb, var(--t-accent) 30%, transparent); }
|
||||||
|
|
||||||
@@ -293,14 +392,28 @@ body::after {
|
|||||||
.settings-tab.active { color: var(--t-accent); border-left-color: var(--t-accent); background: color-mix(in srgb, var(--t-accent) 8%, transparent); }
|
.settings-tab.active { color: var(--t-accent); border-left-color: var(--t-accent); background: color-mix(in srgb, var(--t-accent) 8%, transparent); }
|
||||||
|
|
||||||
@keyframes spin { to { transform: rotate(360deg); } }
|
@keyframes spin { to { transform: rotate(360deg); } }
|
||||||
|
|
||||||
@keyframes pulse-glow { 0%, 100% { opacity: 1; } 50% { opacity: 0.35; } }
|
@keyframes pulse-glow { 0%, 100% { opacity: 1; } 50% { opacity: 0.35; } }
|
||||||
.card-bar-pulse { animation: pulse-glow 2s ease-in-out infinite; }
|
.card-bar-pulse { animation: pulse-glow 2s ease-in-out infinite; }
|
||||||
.board-card:has(.card-bar-pulse) { border-color: var(--t-danger); }
|
.board-card:has(.card-bar-pulse) { border-color: var(--t-danger); }
|
||||||
.due-pill { display: inline-flex; align-items: center; gap: 3px; padding: 0 5px; border-radius: 8px; font-size: 9px; line-height: 16px; color: var(--t-bg); font-family: var(--t-font-pixel); }
|
.due-pill { display: inline-flex; align-items: center; gap: 3px; padding: 0 5px; border-radius: 8px; font-size: 9px; line-height: 16px; color: var(--t-bg); font-family: var(--t-font-pixel); }
|
||||||
.card-done-badge { position: absolute; bottom: 0; right: 0; width: 0; height: 0; border-style: solid; border-width: 0 0 24px 24px; border-color: transparent transparent #4ade80 transparent; z-index: 1; }
|
.card-done-badge { position: absolute; bottom: 0; right: 0; width: 0; height: 0; border-style: solid; border-width: 0 0 24px 24px; border-color: transparent transparent #4ade80 transparent; z-index: 1; }
|
||||||
.card-done-badge i { position: absolute; bottom: -22px; right: 1px; font-size: 10px; color: #000; }
|
.card-done-badge i { position: absolute; bottom: -22px; right: 1px; font-size: 10px; color: #000; }
|
||||||
|
/* Rounded-cards variant: the corner triangle gets clipped by the
|
||||||
|
* rounded border, so toggle to a circle pill that sits comfortably
|
||||||
|
* inside any radius. JS adds `rounded-cards` on body whenever
|
||||||
|
* --ui-radius-card is > 0. */
|
||||||
|
body.rounded-cards .card-done-badge {
|
||||||
|
width: 18px; height: 18px;
|
||||||
|
bottom: 6px; right: 6px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: #4ade80;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
}
|
||||||
|
body.rounded-cards .card-done-badge i { position: static; bottom: auto; right: auto; font-size: 11px; color: #000; font-weight: bold; }
|
||||||
.board-card:has(.card-bar-pulse) .card-bar-pulse ~ * .text-t-danger { animation: pulse-glow 2s ease-in-out infinite; }
|
.board-card:has(.card-bar-pulse) .card-bar-pulse ~ * .text-t-danger { animation: pulse-glow 2s ease-in-out infinite; }
|
||||||
.card-spinner { animation: spin 0.8s linear infinite; }
|
.card-spinner { animation: spin 0.8s linear infinite; display: inline-block; }
|
||||||
|
|
||||||
/* Cards */
|
/* Cards */
|
||||||
.card-bar { image-rendering: pixelated; height: var(--ui-bar-height, 3px); }
|
.card-bar { image-rendering: pixelated; height: var(--ui-bar-height, 3px); }
|
||||||
@@ -386,6 +499,11 @@ body::after {
|
|||||||
}
|
}
|
||||||
.card-glow:hover { box-shadow: var(--ui-shadow-card), var(--card-stack-shadow), 0 0 16px -3px var(--glow-color, rgba(56, 189, 248, 0.15)); }
|
.card-glow:hover { box-shadow: var(--ui-shadow-card), var(--card-stack-shadow), 0 0 16px -3px var(--glow-color, rgba(56, 189, 248, 0.15)); }
|
||||||
.card-selected { outline: 2px solid var(--t-accent) !important; outline-offset: -2px; }
|
.card-selected { outline: 2px solid var(--t-accent) !important; outline-offset: -2px; }
|
||||||
|
.card-focused {
|
||||||
|
outline: 2px solid var(--t-accent) !important;
|
||||||
|
outline-offset: -2px;
|
||||||
|
box-shadow: 0 0 0 1px var(--t-accent), 0 0 16px -4px color-mix(in srgb, var(--t-accent) 40%, transparent) !important;
|
||||||
|
}
|
||||||
.card-select-check {
|
.card-select-check {
|
||||||
position: absolute; top: 6px; left: 6px; width: 18px; height: 18px;
|
position: absolute; top: 6px; left: 6px; width: 18px; height: 18px;
|
||||||
border-radius: 50%; background: var(--t-accent); z-index: 6;
|
border-radius: 50%; background: var(--t-accent); z-index: 6;
|
||||||
@@ -398,26 +516,68 @@ body::after {
|
|||||||
transform: rotate(45deg); margin-top: -2px;
|
transform: rotate(45deg); margin-top: -2px;
|
||||||
}
|
}
|
||||||
.card-dragging { opacity: 0.15; transform: scale(0.95); }
|
.card-dragging { opacity: 0.15; transform: scale(0.95); }
|
||||||
|
@keyframes card-remove {
|
||||||
|
0% { opacity:1; transform:scale(1); }
|
||||||
|
100% { opacity:0; transform:scale(0.85) translateY(8px); }
|
||||||
|
}
|
||||||
|
.card-removing {
|
||||||
|
animation: card-remove 0.25s ease-in forwards;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
/* Move-in-flight: card ghosted with a spinner overlay while the
|
||||||
|
* PATCH + reloadAll round-trip completes. The pseudo-elements paint
|
||||||
|
* a dim scrim and a centred spinning ring so the origin bucket
|
||||||
|
* clearly shows the card is "leaving". Removed by the next
|
||||||
|
* renderBoard() since the DOM is rebuilt from scratch. */
|
||||||
|
.board-card.card-moving {
|
||||||
|
opacity: 0.5;
|
||||||
|
pointer-events: none;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.board-card.card-moving::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute; inset: 0;
|
||||||
|
background: rgba(0, 0, 0, 0.25);
|
||||||
|
z-index: 3;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
.board-card.card-moving::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 50%; left: 50%;
|
||||||
|
width: 22px; height: 22px;
|
||||||
|
margin: -11px 0 0 -11px;
|
||||||
|
border: 2px solid rgba(255, 255, 255, 0.2);
|
||||||
|
border-top-color: var(--t-accent);
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: spin 0.8s linear infinite;
|
||||||
|
z-index: 4;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
.box-select {
|
.box-select {
|
||||||
position: absolute; border: 1px solid var(--t-accent); background: rgba(56, 189, 248, 0.08);
|
position: absolute; border: 1px solid var(--t-accent); background: rgba(56, 189, 248, 0.08);
|
||||||
pointer-events: none; z-index: 10;
|
pointer-events: none; z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Drop indicators — thick glowing bar */
|
/* Card drop cursor — single absolutely-positioned vertical line that
|
||||||
.card-drop-before::before,
|
lives inside #board (which is `position: relative`) and gets
|
||||||
.card-drop-after::after {
|
repositioned by the dragover handlers in `board.js`. Replaces the
|
||||||
content: '';
|
old `.card-drop-before::before` / `.card-drop-after::after` pseudo-
|
||||||
|
elements so the indicator is a real DOM node in the gap between cards
|
||||||
|
instead of a sliver glued to one card. The "before first card"
|
||||||
|
case works automatically: the first card's left-25% zone positions
|
||||||
|
the cursor at `card.offsetLeft - 6`, which sits in #board's left
|
||||||
|
padding and stays visible. */
|
||||||
|
#card-drop-cursor {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 8px;
|
|
||||||
bottom: 8px;
|
|
||||||
width: 4px;
|
width: 4px;
|
||||||
background: var(--t-accent);
|
background: var(--t-accent);
|
||||||
border-radius: 2px;
|
|
||||||
box-shadow: 0 0 12px var(--t-accent), 0 0 4px var(--t-accent);
|
box-shadow: 0 0 12px var(--t-accent), 0 0 4px var(--t-accent);
|
||||||
|
border-radius: 2px;
|
||||||
|
pointer-events: none;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
.card-drop-before::before { left: -6px; }
|
|
||||||
.card-drop-after::after { right: -6px; }
|
|
||||||
|
|
||||||
/* Group fan preview */
|
/* Group fan preview */
|
||||||
.group-fan {
|
.group-fan {
|
||||||
@@ -642,8 +802,211 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
}
|
}
|
||||||
.bucket-add.drag-over i,
|
.bucket-add.drag-over i,
|
||||||
.bucket-add.drag-over span { color: inherit !important; }
|
.bucket-add.drag-over span { color: inherit !important; }
|
||||||
.bucket-drop-left { border-left: 3px solid var(--t-accent) !important; }
|
/* Bucket reorder drop cursor — a single absolutely-positioned vertical
|
||||||
.bucket-drop-right { border-right: 3px solid var(--t-accent) !important; }
|
line that lives inside #bucket-bar and gets repositioned by the
|
||||||
|
dragover handler in `public/js/modules/buckets.js`. Showing the cursor
|
||||||
|
*between* tiles makes the insert point unambiguous next to the
|
||||||
|
super-bucket nest gesture (center 50% → nest, edges 25% → reorder). */
|
||||||
|
#bucket-drop-cursor {
|
||||||
|
position: absolute;
|
||||||
|
top: 4px;
|
||||||
|
bottom: 4px;
|
||||||
|
width: 3px;
|
||||||
|
background: var(--t-accent);
|
||||||
|
box-shadow: 0 0 6px color-mix(in srgb, var(--t-accent) 70%, transparent);
|
||||||
|
border-radius: 1px;
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 4;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
/* Drop-into-center highlight: target tile gets an outline that says
|
||||||
|
"release here to nest". Distinct from the insertion cursor so the
|
||||||
|
user can tell reorder vs. nest at a glance. */
|
||||||
|
.bucket-tab.bucket-nest-target {
|
||||||
|
outline: 2px dashed var(--t-accent) !important;
|
||||||
|
outline-offset: 1px;
|
||||||
|
background: color-mix(in srgb, var(--t-accent) 12%, transparent) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bucket bar: no visible scrollbar, soft edge fades when the row
|
||||||
|
overflows so the user knows there's more off-screen. Fade is
|
||||||
|
implemented via absolutely-positioned overlay pseudo-elements on
|
||||||
|
#bucket-row (parent) rather than mask-image on the bar itself,
|
||||||
|
because mask-image would also clip super-bucket popovers rendered
|
||||||
|
inside the bar. Overlays use pointer-events:none so clicks pass
|
||||||
|
through to the tabs underneath. */
|
||||||
|
#bucket-bar {
|
||||||
|
scrollbar-width: none;
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
scroll-behavior: smooth;
|
||||||
|
}
|
||||||
|
#bucket-bar::-webkit-scrollbar { display: none; }
|
||||||
|
|
||||||
|
#bucket-row::before,
|
||||||
|
#bucket-row::after {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
width: 32px;
|
||||||
|
pointer-events: none;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 0.15s;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
#bucket-row::before {
|
||||||
|
left: 24px; /* matches .px-6 = 24px on #bucket-row */
|
||||||
|
background: linear-gradient(to right, var(--t-bg) 0%, transparent 100%);
|
||||||
|
}
|
||||||
|
#bucket-row::after {
|
||||||
|
/* Stop at the right edge of #bucket-bar (before the toolbar
|
||||||
|
toggles). The toolbar is flex-0, bar is flex-1 — the easiest
|
||||||
|
way is to inset the overlay by the total width of the toolbar
|
||||||
|
via a right offset that the JS writes. Defaults to 24px (the
|
||||||
|
.px-6 pad) and the JS overrides with the real value. */
|
||||||
|
right: var(--bucket-row-right-inset, 24px);
|
||||||
|
background: linear-gradient(to left, var(--t-bg) 0%, transparent 100%);
|
||||||
|
}
|
||||||
|
#bucket-row.fade-left::before,
|
||||||
|
#bucket-row.fade-both::before { opacity: 1; }
|
||||||
|
#bucket-row.fade-right::after,
|
||||||
|
#bucket-row.fade-both::after { opacity: 1; }
|
||||||
|
|
||||||
|
/* Unread dot on the fixed `all` bucket-tab — appears when new cards
|
||||||
|
arrive while the user is viewing a different bucket. Cleared the
|
||||||
|
moment the user navigates back to all (renderBoard drains the
|
||||||
|
unseen set + pulses the cards). The dot sits *inside* the tab's
|
||||||
|
top-right corner because the parent #main-header has overflow:
|
||||||
|
hidden — anything positioned outside the tab gets clipped twice
|
||||||
|
(overflow-x-auto on bucket-bar + overflow:hidden on header). */
|
||||||
|
.bucket-tab.has-unread { position: relative; }
|
||||||
|
.bar-unread-dot {
|
||||||
|
position: absolute; top: 3px; right: 3px;
|
||||||
|
width: 7px; height: 7px; border-radius: 50%;
|
||||||
|
background: var(--t-danger);
|
||||||
|
box-shadow: 0 0 6px color-mix(in srgb, var(--t-danger) 75%, transparent);
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* "Look at me" pulse on cards that just arrived. Triggered by
|
||||||
|
board.js when the all view is shown with unseen cards in the set —
|
||||||
|
either because new cards arrived while the user was already on
|
||||||
|
all, or because the user just navigated to all and the unseen ids
|
||||||
|
accumulated since the last visit. 3 short accent flashes, then
|
||||||
|
the class is stripped automatically by setTimeout. */
|
||||||
|
@keyframes card-pulse-new {
|
||||||
|
0%, 100% {
|
||||||
|
box-shadow: var(--ui-shadow-card, none),
|
||||||
|
0 0 0 0 color-mix(in srgb, var(--t-accent) 80%, transparent);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
box-shadow: var(--ui-shadow-card, none),
|
||||||
|
0 0 18px 4px color-mix(in srgb, var(--t-accent) 75%, transparent),
|
||||||
|
inset 0 0 0 2px color-mix(in srgb, var(--t-accent) 70%, transparent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.board-card.card-pulse-new {
|
||||||
|
animation: card-pulse-new 0.8s ease-in-out 3;
|
||||||
|
z-index: 5;
|
||||||
|
}
|
||||||
|
/* Single pulse for cards the user just created themselves — subtler
|
||||||
|
than the triple-pulse for relay-synced cards so the user registers
|
||||||
|
"I made this" without the urgency of "someone else sent this". */
|
||||||
|
.board-card.card-pulse-local {
|
||||||
|
animation: card-pulse-new 0.8s ease-in-out 1;
|
||||||
|
z-index: 5;
|
||||||
|
}
|
||||||
|
/* Pin the cadence so anim-fast/anim-slow can't strobe it */
|
||||||
|
body.anim-fast .board-card.card-pulse-new,
|
||||||
|
body.anim-slow .board-card.card-pulse-new {
|
||||||
|
animation: card-pulse-new 0.8s ease-in-out 3 !important;
|
||||||
|
animation-duration: 0.8s !important;
|
||||||
|
}
|
||||||
|
body.anim-fast .board-card.card-pulse-local,
|
||||||
|
body.anim-slow .board-card.card-pulse-local {
|
||||||
|
animation: card-pulse-new 0.8s ease-in-out 1 !important;
|
||||||
|
animation-duration: 0.8s !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Super-bucket dropdown popover. Positioned via inline styles by
|
||||||
|
openSuperDropdown() in buckets.js. Lives on document.body (not
|
||||||
|
inside #bucket-bar) so it can escape the bar's overflow:auto. */
|
||||||
|
.super-caret {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
margin-left: 2px;
|
||||||
|
padding: 2px 4px;
|
||||||
|
border-radius: 3px;
|
||||||
|
opacity: 0.6;
|
||||||
|
transition: opacity 0.15s, background 0.15s;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.super-caret:hover {
|
||||||
|
opacity: 1;
|
||||||
|
background: color-mix(in srgb, var(--t-accent) 25%, transparent);
|
||||||
|
}
|
||||||
|
.bucket-tab.active .super-caret:hover {
|
||||||
|
background: rgba(0,0,0,0.25);
|
||||||
|
}
|
||||||
|
#bucket-super-popover {
|
||||||
|
z-index: 220;
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-modal);
|
||||||
|
box-shadow: var(--ui-shadow-modal, 0 10px 30px rgba(0,0,0,0.4));
|
||||||
|
padding: 4px;
|
||||||
|
min-width: 180px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Shortcut help table — table-fixed prevents column wobble when content
|
||||||
|
length varies between sections. kbd styling matches typical keyboard-cap
|
||||||
|
look (surface bg, border, mono font, tiny padding). */
|
||||||
|
/* Asset tab filters in the gallery/assets overlay header */
|
||||||
|
.gallery-tab { border-radius: var(--ui-radius-button, 0); }
|
||||||
|
.gallery-tab:hover { color: var(--t-accent); border-color: var(--t-accent); }
|
||||||
|
.gallery-tab.active { background: var(--t-accent); color: var(--t-bg); border-color: var(--t-accent); }
|
||||||
|
|
||||||
|
.shortcut-table { width:100%; table-layout:fixed; font-size:12px; border-collapse:collapse; }
|
||||||
|
.shortcut-table td { padding:4px 0; vertical-align:middle; color:var(--t-text); }
|
||||||
|
.shortcut-table td:first-child { width:48%; color:var(--t-dim); white-space:nowrap; font-size:11px; }
|
||||||
|
/* Keycap look: 3D-ish raised surface with bottom shadow simulating
|
||||||
|
depth, subtle gradient, rounded corners. Min-width so single-letter
|
||||||
|
keys don't look squished. The "+" separator between combo keys sits
|
||||||
|
outside <kbd> and inherits the dim color from the td. */
|
||||||
|
.shortcut-table kbd {
|
||||||
|
display:inline-block;
|
||||||
|
min-width:20px; text-align:center;
|
||||||
|
padding:3px 7px;
|
||||||
|
background: linear-gradient(180deg, color-mix(in srgb, var(--t-raised) 90%, white 10%), var(--t-bg));
|
||||||
|
border:1px solid var(--t-border);
|
||||||
|
border-bottom-width:2px;
|
||||||
|
border-radius:4px;
|
||||||
|
font-family:var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
font-size:10px;
|
||||||
|
color:var(--t-bright);
|
||||||
|
line-height:1.4;
|
||||||
|
box-shadow: 0 1px 0 color-mix(in srgb, var(--t-border) 80%, black 20%),
|
||||||
|
inset 0 1px 0 color-mix(in srgb, var(--t-raised) 60%, white 15%);
|
||||||
|
}
|
||||||
|
.shortcut-table .mouse {
|
||||||
|
font-family:var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size:9px; color:var(--t-dim);
|
||||||
|
}
|
||||||
|
/* The auto-generated shortcut help uses a 3-column grid on the
|
||||||
|
.shortcut-help-content div. Collapse to 2 then 1 on smaller screens. */
|
||||||
|
.shortcut-help-content { column-gap: 20px; }
|
||||||
|
.shortcut-help-content section { break-inside: avoid; margin-bottom: 16px; }
|
||||||
|
@media (max-width: 900px) {
|
||||||
|
.shortcut-help-content { grid-template-columns: 1fr 1fr !important; }
|
||||||
|
}
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.shortcut-help-content { grid-template-columns: 1fr !important; }
|
||||||
|
}
|
||||||
|
|
||||||
/* Tag chips */
|
/* Tag chips */
|
||||||
.tag-chip {
|
.tag-chip {
|
||||||
@@ -661,7 +1024,7 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
#tag-bar { border-top: 1px dashed color-mix(in srgb, var(--t-accent) 30%, transparent); }
|
#tag-bar { border-top: 1px dashed color-mix(in srgb, var(--t-accent) 30%, transparent); }
|
||||||
|
|
||||||
/* Toolbar */
|
/* Toolbar */
|
||||||
.toolbar-btn { color: var(--t-muted); padding: 4px 6px; border-radius: 3px; transition: color 0.1s, background 0.1s; cursor: pointer; background: none; border: none; font-family: inherit; }
|
.toolbar-btn { color: var(--t-muted); padding: 4px 6px; border-radius: var(--ui-radius-button); transition: color 0.1s, background 0.1s; cursor: pointer; background: none; border: none; font-family: inherit; }
|
||||||
.toolbar-btn:hover { color: var(--t-bright); background: var(--t-raised); }
|
.toolbar-btn:hover { color: var(--t-bright); background: var(--t-raised); }
|
||||||
|
|
||||||
/* Editor */
|
/* Editor */
|
||||||
@@ -678,6 +1041,7 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
.search-hit { scroll-margin: 8px; }
|
.search-hit { scroll-margin: 8px; }
|
||||||
.search-hit.active { background: var(--t-raised); }
|
.search-hit.active { background: var(--t-raised); }
|
||||||
.search-hit mark, #search-preview-content mark { background: none; color: var(--t-accent); font-weight: 700; }
|
.search-hit mark, #search-preview-content mark { background: none; color: var(--t-accent); font-weight: 700; }
|
||||||
|
#search-replace-toggle.active { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
|
||||||
/* Context menu */
|
/* Context menu */
|
||||||
#ctx-menu .ctx-item, #bucket-ctx .ctx-item {
|
#ctx-menu .ctx-item, #bucket-ctx .ctx-item {
|
||||||
@@ -795,17 +1159,18 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
margin-left: -1.5em !important;
|
margin-left: -1.5em !important;
|
||||||
display: flex !important;
|
display: flex !important;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
gap: 10px;
|
gap: 8px;
|
||||||
min-height: 28px;
|
min-height: 24px;
|
||||||
padding: 5px 0;
|
padding: 2px 0;
|
||||||
}
|
}
|
||||||
|
.todo-item p { margin: 0 !important; min-height: 0 !important; }
|
||||||
|
.todo-cb { margin-top: 2px; }
|
||||||
.todo-item { cursor: pointer; }
|
.todo-item { cursor: pointer; }
|
||||||
.todo-item:hover { background: color-mix(in srgb, var(--t-raised) 50%, transparent); }
|
.todo-item:hover { background: color-mix(in srgb, var(--t-raised) 50%, transparent); }
|
||||||
.todo-item.todo-done .todo-text { color: var(--t-dim); text-decoration: line-through; }
|
.todo-item.todo-done .todo-text { color: var(--t-dim); text-decoration: line-through; }
|
||||||
.todo-text { flex: 1; min-width: 0; line-height: 1.5; user-select: none; }
|
.todo-text { flex: 1; min-width: 0; line-height: 1.5; user-select: none; }
|
||||||
.todo-cb {
|
.todo-cb {
|
||||||
width: 18px; height: 18px; min-width: 18px;
|
width: 18px; height: 18px; min-width: 18px;
|
||||||
transform: translateY(-9px);
|
|
||||||
border: 2px solid var(--t-border); border-radius: 3px;
|
border: 2px solid var(--t-border); border-radius: 3px;
|
||||||
background: transparent; cursor: pointer;
|
background: transparent; cursor: pointer;
|
||||||
display: flex; align-items: center; justify-content: center;
|
display: flex; align-items: center; justify-content: center;
|
||||||
@@ -858,9 +1223,13 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
#board-preview-body.prose img,
|
#board-preview-body.prose img,
|
||||||
#board-preview-body .prose img {
|
#board-preview-body .prose img {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
width: auto;
|
|
||||||
height: auto;
|
height: auto;
|
||||||
}
|
}
|
||||||
|
#editor-preview .prose img:not([width]),
|
||||||
|
#board-preview-body.prose img:not([width]),
|
||||||
|
#board-preview-body .prose img:not([width]) {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
.prose table { border-collapse: collapse; width: 100%; margin: 0.8em 0; }
|
.prose table { border-collapse: collapse; width: 100%; margin: 0.8em 0; }
|
||||||
.prose th, .prose td { border: 1px solid var(--t-border); padding: 0.4em 0.8em; text-align: left; }
|
.prose th, .prose td { border: 1px solid var(--t-border); padding: 0.4em 0.8em; text-align: left; }
|
||||||
.prose th { background: var(--t-raised); color: var(--t-bright); font-weight: 600; }
|
.prose th { background: var(--t-raised); color: var(--t-bright); font-weight: 600; }
|
||||||
@@ -919,3 +1288,108 @@ body.detail-image-fs-open { overflow: hidden; }
|
|||||||
#detail-body .detail-reading-resize.resizing .detail-font-dragline::before {
|
#detail-body .detail-reading-resize.resizing .detail-font-dragline::before {
|
||||||
border-color: var(--t-accent);
|
border-color: var(--t-accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Remote-edit banner in the detail view.
|
||||||
|
Shown when a foreign sync replaced the card we're currently reading — the
|
||||||
|
user gets a manual Reload button instead of having the content change
|
||||||
|
under them mid-read. */
|
||||||
|
.detail-stale-banner {
|
||||||
|
display: flex; align-items: center; gap: 10px;
|
||||||
|
padding: 6px 12px;
|
||||||
|
background: color-mix(in srgb, var(--t-accent2) 10%, transparent);
|
||||||
|
border-bottom: 1px solid var(--t-accent2);
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--t-muted);
|
||||||
|
}
|
||||||
|
.detail-stale-banner i.ph-info { color: var(--t-accent2); flex-shrink: 0; font-size: 14px; }
|
||||||
|
.detail-stale-banner span { flex: 1; }
|
||||||
|
.detail-stale-banner button {
|
||||||
|
display: inline-flex; align-items: center; gap: 4px;
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
padding: 3px 8px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-accent2);
|
||||||
|
color: var(--t-accent2);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.detail-stale-banner button:hover { background: var(--t-accent2); color: var(--t-bg); }
|
||||||
|
.detail-stale-banner .detail-stale-dismiss { border-color: var(--t-border); color: var(--t-dim); padding: 3px 5px; }
|
||||||
|
.detail-stale-banner .detail-stale-dismiss:hover { border-color: var(--t-danger); color: var(--t-danger); background: transparent; }
|
||||||
|
|
||||||
|
/* Sync + autosync combo: the pair reads as one button.
|
||||||
|
- At rest: Sync has no right border, autosync has no left border —
|
||||||
|
only the outer rectangle remains.
|
||||||
|
- Hover Sync: the right border comes back in accent so Sync gets a
|
||||||
|
complete outline around itself.
|
||||||
|
- Hover autosync: no accent border at all — instead a background
|
||||||
|
fill so the pair doesn't end up with a mismatched half-outline. */
|
||||||
|
.header-sync-group { align-items: stretch; }
|
||||||
|
.header-sync-group > button:first-child {
|
||||||
|
border-right: 0 !important;
|
||||||
|
}
|
||||||
|
.header-sync-group > button:first-child:hover {
|
||||||
|
border-right: 1px solid var(--t-accent) !important;
|
||||||
|
}
|
||||||
|
.header-sync-group > button + button {
|
||||||
|
border-left: 0 !important;
|
||||||
|
align-self: stretch;
|
||||||
|
}
|
||||||
|
#header-autosync:hover {
|
||||||
|
background: var(--t-accent);
|
||||||
|
border-color: var(--t-accent) !important;
|
||||||
|
color: var(--t-bg) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Autosync toggle button.
|
||||||
|
Border stays neutral in both states — the dot carries the status
|
||||||
|
signal (accent + pulse when on, grey when off). Hover styling is
|
||||||
|
handled by the bg-fill rule further down. */
|
||||||
|
#header-autosync {
|
||||||
|
border-color: var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-autosync-dot {
|
||||||
|
display: inline-block;
|
||||||
|
width: 9px; height: 9px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--t-accent);
|
||||||
|
transition: background 0.15s, transform 0.2s;
|
||||||
|
}
|
||||||
|
#header-autosync[data-autosync="off"] .header-autosync-dot {
|
||||||
|
background: var(--t-dim);
|
||||||
|
box-shadow: none;
|
||||||
|
}
|
||||||
|
/* Hover: button fills with solid accent (matching the Sync button's
|
||||||
|
hover border color). Dot switches to the app background color so it
|
||||||
|
reads as a knockout against the fill. Pulsing keeps tracking real
|
||||||
|
status — when a sync fires during hover the ring still animates. */
|
||||||
|
#header-autosync:hover .header-autosync-dot {
|
||||||
|
background: var(--t-bg);
|
||||||
|
}
|
||||||
|
/* Pulse shadow is accent-colored too, which would be invisible against
|
||||||
|
the accent fill. Swap it to a bg-toned ring during hover so the
|
||||||
|
pulse stays visible. */
|
||||||
|
#header-autosync:hover .header-autosync-dot.pulsing {
|
||||||
|
animation: header-autosync-pulse-on-hover 0.9s ease-out 1;
|
||||||
|
}
|
||||||
|
@keyframes header-autosync-pulse-on-hover {
|
||||||
|
0% { box-shadow: 0 0 0 0 color-mix(in srgb, var(--t-bg) 75%, transparent); transform: scale(1); }
|
||||||
|
40% { transform: scale(1.4); }
|
||||||
|
100% { box-shadow: 0 0 0 10px color-mix(in srgb, var(--t-bg) 0%, transparent); transform: scale(1); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Burst pulse on each sync. JS adds `.pulsing` at the start of a sync
|
||||||
|
and removes it after the animation finishes. Tuned to be visible
|
||||||
|
against the button background — a generous ring that fades out. */
|
||||||
|
.header-autosync-dot.pulsing {
|
||||||
|
animation: header-autosync-pulse 0.9s ease-out 1;
|
||||||
|
}
|
||||||
|
@keyframes header-autosync-pulse {
|
||||||
|
0% { box-shadow: 0 0 0 0 color-mix(in srgb, var(--t-accent) 75%, transparent); transform: scale(1); }
|
||||||
|
40% { transform: scale(1.4); }
|
||||||
|
100% { box-shadow: 0 0 0 10px color-mix(in srgb, var(--t-accent) 0%, transparent); transform: scale(1); }
|
||||||
|
}
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
/*! tailwindcss v4.2.2 | MIT License | https://tailwindcss.com */
|
/*! tailwindcss v4.2.2 | MIT License | https://tailwindcss.com */
|
||||||
@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scale-z:1;--tw-rotate-x:initial;--tw-rotate-y:initial;--tw-rotate-z:initial;--tw-skew-x:initial;--tw-skew-y:initial;--tw-space-y-reverse:0;--tw-border-style:solid;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-outline-style:solid;--tw-blur:initial;--tw-brightness:initial;--tw-contrast:initial;--tw-grayscale:initial;--tw-hue-rotate:initial;--tw-invert:initial;--tw-opacity:initial;--tw-saturate:initial;--tw-sepia:initial;--tw-drop-shadow:initial;--tw-drop-shadow-color:initial;--tw-drop-shadow-alpha:100%;--tw-drop-shadow-size:initial;--tw-duration:initial;--tw-ease:initial}}}@layer theme{:root,:host{--font-sans:ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";--font-mono:"JetBrains Mono", monospace;--color-amber-400:oklch(82.8% .189 84.429);--color-green-400:oklch(79.2% .209 151.711);--color-black:#000;--color-white:#fff;--spacing:.25rem;--container-sm:24rem;--container-2xl:42rem;--container-3xl:48rem;--text-xs:.75rem;--text-xs--line-height:calc(1 / .75);--text-sm:.875rem;--text-sm--line-height:calc(1.25 / .875);--text-base:1rem;--text-base--line-height:calc(1.5 / 1);--text-lg:1.125rem;--text-lg--line-height:calc(1.75 / 1.125);--text-xl:1.25rem;--text-xl--line-height:calc(1.75 / 1.25);--text-2xl:1.5rem;--text-2xl--line-height:calc(2 / 1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25 / 1.875);--text-4xl:2.25rem;--text-4xl--line-height:calc(2.5 / 2.25);--text-5xl:3rem;--text-5xl--line-height:1;--font-weight-bold:700;--tracking-wider:.05em;--leading-relaxed:1.625;--radius-sm:.25rem;--ease-in-out:cubic-bezier(.4, 0, .2, 1);--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4, 0, .2, 1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono);--font-pixel:"Silkscreen", cursive;--color-t-bg:var(--t-bg);--color-t-surface:var(--t-surface);--color-t-raised:var(--t-raised);--color-t-border:var(--t-border);--color-t-dim:var(--t-dim);--color-t-muted:var(--t-muted);--color-t-text:var(--t-text);--color-t-bright:var(--t-bright);--color-t-accent:var(--t-accent);--color-t-accent2:var(--t-accent2);--color-t-danger:var(--t-danger)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolderLine truncated
|
@layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-translate-x:0;--tw-translate-y:0;--tw-translate-z:0;--tw-scale-x:1;--tw-scale-y:1;--tw-scale-z:1;--tw-rotate-x:initial;--tw-rotate-y:initial;--tw-rotate-z:initial;--tw-skew-x:initial;--tw-skew-y:initial;--tw-space-y-reverse:0;--tw-divide-y-reverse:0;--tw-border-style:solid;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000;--tw-outline-style:solid;--tw-blur:initial;--tw-brightness:initial;--tw-contrast:initial;--tw-grayscale:initial;--tw-hue-rotate:initial;--tw-invert:initial;--tw-opacity:initial;--tw-saturate:initial;--tw-sepia:initial;--tw-drop-shadow:initial;--tw-drop-shadow-color:initial;--tw-drop-shadow-alpha:100%;--tw-drop-shadow-size:initial;--tw-backdrop-blur:initial;--tw-backdrop-brightness:initial;--tw-backdrop-contrast:initial;--tw-backdrop-grayscale:initial;--tw-backdrop-hue-rotate:initial;--tw-backdrop-invert:initial;--tw-backdrop-opacity:initial;--tw-backdrop-saturate:initial;--tw-backdrop-sepia:initial;--tw-duration:initial;--tw-ease:initial}}}@layer theme{:root,:host{--font-sans:ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";--font-mono:"JetBrains Mono", monospace;--color-amber-400:oklch(82.8% .189 84.429);--color-amber-500:oklch(76.9% .188 70.08);--color-green-400:oklch(79.2% .209 151.711);--color-black:#000;--color-white:#fff;--spacing:.25rem;--container-sm:24rem;--container-md:28rem;--container-2xl:42rem;--container-3xl:48rem;--container-4xl:56rem;--text-xs:.75rem;--text-xs--line-height:calc(1 / .75);--text-sm:.875rem;--text-sm--line-height:calc(1.25 / .875);--text-base:1rem;--text-base--line-height:calc(1.5 / 1);--text-lg:1.125rem;--text-lg--line-height:calc(1.75 / 1.125);--text-xl:1.25rem;--text-xl--line-height:calc(1.75 / 1.25);--text-2xl:1.5rem;--text-2xl--line-height:calc(2 / 1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25 / 1.875);--text-4xl:2.25rem;--text-4xl--line-height:calc(2.5 / 2.25);--text-5xl:3rem;--text-5xl--line-height:1;--text-6xl:3.75rem;--text-6xl--line-height:1;--font-weight-bold:700;--tracking-wider:.05em;--leading-snug:1.375;--leading-relaxed:1.625;--radius-sm:.25rem;--radius-lg:.5rem;--ease-in-out:cubic-bezier(.4, 0, .2, 1);--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4, 0, .2, 1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono);--font-pixel:"Silkscreen", cursive;--color-t-bg:var(--t-bg);--color-t-surface:var(--t-surface);--color-t-raised:var(--t-raised);--color-t-border:var(--t-border);--color-t-dim:var(--t-dim);--color-t-muted:var(--t-muted);--color-t-text:var(--t-text);--color-t-bright:var(--t-bright);--color-t-accent:var(--t-accent);--color-t-accent2:var(--t-accent2);--color-t-danger:var(--t-danger)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-widLine truncated
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="60.122112mm"
|
||||||
|
height="60.122108mm"
|
||||||
|
viewBox="0 0 60.122112 60.122108"
|
||||||
|
version="1.1"
|
||||||
|
id="svg1"
|
||||||
|
xml:space="preserve"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||||
|
id="defs1" /><g
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(-8.2147047,-118.8156)"><rect
|
||||||
|
style="fill:#06080f;fill-opacity:1;stroke-width:1.5875"
|
||||||
|
id="rect4"
|
||||||
|
width="60.122112"
|
||||||
|
height="60.122112"
|
||||||
|
x="8.2147045"
|
||||||
|
y="118.81558" /><path
|
||||||
|
id="rect1"
|
||||||
|
style="fill:#15bff6;fill-opacity:1;stroke-width:1.5875"
|
||||||
|
d="m 41.162784,130.18519 v 37.02565 h 20.35844 v -37.02565 z m -25.209835,4.34547 v 23.45335 h 5.000729 v -9.22631 h 8.928654 v 9.22631 h 5.000212 v -23.45335 h -5.000212 v 9.22683 h -8.928654 v -9.22683 z" /></g></svg>
|
||||||
|
After Width: | Height: | Size: 926 B |
+786
-181
File diff suppressed because it is too large.
Load diff
+362
-77
@@ -6,17 +6,20 @@ import { api, setCsrf, getCsrf } from './modules/util.js';
|
|||||||
import { state, getGroupCards } from './modules/state.js';
|
import { state, getGroupCards } from './modules/state.js';
|
||||||
import { showDialog, isDialogOpen } from './modules/dialog.js';
|
import { showDialog, isDialogOpen } from './modules/dialog.js';
|
||||||
import './modules/theme.js';
|
import './modules/theme.js';
|
||||||
import { loadBuckets, renderTagBar } from './modules/buckets.js';
|
import { loadBuckets, renderTagBar, activateBucket } from './modules/buckets.js';
|
||||||
import { renderBoard, updateSortUI, getSelectedIds, clearSelection } from './modules/board.js';
|
import { renderBoard, updateSortUI, getSelectedIds, clearSelection } from './modules/board.js';
|
||||||
import { openDetail, closeDetail, showDetailCard, ungroupCard } from './modules/detail.js';
|
import { openDetail, closeDetail, showDetailCard, ungroupCard } from './modules/detail.js';
|
||||||
import { openModal, closeModal, saveCard, saveOnly } from './modules/editor.js';
|
import { openModal, closeModal, saveCard, saveOnly, openFindBar } from './modules/editor.js';
|
||||||
import { openSearch, closeSearch } from './modules/search.js';
|
import { openSearch, closeSearch } from './modules/search.js';
|
||||||
import { showContextMenu } from './modules/context-menu.js';
|
import { showContextMenu } from './modules/context-menu.js';
|
||||||
import { undo, canUndo } from './modules/undo.js';
|
import { undo, canUndo } from './modules/undo.js';
|
||||||
|
import './modules/tooltip.js';
|
||||||
|
import { registerShortcut, guards, renderShortcutHelp } from './modules/shortcuts.js';
|
||||||
import { openGallery, closeGallery } from './modules/gallery.js';
|
import { openGallery, closeGallery } from './modules/gallery.js';
|
||||||
import { refreshTasksView, openTasks, closeTasks } from './modules/tasks.js';
|
import { refreshTasksView, openTasks, closeTasks } from './modules/tasks.js';
|
||||||
import { openCalendar, closeCalendar, refreshCalendar } from './modules/calendar.js';
|
import { openCalendar, closeCalendar, refreshCalendar } from './modules/calendar.js';
|
||||||
import { startBackgroundSync, triggerSync, loadSettings as loadCaldavSettings, loadRelaySettings } from './modules/caldav.js';
|
import { loadSettings as loadCaldavSettings } from './modules/caldav.js';
|
||||||
|
import { startBackgroundSync, triggerSync, loadRelaySettings } from './modules/sync.js';
|
||||||
import { openPluginSettings } from './modules/plugin-settings.js';
|
import { openPluginSettings } from './modules/plugin-settings.js';
|
||||||
|
|
||||||
// ── Global API (for inline onclick handlers and cross-module calls) ──
|
// ── Global API (for inline onclick handlers and cross-module calls) ──
|
||||||
@@ -38,7 +41,21 @@ window._ungroupCard = ungroupCard;
|
|||||||
window._getSelectedIds = getSelectedIds;
|
window._getSelectedIds = getSelectedIds;
|
||||||
window._clearSelection = clearSelection;
|
window._clearSelection = clearSelection;
|
||||||
window._refreshTasks = refreshTasksView;
|
window._refreshTasks = refreshTasksView;
|
||||||
window._reloadAll = async () => { await loadBuckets(); state.cards = await api('api/cards') || []; renderBoard(); refreshCalendar(); };
|
window.openFindBar = openFindBar;
|
||||||
|
window._reloadAll = async () => {
|
||||||
|
await loadBuckets();
|
||||||
|
state.cards = await api('api/cards') || [];
|
||||||
|
state.cardsLoaded = true;
|
||||||
|
renderBoard();
|
||||||
|
refreshCalendar();
|
||||||
|
// Let plugins / modules react to a full card reload (detail view checks
|
||||||
|
// whether the currently viewed card is now stale; collab-buckets uses it
|
||||||
|
// to refresh its decorators).
|
||||||
|
window.hyprcrd?.hooks?.emit?.('cards.reloaded');
|
||||||
|
};
|
||||||
|
// Exposed for plugins that need to read the shared state (e.g. collab-buckets
|
||||||
|
// reads `state.buckets` in its MutationObserver to find collab_uid mapping).
|
||||||
|
window.state = state;
|
||||||
window._extractToCard = async (text) => {
|
window._extractToCard = async (text) => {
|
||||||
if (!text?.trim()) return;
|
if (!text?.trim()) return;
|
||||||
const lines = text.trim().split('\n');
|
const lines = text.trim().split('\n');
|
||||||
@@ -70,10 +87,14 @@ function setCachedCards(cards) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function loadCards() {
|
async function loadCards() {
|
||||||
// Phase 0: Show cached cards instantly (from previous session)
|
// Phase 0: Show cached cards instantly (from previous session).
|
||||||
|
// A hit here is enough to flip cardsLoaded — fresh meta will
|
||||||
|
// overwrite state.cards a moment later, but the spinner→content
|
||||||
|
// transition already happened.
|
||||||
const cached = getCachedCards();
|
const cached = getCachedCards();
|
||||||
if (cached.length) {
|
if (cached.length) {
|
||||||
state.cards = cached.map(c => ({ ...c, body: null }));
|
state.cards = cached.map(c => ({ ...c, body: null }));
|
||||||
|
state.cardsLoaded = true;
|
||||||
updateSortUI();
|
updateSortUI();
|
||||||
renderBoard();
|
renderBoard();
|
||||||
}
|
}
|
||||||
@@ -81,16 +102,20 @@ async function loadCards() {
|
|||||||
// Phase 1: Load metadata → update board with fresh titles/tags/dates
|
// Phase 1: Load metadata → update board with fresh titles/tags/dates
|
||||||
const meta = await api('api/cards/meta');
|
const meta = await api('api/cards/meta');
|
||||||
if (!meta) return;
|
if (!meta) return;
|
||||||
|
state.cardsLoaded = true;
|
||||||
state.cards = meta.map(c => ({ ...c, body: null }));
|
state.cards = meta.map(c => ({ ...c, body: null }));
|
||||||
setCachedCards(meta);
|
setCachedCards(meta);
|
||||||
updateSortUI();
|
updateSortUI();
|
||||||
renderBoard();
|
renderBoard();
|
||||||
|
|
||||||
// Phase 2: Load full cards in batches → replace spinners with content
|
// Phase 2: Load full card bodies. One fetch up to the ID cap — with
|
||||||
const batchSize = 25;
|
// the /api/cards(?ids=) endpoint now indexed on cards.position +
|
||||||
for (let i = 0; i < meta.length; i += batchSize) {
|
// created_at a single big batch is faster than many small ones, and
|
||||||
const batch = meta.slice(i, i + batchSize);
|
// shorter perceived spinner time matters more than memory. Fall back
|
||||||
const ids = batch.map(c => c.id).join(',');
|
// to smaller batches only if the URL would blow past ~2000 chars.
|
||||||
|
const IDS_MAX_PER_FETCH = 500;
|
||||||
|
for (let i = 0; i < meta.length; i += IDS_MAX_PER_FETCH) {
|
||||||
|
const ids = meta.slice(i, i + IDS_MAX_PER_FETCH).map(c => c.id).join(',');
|
||||||
const full = await api('api/cards?ids=' + ids);
|
const full = await api('api/cards?ids=' + ids);
|
||||||
if (!full) continue;
|
if (!full) continue;
|
||||||
for (const card of full) {
|
for (const card of full) {
|
||||||
@@ -109,10 +134,13 @@ function closeHelp() { helpOverlay?.classList.remove('open'); }
|
|||||||
document.getElementById('help-btn')?.addEventListener('click', openHelp);
|
document.getElementById('help-btn')?.addEventListener('click', openHelp);
|
||||||
document.getElementById('help-close')?.addEventListener('click', closeHelp);
|
document.getElementById('help-close')?.addEventListener('click', closeHelp);
|
||||||
helpOverlay?.addEventListener('click', e => { if (e.target === helpOverlay) closeHelp(); });
|
helpOverlay?.addEventListener('click', e => { if (e.target === helpOverlay) closeHelp(); });
|
||||||
document.addEventListener('keydown', e => {
|
|
||||||
if (e.key === 'F1') { e.preventDefault(); helpOverlay?.classList.contains('open') ? closeHelp() : openHelp(); }
|
|
||||||
});
|
|
||||||
|
|
||||||
|
const shortcutsOverlay = document.getElementById('shortcuts');
|
||||||
|
function openShortcuts() { shortcutsOverlay?.classList.add('open'); }
|
||||||
|
function closeShortcuts() { shortcutsOverlay?.classList.remove('open'); }
|
||||||
|
document.getElementById('shortcuts-btn')?.addEventListener('click', openShortcuts);
|
||||||
|
document.getElementById('shortcuts-close')?.addEventListener('click', closeShortcuts);
|
||||||
|
shortcutsOverlay?.addEventListener('click', e => { if (e.target === shortcutsOverlay) closeShortcuts(); });
|
||||||
// ── Export / Import ──
|
// ── Export / Import ──
|
||||||
|
|
||||||
document.getElementById('export-btn')?.addEventListener('click', () => { window.location.href = 'api/export'; });
|
document.getElementById('export-btn')?.addEventListener('click', () => { window.location.href = 'api/export'; });
|
||||||
@@ -135,10 +163,14 @@ importFile?.addEventListener('change', async e => {
|
|||||||
try {
|
try {
|
||||||
const url = mode ? 'api/import?merge=1' : 'api/import';
|
const url = mode ? 'api/import?merge=1' : 'api/import';
|
||||||
const res = await fetch(url, { method: 'POST', body: form, headers: { 'X-CSRF-Token': getCsrf() } });
|
const res = await fetch(url, { method: 'POST', body: form, headers: { 'X-CSRF-Token': getCsrf() } });
|
||||||
const data = JSON.parse(await res.text());
|
const text = await res.text();
|
||||||
|
if (!res.ok) throw new Error(text || `HTTP ${res.status}`);
|
||||||
|
const data = JSON.parse(text);
|
||||||
if (data.error) throw new Error(data.error);
|
if (data.error) throw new Error(data.error);
|
||||||
await loadBuckets(); state.cards = await api('api/cards'); renderBoard();
|
await loadBuckets(); state.cards = await api('api/cards'); state.cardsLoaded = true; renderBoard();
|
||||||
} catch {}
|
} catch (err) {
|
||||||
|
await showDialog({ title: 'import failed', message: err.message || 'Unknown error', danger: true, okLabel: 'OK', cancelLabel: '' });
|
||||||
|
}
|
||||||
e.target.value = '';
|
e.target.value = '';
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -151,31 +183,56 @@ document.getElementById('logout-btn')?.addEventListener('click', async () => {
|
|||||||
location.reload();
|
location.reload();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Re-usable login prompt loop. Shared between the boot-time auth check
|
||||||
|
// and the 401-driven re-auth path (session expiry while the UI is open).
|
||||||
|
// Concurrent callers collapse onto a single dialog via reauthPromise so a
|
||||||
|
// wave of background polls doesn't stack up N prompts.
|
||||||
|
let reauthPromise = null;
|
||||||
|
async function promptLogin(message = '') {
|
||||||
|
if (reauthPromise) return reauthPromise;
|
||||||
|
reauthPromise = (async () => {
|
||||||
|
while (true) {
|
||||||
|
const pw = await showDialog({ title: 'login', message, input: 'password', placeholder: '> password...', okLabel: 'Login', cancelLabel: '' });
|
||||||
|
if (!pw) continue;
|
||||||
|
const r = await fetch('api/auth/login', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ password: pw }) });
|
||||||
|
const d = await r.json();
|
||||||
|
if (d.ok) {
|
||||||
|
if (d.csrf) { setCsrf(d.csrf); window.hyprcrd?.util?.setCsrf?.(d.csrf); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// wrong password — loop and re-prompt
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
try { await reauthPromise; } finally { reauthPromise = null; }
|
||||||
|
}
|
||||||
|
// Expose for the api() helpers so a 401 from any fetch triggers the same
|
||||||
|
// dialog + CSRF refresh flow.
|
||||||
|
window._reauth = () => promptLogin('Session expired — sign in to continue.');
|
||||||
|
|
||||||
async function checkAuth() {
|
async function checkAuth() {
|
||||||
const res = await fetch('api/auth/status');
|
const res = await fetch('api/auth/status');
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (data.csrf) { setCsrf(data.csrf); window.hyprcrd?.util?.setCsrf?.(data.csrf); }
|
if (data.csrf) { setCsrf(data.csrf); window.hyprcrd?.util?.setCsrf?.(data.csrf); }
|
||||||
|
// Refresh version-displaying spans from the live API response so the
|
||||||
|
// GUI doesn't show a stale APP_VERSION when the PHP page is cached.
|
||||||
|
if (data.version) {
|
||||||
|
for (const el of document.querySelectorAll('[data-app-version]')) {
|
||||||
|
el.textContent = 'v' + data.version;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (data.setup) {
|
if (data.setup) {
|
||||||
let pw = null;
|
let pw = null;
|
||||||
while (!pw || pw.length < 4) {
|
while (!pw || pw.length < 10) {
|
||||||
pw = await showDialog({ title: 'setup', message: 'Welcome to hyprcrd. Set a password:', input: 'password', placeholder: '> password (min. 4 chars)...', okLabel: 'Set', cancelLabel: '' });
|
pw = await showDialog({ title: 'setup', message: 'Welcome to hyprcrd. Set a password:', input: 'password', placeholder: '> password (min. 10 chars)...', okLabel: 'Set', cancelLabel: '' });
|
||||||
if (pw && pw.length < 4) pw = null;
|
if (pw && pw.length < 10) pw = null;
|
||||||
}
|
}
|
||||||
const r = await fetch('api/auth/setup', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ password: pw }) });
|
const r = await fetch('api/auth/setup', { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': data.csrf || '' }, body: JSON.stringify({ password: pw }) });
|
||||||
const d = await r.json();
|
const d = await r.json();
|
||||||
if (d.error) { location.reload(); return; }
|
if (d.error) { location.reload(); return; }
|
||||||
if (d.csrf) { setCsrf(d.csrf); window.hyprcrd?.util?.setCsrf?.(d.csrf); }
|
if (d.csrf) { setCsrf(d.csrf); window.hyprcrd?.util?.setCsrf?.(d.csrf); }
|
||||||
} else if (!data.logged_in) {
|
} else if (!data.logged_in) {
|
||||||
let ok = false;
|
await promptLogin();
|
||||||
while (!ok) {
|
|
||||||
const pw = await showDialog({ title: 'login', message: '', input: 'password', placeholder: '> password...', okLabel: 'Login', cancelLabel: '' });
|
|
||||||
if (!pw) continue;
|
|
||||||
const r = await fetch('api/auth/login', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ password: pw }) });
|
|
||||||
const d = await r.json();
|
|
||||||
if (d.ok) { ok = true; if (d.csrf) { setCsrf(d.csrf); window.hyprcrd?.util?.setCsrf?.(d.csrf); } }
|
|
||||||
else { /* failed login: caller will retry */ }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
loadBuckets();
|
loadBuckets();
|
||||||
@@ -183,56 +240,187 @@ async function checkAuth() {
|
|||||||
startBackgroundSync();
|
startBackgroundSync();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Global keyboard ──
|
// ── Keyboard shortcuts (central registry) ──
|
||||||
|
//
|
||||||
|
// All document-level shortcuts are registered here via registerShortcut().
|
||||||
|
// The dispatcher in shortcuts.js handles key matching, guards, and
|
||||||
|
// priority ordering. Element-specific shortcuts (editor textarea, search
|
||||||
|
// input, canvas, dialog) stay on their respective DOM elements.
|
||||||
|
|
||||||
document.addEventListener('keydown', e => {
|
const { board: gBoard } = guards;
|
||||||
const modal = document.getElementById('modal');
|
|
||||||
const detail = document.getElementById('detail');
|
|
||||||
const search = document.getElementById('search');
|
|
||||||
const tasks = document.getElementById('tasks');
|
|
||||||
if (isDialogOpen()) return;
|
|
||||||
|
|
||||||
if (e.key === 'k' && (e.ctrlKey || e.metaKey)) { e.preventDefault(); search.classList.contains('open') ? closeSearch() : openSearch(); return; }
|
// — Escape chain (highest priority first) —
|
||||||
if (e.key === 'n' && (e.ctrlKey || e.metaKey) && !e.shiftKey) {
|
registerShortcut({ key: 'Escape', priority: 100, guard: () => !isDialogOpen() && !document.getElementById('quick-capture').classList.contains('hidden'), section: 'global', label: 'close quick capture', hidden: true, handler: () => { const qc = document.getElementById('quick-capture'); qc.classList.add('hidden'); document.getElementById('quick-capture-input').value = ''; } });
|
||||||
e.preventDefault();
|
registerShortcut({ key: 'Escape', priority: 90, guard: () => !isDialogOpen() && guards.isOpen('detail'), section: 'global', label: 'close detail', hidden: true, handler: () => { if (document.getElementById('detail')?.classList.contains('zen')) { document.getElementById('detail-zen')?.click(); return; } closeDetail(); } });
|
||||||
const qc = document.getElementById('quick-capture');
|
registerShortcut({ key: 'z', guard: () => !isDialogOpen() && guards.isOpen('detail'), section: 'detail', keys: '<kbd>Z</kbd>', label: 'toggle zen mode', handler: () => document.getElementById('detail-zen')?.click() });
|
||||||
const qci = document.getElementById('quick-capture-input');
|
registerShortcut({ key: 'Escape', priority: 80, guard: () => !isDialogOpen() && guards.isOpen('modal'), section: 'global', label: 'close editor', hidden: true, handler: () => closeModal() });
|
||||||
if (qc.classList.contains('hidden')) { qc.classList.remove('hidden'); qci.focus(); }
|
registerShortcut({ key: 'Escape', priority: 70, guard: () => !isDialogOpen() && guards.isOpen('search'), section: 'global', label: 'close search', hidden: true, handler: () => closeSearch() });
|
||||||
else { qc.classList.add('hidden'); qci.value = ''; }
|
registerShortcut({ key: 'Escape', priority: 60, guard: () => !isDialogOpen() && guards.isOpen('tasks'), section: 'global', label: 'close tasks', hidden: true, handler: () => closeTasks() });
|
||||||
return;
|
registerShortcut({ key: 'Escape', priority: 50, guard: () => !isDialogOpen() && guards.isOpen('gallery'), section: 'global', label: 'close gallery', hidden: true, handler: () => closeGallery() });
|
||||||
}
|
registerShortcut({ key: 'Escape', priority: 40, guard: () => !isDialogOpen() && guards.isOpen('calendar'), section: 'global', label: 'close calendar', hidden: true, handler: () => closeCalendar() });
|
||||||
if (e.key === 'Escape') {
|
registerShortcut({ key: 'Escape', priority: 30, guard: () => !isDialogOpen() && guards.isOpen('shortcuts'), section: 'global', label: 'close shortcuts', hidden: true, handler: () => closeShortcuts() });
|
||||||
const qc = document.getElementById('quick-capture');
|
registerShortcut({ key: 'Escape', priority: 20, guard: () => !isDialogOpen() && guards.isOpen('help'), section: 'global', label: 'close help', hidden: true, handler: () => closeHelp() });
|
||||||
if (!qc.classList.contains('hidden')) { qc.classList.add('hidden'); document.getElementById('quick-capture-input').value = ''; return; }
|
// Visible Escape entry for the help screen
|
||||||
if (detail.classList.contains('open')) {
|
registerShortcut({ key: 'Escape', priority: -1, guard: () => false, section: 'global', keys: '<kbd>Esc</kbd>', label: 'close any overlay' });
|
||||||
// If the user chose "exit zen first", ESC leaves zen mode before closing the card.
|
|
||||||
const escAction = localStorage.getItem('hyprcrd-esc-action') || 'close';
|
|
||||||
if (escAction === 'exitZen' && detail.classList.contains('zen')) {
|
|
||||||
document.getElementById('detail-zen')?.click();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
closeDetail();
|
|
||||||
}
|
|
||||||
else if (modal.classList.contains('open')) closeModal();
|
|
||||||
else if (search.classList.contains('open')) closeSearch();
|
|
||||||
else if (tasks?.classList.contains('open')) closeTasks();
|
|
||||||
else if (document.getElementById('gallery')?.classList.contains('open')) closeGallery();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (e.key === 's' && (e.ctrlKey || e.metaKey) && modal.classList.contains('open')) { e.preventDefault(); e.shiftKey ? saveCard() : saveOnly(); return; }
|
|
||||||
if (e.key === 'z' && (e.ctrlKey || e.metaKey) && !modal.classList.contains('open') && canUndo()) { e.preventDefault(); undo(); return; }
|
|
||||||
if (e.key === '/' && ![modal, detail, search, tasks].some(el => el?.classList.contains('open')) && document.activeElement === document.body) { e.preventDefault(); openSearch(); }
|
|
||||||
|
|
||||||
// Arrow keys navigate group in detail view
|
// — Global (work everywhere unless dialog is open) —
|
||||||
if ((e.key === 'ArrowLeft' || e.key === 'ArrowRight') && detail.classList.contains('open') && state.viewingCard) {
|
registerShortcut({ key: 'k', ctrl: true, guard: () => !isDialogOpen(), section: 'global', keys: '<kbd>⌃</kbd> <kbd>K</kbd>', label: 'search', handler: () => { const s = document.getElementById('search'); s?.classList.contains('open') ? closeSearch() : openSearch(); } });
|
||||||
const gc = getGroupCards(state.viewingCard);
|
registerShortcut({ key: 'n', ctrl: true, guard: () => !isDialogOpen(), section: 'global', keys: '<kbd>⌃</kbd> <kbd>N</kbd>', label: 'quick capture (in bucket)', handler: () => { const qc = document.getElementById('quick-capture'); const qci = document.getElementById('quick-capture-input'); if (qc.classList.contains('hidden')) { qc.classList.remove('hidden'); qci.focus(); } else { qc.classList.add('hidden'); qci.value = ''; } } });
|
||||||
if (!gc || gc.length < 2) return;
|
registerShortcut({ key: 'z', ctrl: true, guard: () => !isDialogOpen() && !guards.isOpen('modal') && canUndo(), section: 'global', keys: '<kbd>⌃</kbd> <kbd>Z</kbd>', label: 'undo', handler: () => undo() });
|
||||||
const idx = gc.findIndex(c => c.id == state.viewingCard.id);
|
registerShortcut({ key: 'F1', guard: () => !isDialogOpen(), section: 'global', keys: '<kbd>F1</kbd>', label: 'help', handler: () => helpOverlay?.classList.contains('open') ? closeHelp() : openHelp() });
|
||||||
if (idx === -1) return;
|
registerShortcut({ key: '?', guard: () => !isDialogOpen() && guards.bodyFocused(), section: 'global', keys: '<kbd>?</kbd>', label: 'this screen', handler: () => shortcutsOverlay?.classList.contains('open') ? closeShortcuts() : openShortcuts() });
|
||||||
e.preventDefault();
|
|
||||||
showDetailCard((e.key === 'ArrowRight' ? gc[(idx + 1) % gc.length] : gc[(idx - 1 + gc.length) % gc.length]).id);
|
// — Editor (modal open) —
|
||||||
|
registerShortcut({ key: 's', ctrl: true, guard: () => !isDialogOpen() && guards.isOpen('modal'), section: 'editor', keys: '<kbd>⌃</kbd> <kbd>S</kbd>', label: 'save', handler: () => saveOnly() });
|
||||||
|
registerShortcut({ key: 's', ctrl: true, shift: true, guard: () => !isDialogOpen() && guards.isOpen('modal'), section: 'editor', keys: '<kbd>⌃</kbd> <kbd>⇧</kbd> <kbd>S</kbd>', label: 'save + close', handler: () => saveCard() });
|
||||||
|
registerShortcut({ key: 'Enter', ctrl: true, guard: () => !isDialogOpen() && guards.isOpen('modal'), section: 'editor', keys: '<kbd>⌃</kbd> <kbd>↵</kbd>', label: 'save + close', handler: () => saveCard() });
|
||||||
|
// Editor element-level shortcuts listed for help screen only (handled by editor.js)
|
||||||
|
registerShortcut({ key: 'Tab', guard: () => false, section: 'editor', keys: '<kbd>⇥</kbd>', label: 'indent / title→body' });
|
||||||
|
registerShortcut({ key: 'ArrowUp', guard: () => false, section: 'editor', keys: '<kbd>Alt</kbd> <kbd>↑</kbd> <kbd>↓</kbd>', label: 'move line' });
|
||||||
|
registerShortcut({ key: 'ArrowUp', guard: () => false, section: 'editor', keys: '<kbd>⇧</kbd> <kbd>Alt</kbd> <kbd>↑</kbd> <kbd>↓</kbd>', label: 'duplicate line' });
|
||||||
|
registerShortcut({ key: 'Enter', guard: () => false, section: 'editor', keys: '<kbd>↵</kbd>', label: 'auto-continue list' });
|
||||||
|
registerShortcut({ key: '[', guard: () => false, section: 'editor', keys: '<kbd>[</kbd><kbd>[</kbd>', label: 'link autocomplete' });
|
||||||
|
registerShortcut({ key: '#', guard: () => false, section: 'editor', keys: '<kbd>#</kbd>', label: 'tag autocomplete' });
|
||||||
|
registerShortcut({ key: '?', guard: () => false, section: 'editor', keys: '<kbd>?</kbd><em>snippet</em>', label: 'snippet expand' });
|
||||||
|
registerShortcut({ key: 'h', guard: () => false, section: 'editor', keys: '<kbd>⌃</kbd> <kbd>H</kbd>', label: 'find + replace' });
|
||||||
|
registerShortcut({ key: 'f', guard: () => false, section: 'editor', keys: '<kbd>⌃</kbd> <kbd>F</kbd>', label: 'find' });
|
||||||
|
registerShortcut({ key: 'H', ctrl: true, shift: true, guard: () => !isDialogOpen() && !guards.isOpen('modal'), section: 'global', keys: '<kbd>⌃</kbd> <kbd>⇧</kbd> <kbd>H</kbd>', label: 'find + replace across cards', handler: () => openSearch({ replace: true }) });
|
||||||
|
|
||||||
|
// — Detail view —
|
||||||
|
registerShortcut({ match: (e) => (e.key === 'ArrowLeft' || e.key === 'ArrowRight') && !e.ctrlKey && guards.isOpen('detail') && !!state.viewingCard, priority: 10, section: 'board + detail', keys: '<kbd>←</kbd> <kbd>→</kbd> <span class="mouse">in preview</span>', label: 'group prev / next', handler: (e) => {
|
||||||
|
const gc = getGroupCards(state.viewingCard);
|
||||||
|
if (!gc || gc.length < 2) return;
|
||||||
|
const idx = gc.findIndex(c => c.id == state.viewingCard.id);
|
||||||
|
if (idx === -1) return;
|
||||||
|
showDetailCard((e.key === 'ArrowRight' ? gc[(idx + 1) % gc.length] : gc[(idx - 1 + gc.length) % gc.length]).id);
|
||||||
|
}});
|
||||||
|
registerShortcut({ key: 'Enter', guard: () => !isDialogOpen() && guards.isOpen('detail') && !!state.viewingCard, priority: 10, section: 'board + detail', keys: '<kbd>↵</kbd> <span class="mouse">in preview</span>', label: '→ editor', handler: () => { const card = state.viewingCard; closeDetail(); openModal(card); } });
|
||||||
|
|
||||||
|
// — Board navigation (body focus, no overlay) —
|
||||||
|
registerShortcut({ key: 'a', guard: gBoard, section: 'navigation', keys: '<kbd>A</kbd>', label: 'all cards', handler: () => activateBucket('all') });
|
||||||
|
registerShortcut({ key: 'f', guard: gBoard, section: 'navigation', keys: '<kbd>F</kbd>', label: 'favorites', handler: () => activateBucket('favorites') });
|
||||||
|
registerShortcut({ key: 'n', guard: gBoard, section: 'navigation', keys: '<kbd>N</kbd>', label: 'new card', handler: () => openModal(null) });
|
||||||
|
registerShortcut({ key: 'j', guard: gBoard, section: 'navigation', keys: '<kbd>J</kbd>', label: 'today\'s journal', handler: () => {
|
||||||
|
const today = new Date().toISOString().substring(0, 10);
|
||||||
|
const existing = state.cards.find(c => (c.title || '').startsWith(today));
|
||||||
|
if (existing) openModal(existing);
|
||||||
|
else { activateBucket('journal'); openModal(null); }
|
||||||
|
}});
|
||||||
|
registerShortcut({ key: 't', guard: gBoard, section: 'navigation', keys: '<kbd>T</kbd>', label: 'tag quick-pick', handler: () => openTagQuickPick() });
|
||||||
|
registerShortcut({ key: 'c', guard: gBoard, section: 'navigation', keys: '<kbd>C</kbd>', label: 'calendar', handler: () => { const cal = document.getElementById('calendar'); cal?.classList.contains('open') ? closeCalendar() : openCalendar(); } });
|
||||||
|
registerShortcut({ key: 'm', guard: () => false, section: 'navigation', keys: '<kbd>M</kbd>', label: 'mail (plugin)' });
|
||||||
|
registerShortcut({ key: 'w', guard: gBoard, section: 'navigation', keys: '<kbd>W</kbd>', label: 'watch', handler: () => window._watchToggle?.() });
|
||||||
|
registerShortcut({ key: 'i', guard: gBoard, section: 'navigation', keys: '<kbd>I</kbd>', label: 'tim (time calculator)', handler: () => window._timToggle?.() });
|
||||||
|
registerShortcut({ key: '/', guard: gBoard, section: 'navigation', keys: '<kbd>/</kbd>', label: 'search', handler: () => openSearch() });
|
||||||
|
registerShortcut({ match: (e) => e.key === 'Tab' && !e.ctrlKey && !e.metaKey && !e.altKey && gBoard(), section: 'navigation', keys: '<kbd>⇥</kbd> / <kbd>⇧</kbd> <kbd>⇥</kbd>', label: 'cycle buckets', handler: (e) => {
|
||||||
|
const tiles = [...document.querySelectorAll('#bucket-bar .bucket-tab[data-bucket], #bucket-bar .bucket-tab[data-bucket-super]')];
|
||||||
|
if (!tiles.length) return;
|
||||||
|
const curIdx = tiles.findIndex(t => {
|
||||||
|
const bid = t.dataset.bucket || t.dataset.bucketSuper;
|
||||||
|
if (bid == state.activeBucket) return true;
|
||||||
|
if (t.dataset.bucketSuper) return state.buckets.some(b => b.parent_id == t.dataset.bucketSuper && b.id == state.activeBucket);
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
const dir = e.shiftKey ? -1 : 1;
|
||||||
|
const next = tiles[(curIdx + dir + tiles.length) % tiles.length];
|
||||||
|
if (next) activateBucket(next.dataset.bucketSuper ? (next.dataset.superShown || next.dataset.bucketSuper) : next.dataset.bucket);
|
||||||
|
}});
|
||||||
|
registerShortcut({ match: (e) => /^[1-9]$/.test(e.key) && !e.ctrlKey && !e.metaKey && !e.altKey && !e.shiftKey && gBoard(), section: 'navigation', keys: '<kbd>1</kbd> – <kbd>9</kbd>', label: 'Nth user bucket', handler: (e) => {
|
||||||
|
const SPECIAL = new Set(['all', 'current', 'favorites', 'journal', 'none']);
|
||||||
|
const tiles = [...document.querySelectorAll('#bucket-bar .bucket-tab[data-bucket], #bucket-bar .bucket-tab[data-bucket-super]')].filter(t => !SPECIAL.has(t.dataset.bucket));
|
||||||
|
const tile = tiles[parseInt(e.key, 10) - 1];
|
||||||
|
if (tile) activateBucket(tile.dataset.bucketSuper ? (tile.dataset.superShown || tile.dataset.bucketSuper) : tile.dataset.bucket);
|
||||||
|
}});
|
||||||
|
|
||||||
|
// — Board arrow-key card navigation + Enter —
|
||||||
|
registerShortcut({ match: (e) => ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(e.key) && gBoard(), section: 'board + detail', keys: '<kbd>↑</kbd> <kbd>↓</kbd> <kbd>←</kbd> <kbd>→</kbd>', label: 'focus card', handler: (e) => {
|
||||||
|
const board = document.getElementById('board');
|
||||||
|
if (!board) return;
|
||||||
|
const cards = [...board.querySelectorAll('.board-card[data-id]')];
|
||||||
|
if (!cards.length) return;
|
||||||
|
const focused = board.querySelector('.card-focused');
|
||||||
|
let curIdx = focused ? cards.indexOf(focused) : -1;
|
||||||
|
if (curIdx < 0) { setCardFocus(cards[0]); return; }
|
||||||
|
const firstTop = cards[0].offsetTop;
|
||||||
|
let cols = cards.length;
|
||||||
|
for (let i = 1; i < cards.length; i++) { if (cards[i].offsetTop !== firstTop) { cols = i; break; } }
|
||||||
|
let next = curIdx;
|
||||||
|
if (e.key === 'ArrowRight') next = Math.min(curIdx + 1, cards.length - 1);
|
||||||
|
else if (e.key === 'ArrowLeft') next = Math.max(curIdx - 1, 0);
|
||||||
|
else if (e.key === 'ArrowDown') next = Math.min(curIdx + cols, cards.length - 1);
|
||||||
|
else if (e.key === 'ArrowUp') next = Math.max(curIdx - cols, 0);
|
||||||
|
if (next !== curIdx) setCardFocus(cards[next]);
|
||||||
|
}});
|
||||||
|
registerShortcut({ key: 'Enter', guard: () => gBoard() && !!document.querySelector('#board .card-focused'), section: 'board + detail', keys: '<kbd>↵</kbd>', label: 'focused → preview', handler: () => {
|
||||||
|
const focused = document.querySelector('#board .card-focused');
|
||||||
|
if (focused) { window._openDetail(focused.dataset.id); clearCardFocus(); }
|
||||||
|
}});
|
||||||
|
// Delete selected or focused card
|
||||||
|
registerShortcut({ match: (e) => (e.key === 'Delete' || e.key === 'Backspace') && !e.ctrlKey && gBoard() && (getSelectedIds().length > 0 || !!document.querySelector('#board .card-focused')), section: 'global', keys: '<kbd>⌫</kbd>', label: 'delete selected / focused', hidden: true, handler: async () => {
|
||||||
|
let ids = getSelectedIds();
|
||||||
|
if (!ids.length) {
|
||||||
|
const focused = document.querySelector('#board .card-focused');
|
||||||
|
if (focused) ids = [focused.dataset.id];
|
||||||
}
|
}
|
||||||
});
|
if (!ids.length) return;
|
||||||
|
if (localStorage.getItem('hyprcrd-confirm-delete') !== '0') {
|
||||||
|
const ok = await showDialog({ title: 'delete cards', message: `Delete ${ids.length} card${ids.length > 1 ? 's' : ''}?`, danger: true, okLabel: 'Delete' });
|
||||||
|
if (!ok) return;
|
||||||
|
}
|
||||||
|
const { animateCardRemoval, clearCardFocus } = await import('./modules/board.js');
|
||||||
|
await animateCardRemoval(ids);
|
||||||
|
for (const id of ids) await api(`api/cards/${id}`, { method: 'DELETE' });
|
||||||
|
clearSelection();
|
||||||
|
clearCardFocus();
|
||||||
|
await window._reloadAll();
|
||||||
|
}});
|
||||||
|
|
||||||
|
// — Search (help-screen-only, handled by search.js element listener) —
|
||||||
|
registerShortcut({ key: 'ArrowDown', guard: () => false, section: 'search', keys: '<kbd>↑</kbd> <kbd>↓</kbd>', label: 'navigate results' });
|
||||||
|
registerShortcut({ key: 'Enter', guard: () => false, section: 'search', keys: '<kbd>↵</kbd>', label: 'open selected result' });
|
||||||
|
registerShortcut({ key: 'Escape', guard: () => false, section: 'search', keys: '<kbd>Esc</kbd>', label: 'close search' });
|
||||||
|
|
||||||
|
// — Board mouse actions (help-screen-only) —
|
||||||
|
registerShortcut({ key: '_click', guard: () => false, section: 'board + detail', keys: '<span class="mouse">click</span>', label: 'preview / split' });
|
||||||
|
registerShortcut({ key: '_dbl', guard: () => false, section: 'board + detail', keys: '<span class="mouse">dbl-click</span>', label: 'editor' });
|
||||||
|
registerShortcut({ key: '_rclick', guard: () => false, section: 'board + detail', keys: '<span class="mouse">right-click</span>', label: 'context menu' });
|
||||||
|
registerShortcut({ key: '_ctrlclick', guard: () => false, section: 'board + detail', keys: '<kbd>⌃</kbd> <span class="mouse">click</span>', label: 'multi-select' });
|
||||||
|
registerShortcut({ key: '_drag_edge', guard: () => false, section: 'board + detail', keys: '<span class="mouse">drag → edge</span>', label: 'reorder' });
|
||||||
|
registerShortcut({ key: '_drag_center', guard: () => false, section: 'board + detail', keys: '<span class="mouse">drag → center</span>', label: 'group' });
|
||||||
|
|
||||||
|
// — Canvas (help-screen-only, handled by canvas.js overlay listener) —
|
||||||
|
for (const [k, lbl] of [['B','brush'],['E','eraser'],['L','line'],['R','rectangle'],['O','circle'],['F','fill'],['T','text cursor']]) {
|
||||||
|
registerShortcut({ key: k.toLowerCase(), guard: () => false, section: 'canvas', keys: `<kbd>${k}</kbd>`, label: lbl });
|
||||||
|
}
|
||||||
|
registerShortcut({ key: 'Backspace', guard: () => false, section: 'canvas', keys: '<kbd>⌫</kbd>', label: 'delete char' });
|
||||||
|
|
||||||
|
// — Mail (help-screen-only, handled by email.js document listener) —
|
||||||
|
registerShortcut({ key: 'Backspace', guard: () => false, section: 'mail', keys: '<kbd>⌫</kbd>', label: 'delete selected mails' });
|
||||||
|
registerShortcut({ key: 'Backspace', guard: () => false, section: 'mail', keys: '<kbd>⇧</kbd> <kbd>⌫</kbd>', label: 'delete (skip confirm)' });
|
||||||
|
|
||||||
|
let focusedCardId = null;
|
||||||
|
function setCardFocus(el) {
|
||||||
|
clearCardFocus();
|
||||||
|
if (!el) return;
|
||||||
|
el.classList.add('card-focused');
|
||||||
|
focusedCardId = el.dataset.id;
|
||||||
|
el.scrollIntoView({ block: 'nearest', behavior: 'smooth' });
|
||||||
|
}
|
||||||
|
function clearCardFocus() {
|
||||||
|
document.querySelectorAll('.card-focused').forEach(c => c.classList.remove('card-focused'));
|
||||||
|
focusedCardId = null;
|
||||||
|
}
|
||||||
|
// Clear focus when clicking anywhere on the board (a card click opens
|
||||||
|
// detail/editor and focus is no longer meaningful), or when any overlay
|
||||||
|
// opens. Also re-apply after a board re-render if the focused card is
|
||||||
|
// still in the DOM.
|
||||||
|
document.addEventListener('click', () => { if (focusedCardId) clearCardFocus(); });
|
||||||
|
window._restoreCardFocus = function () {
|
||||||
|
if (!focusedCardId) return;
|
||||||
|
const el = document.querySelector(`#board .board-card[data-id="${focusedCardId}"]`);
|
||||||
|
if (el) el.classList.add('card-focused');
|
||||||
|
else clearCardFocus();
|
||||||
|
};
|
||||||
|
|
||||||
// ── Quick Capture ──
|
// ── Quick Capture ──
|
||||||
|
|
||||||
@@ -261,9 +449,15 @@ document.getElementById('quick-capture-input')?.addEventListener('keydown', asyn
|
|||||||
body = lines.slice(1).join('\n').trim();
|
body = lines.slice(1).join('\n').trim();
|
||||||
}
|
}
|
||||||
if (!cardTitle) return;
|
if (!cardTitle) return;
|
||||||
if (!body.includes('#inbox')) body = (body ? body + '\n\n' : '') + '#inbox';
|
// No auto-tag — the card goes into the active bucket (or unsorted).
|
||||||
|
|
||||||
await api('api/cards', { method: 'POST', body: { title: cardTitle, body, color: '#38bdf8', position: -1 } });
|
// Place the card in the currently active bucket (if it's a real
|
||||||
|
// user bucket). Special filters (all/current/favorites/journal/none)
|
||||||
|
// don't map to a bucket_id — cards captured there stay unsorted.
|
||||||
|
const VIRTUAL = ['all', 'current', 'favorites', 'journal', 'none'];
|
||||||
|
const bucketId = VIRTUAL.includes(state.activeBucket) ? null : state.activeBucket;
|
||||||
|
const captured = await api('api/cards', { method: 'POST', body: { title: cardTitle, body, color: '#38bdf8', position: -1, bucket_id: bucketId } });
|
||||||
|
if (captured?.id) state.recentlyCreatedIds?.add(String(captured.id));
|
||||||
|
|
||||||
e.target.value = '';
|
e.target.value = '';
|
||||||
document.getElementById('quick-capture').classList.add('hidden');
|
document.getElementById('quick-capture').classList.add('hidden');
|
||||||
@@ -277,8 +471,99 @@ document.getElementById('quick-capture-input')?.addEventListener('keydown', asyn
|
|||||||
setTimeout(() => { n.style.transition = 'opacity .3s'; n.style.opacity = '0'; setTimeout(() => n.remove(), 350); }, 2500);
|
setTimeout(() => { n.style.transition = 'opacity .3s'; n.style.opacity = '0'; setTimeout(() => n.remove(), 350); }, 2500);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ── Tag quick-pick (bare "t" hotkey on the board) ──
|
||||||
|
|
||||||
|
/** Show a small popover listing every tag found on any card. Typing
|
||||||
|
* filters; arrow keys + enter pick; clicking outside or ESC closes.
|
||||||
|
* Picking a tag sets state.activeTags = [tag] and re-renders the board. */
|
||||||
|
function openTagQuickPick() {
|
||||||
|
const existing = document.getElementById('tag-quickpick');
|
||||||
|
if (existing) { existing.remove(); return; }
|
||||||
|
|
||||||
|
const tagSet = new Set();
|
||||||
|
for (const c of state.cards) {
|
||||||
|
for (const t of (c.tags || '').split(',').filter(Boolean)) tagSet.add(t);
|
||||||
|
}
|
||||||
|
const allTags = [...tagSet].sort();
|
||||||
|
if (!allTags.length) return;
|
||||||
|
|
||||||
|
const overlay = document.createElement('div');
|
||||||
|
overlay.id = 'tag-quickpick';
|
||||||
|
overlay.style.cssText = 'position:fixed;inset:0;z-index:120;background:var(--t-overlay,rgba(0,0,0,0.55));display:flex;align-items:flex-start;justify-content:center;padding:80px 16px 16px;backdrop-filter:blur(var(--ui-blur-overlay,0));';
|
||||||
|
const box = document.createElement('div');
|
||||||
|
box.style.cssText = 'background:var(--t-surface);border:1px solid var(--t-border);border-radius:var(--ui-radius-modal);box-shadow:var(--ui-shadow-modal);width:100%;max-width:380px;max-height:60vh;display:flex;flex-direction:column;overflow:hidden;';
|
||||||
|
box.innerHTML = `
|
||||||
|
<div style="padding:10px 12px;border-bottom:1px solid var(--t-border);display:flex;align-items:center;gap:8px;">
|
||||||
|
<i class="ph ph-funnel text-t-accent"></i>
|
||||||
|
<input id="tag-quickpick-input" type="text" placeholder="filter tags…"
|
||||||
|
style="flex:1;background:var(--t-bg);border:1px solid var(--t-border);border-radius:var(--ui-radius-input);color:var(--t-bright);padding:6px 10px;font-size:12px;font-family:var(--t-font-content,'JetBrains Mono',monospace);outline:none;">
|
||||||
|
</div>
|
||||||
|
<div id="tag-quickpick-list" style="flex:1;overflow-y:auto;padding:4px 0;"></div>
|
||||||
|
`;
|
||||||
|
overlay.appendChild(box);
|
||||||
|
document.body.appendChild(overlay);
|
||||||
|
|
||||||
|
const input = box.querySelector('#tag-quickpick-input');
|
||||||
|
const list = box.querySelector('#tag-quickpick-list');
|
||||||
|
let filtered = allTags;
|
||||||
|
let active = 0;
|
||||||
|
|
||||||
|
function escHtml(s) { return String(s).replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"'); }
|
||||||
|
|
||||||
|
function renderList() {
|
||||||
|
if (!filtered.length) {
|
||||||
|
list.innerHTML = '<div style="padding:14px 12px;text-align:center;font-size:11px;color:var(--t-dim);font-style:italic;">no tags match</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
list.innerHTML = filtered.map((t, i) => `
|
||||||
|
<button class="tag-quickpick-row" data-tag="${escHtml(t)}" data-idx="${i}"
|
||||||
|
style="display:block;width:100%;text-align:left;padding:6px 14px;font-size:11px;font-family:var(--t-font-pixel,'Silkscreen',cursive);color:${i === active ? 'var(--t-bright)' : 'var(--t-text)'};background:${i === active ? 'var(--t-raised)' : 'transparent'};border:none;cursor:pointer;">
|
||||||
|
#${escHtml(t)}
|
||||||
|
</button>
|
||||||
|
`).join('');
|
||||||
|
list.querySelectorAll('[data-tag]').forEach(btn => {
|
||||||
|
btn.addEventListener('mouseenter', () => { active = parseInt(btn.dataset.idx, 10); renderList(); });
|
||||||
|
btn.addEventListener('click', () => pick(btn.dataset.tag));
|
||||||
|
});
|
||||||
|
const activeEl = list.querySelector(`[data-idx="${active}"]`);
|
||||||
|
activeEl?.scrollIntoView({ block: 'nearest' });
|
||||||
|
}
|
||||||
|
|
||||||
|
function pick(tag) {
|
||||||
|
state.activeTags = [tag];
|
||||||
|
close();
|
||||||
|
window._renderTagBar?.();
|
||||||
|
window._renderBoard?.();
|
||||||
|
}
|
||||||
|
function close() {
|
||||||
|
overlay.remove();
|
||||||
|
document.removeEventListener('keydown', onKey, true);
|
||||||
|
}
|
||||||
|
function onKey(e) {
|
||||||
|
if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); close(); }
|
||||||
|
else if (e.key === 'ArrowDown') { e.preventDefault(); active = Math.min(active + 1, filtered.length - 1); renderList(); }
|
||||||
|
else if (e.key === 'ArrowUp') { e.preventDefault(); active = Math.max(active - 1, 0); renderList(); }
|
||||||
|
else if (e.key === 'Enter') { e.preventDefault(); if (filtered[active]) pick(filtered[active]); }
|
||||||
|
}
|
||||||
|
|
||||||
|
input.addEventListener('input', () => {
|
||||||
|
const f = input.value.toLowerCase().replace(/^#/, '');
|
||||||
|
filtered = f ? allTags.filter(t => t.toLowerCase().includes(f)) : allTags;
|
||||||
|
active = 0;
|
||||||
|
renderList();
|
||||||
|
});
|
||||||
|
overlay.addEventListener('click', e => { if (e.target === overlay) close(); });
|
||||||
|
// Capture-phase keydown so ESC etc. don't bubble back to the rest of
|
||||||
|
// the page handlers (search, board) while the picker is open.
|
||||||
|
document.addEventListener('keydown', onKey, true);
|
||||||
|
|
||||||
|
renderList();
|
||||||
|
setTimeout(() => input.focus(), 0);
|
||||||
|
}
|
||||||
|
|
||||||
// ── Boot ──
|
// ── Boot ──
|
||||||
|
|
||||||
|
renderShortcutHelp();
|
||||||
checkAuth();
|
checkAuth();
|
||||||
|
|
||||||
// ── Test runner: now provided by the "tests" plugin (see public/plugins/tests/) ──
|
// ── Test runner: now provided by the "tests" plugin (see public/plugins/tests/) ──
|
||||||
+19
-8
@@ -127,15 +127,26 @@
|
|||||||
csrf() { return csrfToken; },
|
csrf() { return csrfToken; },
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Generic JSON API call with automatic CSRF header. */
|
/** Generic JSON API call with automatic CSRF header.
|
||||||
|
* On 401 (session expired while the UI is open) we call the app's
|
||||||
|
* re-auth prompt once, pick up the refreshed CSRF token, and retry
|
||||||
|
* the original request so the caller's save / poll succeeds instead
|
||||||
|
* of silently returning an unauthorized error payload. */
|
||||||
async function api(path, opts = {}) {
|
async function api(path, opts = {}) {
|
||||||
const headers = { 'Content-Type': 'application/json' };
|
const doFetch = () => {
|
||||||
if (csrfToken) headers['X-CSRF-Token'] = csrfToken;
|
const headers = { 'Content-Type': 'application/json' };
|
||||||
const res = await fetch(path, {
|
if (csrfToken) headers['X-CSRF-Token'] = csrfToken;
|
||||||
method: opts.method || 'GET',
|
return fetch(path, {
|
||||||
headers,
|
method: opts.method || 'GET',
|
||||||
body: opts.body !== undefined ? JSON.stringify(opts.body) : undefined,
|
headers,
|
||||||
});
|
body: opts.body !== undefined ? JSON.stringify(opts.body) : undefined,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
let res = await doFetch();
|
||||||
|
if (res.status === 401 && !path.startsWith('api/auth/') && typeof window._reauth === 'function') {
|
||||||
|
await window._reauth();
|
||||||
|
res = await doFetch();
|
||||||
|
}
|
||||||
return res.json();
|
return res.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+285
-33
@@ -23,6 +23,82 @@ const boardPreviewTags = $('board-preview-tags');
|
|||||||
const boardPreviewMeta = $('board-preview-meta');
|
const boardPreviewMeta = $('board-preview-meta');
|
||||||
let activeDragEl = null;
|
let activeDragEl = null;
|
||||||
let dragGhost = null;
|
let dragGhost = null;
|
||||||
|
// Set of card ids currently being dragged. Module-scoped so a poll-driven
|
||||||
|
// re-render (caldav/collab) can re-apply the `.card-dragging` ghost class
|
||||||
|
// to the matching DOM nodes after `board.innerHTML = …` wipes them. Without
|
||||||
|
// this the dragged card would visually pop back to its normal state every
|
||||||
|
// time a background poll completed mid-drag.
|
||||||
|
const draggingCardIds = new Set();
|
||||||
|
|
||||||
|
// Tracks every card id we've ever rendered. On the first render we just
|
||||||
|
// snapshot whatever's currently in state.cards (everything counts as
|
||||||
|
// "already known"); after that, the diff against this set tells us
|
||||||
|
// which cards just arrived from a poll / sync. New cards get pushed into
|
||||||
|
// state.unseenCardIds and either pulse immediately (if we're already on
|
||||||
|
// the all view) or wait for the next visit to the all tab to pulse.
|
||||||
|
let knownCardIds = null;
|
||||||
|
|
||||||
|
/** Animate card removal: adds .card-removing to each matching card
|
||||||
|
* element and waits for the CSS animation to finish before resolving.
|
||||||
|
* Call this BEFORE the API delete + _reloadAll so the user sees the
|
||||||
|
* card shrink/fade out instead of just vanishing. */
|
||||||
|
export function animateCardRemoval(ids) {
|
||||||
|
if (!ids || !ids.length) return Promise.resolve();
|
||||||
|
const els = ids.map(id => board.querySelector(`[data-id="${id}"]`)).filter(Boolean);
|
||||||
|
if (!els.length) return Promise.resolve();
|
||||||
|
for (const el of els) el.classList.add('card-removing');
|
||||||
|
return new Promise(r => setTimeout(r, 260));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Ghost-and-spinner overlay for cards that are being moved between
|
||||||
|
* buckets. The PATCH + reloadAll round-trip used to leave the original
|
||||||
|
* tile sitting stale in the current bucket for a couple hundred ms;
|
||||||
|
* marking them gives immediate feedback. The class comes off naturally
|
||||||
|
* on the next renderBoard() (the DOM is rebuilt from fresh state). */
|
||||||
|
export function markCardsMoving(ids) {
|
||||||
|
if (!ids || !ids.length) return;
|
||||||
|
for (const id of ids) {
|
||||||
|
const el = board.querySelector(`[data-id="${id}"]`);
|
||||||
|
if (el) el.classList.add('card-moving');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window._markCardsMoving = markCardsMoving;
|
||||||
|
|
||||||
|
/** Add a pulse class to matching board cards and strip it after the
|
||||||
|
* animation. `cls` controls the variant: 'card-pulse-new' (3×, for
|
||||||
|
* relay-synced cards) or 'card-pulse-local' (1×, for cards the user
|
||||||
|
* just created themselves). */
|
||||||
|
function pulseCards(ids, cls = 'card-pulse-new') {
|
||||||
|
if (!ids || !ids.size) return;
|
||||||
|
const durationMs = cls === 'card-pulse-local' ? 900 : 2400;
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
for (const id of ids) {
|
||||||
|
const el = board.querySelector(`[data-id="${id}"]`);
|
||||||
|
if (!el) continue;
|
||||||
|
el.classList.add(cls);
|
||||||
|
setTimeout(() => el.classList.remove(cls), durationMs);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Add or remove the unread dot on the fixed `all` bucket-tab. Hidden
|
||||||
|
* while the user is currently looking at the all view. Lives in
|
||||||
|
* board.js (rather than buckets.js) because the trigger is "new card
|
||||||
|
* arrived" — buckets.js doesn't know about that, board.js does. */
|
||||||
|
function decorateAllUnreadDot() {
|
||||||
|
const allTab = document.querySelector('#bucket-bar [data-bucket="all"]');
|
||||||
|
if (!allTab) return;
|
||||||
|
const hasUnread = state.unseenCardIds.size > 0 && state.activeBucket !== 'all';
|
||||||
|
allTab.classList.toggle('has-unread', hasUnread);
|
||||||
|
let dot = allTab.querySelector('.bar-unread-dot');
|
||||||
|
if (hasUnread && !dot) {
|
||||||
|
dot = document.createElement('span');
|
||||||
|
dot.className = 'bar-unread-dot';
|
||||||
|
allTab.appendChild(dot);
|
||||||
|
} else if (!hasUnread && dot) {
|
||||||
|
dot.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ── Multi-select ──
|
// ── Multi-select ──
|
||||||
const selectedIds = state.selectedIds;
|
const selectedIds = state.selectedIds;
|
||||||
@@ -60,6 +136,7 @@ function toggleSelect(id) {
|
|||||||
|
|
||||||
function clearSelection() {
|
function clearSelection() {
|
||||||
selectedIds.clear();
|
selectedIds.clear();
|
||||||
|
state.selectionWasBulk = false;
|
||||||
board.querySelectorAll('.card-selected').forEach(el => {
|
board.querySelectorAll('.card-selected').forEach(el => {
|
||||||
el.classList.remove('card-selected');
|
el.classList.remove('card-selected');
|
||||||
el.querySelector('.card-select-check')?.remove();
|
el.querySelector('.card-select-check')?.remove();
|
||||||
@@ -70,21 +147,9 @@ function clearSelection() {
|
|||||||
export function getSelectedIds() { return [...selectedIds]; }
|
export function getSelectedIds() { return [...selectedIds]; }
|
||||||
export { clearSelection };
|
export { clearSelection };
|
||||||
|
|
||||||
// Delete/Backspace deletes selected cards
|
// Delete/Backspace for selected cards is now in the central shortcuts
|
||||||
document.addEventListener('keydown', async e => {
|
// registry (app.js registerShortcut). It uses getSelectedIds() /
|
||||||
if (!selectedIds.size) return;
|
// clearSelection() which are already exported.
|
||||||
if (e.key !== 'Delete' && e.key !== 'Backspace') return;
|
|
||||||
if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA' || e.target.isContentEditable) return;
|
|
||||||
e.preventDefault();
|
|
||||||
if (localStorage.getItem('hyprcrd-confirm-delete') !== '0') {
|
|
||||||
const { showDialog } = await import('./dialog.js');
|
|
||||||
const ok = await showDialog({ title: 'delete cards', message: `Delete ${selectedIds.size} card${selectedIds.size > 1 ? 's' : ''}?`, danger: true, okLabel: 'Delete' });
|
|
||||||
if (!ok) return;
|
|
||||||
}
|
|
||||||
for (const id of selectedIds) await api(`api/cards/${id}`, { method: 'DELETE' });
|
|
||||||
clearSelection();
|
|
||||||
await window._reloadAll();
|
|
||||||
});
|
|
||||||
|
|
||||||
// Clear selection on click outside board (header, footer, etc)
|
// Clear selection on click outside board (header, footer, etc)
|
||||||
document.addEventListener('click', e => {
|
document.addEventListener('click', e => {
|
||||||
@@ -111,6 +176,16 @@ $('select-group')?.addEventListener('click', async () => {
|
|||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('select-join')?.addEventListener('click', async () => {
|
||||||
|
if (selectedIds.size < 2) return;
|
||||||
|
// Dynamic import keeps the board → context-menu edge lazy and avoids
|
||||||
|
// circular import surprises at module load time. joinSelectedCards
|
||||||
|
// reads state.selectedIds + state.selectionWasBulk and handles its
|
||||||
|
// own reload + selection clear.
|
||||||
|
const { joinSelectedCards } = await import('./context-menu.js');
|
||||||
|
await joinSelectedCards();
|
||||||
|
});
|
||||||
|
|
||||||
$('select-bucket')?.addEventListener('click', () => {
|
$('select-bucket')?.addEventListener('click', () => {
|
||||||
if (!selectedIds.size) return;
|
if (!selectedIds.size) return;
|
||||||
// Remove existing picker
|
// Remove existing picker
|
||||||
@@ -295,8 +370,11 @@ function closeBoardPreview() {
|
|||||||
boardPreview?.classList.add('hidden');
|
boardPreview?.classList.add('hidden');
|
||||||
state.boardSplitOpen = false;
|
state.boardSplitOpen = false;
|
||||||
localStorage.setItem('hyprcrd-board-split', '0');
|
localStorage.setItem('hyprcrd-board-split', '0');
|
||||||
|
// The toolbar's active state lives on the `.active` class — the
|
||||||
|
// previous `text-t-accent` removal was a no-op since that class
|
||||||
|
// isn't what toggleBoardSplit uses.
|
||||||
const btn = $('board-split-toggle');
|
const btn = $('board-split-toggle');
|
||||||
if (btn) btn.classList.remove('text-t-accent');
|
if (btn) btn.classList.remove('active');
|
||||||
board.querySelectorAll('.board-card').forEach(el => el.classList.remove('preview-active'));
|
board.querySelectorAll('.board-card').forEach(el => el.classList.remove('preview-active'));
|
||||||
state.boardPreviewCardId = null;
|
state.boardPreviewCardId = null;
|
||||||
resetBoardPreview();
|
resetBoardPreview();
|
||||||
@@ -422,14 +500,55 @@ export function renderCardHtml(c, inGroup = false, recent = []) {
|
|||||||
<div class="mt-auto pt-2 flex items-center gap-2 text-[10px] ${hasCover ? 'text-t-text' : 'text-t-dim'} font-pixel">
|
<div class="mt-auto pt-2 flex items-center gap-2 text-[10px] ${hasCover ? 'text-t-text' : 'text-t-dim'} font-pixel">
|
||||||
${c.due_date ? `<span class="due-pill" style="background:${overdue ? 'var(--t-danger)' : cardColor};"><i class="ph ph-clock-countdown" style="font-size:9px;"></i>${c.due_date}</span>` : `<span class="flex items-center gap-1"><i class="ph ph-clock text-xs"></i>${(c.updated_at || c.created_at || '').substring(0, 10)}</span>`}
|
${c.due_date ? `<span class="due-pill" style="background:${overdue ? 'var(--t-danger)' : cardColor};"><i class="ph ph-clock-countdown" style="font-size:9px;"></i>${c.due_date}</span>` : `<span class="flex items-center gap-1"><i class="ph ph-clock text-xs"></i>${(c.updated_at || c.created_at || '').substring(0, 10)}</span>`}
|
||||||
${c.bucket_name ? `<span class="flex items-center gap-1"><i class="ph ph-folder text-xs"></i>${esc(c.bucket_name)}</span>` : ''}
|
${c.bucket_name ? `<span class="flex items-center gap-1"><i class="ph ph-folder text-xs"></i>${esc(c.bucket_name)}</span>` : ''}
|
||||||
|
${Number(c.read_push) ? '<span class="flex items-center gap-1 text-t-accent" title="On your relay\'s Read list"><i class="ph ph-book-open text-xs"></i></span>' : ''}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Render ──
|
// ── Render ──
|
||||||
|
//
|
||||||
|
// Public renderBoard() is coalesced via requestAnimationFrame: multiple
|
||||||
|
// callers in the same tick (cache paint → meta paint → body paint →
|
||||||
|
// plugin-hook re-render → ...) collapse into a single actual render on
|
||||||
|
// the next frame. Dropped the "three innerHTML swaps per reload" cost
|
||||||
|
// that showed up as the "Gekringel" during boot. Callers that need the
|
||||||
|
// DOM in a specific state before doing something else can call
|
||||||
|
// renderBoardSync() explicitly — but in practice every existing caller
|
||||||
|
// just wants the board to reflect the latest state.
|
||||||
|
|
||||||
|
let rafScheduled = 0;
|
||||||
export function renderBoard() {
|
export function renderBoard() {
|
||||||
|
if (rafScheduled) return;
|
||||||
|
rafScheduled = requestAnimationFrame(() => {
|
||||||
|
rafScheduled = 0;
|
||||||
|
renderBoardSync();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
export function renderBoardSync() {
|
||||||
|
if (rafScheduled) { cancelAnimationFrame(rafScheduled); rafScheduled = 0; }
|
||||||
|
renderBoardImpl();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderBoardImpl() {
|
||||||
|
// Diff state.cards against the last seen ids so we can flag arrivals
|
||||||
|
// as "unseen". The very first renderBoard runs with state.cards = []
|
||||||
|
// (initial empty state, before the API has returned), so we wait
|
||||||
|
// until knownCardIds is non-empty before doing the diff — otherwise
|
||||||
|
// the first real load looks like "every card just arrived" and the
|
||||||
|
// entire board pulses on page open.
|
||||||
|
const currentIds = new Set(state.cards.map(c => String(c.id)));
|
||||||
|
const newLocalIds = new Set();
|
||||||
|
if (knownCardIds && knownCardIds.size > 0) {
|
||||||
|
for (const id of currentIds) {
|
||||||
|
if (knownCardIds.has(id)) continue;
|
||||||
|
// Locally-created cards go into a separate set — they get a
|
||||||
|
// 1× pulse but must NOT trigger the unread dot on the all-tab.
|
||||||
|
if (state.recentlyCreatedIds.has(id)) newLocalIds.add(id);
|
||||||
|
else state.unseenCardIds.add(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
knownCardIds = currentIds;
|
||||||
let cards;
|
let cards;
|
||||||
if (state.activeGroup) {
|
if (state.activeGroup) {
|
||||||
const parent = state.cards.find(c => c.id == state.activeGroup);
|
const parent = state.cards.find(c => c.id == state.activeGroup);
|
||||||
@@ -502,10 +621,21 @@ export function renderBoard() {
|
|||||||
renderGroupBar(cards);
|
renderGroupBar(cards);
|
||||||
|
|
||||||
if (!cards.length) {
|
if (!cards.length) {
|
||||||
board.style.display = '';
|
board.style.display = 'flex';
|
||||||
board.innerHTML = `<div class="col-span-full text-center py-20">
|
board.style.alignItems = 'center';
|
||||||
<i class="ph ph-cards text-4xl text-t-dim mb-4 block"></i>
|
board.style.justifyContent = 'center';
|
||||||
<p class="font-pixel text-sm text-t-dim cursor-blink">no cards found</p></div>`;
|
// Distinguish "genuinely empty" from "haven't heard back yet".
|
||||||
|
// Blurting "no cards found" during the initial load is scary
|
||||||
|
// on boards the user knows aren't empty.
|
||||||
|
if (!state.cardsLoaded) {
|
||||||
|
board.innerHTML = `<div class="flex flex-col items-center text-center">
|
||||||
|
<i class="ph ph-circle-notch text-4xl text-t-dim mb-4 block card-spinner"></i>
|
||||||
|
<p class="font-pixel text-sm text-t-dim">loading…</p></div>`;
|
||||||
|
} else {
|
||||||
|
board.innerHTML = `<div class="flex flex-col items-center text-center">
|
||||||
|
<i class="ph ph-cards text-4xl text-t-dim mb-4 block"></i>
|
||||||
|
<p class="font-pixel text-sm text-t-dim cursor-blink">no cards found</p></div>`;
|
||||||
|
}
|
||||||
const fc = $('footer-count');
|
const fc = $('footer-count');
|
||||||
if (fc) fc.textContent = `0 cards · ${state.cards.length} total`;
|
if (fc) fc.textContent = `0 cards · ${state.cards.length} total`;
|
||||||
return;
|
return;
|
||||||
@@ -515,10 +645,9 @@ export function renderBoard() {
|
|||||||
const inGroup = !!state.activeGroup;
|
const inGroup = !!state.activeGroup;
|
||||||
|
|
||||||
if (state.superView) {
|
if (state.superView) {
|
||||||
// Compact multi-column list view — override board grid
|
// Single-column list view — override board grid
|
||||||
board.style.display = 'block';
|
board.style.display = 'block';
|
||||||
const cols = cards.length <= 20 ? 2 : cards.length <= 50 ? 3 : cards.length <= 100 ? 4 : 5;
|
board.innerHTML = `<div class="superview-grid">` + cards.map(c => {
|
||||||
board.innerHTML = `<div class="superview-grid" style="column-count:${cols};">` + cards.map(c => {
|
|
||||||
const tags = parseTags(c);
|
const tags = parseTags(c);
|
||||||
const isTermin = tags.includes('termin') || tags.includes('geburtstag');
|
const isTermin = tags.includes('termin') || tags.includes('geburtstag');
|
||||||
let calCfg = null;
|
let calCfg = null;
|
||||||
@@ -526,10 +655,26 @@ export function renderBoard() {
|
|||||||
const dotColor = calCfg?.color || c.color;
|
const dotColor = calCfg?.color || c.color;
|
||||||
const icon = isTermin ? (calCfg?.icon || 'calendar-dots') : (isFavorite(c.id) ? 'star' : null);
|
const icon = isTermin ? (calCfg?.icon || 'calendar-dots') : (isFavorite(c.id) ? 'star' : null);
|
||||||
const iconColor = isTermin ? dotColor : (isFavorite(c.id) ? '#fbbf24' : 'var(--t-dim)');
|
const iconColor = isTermin ? dotColor : (isFavorite(c.id) ? '#fbbf24' : 'var(--t-dim)');
|
||||||
|
// Date column: due_date if set, else date prefix in title, else updated/created
|
||||||
|
const dateStr = c.due_date
|
||||||
|
|| ((c.title || '').match(/^\d{4}-\d{2}-\d{2}/)?.[0])
|
||||||
|
|| (c.updated_at || c.created_at || '').substring(0, 10);
|
||||||
|
// Tag chips (excluding termin/geburtstag — those are already
|
||||||
|
// represented by the icon + dot on the left)
|
||||||
|
const visibleTags = tags.filter(t => t !== 'termin' && t !== 'geburtstag');
|
||||||
|
const tagsHtml = visibleTags.length
|
||||||
|
? `<span class="superview-tags">${visibleTags.slice(0, 4).map(t => `<span class="superview-tag">#${esc(t)}</span>`).join('')}${visibleTags.length > 4 ? `<span class="superview-tag superview-tag-more">+${visibleTags.length - 4}</span>` : ''}</span>`
|
||||||
|
: '';
|
||||||
|
const bucketHtml = c.bucket_name
|
||||||
|
? `<span class="superview-bucket"><i class="ph ph-folder"></i>${esc(c.bucket_name)}</span>`
|
||||||
|
: '';
|
||||||
return `<div class="superview-item" data-id="${c.id}">
|
return `<div class="superview-item" data-id="${c.id}">
|
||||||
<span class="superview-dot" style="background:${dotColor}"></span>
|
<span class="superview-dot" style="background:${dotColor}"></span>
|
||||||
${icon ? `<i class="ph ph-${icon} superview-icon" style="color:${iconColor}"></i>` : ''}
|
${icon ? `<i class="ph ph-${icon} superview-icon" style="color:${iconColor}"></i>` : ''}
|
||||||
<span class="superview-title">${esc(c.title)}</span>
|
<span class="superview-title">${esc(c.title)}</span>
|
||||||
|
${tagsHtml}
|
||||||
|
${bucketHtml}
|
||||||
|
<span class="superview-date">${dateStr}</span>
|
||||||
</div>`;
|
</div>`;
|
||||||
}).join('') + '</div>';
|
}).join('') + '</div>';
|
||||||
|
|
||||||
@@ -610,10 +755,25 @@ export function renderBoard() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
board.style.display = '';
|
board.style.display = '';
|
||||||
|
board.style.alignItems = '';
|
||||||
|
board.style.justifyContent = '';
|
||||||
board.innerHTML = cards.map(c => renderCardHtml(c, inGroup, recent)).join('');
|
board.innerHTML = cards.map(c => renderCardHtml(c, inGroup, recent)).join('');
|
||||||
|
|
||||||
bindCardEvents();
|
bindCardEvents();
|
||||||
|
|
||||||
|
// Re-apply the dragging ghost to any card whose drag is still in
|
||||||
|
// flight. Polls (caldav, collab) call _reloadAll → renderBoard mid-
|
||||||
|
// drag, which would otherwise wipe the visual ghost state without
|
||||||
|
// the underlying drag operation noticing.
|
||||||
|
if (draggingCardIds.size) {
|
||||||
|
draggingCardIds.forEach(did => {
|
||||||
|
board.querySelector(`[data-id="${did}"]`)?.classList.add('card-dragging');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Restore arrow-key card focus if the focused card is still rendered
|
||||||
|
window._restoreCardFocus?.();
|
||||||
|
|
||||||
// Restore selection state
|
// Restore selection state
|
||||||
selectedIds.forEach(id => {
|
selectedIds.forEach(id => {
|
||||||
const el = board.querySelector(`[data-id="${id}"]`);
|
const el = board.querySelector(`[data-id="${id}"]`);
|
||||||
@@ -641,6 +801,38 @@ export function renderBoard() {
|
|||||||
|
|
||||||
// Notification banner
|
// Notification banner
|
||||||
renderNotifs();
|
renderNotifs();
|
||||||
|
|
||||||
|
// Pulse locally-created cards in ANY bucket (1× subtle pulse).
|
||||||
|
// These never enter unseenCardIds so they can't trigger the all-tab
|
||||||
|
// dot — the user just made them, there's nothing "unseen" about it.
|
||||||
|
// Journal entries are exempt from the pulse entirely — they're daily
|
||||||
|
// log jottings, not "here's a new thing" moments, so the flash
|
||||||
|
// reads as noise. Detection mirrors calendar.js isJournal: title
|
||||||
|
// begins with YYYY-MM-DD, no termin/geburtstag tag, no caldav_uid,
|
||||||
|
// and no " — <summary>" suffix (which denotes an appointment).
|
||||||
|
if (newLocalIds.size) {
|
||||||
|
for (const id of newLocalIds) state.recentlyCreatedIds.delete(id);
|
||||||
|
const toPulse = new Set();
|
||||||
|
for (const id of newLocalIds) {
|
||||||
|
const card = state.cards.find(c => String(c.id) === id);
|
||||||
|
if (!card) continue;
|
||||||
|
const isJournal = /^\d{4}-\d{2}-\d{2}$/.test((card.title || '').trim())
|
||||||
|
&& !/^\d{4}-\d{2}-\d{2}\s*[—-]\s*.+/.test(card.title || '')
|
||||||
|
&& !card.caldav_uid
|
||||||
|
&& !(card.tags || '').split(',').some(t => t === 'termin' || t === 'geburtstag');
|
||||||
|
if (!isJournal) toPulse.add(id);
|
||||||
|
}
|
||||||
|
if (toPulse.size) pulseCards(toPulse, 'card-pulse-local');
|
||||||
|
}
|
||||||
|
// Remote (relay-synced) cards: pulse 3× only when the user is on
|
||||||
|
// the all view. On other views, the unseen ids accumulate and
|
||||||
|
// the all-tab gets a dot until the user opens it.
|
||||||
|
if (state.activeBucket === 'all' && state.unseenCardIds.size) {
|
||||||
|
const remote = new Set(state.unseenCardIds);
|
||||||
|
state.unseenCardIds.clear();
|
||||||
|
pulseCards(remote, 'card-pulse-new');
|
||||||
|
}
|
||||||
|
decorateAllUnreadDot();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Notification providers ──
|
// ── Notification providers ──
|
||||||
@@ -843,6 +1035,36 @@ function hideFan() {
|
|||||||
// ── Card event binding ──
|
// ── Card event binding ──
|
||||||
|
|
||||||
function bindCardEvents() {
|
function bindCardEvents() {
|
||||||
|
// Single insertion-cursor element that lives inside #board (which is
|
||||||
|
// `relative`) and gets repositioned by the card-level dragover handlers
|
||||||
|
// below. Replaces the previous `.card-drop-before::before` /
|
||||||
|
// `.card-drop-after::after` pseudo-elements so the cursor is a real
|
||||||
|
// element in the gap rather than a sliver glued to the side of a tile.
|
||||||
|
let cardDropCursor = board.querySelector('#card-drop-cursor');
|
||||||
|
if (!cardDropCursor) {
|
||||||
|
cardDropCursor = document.createElement('div');
|
||||||
|
cardDropCursor.id = 'card-drop-cursor';
|
||||||
|
board.appendChild(cardDropCursor);
|
||||||
|
}
|
||||||
|
function showCardDropCursor(targetEl, before) {
|
||||||
|
// offsetLeft / offsetTop / offsetHeight are relative to the
|
||||||
|
// offsetParent (#board) so the cursor positions correctly even
|
||||||
|
// when #board is scrolled vertically.
|
||||||
|
const x = before
|
||||||
|
? targetEl.offsetLeft - 6
|
||||||
|
: targetEl.offsetLeft + targetEl.offsetWidth + 2;
|
||||||
|
cardDropCursor.style.left = x + 'px';
|
||||||
|
cardDropCursor.style.top = (targetEl.offsetTop + 8) + 'px';
|
||||||
|
cardDropCursor.style.height = (targetEl.offsetHeight - 16) + 'px';
|
||||||
|
cardDropCursor.style.display = 'block';
|
||||||
|
}
|
||||||
|
function hideCardDropCursor() {
|
||||||
|
cardDropCursor.style.display = 'none';
|
||||||
|
}
|
||||||
|
// Expose so the global dragend handler (defined outside this function)
|
||||||
|
// can hide the cursor too.
|
||||||
|
board._hideCardDropCursor = hideCardDropCursor;
|
||||||
|
|
||||||
board.querySelectorAll('[data-group]').forEach(badge => {
|
board.querySelectorAll('[data-group]').forEach(badge => {
|
||||||
badge.addEventListener('click', e => { e.stopPropagation(); state.activeGroup = badge.dataset.group; renderBoard(); });
|
badge.addEventListener('click', e => { e.stopPropagation(); state.activeGroup = badge.dataset.group; renderBoard(); });
|
||||||
});
|
});
|
||||||
@@ -932,8 +1154,11 @@ function bindCardEvents() {
|
|||||||
const isMulti = selectedIds.has(String(id)) && selectedIds.size > 1;
|
const isMulti = selectedIds.has(String(id)) && selectedIds.size > 1;
|
||||||
const dragIds = isMulti ? [...selectedIds] : [String(id)];
|
const dragIds = isMulti ? [...selectedIds] : [String(id)];
|
||||||
|
|
||||||
// Ghost all dragged cards
|
// Ghost all dragged cards + remember the ids so a poll-driven
|
||||||
|
// re-render can re-apply the ghost state.
|
||||||
|
draggingCardIds.clear();
|
||||||
dragIds.forEach(did => {
|
dragIds.forEach(did => {
|
||||||
|
draggingCardIds.add(String(did));
|
||||||
board.querySelector(`[data-id="${did}"]`)?.classList.add('card-dragging');
|
board.querySelector(`[data-id="${did}"]`)?.classList.add('card-dragging');
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -979,20 +1204,36 @@ function bindCardEvents() {
|
|||||||
el.addEventListener('dragend', () => {
|
el.addEventListener('dragend', () => {
|
||||||
// Remove ghost class from all dragged cards
|
// Remove ghost class from all dragged cards
|
||||||
board.querySelectorAll('.card-dragging').forEach(c => c.classList.remove('card-dragging'));
|
board.querySelectorAll('.card-dragging').forEach(c => c.classList.remove('card-dragging'));
|
||||||
|
draggingCardIds.clear();
|
||||||
activeDragEl = null;
|
activeDragEl = null;
|
||||||
if (dragGhost) { dragGhost.remove(); dragGhost = null; }
|
if (dragGhost) { dragGhost.remove(); dragGhost = null; }
|
||||||
board.querySelectorAll('.card-drop-before,.card-drop-after,.card-drop-group').forEach(x =>
|
board.querySelectorAll('.card-drop-group').forEach(x => x.classList.remove('card-drop-group'));
|
||||||
x.classList.remove('card-drop-before', 'card-drop-after', 'card-drop-group'));
|
hideCardDropCursor();
|
||||||
});
|
});
|
||||||
el.addEventListener('dragover', e => {
|
el.addEventListener('dragover', e => {
|
||||||
e.preventDefault(); e.dataTransfer.dropEffect = 'move';
|
e.preventDefault(); e.dataTransfer.dropEffect = 'move';
|
||||||
const rect = el.getBoundingClientRect();
|
const rect = el.getBoundingClientRect();
|
||||||
const edge = rect.width * 0.25, x = e.clientX - rect.left;
|
const edge = rect.width * 0.25, x = e.clientX - rect.left;
|
||||||
el.classList.toggle('card-drop-before', x < edge);
|
// Three zones (matching the bucket fix): left 25% / right 25%
|
||||||
el.classList.toggle('card-drop-after', x > rect.width - edge);
|
// → insertion cursor in the gap, center 50% → group highlight
|
||||||
el.classList.toggle('card-drop-group', x >= edge && x <= rect.width - edge);
|
// on the target card.
|
||||||
|
const isBefore = x < edge;
|
||||||
|
const isAfter = x > rect.width - edge;
|
||||||
|
const isGroup = !isBefore && !isAfter;
|
||||||
|
el.classList.toggle('card-drop-group', isGroup);
|
||||||
|
if (isGroup) {
|
||||||
|
hideCardDropCursor();
|
||||||
|
} else {
|
||||||
|
showCardDropCursor(el, isBefore);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
el.addEventListener('dragleave', () => {
|
||||||
|
el.classList.remove('card-drop-group');
|
||||||
|
// Don't hide the cursor here — the next card's dragover will
|
||||||
|
// reposition it. Hiding on dragleave makes the cursor flicker
|
||||||
|
// as the mouse moves across adjacent cards. Final cleanup
|
||||||
|
// happens on dragend.
|
||||||
});
|
});
|
||||||
el.addEventListener('dragleave', () => el.classList.remove('card-drop-before', 'card-drop-after', 'card-drop-group'));
|
|
||||||
el.addEventListener('drop', e => handleCardDrop(e, el, id));
|
el.addEventListener('drop', e => handleCardDrop(e, el, id));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -1001,9 +1242,17 @@ function bindCardEvents() {
|
|||||||
|
|
||||||
async function handleCardDrop(e, el, targetId) {
|
async function handleCardDrop(e, el, targetId) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const wasGroup = el.classList.contains('card-drop-group');
|
// Recompute the drop zone from the mouse position rather than reading
|
||||||
const wasBefore = el.classList.contains('card-drop-before');
|
// it back from CSS classes — the new cursor-based dragover doesn't
|
||||||
el.classList.remove('card-drop-before', 'card-drop-after', 'card-drop-group');
|
// tag the target with `.card-drop-before` / `.card-drop-after` anymore,
|
||||||
|
// only `.card-drop-group` for the center hover state.
|
||||||
|
const rect = el.getBoundingClientRect();
|
||||||
|
const edge = rect.width * 0.25;
|
||||||
|
const x = e.clientX - rect.left;
|
||||||
|
const wasGroup = !(x < edge) && !(x > rect.width - edge);
|
||||||
|
const wasBefore = x < edge;
|
||||||
|
el.classList.remove('card-drop-group');
|
||||||
|
board.querySelector('#card-drop-cursor')?.style.setProperty('display', 'none');
|
||||||
const dragId = e.dataTransfer.getData('text/plain');
|
const dragId = e.dataTransfer.getData('text/plain');
|
||||||
if (!dragId || dragId === targetId) return;
|
if (!dragId || dragId === targetId) return;
|
||||||
|
|
||||||
@@ -1105,6 +1354,9 @@ board.addEventListener('mousedown', e => {
|
|||||||
if (!boxActive) {
|
if (!boxActive) {
|
||||||
boxActive = true;
|
boxActive = true;
|
||||||
if (!additive) clearSelection();
|
if (!additive) clearSelection();
|
||||||
|
// Mark the selection as bulk so the join action knows to use
|
||||||
|
// the longest-title strategy instead of first-clicked.
|
||||||
|
state.selectionWasBulk = true;
|
||||||
boxEl = document.createElement('div');
|
boxEl = document.createElement('div');
|
||||||
boxEl.className = 'box-select';
|
boxEl.className = 'box-select';
|
||||||
board.appendChild(boxEl);
|
board.appendChild(boxEl);
|
||||||
|
|||||||
+440
-46
@@ -1,8 +1,9 @@
|
|||||||
// ── Bucket management ──
|
// ── Bucket management ──
|
||||||
|
|
||||||
import { $, esc, api } from './util.js';
|
import { $, esc, api } from './util.js';
|
||||||
import { state, CARD_COLORS } from './state.js';
|
import { state, CARD_COLORS, setActiveBucket, ensureActiveBucketValid } from './state.js';
|
||||||
import { showDialog } from './dialog.js';
|
import { showDialog } from './dialog.js';
|
||||||
|
import { pushUndo } from './undo.js';
|
||||||
|
|
||||||
// ── Bucket context menu ──
|
// ── Bucket context menu ──
|
||||||
|
|
||||||
@@ -19,14 +20,30 @@ document.addEventListener('click', hideBucketCtx);
|
|||||||
|
|
||||||
async function showBucketCtx(x, y, bucket) {
|
async function showBucketCtx(x, y, bucket) {
|
||||||
ctxBucketId = bucket.id;
|
ctxBucketId = bucket.id;
|
||||||
const idx = state.buckets.findIndex(b => b.id == bucket.id);
|
// Move-left / move-right operates within the bucket's siblings —
|
||||||
|
// top-level peers if the bucket is top-level, dropdown peers if it's
|
||||||
|
// a super-bucket child. This keeps reordering scoped to where the
|
||||||
|
// user actually sees the bucket in the UI.
|
||||||
|
const siblings = state.buckets
|
||||||
|
.filter(b => (b.parent_id || null) === (bucket.parent_id || null))
|
||||||
|
.sort((a, b) => (a.position || 0) - (b.position || 0));
|
||||||
|
const idx = siblings.findIndex(b => b.id == bucket.id);
|
||||||
const canLeft = idx > 0;
|
const canLeft = idx > 0;
|
||||||
const canRight = idx < state.buckets.length - 1;
|
const canRight = idx >= 0 && idx < siblings.length - 1;
|
||||||
const hasCards = state.cards.some(c => c.bucket_id == bucket.id);
|
const hasCards = state.cards.some(c => c.bucket_id == bucket.id);
|
||||||
|
|
||||||
|
const isCollab = !!bucket.collab_uid;
|
||||||
ctxMenu.innerHTML = `<div class="py-1">
|
ctxMenu.innerHTML = `<div class="py-1">
|
||||||
<button class="ctx-item" data-baction="rename"><i class="ph ph-pencil-simple text-sm"></i><span class="font-pixel text-[10px]">Rename</span></button>
|
<button class="ctx-item" data-baction="rename"><i class="ph ph-pencil-simple text-sm"></i><span class="font-pixel text-[10px]">Rename</span></button>
|
||||||
<button class="ctx-item" data-baction="color"><i class="ph ph-palette text-sm"></i><span class="font-pixel text-[10px]">Color</span><i class="ph ph-caret-right text-xs ml-auto"></i></button>
|
<button class="ctx-item" data-baction="color"><i class="ph ph-palette text-sm"></i><span class="font-pixel text-[10px]">Color</span><i class="ph ph-caret-right text-xs ml-auto"></i></button>
|
||||||
|
${isCollab && typeof window._collabBucketsEditDialog === 'function'
|
||||||
|
? `<button class="ctx-item" data-baction="collab-manage"><i class="ph ph-users-three text-sm"></i><span class="font-pixel text-[10px]">Members & owner…</span></button>`
|
||||||
|
: ''
|
||||||
|
}
|
||||||
|
${!isCollab && typeof window._collabBucketsUpgradeDialog === 'function'
|
||||||
|
? `<button class="ctx-item" data-baction="collab-upgrade"><i class="ph ph-users-three text-sm"></i><span class="font-pixel text-[10px]">Make collaborative…</span></button>`
|
||||||
|
: ''
|
||||||
|
}
|
||||||
<div style="height:1px;background:var(--t-border);margin:2px 0"></div>
|
<div style="height:1px;background:var(--t-border);margin:2px 0"></div>
|
||||||
<button class="ctx-item ${!canLeft ? 'opacity-30 pointer-events-none' : ''}" data-baction="move-left"><i class="ph ph-arrow-left text-sm"></i><span class="font-pixel text-[10px]">Move left</span></button>
|
<button class="ctx-item ${!canLeft ? 'opacity-30 pointer-events-none' : ''}" data-baction="move-left"><i class="ph ph-arrow-left text-sm"></i><span class="font-pixel text-[10px]">Move left</span></button>
|
||||||
<button class="ctx-item ${!canRight ? 'opacity-30 pointer-events-none' : ''}" data-baction="move-right"><i class="ph ph-arrow-right text-sm"></i><span class="font-pixel text-[10px]">Move right</span></button>
|
<button class="ctx-item ${!canRight ? 'opacity-30 pointer-events-none' : ''}" data-baction="move-right"><i class="ph ph-arrow-right text-sm"></i><span class="font-pixel text-[10px]">Move right</span></button>
|
||||||
@@ -56,32 +73,81 @@ async function showBucketCtx(x, y, bucket) {
|
|||||||
document.getElementById('bctx-colors').classList.toggle('hidden');
|
document.getElementById('bctx-colors').classList.toggle('hidden');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (a === 'collab-manage') {
|
||||||
|
hideBucketCtx();
|
||||||
|
if (typeof window._collabBucketsEditDialog === 'function') {
|
||||||
|
const changed = await window._collabBucketsEditDialog(bucket.collab_uid);
|
||||||
|
if (changed) await window._reloadAll();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (a === 'collab-upgrade') {
|
||||||
|
hideBucketCtx();
|
||||||
|
if (typeof window._collabBucketsUpgradeDialog === 'function') {
|
||||||
|
const changed = await window._collabBucketsUpgradeDialog(bucket.id);
|
||||||
|
if (changed) await window._reloadAll();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
else if (a === 'rename') {
|
else if (a === 'rename') {
|
||||||
hideBucketCtx();
|
hideBucketCtx();
|
||||||
const name = await showDialog({ title: 'rename_bucket', input: true, placeholder: bucket.name });
|
const name = await showDialog({ title: 'rename_bucket', input: true, placeholder: bucket.name });
|
||||||
if (!name || !name.trim()) return;
|
if (!name || !name.trim()) return;
|
||||||
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { name: name.trim() } });
|
// Collab buckets: push name change through the plugin (relay +
|
||||||
await loadBuckets(); window._renderBoard();
|
// mirror). The next poll pulls the new name into the local row.
|
||||||
|
if (bucket.collab_uid && typeof window._collabBucketsPatch === 'function') {
|
||||||
|
const res = await window._collabBucketsPatch(bucket.collab_uid, { name: name.trim() });
|
||||||
|
if (!res?.ok) { alert(res?.error || 'rename failed'); return; }
|
||||||
|
} else {
|
||||||
|
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { name: name.trim() } });
|
||||||
|
}
|
||||||
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
else if (a === 'move-left' || a === 'move-right') {
|
else if (a === 'move-left' || a === 'move-right') {
|
||||||
hideBucketCtx();
|
hideBucketCtx();
|
||||||
const swapIdx = a === 'move-left' ? idx - 1 : idx + 1;
|
const other = siblings[a === 'move-left' ? idx - 1 : idx + 1];
|
||||||
const other = state.buckets[swapIdx];
|
|
||||||
if (!other) return;
|
if (!other) return;
|
||||||
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { position: swapIdx } });
|
// Swap positions of two siblings — works for both top-level
|
||||||
await api(`api/buckets/${other.id}`, { method: 'PATCH', body: { position: idx } });
|
// and dropdown reordering since `siblings` is scoped above.
|
||||||
|
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { position: other.position ?? 0 } });
|
||||||
|
await api(`api/buckets/${other.id}`, { method: 'PATCH', body: { position: bucket.position ?? 0 } });
|
||||||
await loadBuckets(); window._renderBoard();
|
await loadBuckets(); window._renderBoard();
|
||||||
}
|
}
|
||||||
else if (a === 'delete-keep') {
|
else if (a === 'delete-keep') {
|
||||||
hideBucketCtx();
|
hideBucketCtx();
|
||||||
const cards = state.cards.filter(c => c.bucket_id == bucket.id);
|
const cards = state.cards.filter(c => c.bucket_id == bucket.id);
|
||||||
if (cards.length > 0 || localStorage.getItem('hyprcrd-confirm-delete') !== '0') {
|
if (cards.length > 0 || localStorage.getItem('hyprcrd-confirm-delete') !== '0') {
|
||||||
const ok = await showDialog({ title: 'delete_bucket', message: cards.length ? `Delete "${bucket.name}"? ${cards.length} card(s) will be kept.` : `Delete "${bucket.name}"?`, danger: true, okLabel: 'Delete' });
|
const msg = bucket.collab_uid
|
||||||
|
? (cards.length ? `Leave / delete "${bucket.name}"? ${cards.length} card(s) will be kept locally.` : `Leave / delete "${bucket.name}"?`)
|
||||||
|
: (cards.length ? `Delete "${bucket.name}"? ${cards.length} card(s) will be kept.` : `Delete "${bucket.name}"?`);
|
||||||
|
const ok = await showDialog({ title: 'delete_bucket', message: msg, danger: true, okLabel: bucket.collab_uid ? 'Leave / delete' : 'Delete' });
|
||||||
if (!ok) return;
|
if (!ok) return;
|
||||||
}
|
}
|
||||||
if (state.activeBucket == bucket.id) state.activeBucket = 'all';
|
if (state.activeBucket == bucket.id) setActiveBucket('all');
|
||||||
await api(`api/buckets/${bucket.id}`, { method: 'DELETE' });
|
// Collab bucket: route through plugin so the relay is notified
|
||||||
await loadBuckets(); await window._reloadAll();
|
// (owner = delete for everyone; member = just leave).
|
||||||
|
if (bucket.collab_uid && typeof window._collabBucketsDelete === 'function') {
|
||||||
|
const res = await window._collabBucketsDelete(bucket.collab_uid);
|
||||||
|
if (!res?.ok) { alert(res?.error || 'delete failed'); return; }
|
||||||
|
// Undo is intentionally NOT wired for collab deletes/leaves
|
||||||
|
// — restoring would require re-creating on the relay and
|
||||||
|
// re-attaching cards under a new uid. Too messy for MVP.
|
||||||
|
} else {
|
||||||
|
// Snapshot the row + affected card ids before deleting so
|
||||||
|
// the undo entry can restore them.
|
||||||
|
const snapshot = { name: bucket.name, color: bucket.color, position: bucket.position };
|
||||||
|
const affected = cards.map(c => c.id);
|
||||||
|
await api(`api/buckets/${bucket.id}`, { method: 'DELETE' });
|
||||||
|
pushUndo(`delete bucket "${bucket.name}"`, async () => {
|
||||||
|
const created = await api('api/buckets', { method: 'POST', body: { name: snapshot.name } });
|
||||||
|
if (created?.id) {
|
||||||
|
await api(`api/buckets/${created.id}`, { method: 'PATCH', body: { color: snapshot.color, position: snapshot.position } });
|
||||||
|
// Re-attach cards to the recreated bucket
|
||||||
|
await Promise.all(affected.map(id => api(`api/cards/${id}`, { method: 'PATCH', body: { bucket_id: created.id } })));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
else if (a === 'delete-all') {
|
else if (a === 'delete-all') {
|
||||||
hideBucketCtx();
|
hideBucketCtx();
|
||||||
@@ -89,9 +155,14 @@ async function showBucketCtx(x, y, bucket) {
|
|||||||
const ok = await showDialog({ title: 'delete_bucket', message: `Delete "${bucket.name}" and ${cards.length} card(s)?`, danger: true, okLabel: 'Delete all' });
|
const ok = await showDialog({ title: 'delete_bucket', message: `Delete "${bucket.name}" and ${cards.length} card(s)?`, danger: true, okLabel: 'Delete all' });
|
||||||
if (!ok) return;
|
if (!ok) return;
|
||||||
for (const c of cards) await api(`api/cards/${c.id}`, { method: 'DELETE' });
|
for (const c of cards) await api(`api/cards/${c.id}`, { method: 'DELETE' });
|
||||||
if (state.activeBucket == bucket.id) state.activeBucket = 'all';
|
if (state.activeBucket == bucket.id) setActiveBucket('all');
|
||||||
await api(`api/buckets/${bucket.id}`, { method: 'DELETE' });
|
if (bucket.collab_uid && typeof window._collabBucketsDelete === 'function') {
|
||||||
await loadBuckets(); await window._reloadAll();
|
const res = await window._collabBucketsDelete(bucket.collab_uid);
|
||||||
|
if (!res?.ok) { alert(res?.error || 'delete failed'); return; }
|
||||||
|
} else {
|
||||||
|
await api(`api/buckets/${bucket.id}`, { method: 'DELETE' });
|
||||||
|
}
|
||||||
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -99,9 +170,14 @@ async function showBucketCtx(x, y, bucket) {
|
|||||||
ctxMenu.querySelectorAll('[data-bctx-color]').forEach(btn => btn.addEventListener('click', async e => {
|
ctxMenu.querySelectorAll('[data-bctx-color]').forEach(btn => btn.addEventListener('click', async e => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
hideBucketCtx();
|
hideBucketCtx();
|
||||||
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { color: btn.dataset.bctxColor } });
|
const newColor = btn.dataset.bctxColor;
|
||||||
await loadBuckets();
|
if (bucket.collab_uid && typeof window._collabBucketsPatch === 'function') {
|
||||||
window._renderBoard();
|
const res = await window._collabBucketsPatch(bucket.collab_uid, { color: newColor });
|
||||||
|
if (!res?.ok) { alert(res?.error || 'color change failed'); return; }
|
||||||
|
} else {
|
||||||
|
await api(`api/buckets/${bucket.id}`, { method: 'PATCH', body: { color: newColor } });
|
||||||
|
}
|
||||||
|
await window._reloadAll();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,8 +186,61 @@ const inpBucket = $('inp-bucket');
|
|||||||
const searchFilter = $('search-bucket-filter');
|
const searchFilter = $('search-bucket-filter');
|
||||||
const tasksFilter = $('tasks-bucket-filter');
|
const tasksFilter = $('tasks-bucket-filter');
|
||||||
|
|
||||||
|
// ── Overflow handling for the bucket bar ─────────────────────────
|
||||||
|
// Scrollbar is hidden (CSS). Mouse-wheel over the bar translates to
|
||||||
|
// horizontal scroll so long bucket rows stay usable without a bar.
|
||||||
|
// Edge fades kick in dynamically based on scroll position so the
|
||||||
|
// user sees there's more off-screen — both sides at once in the
|
||||||
|
// middle, one side at either extreme. Fade overlays live on the
|
||||||
|
// parent #bucket-row (see CSS) so they don't clip super-bucket
|
||||||
|
// popovers that render inside #bucket-bar itself.
|
||||||
|
const barRow = $('bucket-row');
|
||||||
|
function updateBucketBarFades() {
|
||||||
|
if (!bar || !barRow) return;
|
||||||
|
const canLeft = bar.scrollLeft > 2;
|
||||||
|
const canRight = bar.scrollLeft + bar.clientWidth < bar.scrollWidth - 2;
|
||||||
|
barRow.classList.toggle('fade-left', canLeft && !canRight);
|
||||||
|
barRow.classList.toggle('fade-right', !canLeft && canRight);
|
||||||
|
barRow.classList.toggle('fade-both', canLeft && canRight);
|
||||||
|
// Right-side fade overlay is anchored to the parent's right edge;
|
||||||
|
// the actual bar ends before the toolbar toggles. Compute the
|
||||||
|
// distance so the gradient lines up with the bar's right edge.
|
||||||
|
const rowRect = barRow.getBoundingClientRect();
|
||||||
|
const barRect = bar.getBoundingClientRect();
|
||||||
|
const rightInset = Math.max(0, rowRect.right - barRect.right);
|
||||||
|
barRow.style.setProperty('--bucket-row-right-inset', rightInset + 'px');
|
||||||
|
}
|
||||||
|
if (bar) {
|
||||||
|
bar.addEventListener('wheel', (e) => {
|
||||||
|
if (e.deltaY === 0) return;
|
||||||
|
if (bar.scrollWidth <= bar.clientWidth) return;
|
||||||
|
e.preventDefault();
|
||||||
|
bar.scrollLeft += e.deltaY;
|
||||||
|
}, { passive: false });
|
||||||
|
bar.addEventListener('scroll', updateBucketBarFades, { passive: true });
|
||||||
|
window.addEventListener('resize', updateBucketBarFades);
|
||||||
|
new MutationObserver(updateBucketBarFades).observe(bar, { childList: true, subtree: false });
|
||||||
|
updateBucketBarFades();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Switch the active bucket without going through the click path —
|
||||||
|
* used by the number-key hotkeys (and any other code that wants to
|
||||||
|
* activate a bucket programmatically without triggering the super-
|
||||||
|
* bucket dropdown). Persists via setActiveBucket and re-renders the
|
||||||
|
* bar + board so the active highlight tracks. */
|
||||||
|
export function activateBucket(idOrSpecial) {
|
||||||
|
setActiveBucket(idOrSpecial);
|
||||||
|
state.activeGroup = null;
|
||||||
|
renderBar();
|
||||||
|
window._renderBoard?.();
|
||||||
|
}
|
||||||
|
|
||||||
export async function loadBuckets() {
|
export async function loadBuckets() {
|
||||||
state.buckets = await api('api/buckets');
|
state.buckets = await api('api/buckets');
|
||||||
|
// The persisted activeBucket may point to a bucket that no longer
|
||||||
|
// exists (deleted in another tab, removed via import, etc.). Reset
|
||||||
|
// to 'all' in that case before rendering.
|
||||||
|
ensureActiveBucketValid();
|
||||||
renderBar();
|
renderBar();
|
||||||
populateSelects();
|
populateSelects();
|
||||||
}
|
}
|
||||||
@@ -150,17 +279,75 @@ function updateHeaderTint() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Remembers the last active member per super-bucket so the tile doesn't
|
||||||
|
// fall back to the parent label when the user navigates away and comes
|
||||||
|
// back. Keyed by parent bucket id → last selected member id (could be
|
||||||
|
// the parent itself or any child).
|
||||||
|
const lastSuperSelection = new Map();
|
||||||
|
|
||||||
function renderBar() {
|
function renderBar() {
|
||||||
if (!bar) return;
|
if (!bar) return;
|
||||||
const tab = (active) => `bucket-tab ${active ? 'active' : ''} flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors shrink-0`;
|
const tab = (active) => `bucket-tab ${active ? 'active' : ''} flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors shrink-0`;
|
||||||
|
|
||||||
|
// Top-level buckets only — children are rendered inside their parent's
|
||||||
|
// dropdown popover, not directly in the bar.
|
||||||
|
const topLevel = state.buckets.filter(b => !b.parent_id);
|
||||||
|
const childrenOf = (parentId) => state.buckets
|
||||||
|
.filter(b => b.parent_id == parentId)
|
||||||
|
.sort((a, b) => (a.position || 0) - (b.position || 0));
|
||||||
|
|
||||||
|
// Track which super-bucket member is active NOW so we can recall it
|
||||||
|
// later when the user comes back from a different bucket.
|
||||||
|
for (const b of topLevel) {
|
||||||
|
const kids = childrenOf(b.id);
|
||||||
|
if (!kids.length) continue;
|
||||||
|
if (state.activeBucket == b.id) lastSuperSelection.set(b.id, b.id);
|
||||||
|
const activeKid = kids.find(c => c.id == state.activeBucket);
|
||||||
|
if (activeKid) lastSuperSelection.set(b.id, activeKid.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve which child / parent to *show* on a super-bucket tile.
|
||||||
|
// Priority: currently active member → last selected member → parent.
|
||||||
|
const tileFor = (parent) => {
|
||||||
|
const kids = childrenOf(parent.id);
|
||||||
|
if (!kids.length) return null; // not a super-bucket
|
||||||
|
const activeChild = kids.find(c => c.id == state.activeBucket);
|
||||||
|
if (activeChild) return activeChild;
|
||||||
|
if (state.activeBucket == parent.id) return parent;
|
||||||
|
// Fall back to the last selection rather than the parent
|
||||||
|
const lastId = lastSuperSelection.get(parent.id);
|
||||||
|
if (lastId) {
|
||||||
|
if (lastId == parent.id) return parent;
|
||||||
|
const lastKid = kids.find(c => c.id == lastId);
|
||||||
|
if (lastKid) return lastKid;
|
||||||
|
}
|
||||||
|
return parent;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Show an unread dot on the fixed `all` tab when state.unseenCardIds
|
||||||
|
// has anything in it AND the user isn't currently looking at the
|
||||||
|
// all view. board.js drives the unseen set; we just read it here so
|
||||||
|
// the dot survives bar re-renders that aren't followed by a board
|
||||||
|
// render (e.g. bucket reorder, plain renderBar() call).
|
||||||
|
const allUnread = state.activeBucket !== 'all' && state.unseenCardIds.size > 0;
|
||||||
bar.innerHTML = `
|
bar.innerHTML = `
|
||||||
<button class="${tab(state.activeBucket === 'all')}" data-bucket="all" title="all"><i class="ph ph-squares-four text-sm"></i></button>
|
<button class="${tab(state.activeBucket === 'all')}${allUnread ? ' has-unread' : ''}" data-bucket="all" data-tip="all"><i class="ph ph-squares-four text-sm"></i>${allUnread ? '<span class="bar-unread-dot"></span>' : ''}</button>
|
||||||
<button class="${tab(state.activeBucket === 'current')}" data-bucket="current" title="current"><i class="ph ph-lightning text-sm"></i></button>
|
<button class="${tab(state.activeBucket === 'current')}" data-bucket="current" data-tip="current"><i class="ph ph-lightning text-sm"></i></button>
|
||||||
<button class="${tab(state.activeBucket === 'favorites')}" data-bucket="favorites" title="favorites"><i class="ph ph-star text-sm"></i></button>
|
<button class="${tab(state.activeBucket === 'favorites')}" data-bucket="favorites" data-tip="favorites"><i class="ph ph-star text-sm"></i></button>
|
||||||
<button class="${tab(state.activeBucket === 'journal')}" data-bucket="journal" title="journal"><i class="ph ph-notebook text-sm"></i></button>
|
<button class="${tab(state.activeBucket === 'journal')}" data-bucket="journal" data-tip="journal"><i class="ph ph-notebook text-sm"></i></button>
|
||||||
<button class="${tab(state.activeBucket === 'none')}" data-bucket="none" title="unsorted"><i class="ph ph-tray text-sm"></i></button>
|
<button class="${tab(state.activeBucket === 'none')}" data-bucket="none" data-tip="unsorted"><i class="ph ph-tray text-sm"></i></button>
|
||||||
${state.buckets.map(b => {
|
${topLevel.map(b => {
|
||||||
|
const kids = childrenOf(b.id);
|
||||||
|
const isSuper = kids.length > 0;
|
||||||
|
if (isSuper) {
|
||||||
|
// Super-bucket tile: shows the active member's name + a stack icon.
|
||||||
|
// The shown member's id goes on `data-super-shown` so we can
|
||||||
|
// highlight + recolor without taking over the dropdown click.
|
||||||
|
const shown = tileFor(b);
|
||||||
|
const c = shown.color || '#64748b';
|
||||||
|
const groupActive = state.activeBucket == b.id || kids.some(k => k.id == state.activeBucket);
|
||||||
|
return `<button class="${tab(groupActive)} bucket-super" data-bucket-super="${b.id}" data-super-shown="${shown.id}" draggable="true" data-bucket-drag="${b.id}" style="border-top:3px solid ${c};${groupActive ? `background:${c};color:var(--t-bg);border-color:${c}` : ''}"><i class="ph ph-stack text-sm"></i><span class="font-pixel text-[10px]">${esc(shown.name)}</span><span class="super-caret" data-super-caret="${b.id}"><i class="ph ph-caret-down text-[10px]"></i></span></button>`;
|
||||||
|
}
|
||||||
const c = b.color || '#64748b';
|
const c = b.color || '#64748b';
|
||||||
const active = state.activeBucket == b.id;
|
const active = state.activeBucket == b.id;
|
||||||
return `<button class="${tab(active)}" data-bucket="${b.id}" draggable="true" data-bucket-drag="${b.id}" style="border-top:3px solid ${c};${active ? `background:${c};color:var(--t-bg);border-color:${c}` : ''}"><i class="ph ph-folder text-sm"></i><span class="font-pixel text-[10px]">${esc(b.name)}</span></button>`;
|
return `<button class="${tab(active)}" data-bucket="${b.id}" draggable="true" data-bucket-drag="${b.id}" style="border-top:3px solid ${c};${active ? `background:${c};color:var(--t-bg);border-color:${c}` : ''}"><i class="ph ph-folder text-sm"></i><span class="font-pixel text-[10px]">${esc(b.name)}</span></button>`;
|
||||||
@@ -171,11 +358,166 @@ function renderBar() {
|
|||||||
|
|
||||||
let draggingBucketId = null;
|
let draggingBucketId = null;
|
||||||
|
|
||||||
bar.querySelectorAll('.bucket-tab').forEach(t => {
|
// Single insertion-cursor element shared by all bucket tabs. Lives
|
||||||
const bid = t.dataset.bucket;
|
// inside #bucket-bar (which is `position: relative` so absolute
|
||||||
const isUser = bid !== 'all' && bid !== 'none';
|
// children align to its scroll-aware coord space) and gets repositioned
|
||||||
|
// by the dragover handlers below. The cursor sits *between* tiles,
|
||||||
|
// not as a border on the target tile, so it stays unambiguous when
|
||||||
|
// we add the super-bucket nest gesture later.
|
||||||
|
let dropCursor = bar.querySelector('#bucket-drop-cursor');
|
||||||
|
if (!dropCursor) {
|
||||||
|
dropCursor = document.createElement('div');
|
||||||
|
dropCursor.id = 'bucket-drop-cursor';
|
||||||
|
bar.appendChild(dropCursor);
|
||||||
|
}
|
||||||
|
function showDropCursor(targetTab, before) {
|
||||||
|
// Position the cursor at the gap on the chosen side of the target.
|
||||||
|
// offsetLeft / offsetWidth are relative to the offsetParent
|
||||||
|
// (#bucket-bar) so they survive horizontal scroll.
|
||||||
|
const x = before
|
||||||
|
? targetTab.offsetLeft - 4
|
||||||
|
: targetTab.offsetLeft + targetTab.offsetWidth + 1;
|
||||||
|
dropCursor.style.left = x + 'px';
|
||||||
|
dropCursor.style.display = 'block';
|
||||||
|
}
|
||||||
|
function hideDropCursor() {
|
||||||
|
dropCursor.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
t.addEventListener('click', () => { state.activeBucket = bid; state.activeGroup = null; renderBar(); window._renderBoard(); });
|
/** Can `draggedId` legally become a child of `targetId`?
|
||||||
|
* Rules: 1-level deep only, no self-parenting, target must be a real
|
||||||
|
* user bucket and currently top-level, dragged must not have children. */
|
||||||
|
function canNestInto(draggedId, targetId) {
|
||||||
|
if (!Number.isFinite(draggedId) || !Number.isFinite(targetId)) return false;
|
||||||
|
if (draggedId === targetId) return false;
|
||||||
|
const target = state.buckets.find(b => b.id === targetId);
|
||||||
|
if (!target || target.parent_id) return false;
|
||||||
|
const dragged = state.buckets.find(b => b.id === draggedId);
|
||||||
|
if (!dragged) return false;
|
||||||
|
// Already a child of the same target → no-op nest
|
||||||
|
if (dragged.parent_id === targetId) return false;
|
||||||
|
// Dragged has its own children → would create level-2
|
||||||
|
if (state.buckets.some(b => b.parent_id === draggedId)) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Open a popover under a super-bucket tile, listing parent + every
|
||||||
|
* child. Each entry is a real `.bucket-tab[data-bucket=...]` element
|
||||||
|
* so the collab plugin's MutationObserver still picks them up and
|
||||||
|
* decorates them with the unread dot / users-three icon. */
|
||||||
|
function openSuperDropdown(anchorTab, parentId) {
|
||||||
|
// Toggle: if a popover is already open for this parent, close it.
|
||||||
|
const existing = document.getElementById('bucket-super-popover');
|
||||||
|
if (existing) {
|
||||||
|
const wasFor = existing.dataset.parentId;
|
||||||
|
existing.remove();
|
||||||
|
if (wasFor === String(parentId)) return;
|
||||||
|
}
|
||||||
|
const parent = state.buckets.find(b => b.id === parentId);
|
||||||
|
if (!parent) return;
|
||||||
|
const kids = state.buckets
|
||||||
|
.filter(b => b.parent_id === parentId)
|
||||||
|
.sort((a, b) => (a.position || 0) - (b.position || 0));
|
||||||
|
const members = [parent, ...kids];
|
||||||
|
|
||||||
|
const pop = document.createElement('div');
|
||||||
|
pop.id = 'bucket-super-popover';
|
||||||
|
pop.dataset.parentId = String(parentId);
|
||||||
|
// Anchor under the tile, clamped to the viewport.
|
||||||
|
const rect = anchorTab.getBoundingClientRect();
|
||||||
|
pop.style.position = 'fixed';
|
||||||
|
pop.style.top = (rect.bottom + 4) + 'px';
|
||||||
|
pop.style.left = rect.left + 'px';
|
||||||
|
|
||||||
|
// Highlight the currently active member OR the last remembered
|
||||||
|
// selection (so the user sees which child was picked last time
|
||||||
|
// even when they're currently on a different bucket).
|
||||||
|
const lastId = lastSuperSelection.get(parentId);
|
||||||
|
const renderEntry = (m) => {
|
||||||
|
const c = m.color || '#64748b';
|
||||||
|
const active = state.activeBucket == m.id || (!members.some(x => x.id == state.activeBucket) && lastId == m.id);
|
||||||
|
const isParent = m.id === parentId;
|
||||||
|
return `<button class="bucket-tab ${active ? 'active' : ''} flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors w-full" data-bucket="${m.id}" draggable="true" data-bucket-drag="${m.id}" style="border-left:3px solid ${c};${active ? `background:${c};color:var(--t-bg);border-color:${c}` : ''}"><i class="ph ph-folder text-sm"></i><span class="font-pixel text-[10px] flex-1 text-left">${esc(m.name)}</span>${isParent ? '<i class="ph ph-house text-[10px] opacity-60" data-tip="parent"></i>' : ''}</button>`;
|
||||||
|
};
|
||||||
|
pop.innerHTML = members.map(renderEntry).join('');
|
||||||
|
// Append inside #bucket-bar (not document.body) so the collab
|
||||||
|
// plugin's MutationObserver on #bucket-bar still picks up these
|
||||||
|
// .bucket-tab entries and decorates collab children with the
|
||||||
|
// unread dot + users-three icon. Position is `fixed` anyway so
|
||||||
|
// the bar's overflow:auto can't clip the popover.
|
||||||
|
bar.appendChild(pop);
|
||||||
|
|
||||||
|
// Wire each entry: click selects, contextmenu opens bucket ctx,
|
||||||
|
// drag starts a re-parent / re-order operation against the bar.
|
||||||
|
pop.querySelectorAll('.bucket-tab[data-bucket]').forEach(entry => {
|
||||||
|
const ebid = entry.dataset.bucket;
|
||||||
|
entry.addEventListener('click', () => {
|
||||||
|
setActiveBucket(ebid);
|
||||||
|
state.activeGroup = null;
|
||||||
|
pop.remove();
|
||||||
|
renderBar();
|
||||||
|
window._renderBoard();
|
||||||
|
});
|
||||||
|
entry.addEventListener('contextmenu', e => {
|
||||||
|
e.preventDefault(); e.stopPropagation();
|
||||||
|
const bk = state.buckets.find(b => b.id == ebid);
|
||||||
|
if (bk) showBucketCtx(e.clientX, e.clientY, bk);
|
||||||
|
});
|
||||||
|
entry.addEventListener('dragstart', e => {
|
||||||
|
draggingBucketId = ebid;
|
||||||
|
e.dataTransfer.setData('application/x-bucket', ebid);
|
||||||
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
entry.style.opacity = '0.3';
|
||||||
|
});
|
||||||
|
entry.addEventListener('dragend', () => {
|
||||||
|
entry.style.opacity = '';
|
||||||
|
draggingBucketId = null;
|
||||||
|
hideDropCursor();
|
||||||
|
bar.querySelectorAll('.bucket-nest-target').forEach(x => x.classList.remove('bucket-nest-target'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Click outside the popover closes it.
|
||||||
|
setTimeout(() => {
|
||||||
|
const onDocClick = (e) => {
|
||||||
|
if (!pop.contains(e.target) && !anchorTab.contains(e.target)) {
|
||||||
|
pop.remove();
|
||||||
|
document.removeEventListener('click', onDocClick);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.addEventListener('click', onDocClick);
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
bar.querySelectorAll('.bucket-tab').forEach(t => {
|
||||||
|
// Super-bucket tile uses `data-bucket-super`; regular tiles use
|
||||||
|
// `data-bucket`. The id we resolve here is the parent's id for a
|
||||||
|
// super-tile (so drag/contextmenu/etc. operate on the parent).
|
||||||
|
const isSuperTile = t.classList.contains('bucket-super');
|
||||||
|
const bid = isSuperTile ? t.dataset.bucketSuper : t.dataset.bucket;
|
||||||
|
const SPECIAL = ['all', 'current', 'favorites', 'journal', 'none'];
|
||||||
|
const isUser = isSuperTile || !SPECIAL.includes(bid);
|
||||||
|
|
||||||
|
if (isSuperTile) {
|
||||||
|
// Caret arrow opens the dropdown; clicking the rest of the
|
||||||
|
// tab activates the last-shown child (or parent).
|
||||||
|
const caret = t.querySelector('[data-super-caret]');
|
||||||
|
if (caret) {
|
||||||
|
caret.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
openSuperDropdown(t, parseInt(bid, 10));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
t.addEventListener('click', () => {
|
||||||
|
const shownId = t.dataset.superShown;
|
||||||
|
setActiveBucket(shownId || bid);
|
||||||
|
state.activeGroup = null;
|
||||||
|
renderBar();
|
||||||
|
window._renderBoard();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
t.addEventListener('click', () => { setActiveBucket(bid); state.activeGroup = null; renderBar(); window._renderBoard(); });
|
||||||
|
}
|
||||||
|
|
||||||
if (isUser) {
|
if (isUser) {
|
||||||
t.addEventListener('contextmenu', e => {
|
t.addEventListener('contextmenu', e => {
|
||||||
@@ -194,18 +536,31 @@ function renderBar() {
|
|||||||
t.addEventListener('dragend', () => {
|
t.addEventListener('dragend', () => {
|
||||||
t.style.opacity = '';
|
t.style.opacity = '';
|
||||||
draggingBucketId = null;
|
draggingBucketId = null;
|
||||||
bar.querySelectorAll('.bucket-drop-left,.bucket-drop-right').forEach(x => x.classList.remove('bucket-drop-left', 'bucket-drop-right'));
|
hideDropCursor();
|
||||||
|
bar.querySelectorAll('.bucket-nest-target').forEach(x => x.classList.remove('bucket-nest-target'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
t.addEventListener('dragover', e => {
|
t.addEventListener('dragover', e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (draggingBucketId && isUser && draggingBucketId !== bid) {
|
if (draggingBucketId && isUser && draggingBucketId !== bid) {
|
||||||
// Bucket reorder indicator
|
// Three drop zones along the tile's width:
|
||||||
|
// left 25% → insert before
|
||||||
|
// right 25% → insert after
|
||||||
|
// center 50% → nest into this bucket
|
||||||
const rect = t.getBoundingClientRect();
|
const rect = t.getBoundingClientRect();
|
||||||
const left = e.clientX < rect.left + rect.width / 2;
|
const x = e.clientX - rect.left;
|
||||||
t.classList.toggle('bucket-drop-left', left);
|
const isLeft = x < rect.width * 0.25;
|
||||||
t.classList.toggle('bucket-drop-right', !left);
|
const isRight = x > rect.width * 0.75;
|
||||||
|
const isCenter = !isLeft && !isRight;
|
||||||
|
if (isCenter && canNestInto(parseInt(draggingBucketId, 10), parseInt(bid, 10))) {
|
||||||
|
hideDropCursor();
|
||||||
|
bar.querySelectorAll('.bucket-nest-target').forEach(x => x.classList.remove('bucket-nest-target'));
|
||||||
|
t.classList.add('bucket-nest-target');
|
||||||
|
} else {
|
||||||
|
bar.querySelectorAll('.bucket-nest-target').forEach(x => x.classList.remove('bucket-nest-target'));
|
||||||
|
showDropCursor(t, isLeft);
|
||||||
|
}
|
||||||
t.classList.remove('drag-over');
|
t.classList.remove('drag-over');
|
||||||
} else if (!draggingBucketId) {
|
} else if (!draggingBucketId) {
|
||||||
// Card drop on bucket
|
// Card drop on bucket
|
||||||
@@ -213,23 +568,44 @@ function renderBar() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
t.addEventListener('dragleave', () => {
|
t.addEventListener('dragleave', () => {
|
||||||
t.classList.remove('drag-over', 'bucket-drop-left', 'bucket-drop-right');
|
t.classList.remove('drag-over');
|
||||||
});
|
});
|
||||||
t.addEventListener('drop', async e => {
|
t.addEventListener('drop', async e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
t.classList.remove('drag-over', 'bucket-drop-left', 'bucket-drop-right');
|
t.classList.remove('drag-over', 'bucket-nest-target');
|
||||||
|
hideDropCursor();
|
||||||
|
|
||||||
// Bucket reorder
|
// Bucket reorder / nest
|
||||||
const dragBid = e.dataTransfer.getData('application/x-bucket');
|
const dragBid = e.dataTransfer.getData('application/x-bucket');
|
||||||
if (dragBid && isUser && dragBid !== bid) {
|
if (dragBid && isUser && dragBid !== bid) {
|
||||||
const rect = t.getBoundingClientRect();
|
const rect = t.getBoundingClientRect();
|
||||||
const before = e.clientX < rect.left + rect.width / 2;
|
const x = e.clientX - rect.left;
|
||||||
const ids = state.buckets.map(b => String(b.id)).filter(i => i !== dragBid);
|
const isLeft = x < rect.width * 0.25;
|
||||||
const targetIdx = ids.indexOf(String(bid));
|
const isRight = x > rect.width * 0.75;
|
||||||
ids.splice(before ? targetIdx : targetIdx + 1, 0, dragBid);
|
const isCenter = !isLeft && !isRight;
|
||||||
await Promise.all(ids.map((id, i) => api(`api/buckets/${id}`, { method: 'PATCH', body: { position: i } })));
|
if (isCenter && canNestInto(parseInt(dragBid, 10), parseInt(bid, 10))) {
|
||||||
await loadBuckets();
|
// Nest: dragged becomes a child of target. Backend
|
||||||
window._renderBoard();
|
// refuses cycles / level-2 with a 400 — bubble that
|
||||||
|
// up via alert so the user knows.
|
||||||
|
const res = await api(`api/buckets/${dragBid}`, { method: 'PATCH', body: { parent_id: parseInt(bid, 10) } });
|
||||||
|
if (res?.error) { alert(res.error); return; }
|
||||||
|
await loadBuckets();
|
||||||
|
renderBar();
|
||||||
|
window._renderBoard();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Reorder among top-level buckets only.
|
||||||
|
const before = isLeft || (!isRight && x < rect.width / 2);
|
||||||
|
const topIds = state.buckets.filter(b => !b.parent_id).map(b => String(b.id)).filter(i => i !== dragBid);
|
||||||
|
const targetIdx = topIds.indexOf(String(bid));
|
||||||
|
if (targetIdx >= 0) {
|
||||||
|
topIds.splice(before ? targetIdx : targetIdx + 1, 0, dragBid);
|
||||||
|
// The dragged bucket also gets un-nested if it was a child.
|
||||||
|
await api(`api/buckets/${dragBid}`, { method: 'PATCH', body: { parent_id: null } });
|
||||||
|
await Promise.all(topIds.map((id, i) => api(`api/buckets/${id}`, { method: 'PATCH', body: { position: i } })));
|
||||||
|
await loadBuckets();
|
||||||
|
window._renderBoard();
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,8 +622,12 @@ function renderBar() {
|
|||||||
window._renderBoard();
|
window._renderBoard();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const bucketId = bid === 'none' ? null : (['all','current','journal'].includes(bid) ? undefined : bid);
|
// Card drop on a super-bucket: card goes into the *currently
|
||||||
|
// shown* member of that group, not the parent itself.
|
||||||
|
const targetBid = isSuperTile ? (t.dataset.superShown || bid) : bid;
|
||||||
|
const bucketId = targetBid === 'none' ? null : (['all','current','journal'].includes(targetBid) ? undefined : targetBid);
|
||||||
if (bucketId === undefined) return;
|
if (bucketId === undefined) return;
|
||||||
|
window._markCardsMoving?.(ids);
|
||||||
await Promise.all(ids.map(id => api(`api/cards/${id}`, { method: 'PATCH', body: { bucket_id: bucketId, parent_id: null } })));
|
await Promise.all(ids.map(id => api(`api/cards/${id}`, { method: 'PATCH', body: { bucket_id: bucketId, parent_id: null } })));
|
||||||
window._clearSelection?.();
|
window._clearSelection?.();
|
||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
@@ -256,10 +636,23 @@ function renderBar() {
|
|||||||
|
|
||||||
const addBtn = $('add-bucket-btn');
|
const addBtn = $('add-bucket-btn');
|
||||||
addBtn?.addEventListener('click', async () => {
|
addBtn?.addEventListener('click', async () => {
|
||||||
|
// Plugins (e.g. collab-buckets) can override the default create
|
||||||
|
// dialog by exposing window._collabBucketsCreateDialog. It returns
|
||||||
|
// true when a bucket was created, in which case we reload.
|
||||||
|
if (typeof window._collabBucketsCreateDialog === 'function') {
|
||||||
|
const created = await window._collabBucketsCreateDialog();
|
||||||
|
if (created) { await loadBuckets(); window._renderBoard(); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
const name = await showDialog({ title: 'new_bucket', input: true, placeholder: '> bucket name...' });
|
const name = await showDialog({ title: 'new_bucket', input: true, placeholder: '> bucket name...' });
|
||||||
if (!name || !name.trim()) return;
|
if (!name || !name.trim()) return;
|
||||||
await api('api/buckets', { method: 'POST', body: { name: name.trim() } });
|
const created = await api('api/buckets', { method: 'POST', body: { name: name.trim() } });
|
||||||
await loadBuckets();
|
await loadBuckets();
|
||||||
|
if (created?.id) {
|
||||||
|
setActiveBucket(created.id);
|
||||||
|
state.activeGroup = null;
|
||||||
|
}
|
||||||
|
renderBar();
|
||||||
window._renderBoard();
|
window._renderBoard();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -280,6 +673,7 @@ function renderBar() {
|
|||||||
const selected = window._getSelectedIds?.() || [];
|
const selected = window._getSelectedIds?.() || [];
|
||||||
const ids = selected.includes(String(cardId)) ? selected : [String(cardId)];
|
const ids = selected.includes(String(cardId)) ? selected : [String(cardId)];
|
||||||
const card = state.cards.find(c => String(c.id) === String(cardId));
|
const card = state.cards.find(c => String(c.id) === String(cardId));
|
||||||
|
window._markCardsMoving?.(ids);
|
||||||
const created = await api('api/buckets', { method: 'POST', body: { name: autoBucketNameFromCard(card) } });
|
const created = await api('api/buckets', { method: 'POST', body: { name: autoBucketNameFromCard(card) } });
|
||||||
if (!created?.id) return;
|
if (!created?.id) return;
|
||||||
await Promise.all(ids.map(id => api(`api/cards/${id}`, { method: 'PATCH', body: { bucket_id: created.id, parent_id: null } })));
|
await Promise.all(ids.map(id => api(`api/cards/${id}`, { method: 'PATCH', body: { bucket_id: created.id, parent_id: null } })));
|
||||||
|
|||||||
+9
-171
@@ -1,7 +1,13 @@
|
|||||||
// ── CalDAV Sync ──
|
// ── CalDAV Settings + Calendar Config ──
|
||||||
|
//
|
||||||
|
// Genuinely CalDAV-scoped concerns only:
|
||||||
|
// * Settings panel (connection URL / user / password, Test + Save)
|
||||||
|
// * Per-calendar color/icon configuration (persisted in localStorage)
|
||||||
|
//
|
||||||
|
// Sync orchestration (triggerSync, background poll, autosync toggle,
|
||||||
|
// sync-interval, relay settings, sync.tick hook) lives in sync.js.
|
||||||
|
|
||||||
import { $, esc, api, getCsrf } from './util.js';
|
import { $, esc, api, getCsrf } from './util.js';
|
||||||
import { state } from './state.js';
|
|
||||||
|
|
||||||
const CAL_ICONS = [
|
const CAL_ICONS = [
|
||||||
{ id: 'calendar-dots', label: 'calendar' },
|
{ id: 'calendar-dots', label: 'calendar' },
|
||||||
@@ -76,7 +82,7 @@ function renderCalList(calendars) {
|
|||||||
${CAL_COLORS.map(c => `<button class="cal-cfg-color" data-color="${c}" style="width:14px;height:14px;border-radius:2px;background:${c};border:2px solid ${c === activeColor ? 'var(--t-bright)' : 'transparent'};cursor:pointer;"></button>`).join('')}
|
${CAL_COLORS.map(c => `<button class="cal-cfg-color" data-color="${c}" style="width:14px;height:14px;border-radius:2px;background:${c};border:2px solid ${c === activeColor ? 'var(--t-bright)' : 'transparent'};cursor:pointer;"></button>`).join('')}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex gap-1 ml-1">
|
<div class="flex gap-1 ml-1">
|
||||||
${CAL_ICONS.slice(0, 6).map(ic => `<button class="cal-cfg-icon" data-icon="${ic.id}" title="${ic.label}" style="font-size:12px;cursor:pointer;padding:1px;border-radius:2px;${ic.id === activeIcon ? 'color:var(--t-accent);' : 'color:var(--t-dim);'}"><i class="ph ph-${ic.id}"></i></button>`).join('')}
|
${CAL_ICONS.slice(0, 6).map(ic => `<button class="cal-cfg-icon" data-icon="${ic.id}" data-tip="${ic.label}" style="font-size:12px;cursor:pointer;padding:1px;border-radius:2px;${ic.id === activeIcon ? 'color:var(--t-accent);' : 'color:var(--t-dim);'}"><i class="ph ph-${ic.id}"></i></button>`).join('')}
|
||||||
</div>
|
</div>
|
||||||
</div>`;
|
</div>`;
|
||||||
}).join('');
|
}).join('');
|
||||||
@@ -119,7 +125,6 @@ export async function loadSettings() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function setCaldavTestStatus(text, kind = 'info') {
|
function setCaldavTestStatus(text, kind = 'info') {
|
||||||
if (!testStatus) return;
|
if (!testStatus) return;
|
||||||
if (!text) {
|
if (!text) {
|
||||||
@@ -170,52 +175,6 @@ $('caldav-save')?.addEventListener('click', async () => {
|
|||||||
testStatus.style.color = 'var(--t-accent)';
|
testStatus.style.color = 'var(--t-accent)';
|
||||||
});
|
});
|
||||||
|
|
||||||
$('caldav-sync-now')?.addEventListener('click', () => triggerSync());
|
|
||||||
|
|
||||||
export async function triggerSync() {
|
|
||||||
const btn = $('cal-sync');
|
|
||||||
if (btn) btn.style.opacity = '0.5';
|
|
||||||
const headerIcon = $('header-sync-icon');
|
|
||||||
if (headerIcon) headerIcon.classList.add('card-spinner');
|
|
||||||
if (syncStatus) { syncStatus.textContent = 'syncing...'; syncStatus.style.color = 'var(--t-dim)'; }
|
|
||||||
|
|
||||||
const res = await fetch('api/caldav/sync', {
|
|
||||||
method: 'POST', headers: { 'X-CSRF-Token': getCsrf() },
|
|
||||||
}).then(r => r.json()).catch(() => ({ ok: false, error: 'network error' }));
|
|
||||||
|
|
||||||
if (btn) btn.style.opacity = '';
|
|
||||||
|
|
||||||
// Also poll relay
|
|
||||||
// (header spinner stays on until the relay poll completes too — see end)
|
|
||||||
const relayRes = await fetch('api/relay/poll', {
|
|
||||||
method: 'POST', headers: { 'X-CSRF-Token': getCsrf() },
|
|
||||||
}).then(r => r.ok ? r.json() : null).catch(() => null);
|
|
||||||
|
|
||||||
if (res.ok) {
|
|
||||||
const s = res.stats || {};
|
|
||||||
const rp = relayRes?.pulled || 0;
|
|
||||||
const total = { pushed: s.pushed || 0, pulled: (s.pulled || 0) + rp, deleted: s.deleted || 0 };
|
|
||||||
const allLog = res.log || [];
|
|
||||||
const hasErrors = allLog.some(l => l.status === 'error');
|
|
||||||
const msg = `pushed:${total.pushed} pulled:${total.pulled} del:${total.deleted}${rp ? ' relay:' + rp : ''}`;
|
|
||||||
if (syncStatus) { syncStatus.textContent = msg; syncStatus.style.color = hasErrors ? 'var(--t-danger)' : 'var(--t-accent)'; }
|
|
||||||
await window._reloadAll?.();
|
|
||||||
showLog(allLog);
|
|
||||||
showSyncNotification(total);
|
|
||||||
} else {
|
|
||||||
if (syncStatus) { syncStatus.textContent = res.error || 'sync failed'; syncStatus.style.color = 'var(--t-danger)'; }
|
|
||||||
}
|
|
||||||
if (headerIcon) headerIcon.classList.remove('card-spinner');
|
|
||||||
}
|
|
||||||
|
|
||||||
function showLog(log) {
|
|
||||||
if (!logEl || !log?.length) return;
|
|
||||||
logEl.classList.remove('hidden');
|
|
||||||
logEl.innerHTML = log.map(l =>
|
|
||||||
`<div class="${l.status === 'error' ? 'text-t-danger' : 'text-t-dim'}">${l.dir} ${l.action} ${l.status}${l.detail ? ' — ' + l.detail : ''}</div>`
|
|
||||||
).join('');
|
|
||||||
}
|
|
||||||
|
|
||||||
function showConnectionLog(lines) {
|
function showConnectionLog(lines) {
|
||||||
if (!logEl || !lines?.length) return;
|
if (!logEl || !lines?.length) return;
|
||||||
logEl.classList.remove('hidden');
|
logEl.classList.remove('hidden');
|
||||||
@@ -224,125 +183,4 @@ function showConnectionLog(lines) {
|
|||||||
).join('');
|
).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Relay settings ──
|
|
||||||
|
|
||||||
function setRelayStatus(text, kind = 'info') {
|
|
||||||
const el = $('relay-status');
|
|
||||||
if (!el) return;
|
|
||||||
if (!text) {
|
|
||||||
el.classList.add('hidden');
|
|
||||||
el.textContent = '';
|
|
||||||
el.style.borderColor = '';
|
|
||||||
el.style.color = '';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
el.classList.remove('hidden');
|
|
||||||
el.textContent = text;
|
|
||||||
if (kind === 'error') { el.style.borderColor = 'var(--t-danger)'; el.style.color = 'var(--t-danger)'; }
|
|
||||||
else if (kind === 'success') { el.style.borderColor = 'var(--t-accent)'; el.style.color = 'var(--t-accent)'; }
|
|
||||||
else { el.style.borderColor = 'var(--t-border)'; el.style.color = 'var(--t-muted)'; }
|
|
||||||
}
|
|
||||||
|
|
||||||
$('relay-save')?.addEventListener('click', async () => {
|
|
||||||
const body = {
|
|
||||||
url: $('relay-url')?.value || '',
|
|
||||||
username: $('relay-username')?.value || '',
|
|
||||||
key: $('relay-key')?.value || '',
|
|
||||||
};
|
|
||||||
setRelayStatus('saving...');
|
|
||||||
await api('api/relay/settings', { method: 'POST', body });
|
|
||||||
setRelayStatus('saved', 'success');
|
|
||||||
setTimeout(() => setRelayStatus(''), 1500);
|
|
||||||
});
|
|
||||||
|
|
||||||
$('relay-test')?.addEventListener('click', async () => {
|
|
||||||
setRelayStatus('testing...');
|
|
||||||
const res = await fetch('api/relay/poll', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': getCsrf() },
|
|
||||||
body: JSON.stringify({ strict: true }),
|
|
||||||
}).then(r => r.json()).catch(() => null);
|
|
||||||
if (res?.ok) {
|
|
||||||
setRelayStatus(`ok — ${res.pulled} pulled`, 'success');
|
|
||||||
if (res.pulled) await window._reloadAll?.();
|
|
||||||
} else {
|
|
||||||
const detail = res?.sent_username ? ` (sent username: ${res.sent_username})` : '';
|
|
||||||
setRelayStatus((res?.error || 'failed') + detail, 'error');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export async function loadRelaySettings() {
|
|
||||||
const s = await api('api/relay/settings');
|
|
||||||
if (!s) return;
|
|
||||||
const urlInput = $('relay-url');
|
|
||||||
const userInput = $('relay-username');
|
|
||||||
const keyInput = $('relay-key');
|
|
||||||
if (urlInput) urlInput.value = s.url || '';
|
|
||||||
if (userInput) userInput.value = s.username || '';
|
|
||||||
if (keyInput) {
|
|
||||||
keyInput.value = s.key || '';
|
|
||||||
keyInput.placeholder = 'shared secret';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$('cal-caldav-settings')?.addEventListener('click', openCaldavSettings);
|
$('cal-caldav-settings')?.addEventListener('click', openCaldavSettings);
|
||||||
$('cal-sync')?.addEventListener('click', () => triggerSync());
|
|
||||||
$('header-sync')?.addEventListener('click', () => triggerSync());
|
|
||||||
|
|
||||||
// Auto-sync throttle
|
|
||||||
let lastAutoSync = 0;
|
|
||||||
export function autoSync() {
|
|
||||||
if (window._testRunning) return;
|
|
||||||
const now = Date.now();
|
|
||||||
if (now - lastAutoSync < 60000) return;
|
|
||||||
lastAutoSync = now;
|
|
||||||
triggerSync();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Background sync every 2 minutes
|
|
||||||
function showSyncNotification(stats) {
|
|
||||||
const s = stats || {};
|
|
||||||
const parts = [];
|
|
||||||
if (s.pulled) parts.push(`${s.pulled} received`);
|
|
||||||
if (s.pushed) parts.push(`${s.pushed} sent`);
|
|
||||||
if (s.deleted) parts.push(`${s.deleted} deleted`);
|
|
||||||
if (!parts.length) return;
|
|
||||||
|
|
||||||
const note = document.createElement('div');
|
|
||||||
note.style.cssText = 'position:fixed;bottom:60px;right:16px;z-index:200;background:var(--t-surface);border:1px solid var(--t-accent);border-radius:4px;padding:10px 14px;box-shadow:0 4px 20px rgba(0,0,0,0.4);max-width:300px;';
|
|
||||||
note.innerHTML = `<div style="font-family:var(--t-font-pixel);font-size:10px;color:var(--t-accent);display:flex;align-items:center;gap:6px;"><i class="ph ph-cloud-arrow-down"></i>CalDAV: ${parts.join(', ')}</div>`;
|
|
||||||
document.body.appendChild(note);
|
|
||||||
setTimeout(() => { note.style.transition = 'opacity 0.3s'; note.style.opacity = '0'; setTimeout(() => note.remove(), 350); }, 4000);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function backgroundSync() {
|
|
||||||
if (state.bgSyncRunning) return;
|
|
||||||
state.bgSyncRunning = true;
|
|
||||||
try {
|
|
||||||
const headers = { 'X-CSRF-Token': getCsrf() };
|
|
||||||
const [res, relayRes] = await Promise.all([
|
|
||||||
fetch('api/caldav/sync', { method: 'POST', headers }).then(r => r.ok ? r.json() : null).catch(() => null),
|
|
||||||
fetch('api/relay/poll', { method: 'POST', headers }).then(r => r.ok ? r.json() : null).catch(() => null),
|
|
||||||
]);
|
|
||||||
const s = res?.stats || {};
|
|
||||||
const rp = relayRes?.pulled || 0;
|
|
||||||
const total = { pushed: s.pushed || 0, pulled: (s.pulled || 0) + rp, deleted: s.deleted || 0 };
|
|
||||||
if (total.pulled > 0 || total.pushed > 0 || total.deleted > 0) {
|
|
||||||
await window._reloadAll?.();
|
|
||||||
showSyncNotification(total);
|
|
||||||
}
|
|
||||||
} catch {} finally {
|
|
||||||
state.bgSyncRunning = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start background sync after app is ready
|
|
||||||
let bgSyncInterval = null;
|
|
||||||
export function startBackgroundSync() {
|
|
||||||
if (bgSyncInterval) return;
|
|
||||||
backgroundSync();
|
|
||||||
bgSyncInterval = setInterval(backgroundSync, 45000); // every 45 seconds
|
|
||||||
}
|
|
||||||
export function stopBackgroundSync() {
|
|
||||||
if (bgSyncInterval) { clearInterval(bgSyncInterval); bgSyncInterval = null; }
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,8 @@
|
|||||||
import { $, esc } from './util.js';
|
import { $, esc } from './util.js';
|
||||||
import { state } from './state.js';
|
import { state } from './state.js';
|
||||||
import { stripMd, getTodos } from './markdown.js';
|
import { stripMd, getTodos } from './markdown.js';
|
||||||
import { autoSync, getCalConfig, getAllCalConfigs } from './caldav.js';
|
import { autoSync } from './sync.js';
|
||||||
|
import { getCalConfig, getAllCalConfigs } from './caldav.js';
|
||||||
import { renderCardHtml } from './board.js';
|
import { renderCardHtml } from './board.js';
|
||||||
|
|
||||||
const overlay = $('calendar');
|
const overlay = $('calendar');
|
||||||
@@ -88,20 +89,35 @@ function matchesRRule(card, targetDateStr) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getMultiDayEnd(card) {
|
||||||
|
const m = (card.body || '').match(/\*\*Bis:\*\*\s*(\d{4}-\d{2}-\d{2})/i);
|
||||||
|
return m ? m[1] : null;
|
||||||
|
}
|
||||||
|
|
||||||
function getCardsForDate(ds) {
|
function getCardsForDate(ds) {
|
||||||
const results = [];
|
const results = [];
|
||||||
const targetYear = parseInt(ds.substring(0, 4));
|
const targetYear = parseInt(ds.substring(0, 4));
|
||||||
for (const c of state.cards) {
|
for (const c of state.cards) {
|
||||||
if (cardBaseDate(c) === ds) {
|
const base = cardBaseDate(c);
|
||||||
|
if (base === ds) {
|
||||||
results.push({ ...c, _recurring: false });
|
results.push({ ...c, _recurring: false });
|
||||||
} else if (c.caldav_rrule && matchesRRule(c, ds)) {
|
} else if (base && base < ds) {
|
||||||
const baseYear = parseInt(cardBaseDate(c).substring(0, 4));
|
// Multi-day event: check if ds is within [base..end]
|
||||||
|
const end = getMultiDayEnd(c);
|
||||||
|
if (end && ds <= end) {
|
||||||
|
const startMs = Date.parse(base);
|
||||||
|
const curMs = Date.parse(ds);
|
||||||
|
const dayNum = Math.round((curMs - startMs) / 86400000) + 1;
|
||||||
|
const totalDays = Math.round((Date.parse(end) - startMs) / 86400000) + 1;
|
||||||
|
results.push({ ...c, _recurring: false, _multiDay: { day: dayNum, total: totalDays, isEnd: ds === end } });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (c.caldav_rrule && matchesRRule(c, ds)) {
|
||||||
|
const baseYear = parseInt(base.substring(0, 4));
|
||||||
const rrule = parseRRule(c.caldav_rrule);
|
const rrule = parseRRule(c.caldav_rrule);
|
||||||
const age = rrule?.FREQ === 'YEARLY' ? targetYear - baseYear : null;
|
const age = rrule?.FREQ === 'YEARLY' ? targetYear - baseYear : null;
|
||||||
results.push({ ...c, _recurring: true, _age: age });
|
if (base !== ds) results.push({ ...c, _recurring: true, _age: age });
|
||||||
} else if ((c.tags || '').split(',').includes('geburtstag')) {
|
} else if ((c.tags || '').split(',').includes('geburtstag')) {
|
||||||
// Local birthday cards repeat yearly without RRULE
|
|
||||||
const base = cardBaseDate(c);
|
|
||||||
if (base.substring(5) === ds.substring(5) && ds !== base) {
|
if (base.substring(5) === ds.substring(5) && ds !== base) {
|
||||||
const age = targetYear - parseInt(base.substring(0, 4));
|
const age = targetYear - parseInt(base.substring(0, 4));
|
||||||
results.push({ ...c, _recurring: true, _age: age > 0 ? age : null });
|
results.push({ ...c, _recurring: true, _age: age > 0 ? age : null });
|
||||||
@@ -146,7 +162,25 @@ function clearCalHover() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function render() {
|
function render() {
|
||||||
title.textContent = `${MONTHS[state.calMonth]} ${state.calYear}`;
|
// Format: [MM-DD] Mon Y [KW-KW]
|
||||||
|
// MM-DD = today's month-day
|
||||||
|
// Mon Y = displayed month + year (abbreviated)
|
||||||
|
// KW-KW = ISO week range spanning the displayed month
|
||||||
|
const isoWeek = (y, m, d) => {
|
||||||
|
const dt = new Date(Date.UTC(y, m, d));
|
||||||
|
const dayNum = dt.getUTCDay() || 7;
|
||||||
|
dt.setUTCDate(dt.getUTCDate() + 4 - dayNum);
|
||||||
|
const yearStart = new Date(Date.UTC(dt.getUTCFullYear(), 0, 1));
|
||||||
|
return Math.ceil((((dt - yearStart) / 86400000) + 1) / 7);
|
||||||
|
};
|
||||||
|
const pad = n => String(n).padStart(2, '0');
|
||||||
|
const nowDate = new Date();
|
||||||
|
const todayMd = `${pad(nowDate.getMonth() + 1)}-${pad(nowDate.getDate())}`;
|
||||||
|
const monAbbr = MONTHS[state.calMonth].substring(0, 3);
|
||||||
|
const lastDay = new Date(state.calYear, state.calMonth + 1, 0).getDate();
|
||||||
|
const wStart = isoWeek(state.calYear, state.calMonth, 1);
|
||||||
|
const wEnd = isoWeek(state.calYear, state.calMonth, lastDay);
|
||||||
|
title.innerHTML = `<span style="color:var(--t-dim)">[${todayMd}]</span> ${monAbbr} ${state.calYear} <span style="color:var(--t-dim)">[${pad(wStart)}-${pad(wEnd)}]</span>`;
|
||||||
|
|
||||||
const firstDay = new Date(state.calYear, state.calMonth, 1).getDay(); // 0=Sun
|
const firstDay = new Date(state.calYear, state.calMonth, 1).getDay(); // 0=Sun
|
||||||
const startOffset = (firstDay + 6) % 7; // Mon=0
|
const startOffset = (firstDay + 6) % 7; // Mon=0
|
||||||
@@ -210,9 +244,11 @@ function render() {
|
|||||||
const calCfg = getCardCalConfig(c);
|
const calCfg = getCardCalConfig(c);
|
||||||
const itemColor = calCfg?.color || c.color;
|
const itemColor = calCfg?.color || c.color;
|
||||||
const itemIcon = calCfg?.icon || null;
|
const itemIcon = calCfg?.icon || null;
|
||||||
|
const md = c._multiDay;
|
||||||
html += `<div class="cal-item" data-card-id="${c.id}" style="border-left-color:${itemColor};">`;
|
html += `<div class="cal-item" data-card-id="${c.id}" style="border-left-color:${itemColor};">`;
|
||||||
if (itemIcon) html += `<i class="ph ph-${itemIcon}" style="font-size:9px;color:${itemColor};flex-shrink:0;"></i>`;
|
if (itemIcon) html += `<i class="ph ph-${itemIcon}" style="font-size:9px;color:${itemColor};flex-shrink:0;"></i>`;
|
||||||
if (timeStr) html += `<span style="font-family:var(--t-font-pixel);font-size:8px;color:var(--t-dim);flex-shrink:0;">${timeStr}</span>`;
|
if (md) html += `<span style="font-family:var(--t-font-pixel);font-size:8px;color:${itemColor};flex-shrink:0;">${md.day}/${md.total}</span>`;
|
||||||
|
else if (timeStr) html += `<span style="font-family:var(--t-font-pixel);font-size:8px;color:var(--t-dim);flex-shrink:0;">${timeStr}</span>`;
|
||||||
if (c._recurring && !itemIcon) html += `<i class="ph ph-arrows-clockwise" style="font-size:8px;color:var(--t-dim);flex-shrink:0;"></i>`;
|
if (c._recurring && !itemIcon) html += `<i class="ph ph-arrows-clockwise" style="font-size:8px;color:var(--t-dim);flex-shrink:0;"></i>`;
|
||||||
html += `<span class="truncate">${esc(name)}</span>`;
|
html += `<span class="truncate">${esc(name)}</span>`;
|
||||||
html += `</div>`;
|
html += `</div>`;
|
||||||
@@ -398,7 +434,7 @@ function openDayPopup(ds, cellEl) {
|
|||||||
</div>`;
|
</div>`;
|
||||||
}).join('');
|
}).join('');
|
||||||
} else {
|
} else {
|
||||||
list.innerHTML = '<div style="padding:16px 12px;text-align:center;font-family:var(--t-font-pixel);font-size:9px;color:var(--t-dim);">no cards</div>';
|
list.innerHTML = '<div class="cursor-blink" style="padding:16px 12px;text-align:center;font-family:var(--t-font-pixel);font-size:9px;color:var(--t-dim);">no cards</div>';
|
||||||
}
|
}
|
||||||
dayPopup.appendChild(list);
|
dayPopup.appendChild(list);
|
||||||
|
|
||||||
@@ -457,7 +493,7 @@ function openDayPopup(ds, cellEl) {
|
|||||||
const cfg = calSlug ? getCalConfig(calSlug) : null;
|
const cfg = calSlug ? getCalConfig(calSlug) : null;
|
||||||
const col = cfg?.color || '#fb923c';
|
const col = cfg?.color || '#fb923c';
|
||||||
const calTag = calSlug ? ` #${calSlug}` : '';
|
const calTag = calSlug ? ` #${calSlug}` : '';
|
||||||
const body = `**Zeit:** \n**Ort:** \n**Teilnehmer:** \n\n---\n\n**Notizen:**\n\n\n\n#termin${calTag}`;
|
const body = `**Zeit:** \n**Bis:** \n**Ort:** \n**Teilnehmer:** \n\n---\n\n**Notizen:**\n\n\n\n#termin${calTag}`;
|
||||||
window._openModal({ id: null, title: `${ds} — `, body, color: col, bucket_id: null });
|
window._openModal({ id: null, title: `${ds} — `, body, color: col, bucket_id: null });
|
||||||
} else if (type === 'birthday') {
|
} else if (type === 'birthday') {
|
||||||
const body = `#geburtstag`;
|
const body = `#geburtstag`;
|
||||||
@@ -494,9 +530,14 @@ export function refreshCalendar() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function openCalendar() {
|
export function openCalendar() {
|
||||||
const now = new Date();
|
// Only jump to today on first open — preserve the user's navigation
|
||||||
state.calYear = now.getFullYear();
|
// when the calendar is re-opened (e.g. after saving a card in a
|
||||||
state.calMonth = now.getMonth();
|
// different month).
|
||||||
|
if (state.calYear == null || state.calMonth == null) {
|
||||||
|
const now = new Date();
|
||||||
|
state.calYear = now.getFullYear();
|
||||||
|
state.calMonth = now.getMonth();
|
||||||
|
}
|
||||||
render();
|
render();
|
||||||
overlay.classList.add('open');
|
overlay.classList.add('open');
|
||||||
overlay.style.visibility = '';
|
overlay.style.visibility = '';
|
||||||
@@ -506,6 +547,9 @@ export function openCalendar() {
|
|||||||
export function closeCalendar() {
|
export function closeCalendar() {
|
||||||
closeDayPopup();
|
closeDayPopup();
|
||||||
overlay.classList.remove('open');
|
overlay.classList.remove('open');
|
||||||
|
if (document.activeElement && document.activeElement !== document.body) {
|
||||||
|
document.activeElement.blur();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$('calendar-btn')?.addEventListener('click', openCalendar);
|
$('calendar-btn')?.addEventListener('click', openCalendar);
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
import { $, esc, api } from './util.js';
|
import { $, esc, api } from './util.js';
|
||||||
import { state, parseTags, getChildren, isFavorite, toggleFavorite, CARD_COLORS } from './state.js';
|
import { state, parseTags, getChildren, isFavorite, toggleFavorite, CARD_COLORS } from './state.js';
|
||||||
import { showDialog } from './dialog.js';
|
import { showDialog } from './dialog.js';
|
||||||
import { pushCardEdit, pushCardDelete, pushBatch, snapshotCard } from './undo.js';
|
import { pushCardEdit, pushCardDelete, pushBatch, pushUndo, snapshotCard } from './undo.js';
|
||||||
|
import { stripMd } from './markdown.js';
|
||||||
|
|
||||||
const menu = $('ctx-menu');
|
const menu = $('ctx-menu');
|
||||||
const items = $('ctx-items');
|
const items = $('ctx-items');
|
||||||
@@ -31,19 +32,112 @@ menu.addEventListener('mouseenter', () => {
|
|||||||
document.addEventListener('click', hideContextMenu);
|
document.addEventListener('click', hideContextMenu);
|
||||||
document.addEventListener('contextmenu', e => { if (!menu.contains(e.target)) hideContextMenu(); });
|
document.addEventListener('contextmenu', e => { if (!menu.contains(e.target)) hideContextMenu(); });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Merge every currently-selected card into a single card. Title strategy:
|
||||||
|
* if the selection involved a bulk gesture (rubber-band) we use the
|
||||||
|
* longest title — there's no meaningful "first" in that case. Otherwise
|
||||||
|
* the first ctrl-clicked card wins (state.selectedIds is a Set, which
|
||||||
|
* preserves insertion order).
|
||||||
|
*
|
||||||
|
* Body format: list of all titles as `# heading` lines at the top, then
|
||||||
|
* each card's body separated by `---`. The winner keeps its color, tags,
|
||||||
|
* bucket, due_date, parent_id; the others are deleted.
|
||||||
|
*
|
||||||
|
* The whole operation is bundled into a single undo entry that recreates
|
||||||
|
* the deleted cards verbatim and restores the winner's original body.
|
||||||
|
*/
|
||||||
|
export async function joinSelectedCards() {
|
||||||
|
const ids = [...state.selectedIds].map(String);
|
||||||
|
const cards = ids
|
||||||
|
.map(id => state.cards.find(c => String(c.id) === id))
|
||||||
|
.filter(Boolean);
|
||||||
|
if (cards.length < 2) return;
|
||||||
|
|
||||||
|
// We need bodies for the merge. /api/cards GET excludes body for
|
||||||
|
// performance, so fetch the full rows for the selected ids in one shot.
|
||||||
|
const fullRes = await fetch(`api/cards?ids=${cards.map(c => c.id).join(',')}`).then(r => r.json());
|
||||||
|
const fullById = new Map(fullRes.map(c => [String(c.id), c]));
|
||||||
|
const full = cards.map(c => fullById.get(String(c.id)) || c);
|
||||||
|
|
||||||
|
// Pick winner
|
||||||
|
let winner;
|
||||||
|
if (state.selectionWasBulk) {
|
||||||
|
winner = full.reduce((a, b) => (b.title || '').length > (a.title || '').length ? b : a);
|
||||||
|
} else {
|
||||||
|
winner = full[0]; // first in Set iteration order = first selected
|
||||||
|
}
|
||||||
|
const losers = full.filter(c => c.id !== winner.id);
|
||||||
|
|
||||||
|
// Build merged body: title list, then bodies separated by `---`.
|
||||||
|
// Order: winner first (its body stays at the top after the title list),
|
||||||
|
// then losers in their selection order so the result is deterministic.
|
||||||
|
const ordered = [winner, ...losers];
|
||||||
|
const titleList = ordered.map(c => `## ${c.title || ''}`).join('\n');
|
||||||
|
const bodyChunks = ordered.map(c => (c.body || '').trim()).filter(Boolean);
|
||||||
|
let mergedBody = titleList + '\n\n---\n\n' + bodyChunks.join('\n\n---\n\n');
|
||||||
|
// Dedupe hashtag mentions across the merged body — first occurrence
|
||||||
|
// wins, subsequent ones get stripped (case-insensitive). Without
|
||||||
|
// this the merged card has every shared tag listed once per source
|
||||||
|
// card, which clutters the body and makes the rendered tag chips
|
||||||
|
// look duplicated to a casual reader (the server's extractTags also
|
||||||
|
// dedupes the tags column, but the body text itself is what the
|
||||||
|
// user actually edits).
|
||||||
|
const seenTags = new Set();
|
||||||
|
mergedBody = mergedBody.replace(/(^|\s)#([a-zA-Z0-9_/-]+)/g, (match, lead, tag) => {
|
||||||
|
const key = tag.toLowerCase();
|
||||||
|
if (seenTags.has(key)) return lead; // strip the dupe, keep the leading whitespace
|
||||||
|
seenTags.add(key);
|
||||||
|
return match;
|
||||||
|
}).replace(/[ \t]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
|
||||||
|
|
||||||
|
// Snapshot for undo BEFORE we mutate anything
|
||||||
|
const winnerPrev = { title: winner.title, body: winner.body || '' };
|
||||||
|
const loserSnapshots = losers.map(c => snapshotCard(c));
|
||||||
|
|
||||||
|
// Apply: PATCH winner with the merged body, DELETE losers.
|
||||||
|
pushUndo(`join ${ordered.length} cards`, async () => {
|
||||||
|
await api(`api/cards/${winner.id}`, { method: 'PATCH', body: winnerPrev });
|
||||||
|
for (const snap of loserSnapshots) {
|
||||||
|
const created = await api('api/cards', { method: 'POST', body: {
|
||||||
|
title: snap.title, body: snap.body, color: snap.color,
|
||||||
|
bucket_id: snap.bucket_id, parent_id: snap.parent_id, position: snap.position,
|
||||||
|
}});
|
||||||
|
if (created?.id && snap.due_date) {
|
||||||
|
await api(`api/cards/${created.id}`, { method: 'PATCH', body: { due_date: snap.due_date } });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
await api(`api/cards/${winner.id}`, { method: 'PATCH', body: { body: mergedBody } });
|
||||||
|
for (const c of losers) {
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'DELETE' });
|
||||||
|
}
|
||||||
|
|
||||||
|
state.selectedIds.clear();
|
||||||
|
state.selectionWasBulk = false;
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
|
||||||
export function showContextMenu(x, y, card) {
|
export function showContextMenu(x, y, card) {
|
||||||
const children = getChildren(card.id);
|
const children = getChildren(card.id);
|
||||||
const isParent = children.length > 0;
|
const isParent = children.length > 0;
|
||||||
const isChild = !!card.parent_id;
|
const isChild = !!card.parent_id;
|
||||||
|
// Multi-select join: only offered when the right-clicked card is part
|
||||||
|
// of a selection of ≥2 cards. The action merges them into one.
|
||||||
|
const selected = state.selectedIds;
|
||||||
|
const inMultiSelect = selected.size >= 2 && selected.has(String(card.id));
|
||||||
|
|
||||||
items.innerHTML = `
|
items.innerHTML = `
|
||||||
|
${inMultiSelect ? `<button class="ctx-item" data-action="join"><i class="ph ph-arrows-merge text-sm"></i><span class="font-pixel text-[10px]">Join ${selected.size} cards</span></button><div class="ctx-sep"></div>` : ''}
|
||||||
<button class="ctx-item" data-action="open"><i class="ph ph-eye text-sm"></i><span class="font-pixel text-[10px]">Open</span></button>
|
<button class="ctx-item" data-action="open"><i class="ph ph-eye text-sm"></i><span class="font-pixel text-[10px]">Open</span></button>
|
||||||
<button class="ctx-item" data-action="edit"><i class="ph ph-pencil-simple text-sm"></i><span class="font-pixel text-[10px]">Edit</span></button>
|
<button class="ctx-item" data-action="edit"><i class="ph ph-pencil-simple text-sm"></i><span class="font-pixel text-[10px]">Edit</span></button>
|
||||||
<button class="ctx-item" data-action="duplicate"><i class="ph ph-copy text-sm"></i><span class="font-pixel text-[10px]">Duplicate</span></button>
|
<button class="ctx-item" data-action="duplicate"><i class="ph ph-copy text-sm"></i><span class="font-pixel text-[10px]">Duplicate</span></button>
|
||||||
${/^\d{4}-\d{2}-\d{2}/.test(card.title) ? `<button class="ctx-item" data-action="move-date"><i class="ph ph-calendar-dots text-sm"></i><span class="font-pixel text-[10px]">Move to date</span></button>` : ''}
|
${/^\d{4}-\d{2}-\d{2}/.test(card.title) ? `<button class="ctx-item" data-action="move-date"><i class="ph ph-calendar-dots text-sm"></i><span class="font-pixel text-[10px]">Move to date</span></button>` : ''}
|
||||||
<button class="ctx-item" data-action="due-date"><i class="ph ph-clock-countdown text-sm ${card.due_date ? 'text-t-accent' : ''}"></i><span class="font-pixel text-[10px]">${card.due_date ? 'Due: ' + card.due_date : 'Set due date'}</span></button>
|
<button class="ctx-item" data-action="due-date"><i class="ph ph-clock-countdown text-sm ${card.due_date ? 'text-t-accent' : ''}"></i><span class="font-pixel text-[10px]">${card.due_date ? 'Due: ' + card.due_date : 'Set due date'}</span></button>
|
||||||
${card.due_date ? `<button class="ctx-item" data-action="due-done"><i class="ph ph-check-circle text-sm text-t-accent"></i><span class="font-pixel text-[10px]">Mark done</span></button>` : ''}
|
<button class="ctx-item" data-action="due-done"><i class="ph ph-check-circle text-sm ${parseTags(card).includes('done') ? 'text-t-accent' : ''}"></i><span class="font-pixel text-[10px]">${parseTags(card).includes('done') ? 'Unmark done' : 'Mark done'}</span></button>
|
||||||
<button class="ctx-item" data-action="save-md"><i class="ph ph-file-md text-sm"></i><span class="font-pixel text-[10px]">Save .md</span></button>
|
<button class="ctx-item" data-action="save-md"><i class="ph ph-file-md text-sm"></i><span class="font-pixel text-[10px]">Save .md</span></button>
|
||||||
|
<button class="ctx-item" data-action="copy-text"><i class="ph ph-clipboard-text text-sm"></i><span class="font-pixel text-[10px]">Copy text</span></button>
|
||||||
|
${typeof window._giteaMakeIssueFromCard === 'function' ? `<button class="ctx-item" data-action="make-ticket"><i class="ph ph-git-pull-request text-sm"></i><span class="font-pixel text-[10px]">Make ticket</span></button>` : ''}
|
||||||
<button class="ctx-item" data-action="push-relay"><i class="ph ph-broadcast text-sm"></i><span class="font-pixel text-[10px]">Push to relay</span><i class="ph ph-caret-right text-xs ml-auto"></i></button>
|
<button class="ctx-item" data-action="push-relay"><i class="ph ph-broadcast text-sm"></i><span class="font-pixel text-[10px]">Push to relay</span><i class="ph ph-caret-right text-xs ml-auto"></i></button>
|
||||||
<button class="ctx-item" data-action="favorite"><i class="ph${isFavorite(card.id) ? '-fill' : ''} ph-star text-sm ${isFavorite(card.id) ? 'text-amber-400' : ''}"></i><span class="font-pixel text-[10px]">${isFavorite(card.id) ? 'Unfavorite' : 'Favorite'}</span></button>
|
<button class="ctx-item" data-action="favorite"><i class="ph${isFavorite(card.id) ? '-fill' : ''} ph-star text-sm ${isFavorite(card.id) ? 'text-amber-400' : ''}"></i><span class="font-pixel text-[10px]">${isFavorite(card.id) ? 'Unfavorite' : 'Favorite'}</span></button>
|
||||||
<div class="ctx-sep"></div>
|
<div class="ctx-sep"></div>
|
||||||
@@ -101,36 +195,44 @@ export function showContextMenu(x, y, card) {
|
|||||||
</button>` : '');
|
</button>` : '');
|
||||||
|
|
||||||
tagList.querySelectorAll('[data-ctx-tag]').forEach(btn => btn.addEventListener('click', async e => {
|
tagList.querySelectorAll('[data-ctx-tag]').forEach(btn => btn.addEventListener('click', async e => {
|
||||||
e.stopPropagation();
|
e.stopPropagation(); e.preventDefault();
|
||||||
|
const targetId = card.id;
|
||||||
const tag = btn.dataset.ctxTag;
|
const tag = btn.dataset.ctxTag;
|
||||||
const has = cardTags.includes(tag);
|
// Re-read the current card from state to avoid stale body
|
||||||
let newBody = card.body || '';
|
const fresh = state.cards.find(x => x.id == targetId) || card;
|
||||||
|
const freshTags = parseTags(fresh);
|
||||||
|
const has = freshTags.includes(tag);
|
||||||
|
let newBody = fresh.body || '';
|
||||||
if (has) {
|
if (has) {
|
||||||
newBody = newBody.replace(new RegExp('\\s*#' + tag.replace(/[.*+?^${}()|[\]\\\/]/g, '\\$&') + '(?=\\s|$)', 'm'), '');
|
newBody = newBody.replace(new RegExp('\\s*#' + tag.replace(/[.*+?^${}()|[\]\\\/]/g, '\\$&') + '(?=\\s|$)', 'm'), '');
|
||||||
cardTags.splice(cardTags.indexOf(tag), 1);
|
|
||||||
} else {
|
} else {
|
||||||
newBody = newBody.trimEnd() + ' #' + tag;
|
newBody = newBody.trimEnd() + ' #' + tag;
|
||||||
cardTags.push(tag);
|
|
||||||
}
|
}
|
||||||
card.body = newBody;
|
const updated = await api(`api/cards/${targetId}`, { method: 'PATCH', body: { body: newBody } });
|
||||||
await api(`api/cards/${card.id}`, { method: 'PATCH', body: { body: newBody } });
|
// Trust the server's response for the new tags string
|
||||||
const c = state.cards.find(x => x.id == card.id);
|
const c = state.cards.find(x => x.id == targetId);
|
||||||
if (c) { c.body = newBody; c.tags = cardTags.join(','); }
|
if (c) { c.body = updated?.body ?? newBody; c.tags = updated?.tags ?? ''; }
|
||||||
|
// Update our local working copy
|
||||||
|
card.body = c?.body ?? newBody;
|
||||||
|
cardTags.length = 0;
|
||||||
|
cardTags.push(...parseTags(c || { tags: updated?.tags || '' }));
|
||||||
renderCtxTags(tagInput.value);
|
renderCtxTags(tagInput.value);
|
||||||
window._renderBoard();
|
window._renderBoard();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
tagList.querySelectorAll('[data-ctx-tag-new]').forEach(btn => btn.addEventListener('click', async e => {
|
tagList.querySelectorAll('[data-ctx-tag-new]').forEach(btn => btn.addEventListener('click', async e => {
|
||||||
e.stopPropagation();
|
e.stopPropagation(); e.preventDefault();
|
||||||
|
const targetId = card.id;
|
||||||
const tag = btn.dataset.ctxTagNew;
|
const tag = btn.dataset.ctxTagNew;
|
||||||
const newBody = (card.body || '').trimEnd() + ' #' + tag;
|
const fresh = state.cards.find(x => x.id == targetId) || card;
|
||||||
card.body = newBody;
|
const newBody = (fresh.body || '').trimEnd() + ' #' + tag;
|
||||||
cardTags.push(tag);
|
const updated = await api(`api/cards/${targetId}`, { method: 'PATCH', body: { body: newBody } });
|
||||||
allTags.push(tag);
|
const c = state.cards.find(x => x.id == targetId);
|
||||||
allTags.sort();
|
if (c) { c.body = updated?.body ?? newBody; c.tags = updated?.tags ?? ''; }
|
||||||
await api(`api/cards/${card.id}`, { method: 'PATCH', body: { body: newBody } });
|
card.body = c?.body ?? newBody;
|
||||||
const c = state.cards.find(x => x.id == card.id);
|
cardTags.length = 0;
|
||||||
if (c) { c.body = newBody; c.tags = cardTags.join(','); }
|
cardTags.push(...parseTags(c || { tags: updated?.tags || '' }));
|
||||||
|
if (!allTags.includes(tag)) { allTags.push(tag); allTags.sort(); }
|
||||||
tagInput.value = '';
|
tagInput.value = '';
|
||||||
renderCtxTags('');
|
renderCtxTags('');
|
||||||
window._renderBoard();
|
window._renderBoard();
|
||||||
@@ -174,6 +276,11 @@ export function showContextMenu(x, y, card) {
|
|||||||
items.querySelectorAll('[data-action]').forEach(btn => btn.addEventListener('click', async e => {
|
items.querySelectorAll('[data-action]').forEach(btn => btn.addEventListener('click', async e => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
const a = btn.dataset.action;
|
const a = btn.dataset.action;
|
||||||
|
if (a === 'join') {
|
||||||
|
hideContextMenu();
|
||||||
|
await joinSelectedCards();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (a === 'open') { hideContextMenu(); window._openDetail(card.id); }
|
if (a === 'open') { hideContextMenu(); window._openDetail(card.id); }
|
||||||
else if (a === 'edit') { hideContextMenu(); window._openModal(card); }
|
else if (a === 'edit') { hideContextMenu(); window._openModal(card); }
|
||||||
else if (a === 'duplicate') {
|
else if (a === 'duplicate') {
|
||||||
@@ -184,9 +291,11 @@ export function showContextMenu(x, y, card) {
|
|||||||
const newDate = await showDialog({ title: 'duplicate_to_date', input: 'date', defaultValue: curDate, okLabel: 'Duplicate' });
|
const newDate = await showDialog({ title: 'duplicate_to_date', input: 'date', defaultValue: curDate, okLabel: 'Duplicate' });
|
||||||
if (!newDate) return;
|
if (!newDate) return;
|
||||||
const newTitle = card.title.replace(/^\d{4}-\d{2}-\d{2}/, newDate.trim());
|
const newTitle = card.title.replace(/^\d{4}-\d{2}-\d{2}/, newDate.trim());
|
||||||
await api('api/cards', { method: 'POST', body: { title: newTitle, body: card.body, color: card.color, bucket_id: card.bucket_id, position: -1 } });
|
const dup1 = await api('api/cards', { method: 'POST', body: { title: newTitle, body: card.body, color: card.color, bucket_id: card.bucket_id, position: -1 } });
|
||||||
|
if (dup1?.id) state.recentlyCreatedIds?.add(String(dup1.id));
|
||||||
} else {
|
} else {
|
||||||
await api('api/cards', { method: 'POST', body: { title: card.title + ' (copy)', body: card.body, color: card.color, bucket_id: card.bucket_id, position: -1 } });
|
const dup2 = await api('api/cards', { method: 'POST', body: { title: card.title + ' (copy)', body: card.body, color: card.color, bucket_id: card.bucket_id, position: -1 } });
|
||||||
|
if (dup2?.id) state.recentlyCreatedIds?.add(String(dup2.id));
|
||||||
}
|
}
|
||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
@@ -202,9 +311,16 @@ export function showContextMenu(x, y, card) {
|
|||||||
}
|
}
|
||||||
else if (a === 'due-done') {
|
else if (a === 'due-done') {
|
||||||
hideContextMenu();
|
hideContextMenu();
|
||||||
// Clear due date and mark as done
|
const isDone = parseTags(card).includes('done');
|
||||||
const bodyWithDone = (card.body || '').includes('#done') ? card.body : (card.body || '').trimEnd() + ' #done';
|
let newBody;
|
||||||
await api(`api/cards/${card.id}`, { method: 'PATCH', body: { due_date: null, body: bodyWithDone } });
|
if (isDone) {
|
||||||
|
newBody = (card.body || '').replace(/(^|\s)#done\b/g, '$1').replace(/[ \t]+$/gm, '').replace(/\n{3,}/g, '\n\n');
|
||||||
|
} else {
|
||||||
|
newBody = (card.body || '').trimEnd() + ((card.body || '').trimEnd() ? ' ' : '') + '#done';
|
||||||
|
}
|
||||||
|
const patch = { body: newBody };
|
||||||
|
if (!isDone && card.due_date) patch.due_date = null;
|
||||||
|
await api(`api/cards/${card.id}`, { method: 'PATCH', body: patch });
|
||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
else if (a === 'due-date') {
|
else if (a === 'due-date') {
|
||||||
@@ -215,6 +331,22 @@ export function showContextMenu(x, y, card) {
|
|||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
}
|
}
|
||||||
else if (a === 'save-md') { hideContextMenu(); window.location.href = `api/export-md?ids=${card.id}`; }
|
else if (a === 'save-md') { hideContextMenu(); window.location.href = `api/export-md?ids=${card.id}`; }
|
||||||
|
else if (a === 'make-ticket') {
|
||||||
|
hideContextMenu();
|
||||||
|
// Gitea plugin pre-fills the create-issue form from this
|
||||||
|
// card and leaves it open — the user reviews and submits.
|
||||||
|
await window._giteaMakeIssueFromCard?.(card);
|
||||||
|
}
|
||||||
|
else if (a === 'copy-text') {
|
||||||
|
hideContextMenu();
|
||||||
|
let body = card.body || '';
|
||||||
|
// Drop fenced code blocks (incl. slide-image), then markdown structure, then hashtags
|
||||||
|
body = body.replace(/```[\s\S]*?```/g, '');
|
||||||
|
body = stripMd(body);
|
||||||
|
body = body.replace(/(^|\s)#[\w/-]+/g, '$1').replace(/[ \t]+$/gm, '').replace(/\n{2,}/g, '\n\n').trim();
|
||||||
|
const text = (card.title || '') + '\n\n' + body;
|
||||||
|
try { await navigator.clipboard.writeText(text); } catch {}
|
||||||
|
}
|
||||||
else if (a === 'push-relay') {
|
else if (a === 'push-relay') {
|
||||||
await openRelayTenantSubmenu(card);
|
await openRelayTenantSubmenu(card);
|
||||||
}
|
}
|
||||||
@@ -232,13 +364,51 @@ export function showContextMenu(x, y, card) {
|
|||||||
else if (a === 'ungroup') { hideContextMenu(); pushCardEdit('ungroup', card.id, { parent_id: card.parent_id }); await api(`api/cards/${card.id}`, { method: 'PATCH', body: { parent_id: null } }); await window._reloadAll(); }
|
else if (a === 'ungroup') { hideContextMenu(); pushCardEdit('ungroup', card.id, { parent_id: card.parent_id }); await api(`api/cards/${card.id}`, { method: 'PATCH', body: { parent_id: null } }); await window._reloadAll(); }
|
||||||
else if (a === 'delete') {
|
else if (a === 'delete') {
|
||||||
hideContextMenu();
|
hideContextMenu();
|
||||||
|
const children = getChildren(card.id);
|
||||||
|
const isGroup = children.length > 0;
|
||||||
const needConfirm = localStorage.getItem('hyprcrd-confirm-delete') !== '0';
|
const needConfirm = localStorage.getItem('hyprcrd-confirm-delete') !== '0';
|
||||||
if (needConfirm) {
|
if (isGroup) {
|
||||||
|
// Always confirm when deleting a group — list every child
|
||||||
|
// so the user knows exactly what they're losing.
|
||||||
|
const childList = children.map(c => `• ${c.title || '(untitled)'}`).join('\n');
|
||||||
|
const msg = `Delete group "${card.title}" and all ${children.length} card${children.length > 1 ? 's' : ''} inside?\n\n${childList}`;
|
||||||
|
const ok = await showDialog({ title: 'delete_group', message: msg, danger: true, okLabel: `Delete all ${children.length + 1}` });
|
||||||
|
if (!ok) return;
|
||||||
|
} else if (needConfirm) {
|
||||||
const ok = await showDialog({ title: 'delete_card', message: `Really delete "${card.title}"?`, danger: true, okLabel: 'Delete' });
|
const ok = await showDialog({ title: 'delete_card', message: `Really delete "${card.title}"?`, danger: true, okLabel: 'Delete' });
|
||||||
if (!ok) return;
|
if (!ok) return;
|
||||||
}
|
}
|
||||||
const wasSync = !!card.caldav_uid;
|
// Snapshot everything for undo BEFORE deleting
|
||||||
pushCardDelete('delete', snapshotCard(card));
|
const allCards = isGroup ? [card, ...children] : [card];
|
||||||
|
const snapshots = allCards.map(c => snapshotCard(c));
|
||||||
|
const wasSync = allCards.some(c => !!c.caldav_uid);
|
||||||
|
pushUndo(`delete ${isGroup ? 'group' : 'card'} "${card.title}"`, async () => {
|
||||||
|
// Recreate parent first so children can reference it
|
||||||
|
const parent = await api('api/cards', { method: 'POST', body: {
|
||||||
|
title: snapshots[0].title, body: snapshots[0].body,
|
||||||
|
color: snapshots[0].color, bucket_id: snapshots[0].bucket_id,
|
||||||
|
position: snapshots[0].position,
|
||||||
|
}});
|
||||||
|
if (parent?.id && snapshots[0].due_date) {
|
||||||
|
await api(`api/cards/${parent.id}`, { method: 'PATCH', body: { due_date: snapshots[0].due_date } });
|
||||||
|
}
|
||||||
|
// Recreate children pointing at the new parent
|
||||||
|
for (let i = 1; i < snapshots.length; i++) {
|
||||||
|
const s = snapshots[i];
|
||||||
|
const child = await api('api/cards', { method: 'POST', body: {
|
||||||
|
title: s.title, body: s.body, color: s.color,
|
||||||
|
bucket_id: s.bucket_id, parent_id: parent?.id,
|
||||||
|
position: s.position,
|
||||||
|
}});
|
||||||
|
if (child?.id && s.due_date) {
|
||||||
|
await api(`api/cards/${child.id}`, { method: 'PATCH', body: { due_date: s.due_date } });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// Animate out, then delete children first, then parent
|
||||||
|
const { animateCardRemoval } = await import('./board.js');
|
||||||
|
await animateCardRemoval(allCards.map(c => c.id));
|
||||||
|
for (const c of children) await api(`api/cards/${c.id}`, { method: 'DELETE' });
|
||||||
await api(`api/cards/${card.id}`, { method: 'DELETE' });
|
await api(`api/cards/${card.id}`, { method: 'DELETE' });
|
||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
if (wasSync) window._triggerSync?.();
|
if (wasSync) window._triggerSync?.();
|
||||||
@@ -246,7 +416,13 @@ export function showContextMenu(x, y, card) {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
grid.querySelectorAll('[data-ctx-color]').forEach(btn => btn.addEventListener('click', async e => { e.stopPropagation(); hideContextMenu(); pushCardEdit('color', card.id, { color: card.color }); await api(`api/cards/${card.id}`, { method: 'PATCH', body: { color: btn.dataset.ctxColor } }); await window._reloadAll(); }));
|
grid.querySelectorAll('[data-ctx-color]').forEach(btn => btn.addEventListener('click', async e => { e.stopPropagation(); hideContextMenu(); pushCardEdit('color', card.id, { color: card.color }); await api(`api/cards/${card.id}`, { method: 'PATCH', body: { color: btn.dataset.ctxColor } }); await window._reloadAll(); }));
|
||||||
buckets.querySelectorAll('[data-ctx-bucket]').forEach(btn => btn.addEventListener('click', async e => { e.stopPropagation(); hideContextMenu(); pushCardEdit('bucket', card.id, { bucket_id: card.bucket_id }); await api(`api/cards/${card.id}`, { method: 'PATCH', body: { bucket_id: btn.dataset.ctxBucket || null } }); await window._reloadAll(); }));
|
buckets.querySelectorAll('[data-ctx-bucket]').forEach(btn => btn.addEventListener('click', async e => {
|
||||||
|
e.stopPropagation(); hideContextMenu();
|
||||||
|
pushCardEdit('bucket', card.id, { bucket_id: card.bucket_id });
|
||||||
|
window._markCardsMoving?.([card.id]);
|
||||||
|
await api(`api/cards/${card.id}`, { method: 'PATCH', body: { bucket_id: btn.dataset.ctxBucket || null } });
|
||||||
|
await window._reloadAll();
|
||||||
|
}));
|
||||||
members.querySelectorAll('[data-ctx-member]').forEach(btn => btn.addEventListener('click', e => { e.stopPropagation(); if (e.target.closest('[data-ctx-kick]')) return; hideContextMenu(); window._openDetail(btn.dataset.ctxMember); }));
|
members.querySelectorAll('[data-ctx-member]').forEach(btn => btn.addEventListener('click', e => { e.stopPropagation(); if (e.target.closest('[data-ctx-kick]')) return; hideContextMenu(); window._openDetail(btn.dataset.ctxMember); }));
|
||||||
members.querySelectorAll('[data-ctx-kick]').forEach(btn => btn.addEventListener('click', async e => { e.stopPropagation(); hideContextMenu(); await api(`api/cards/${btn.dataset.ctxKick}`, { method: 'PATCH', body: { parent_id: null } }); await window._reloadAll(); }));
|
members.querySelectorAll('[data-ctx-kick]').forEach(btn => btn.addEventListener('click', async e => { e.stopPropagation(); hideContextMenu(); await api(`api/cards/${btn.dataset.ctxKick}`, { method: 'PATCH', body: { parent_id: null } }); await window._reloadAll(); }));
|
||||||
}
|
}
|
||||||
@@ -284,7 +460,7 @@ function renderRelayTenants(card) {
|
|||||||
const list = cachedRelayTenants?.tenants || [];
|
const list = cachedRelayTenants?.tenants || [];
|
||||||
const self = cachedRelayTenants?.self || '';
|
const self = cachedRelayTenants?.self || '';
|
||||||
if (!list.length) {
|
if (!list.length) {
|
||||||
relayTenants.innerHTML = '<div class="px-3 py-2 text-[10px] text-t-dim font-pixel italic">no tenants</div>';
|
relayTenants.innerHTML = '<div class="px-3 py-2 text-[10px] text-t-dim font-pixel italic cursor-blink">no tenants</div>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Self first, then others alphabetical
|
// Self first, then others alphabetical
|
||||||
|
|||||||
+160
-6
@@ -5,6 +5,7 @@ import { state, parseTags, tagChipHtml, getChildren, getGroupCards, getRecent, m
|
|||||||
import { renderMd, stripMd, firstImage, addCodeCopyButtons, formatTodoItems } from './markdown.js';
|
import { renderMd, stripMd, firstImage, addCodeCopyButtons, formatTodoItems } from './markdown.js';
|
||||||
import { pushCardDelete, pushCardEdit, snapshotCard } from './undo.js';
|
import { pushCardDelete, pushCardEdit, snapshotCard } from './undo.js';
|
||||||
import { showDialog } from './dialog.js';
|
import { showDialog } from './dialog.js';
|
||||||
|
import { activateBucket } from './buckets.js';
|
||||||
|
|
||||||
const detail = $('detail');
|
const detail = $('detail');
|
||||||
const scroll = $('detail-scroll');
|
const scroll = $('detail-scroll');
|
||||||
@@ -57,6 +58,18 @@ export function openDetail(id, options = {}) {
|
|||||||
if (!card) return;
|
if (!card) return;
|
||||||
markRecent(id);
|
markRecent(id);
|
||||||
|
|
||||||
|
// Optional: switch the board to the card's bucket so the user
|
||||||
|
// sees context. Only when opened via search, wikilink, or
|
||||||
|
// programmatic call — not when the user clicked a board card
|
||||||
|
// (they're already in the right bucket). Gated by a setting
|
||||||
|
// under Behavior → Interactions.
|
||||||
|
if (card.bucket_id
|
||||||
|
&& localStorage.getItem('hyprcrd-open-switches-bucket') === '1'
|
||||||
|
&& state.activeBucket !== 'all'
|
||||||
|
&& String(state.activeBucket) !== String(card.bucket_id)) {
|
||||||
|
activateBucket(card.bucket_id);
|
||||||
|
}
|
||||||
|
|
||||||
const el = $('board')?.querySelector(`[data-id="${id}"]`);
|
const el = $('board')?.querySelector(`[data-id="${id}"]`);
|
||||||
if (el) el.style.borderBottom = `3px solid ${card.color}`;
|
if (el) el.style.borderBottom = `3px solid ${card.color}`;
|
||||||
|
|
||||||
@@ -72,9 +85,104 @@ export function openDetail(id, options = {}) {
|
|||||||
|
|
||||||
renderSidebar(card);
|
renderSidebar(card);
|
||||||
showContent(card);
|
showContent(card);
|
||||||
|
dismissStaleBanner();
|
||||||
detail.classList.add('open');
|
detail.classList.add('open');
|
||||||
|
|
||||||
|
// Let plugins (collab-buckets unread-dot, etc.) react to the open.
|
||||||
|
window.hyprcrd?.hooks?.emit?.('detail.opened', { id: card.id });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Remote-update detection ──
|
||||||
|
//
|
||||||
|
// When a foreign edit arrives for the card the user is currently viewing,
|
||||||
|
// the pull replaces state.cards but the open detail view keeps rendering
|
||||||
|
// the stale object it captured on open. Instead of force-re-rendering
|
||||||
|
// under the user's finger (jarring when they're mid-read), surface a
|
||||||
|
// banner with a manual Reload button.
|
||||||
|
|
||||||
|
let staleBannerEl = null;
|
||||||
|
|
||||||
|
function dismissStaleBanner() {
|
||||||
|
if (staleBannerEl) { staleBannerEl.remove(); staleBannerEl = null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function showStaleBanner(fresh) {
|
||||||
|
dismissStaleBanner();
|
||||||
|
const host = detail.querySelector('#detail-controls')?.parentElement;
|
||||||
|
if (!host) return;
|
||||||
|
const bar = document.createElement('div');
|
||||||
|
bar.className = 'detail-stale-banner';
|
||||||
|
bar.innerHTML = `
|
||||||
|
<i class="ph ph-info"></i>
|
||||||
|
<span>This card was updated${fresh?.updated_at ? ' ' + timeAgo(fresh.updated_at) : ''}.</span>
|
||||||
|
<button class="detail-stale-reload">
|
||||||
|
<i class="ph ph-arrows-clockwise text-xs"></i>
|
||||||
|
<span>Reload</span>
|
||||||
|
</button>
|
||||||
|
<button class="detail-stale-dismiss" aria-label="Dismiss"><i class="ph ph-x text-xs"></i></button>
|
||||||
|
`;
|
||||||
|
host.insertBefore(bar, host.querySelector('#detail-controls').nextSibling);
|
||||||
|
staleBannerEl = bar;
|
||||||
|
bar.querySelector('.detail-stale-reload').addEventListener('click', () => {
|
||||||
|
const current = state.cards.find(c => c.id == state.viewingCard?.id);
|
||||||
|
if (current) {
|
||||||
|
state.viewingCard = current;
|
||||||
|
renderSidebar(current);
|
||||||
|
showContent(current);
|
||||||
|
// Treat the reload as an explicit "I've now seen the new version"
|
||||||
|
// — re-fire detail.opened so collab-buckets clears the red dot
|
||||||
|
// on the board card and persists mark-card-seen to the backend.
|
||||||
|
window.hyprcrd?.hooks?.emit?.('detail.opened', { id: current.id });
|
||||||
|
}
|
||||||
|
dismissStaleBanner();
|
||||||
|
});
|
||||||
|
bar.querySelector('.detail-stale-dismiss').addEventListener('click', dismissStaleBanner);
|
||||||
|
}
|
||||||
|
|
||||||
|
function timeAgo(iso) {
|
||||||
|
if (!iso) return '';
|
||||||
|
// SQLite stores CURRENT_TIMESTAMP as UTC without a tz marker
|
||||||
|
// ("2026-04-14 12:34:56"). Without an explicit Z, JS parses it as
|
||||||
|
// local time — off by the tz offset (2h on CEST, hence "2h ago"
|
||||||
|
// for a 30-second-old update).
|
||||||
|
const normalized = String(iso).includes('T') || /[Zz]|[+-]\d\d:?\d\d$/.test(iso)
|
||||||
|
? iso
|
||||||
|
: iso.replace(' ', 'T') + 'Z';
|
||||||
|
const t = new Date(normalized).getTime();
|
||||||
|
if (!isFinite(t)) return '';
|
||||||
|
const s = Math.max(0, (Date.now() - t) / 1000);
|
||||||
|
if (s < 60) return `${Math.floor(s)}s ago`;
|
||||||
|
if (s < 3600) return `${Math.floor(s / 60)}m ago`;
|
||||||
|
if (s < 86400) return `${Math.floor(s / 3600)}h ago`;
|
||||||
|
return `${Math.floor(s / 86400)}d ago`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// After every full card reload, check whether the card we're viewing is
|
||||||
|
// newer in the fresh state. If so, show the banner. Dismiss it if the
|
||||||
|
// detail view closed in the meantime.
|
||||||
|
function checkStaleViewingCard() {
|
||||||
|
if (!detail.classList.contains('open') || !state.viewingCard) {
|
||||||
|
dismissStaleBanner();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const viewingId = state.viewingCard.id;
|
||||||
|
const fresh = state.cards.find(c => c.id == viewingId);
|
||||||
|
if (!fresh) return; // card deleted — separate UX, skip banner
|
||||||
|
const old = state.viewingCard;
|
||||||
|
// Compare updated_at OR any field that might have changed. The detail
|
||||||
|
// view captures viewingCard by reference on open, so a replaced
|
||||||
|
// state.cards array (via _reloadAll) gives us a different object — if
|
||||||
|
// any visible field differs, surface the banner.
|
||||||
|
const changed =
|
||||||
|
(fresh.updated_at || '') > (old.updated_at || '') ||
|
||||||
|
(fresh.title || '') !== (old.title || '') ||
|
||||||
|
(fresh.body || '') !== (old.body || '') ||
|
||||||
|
(fresh.color || '') !== (old.color || '') ||
|
||||||
|
(fresh.tags || '') !== (old.tags || '');
|
||||||
|
if (changed) showStaleBanner(fresh);
|
||||||
|
}
|
||||||
|
window.hyprcrd?.hooks?.on?.('cards.reloaded', checkStaleViewingCard);
|
||||||
|
|
||||||
function clearMorphGhost() {
|
function clearMorphGhost() {
|
||||||
if (morphTimer) {
|
if (morphTimer) {
|
||||||
clearTimeout(morphTimer);
|
clearTimeout(morphTimer);
|
||||||
@@ -370,6 +478,7 @@ export function closeDetail(options = {}) {
|
|||||||
closeImageFullscreen();
|
closeImageFullscreen();
|
||||||
|
|
||||||
detail.classList.remove('open', 'zen');
|
detail.classList.remove('open', 'zen');
|
||||||
|
dismissStaleBanner();
|
||||||
removeZenHandles();
|
removeZenHandles();
|
||||||
document.documentElement.classList.remove('detail-zen-open');
|
document.documentElement.classList.remove('detail-zen-open');
|
||||||
document.body.classList.remove('detail-zen-open');
|
document.body.classList.remove('detail-zen-open');
|
||||||
@@ -391,6 +500,11 @@ export function closeDetail(options = {}) {
|
|||||||
state._returnToCalendar = false;
|
state._returnToCalendar = false;
|
||||||
window._openCalendar?.();
|
window._openCalendar?.();
|
||||||
}
|
}
|
||||||
|
// Return focus to body so board shortcuts work immediately.
|
||||||
|
// Skipped when we just focused the search input (openedFromSearch).
|
||||||
|
if (!state.openedFromSearch && document.activeElement && document.activeElement !== document.body) {
|
||||||
|
document.activeElement.blur();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function showDetailCard(id) {
|
export function showDetailCard(id) {
|
||||||
@@ -428,7 +542,7 @@ function renderSidebar(card) {
|
|||||||
<span class="w-2 h-2 rounded-full shrink-0" style="background:${gc.color}"></span>
|
<span class="w-2 h-2 rounded-full shrink-0" style="background:${gc.color}"></span>
|
||||||
${img ? `<span class="w-6 h-6 rounded-full shrink-0 bg-cover bg-center border border-t-border" style="background-image:url('${img}')"></span>` : ''}
|
${img ? `<span class="w-6 h-6 rounded-full shrink-0 bg-cover bg-center border border-t-border" style="background-image:url('${img}')"></span>` : ''}
|
||||||
<span class="font-pixel text-[10px] ${active ? 'text-t-bright' : 'text-t-muted'} truncate flex-1">${esc(gc.title)}</span>
|
<span class="font-pixel text-[10px] ${active ? 'text-t-bright' : 'text-t-muted'} truncate flex-1">${esc(gc.title)}</span>
|
||||||
<button onclick="event.stopPropagation();window._ungroupCard(${gc.id})" class="text-t-dim hover:text-t-danger transition-colors shrink-0 ${gc.id == groupCards[0]?.id ? 'invisible' : ''}" title="ungroup">
|
<button onclick="event.stopPropagation();window._ungroupCard(${gc.id})" class="text-t-dim hover:text-t-danger transition-colors shrink-0 ${gc.id == groupCards[0]?.id ? 'invisible' : ''}" data-tip="ungroup">
|
||||||
<i class="ph ph-x text-[10px]"></i>
|
<i class="ph ph-x text-[10px]"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>`;
|
</div>`;
|
||||||
@@ -456,10 +570,50 @@ function updateDoneButton(card) {
|
|||||||
if (label) label.textContent = isDone ? 'Undone' : 'Done';
|
if (label) label.textContent = isDone ? 'Undone' : 'Done';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateReadButton(card) {
|
||||||
|
const isOn = !!Number(card?.read_push || 0);
|
||||||
|
const btn = $('detail-read-toggle');
|
||||||
|
const icon = $('detail-read-icon');
|
||||||
|
const label = $('detail-read-label');
|
||||||
|
if (!btn) return;
|
||||||
|
// Off state reuses the neutral control-bar style; on state inverts
|
||||||
|
// (accent-filled tile with dark text) so "this card sits on the relay
|
||||||
|
// right now" is visually unmistakable, matching typical toggle UIs.
|
||||||
|
btn.classList.toggle('bg-t-accent', isOn);
|
||||||
|
btn.classList.toggle('border-t-accent', isOn);
|
||||||
|
btn.classList.toggle('text-t-bg', isOn);
|
||||||
|
btn.classList.toggle('text-t-muted', !isOn);
|
||||||
|
btn.classList.toggle('hover:border-t-accent', !isOn);
|
||||||
|
btn.classList.toggle('hover:text-t-accent', !isOn);
|
||||||
|
if (icon) icon.className = (isOn ? 'ph-fill ph-book-open' : 'ph ph-book-open') + ' text-sm';
|
||||||
|
if (label) label.textContent = isOn ? 'On relay' : 'Read';
|
||||||
|
btn.title = isOn
|
||||||
|
? 'On relay — click to remove from your Read list'
|
||||||
|
: 'Push this card to your relay\'s Read list for distraction-free mobile reading';
|
||||||
|
}
|
||||||
|
|
||||||
|
$('detail-read-toggle')?.addEventListener('click', async () => {
|
||||||
|
const card = state.viewingCard;
|
||||||
|
if (!card) return;
|
||||||
|
const next = Number(card.read_push || 0) ? 0 : 1;
|
||||||
|
try {
|
||||||
|
const updated = await api(`api/cards/${card.id}`, { method: 'PATCH', body: { read_push: next } });
|
||||||
|
if (updated && !updated.error) {
|
||||||
|
card.read_push = updated.read_push;
|
||||||
|
card.relay_uid = updated.relay_uid;
|
||||||
|
const c = state.cards.find(x => x.id == card.id);
|
||||||
|
if (c) { c.read_push = updated.read_push; c.relay_uid = updated.relay_uid; }
|
||||||
|
updateReadButton(card);
|
||||||
|
window._renderBoard?.();
|
||||||
|
}
|
||||||
|
} catch (_) { /* network error: silently ignore */ }
|
||||||
|
});
|
||||||
|
|
||||||
function showContent(card) {
|
function showContent(card) {
|
||||||
$('detail-color').style.background = card.color;
|
$('detail-color').style.background = card.color;
|
||||||
titleEl.textContent = card.title;
|
titleEl.textContent = card.title;
|
||||||
updateDoneButton(card);
|
updateDoneButton(card);
|
||||||
|
updateReadButton(card);
|
||||||
const doneCorner = $('detail-done-corner');
|
const doneCorner = $('detail-done-corner');
|
||||||
if (doneCorner) doneCorner.classList.toggle('hidden', !(card.tags || '').split(',').includes('done'));
|
if (doneCorner) doneCorner.classList.toggle('hidden', !(card.tags || '').split(',').includes('done'));
|
||||||
bodyEl.innerHTML = renderMd(card.body);
|
bodyEl.innerHTML = renderMd(card.body);
|
||||||
@@ -549,7 +703,7 @@ function applyReadingResizeHandles(root) {
|
|||||||
const line = document.createElement('button');
|
const line = document.createElement('button');
|
||||||
line.type = 'button';
|
line.type = 'button';
|
||||||
line.className = 'detail-font-dragline';
|
line.className = 'detail-font-dragline';
|
||||||
line.title = 'drag to resize text';
|
line.dataset.tip = 'drag to resize text';
|
||||||
line.setAttribute('aria-label', 'resize text');
|
line.setAttribute('aria-label', 'resize text');
|
||||||
el.appendChild(line);
|
el.appendChild(line);
|
||||||
|
|
||||||
@@ -610,7 +764,7 @@ export function bindDetailImageFullscreen(root) {
|
|||||||
// Regular images: double-click, no gallery nav
|
// Regular images: double-click, no gallery nav
|
||||||
root.querySelectorAll('img').forEach(img => {
|
root.querySelectorAll('img').forEach(img => {
|
||||||
if (img.closest('.md-gallery')) return;
|
if (img.closest('.md-gallery')) return;
|
||||||
img.title = 'double-click to open fullscreen';
|
img.dataset.tip = 'double-click to fullscreen';
|
||||||
img.addEventListener('dblclick', e => {
|
img.addEventListener('dblclick', e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
@@ -807,7 +961,7 @@ function renderSplitGroup(cards, label) {
|
|||||||
|
|
||||||
function renderSplitPicks(cards, label) {
|
function renderSplitPicks(cards, label) {
|
||||||
if (!cards.length) {
|
if (!cards.length) {
|
||||||
splitPicks.innerHTML = `<div class="px-3 py-4 text-center text-t-dim font-pixel text-[9px]">no matches</div>`;
|
splitPicks.innerHTML = `<div class="px-3 py-4 text-center text-t-dim font-pixel text-[9px] cursor-blink">no matches</div>`;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
splitPicks.innerHTML = renderSplitGroup(cards, label);
|
splitPicks.innerHTML = renderSplitGroup(cards, label);
|
||||||
@@ -819,7 +973,7 @@ function renderSplitPicks(cards, label) {
|
|||||||
function renderSplitGroups(groups) {
|
function renderSplitGroups(groups) {
|
||||||
const html = groups.filter(g => g.cards.length).map(g => renderSplitGroup(g.cards, g.label)).join('');
|
const html = groups.filter(g => g.cards.length).map(g => renderSplitGroup(g.cards, g.label)).join('');
|
||||||
if (!html) {
|
if (!html) {
|
||||||
splitPicks.innerHTML = `<div class="px-3 py-4 text-center text-t-dim font-pixel text-[9px]">no matches</div>`;
|
splitPicks.innerHTML = `<div class="px-3 py-4 text-center text-t-dim font-pixel text-[9px] cursor-blink">no matches</div>`;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
splitPicks.innerHTML = html;
|
splitPicks.innerHTML = html;
|
||||||
@@ -893,7 +1047,7 @@ function loadSplitCard(id) {
|
|||||||
<button id="split-back" class="flex items-center gap-1.5 flex-1 px-3 py-2 text-xs text-t-muted hover:text-t-accent hover:bg-t-raised transition-colors">
|
<button id="split-back" class="flex items-center gap-1.5 flex-1 px-3 py-2 text-xs text-t-muted hover:text-t-accent hover:bg-t-raised transition-colors">
|
||||||
<i class="ph ph-arrow-left text-sm"></i><span class="font-pixel text-[10px]">${splitLastQuery ? 'results' : 'related cards'}</span>
|
<i class="ph ph-arrow-left text-sm"></i><span class="font-pixel text-[10px]">${splitLastQuery ? 'results' : 'related cards'}</span>
|
||||||
</button>
|
</button>
|
||||||
<button id="split-promote" class="flex items-center gap-1.5 px-3 py-2 text-xs text-t-muted hover:text-t-accent hover:bg-t-raised transition-colors" title="open as main card">
|
<button id="split-promote" class="flex items-center gap-1.5 px-3 py-2 text-xs text-t-muted hover:text-t-accent hover:bg-t-raised transition-colors" data-tip="open as main card">
|
||||||
<i class="ph ph-arrow-line-left text-sm"></i><span class="font-pixel text-[10px]">Focus</span>
|
<i class="ph ph-arrow-line-left text-sm"></i><span class="font-pixel text-[10px]">Focus</span>
|
||||||
</button>
|
</button>
|
||||||
</div>`;
|
</div>`;
|
||||||
|
|||||||
+382
-25
@@ -4,6 +4,7 @@ import { $, esc, api, escRe, getCsrf, fuzzyMatch } from './util.js';
|
|||||||
import { state, getChildren, CARD_COLORS } from './state.js';
|
import { state, getChildren, CARD_COLORS } from './state.js';
|
||||||
import { renderMd, addCodeCopyButtons, formatTodoItems } from './markdown.js';
|
import { renderMd, addCodeCopyButtons, formatTodoItems } from './markdown.js';
|
||||||
import { pushCardEdit, snapshotCard } from './undo.js';
|
import { pushCardEdit, snapshotCard } from './undo.js';
|
||||||
|
import { showDialog } from './dialog.js';
|
||||||
|
|
||||||
const modal = $('modal');
|
const modal = $('modal');
|
||||||
const body = $('editor-body');
|
const body = $('editor-body');
|
||||||
@@ -13,6 +14,8 @@ const inpTitle = $('inp-title');
|
|||||||
const inpColor = $('inp-color');
|
const inpColor = $('inp-color');
|
||||||
const inpBucket = $('inp-bucket');
|
const inpBucket = $('inp-bucket');
|
||||||
const presets = $('color-presets');
|
const presets = $('color-presets');
|
||||||
|
const scratchpadPanel = $('editor-scratchpad');
|
||||||
|
const scratchpadBody = $('scratchpad-body');
|
||||||
const linkAc = $('link-ac');
|
const linkAc = $('link-ac');
|
||||||
const tagAc = $('tag-ac');
|
const tagAc = $('tag-ac');
|
||||||
|
|
||||||
@@ -102,7 +105,7 @@ function startCloseMorph() {
|
|||||||
|
|
||||||
CARD_COLORS.forEach(c => {
|
CARD_COLORS.forEach(c => {
|
||||||
const btn = document.createElement('button');
|
const btn = document.createElement('button');
|
||||||
btn.type = 'button'; btn.title = c.name;
|
btn.type = 'button'; btn.dataset.tip = c.name;
|
||||||
btn.dataset.color = c.hex;
|
btn.dataset.color = c.hex;
|
||||||
btn.className = 'w-5 h-5 rounded-sm border-2 border-transparent transition-all hover:scale-125 color-swatch';
|
btn.className = 'w-5 h-5 rounded-sm border-2 border-transparent transition-all hover:scale-125 color-swatch';
|
||||||
btn.style.background = c.hex;
|
btn.style.background = c.hex;
|
||||||
@@ -176,6 +179,45 @@ function selectColor(hex) {
|
|||||||
|
|
||||||
// ── Open / close ──
|
// ── Open / close ──
|
||||||
|
|
||||||
|
// ── Autobackup (draft recovery) ──
|
||||||
|
const DRAFT_KEY = 'hyprcrd-editor-draft';
|
||||||
|
let draftSaveTimer = null;
|
||||||
|
|
||||||
|
function draftKeyFor(cardId) {
|
||||||
|
return DRAFT_KEY + ':' + (cardId || 'new');
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadDraft(cardId) {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(draftKeyFor(cardId));
|
||||||
|
return raw ? JSON.parse(raw) : null;
|
||||||
|
} catch { return null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function saveDraftDebounced() {
|
||||||
|
clearTimeout(draftSaveTimer);
|
||||||
|
draftSaveTimer = setTimeout(() => {
|
||||||
|
const id = state.editingId || 'new';
|
||||||
|
const data = {
|
||||||
|
title: inpTitle.value,
|
||||||
|
body: body.value,
|
||||||
|
scratchpad: scratchpadBody?.value || '',
|
||||||
|
savedAt: Date.now(),
|
||||||
|
};
|
||||||
|
// Don't store empty drafts
|
||||||
|
if (!data.title.trim() && !data.body.trim() && !data.scratchpad.trim()) {
|
||||||
|
localStorage.removeItem(draftKeyFor(id));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try { localStorage.setItem(draftKeyFor(id), JSON.stringify(data)); } catch {}
|
||||||
|
}, 800);
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearDraft(cardId) {
|
||||||
|
clearTimeout(draftSaveTimer);
|
||||||
|
try { localStorage.removeItem(draftKeyFor(cardId || 'new')); } catch {}
|
||||||
|
}
|
||||||
|
|
||||||
export function openModal(card = null) {
|
export function openModal(card = null) {
|
||||||
state.editingId = card ? card.id : null;
|
state.editingId = card ? card.id : null;
|
||||||
$('modal-title').textContent = card ? 'edit_card' : 'new_card';
|
$('modal-title').textContent = card ? 'edit_card' : 'new_card';
|
||||||
@@ -184,28 +226,74 @@ export function openModal(card = null) {
|
|||||||
inpTitle.value = card ? card.title : (isJournal ? today : '');
|
inpTitle.value = card ? card.title : (isJournal ? today : '');
|
||||||
body.value = card ? card.body : '';
|
body.value = card ? card.body : '';
|
||||||
const virtualBuckets = ['all', 'none', 'current', 'favorites', 'journal'];
|
const virtualBuckets = ['all', 'none', 'current', 'favorites', 'journal'];
|
||||||
|
// New appointments (#termin / #geburtstag pre-filled from the
|
||||||
|
// calendar's day-popup template) must never inherit the active
|
||||||
|
// bucket — they belong to a calendar, not a kanban column. For
|
||||||
|
// every other new card, inherit the active real bucket if we're
|
||||||
|
// in one so the user doesn't have to re-pick it.
|
||||||
|
// `card` can be `null` (add-button new) or a shell `{id: null, ...}`
|
||||||
|
// from the calendar day-popup — both count as "new", so key on
|
||||||
|
// card?.id not the card ref itself.
|
||||||
|
const isNewAppointment = !card?.id && /#(termin|appointment|geburtstag|birthday)\b/.test(body.value);
|
||||||
inpBucket.value = card?.bucket_id ? card.bucket_id
|
inpBucket.value = card?.bucket_id ? card.bucket_id
|
||||||
: (!virtualBuckets.includes(state.activeBucket) ? state.activeBucket : '');
|
: (isNewAppointment ? ''
|
||||||
|
: (!virtualBuckets.includes(state.activeBucket) ? state.activeBucket : ''));
|
||||||
selectColor(card ? card.color : '#38bdf8');
|
selectColor(card ? card.color : '#38bdf8');
|
||||||
setDueDate(card?.due_date || '');
|
setDueDate(card?.due_date || '');
|
||||||
updateDoneToggle();
|
updateDoneToggle();
|
||||||
state.previewVisible = true;
|
if (scratchpadBody) scratchpadBody.value = card?.scratchpad || '';
|
||||||
preview.classList.remove('hidden');
|
showSidePanel('preview');
|
||||||
editorDivider?.classList.remove('hidden');
|
|
||||||
$('toggle-preview').classList.add('text-t-accent');
|
|
||||||
applyEditorSplit();
|
|
||||||
updatePreview();
|
|
||||||
modal.classList.add('open');
|
modal.classList.add('open');
|
||||||
if (linesVisible) updateGutter();
|
if (linesVisible) updateGutter();
|
||||||
currentLine = -1;
|
currentLine = -1;
|
||||||
updateActiveLine();
|
updateActiveLine();
|
||||||
|
|
||||||
|
// Check for unsaved draft (newer than what we just loaded).
|
||||||
|
// Skipped during test runs — tests would block on the dialog.
|
||||||
|
const draft = loadDraft(card?.id);
|
||||||
|
if (draft && !window._testRunning) {
|
||||||
|
const cardModified = card ? Date.parse(card.updated_at + 'Z') || 0 : 0;
|
||||||
|
const draftIsNewer = draft.savedAt > cardModified;
|
||||||
|
const draftHasContent = draft.title || draft.body || draft.scratchpad;
|
||||||
|
const differsFromLoaded = draft.title !== inpTitle.value || draft.body !== body.value || draft.scratchpad !== (scratchpadBody?.value || '');
|
||||||
|
if (draftIsNewer && draftHasContent && differsFromLoaded) {
|
||||||
|
const age = Math.round((Date.now() - draft.savedAt) / 60000);
|
||||||
|
const ageText = age < 1 ? 'just now' : age < 60 ? `${age} min ago` : `${Math.round(age / 60)} h ago`;
|
||||||
|
const cardId = card?.id;
|
||||||
|
// Async confirm — fires after openModal returns
|
||||||
|
(async () => {
|
||||||
|
const restore = await showDialog({
|
||||||
|
title: 'unsaved draft',
|
||||||
|
message: `Unsaved draft from ${ageText} found.\n\nRestore it?`,
|
||||||
|
okLabel: 'Restore',
|
||||||
|
cancelLabel: 'Discard',
|
||||||
|
});
|
||||||
|
if (!modal.classList.contains('open') || state.editingId != cardId) return;
|
||||||
|
if (restore) {
|
||||||
|
inpTitle.value = draft.title || '';
|
||||||
|
body.value = draft.body || '';
|
||||||
|
if (scratchpadBody) scratchpadBody.value = draft.scratchpad || '';
|
||||||
|
updatePreview();
|
||||||
|
} else {
|
||||||
|
clearDraft(cardId);
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}
|
||||||
|
} else if (draft && window._testRunning) {
|
||||||
|
clearDraft(card?.id);
|
||||||
|
}
|
||||||
|
|
||||||
inpTitle.focus();
|
inpTitle.focus();
|
||||||
|
// Plugins (collab-buckets) hook into this to heartbeat an edit lock
|
||||||
|
window.dispatchEvent(new CustomEvent('hyprcrd:editor-open', { detail: { card } }));
|
||||||
}
|
}
|
||||||
|
|
||||||
inpTitle.addEventListener('input', updatePreview);
|
inpTitle.addEventListener('input', () => { updatePreview(); saveDraftDebounced(); });
|
||||||
inpTitle.addEventListener('keydown', e => {
|
inpTitle.addEventListener('keydown', e => {
|
||||||
if (e.key === 'Tab' && !e.shiftKey) { e.preventDefault(); body.focus(); }
|
if (e.key === 'Tab' && !e.shiftKey) { e.preventDefault(); body.focus(); }
|
||||||
});
|
});
|
||||||
|
body.addEventListener('input', saveDraftDebounced);
|
||||||
|
scratchpadBody?.addEventListener('input', saveDraftDebounced);
|
||||||
|
|
||||||
// ── Line numbers ──
|
// ── Line numbers ──
|
||||||
|
|
||||||
@@ -354,11 +442,14 @@ body.addEventListener('keyup', updateActiveLine);
|
|||||||
window.addEventListener('resize', () => { if (linesVisible) updateGutter(); });
|
window.addEventListener('resize', () => { if (linesVisible) updateGutter(); });
|
||||||
|
|
||||||
export function closeModal({ animate = true } = {}) {
|
export function closeModal({ animate = true } = {}) {
|
||||||
|
const closingId = state.editingId;
|
||||||
if (animate) startCloseMorph();
|
if (animate) startCloseMorph();
|
||||||
else clearMorphGhost();
|
else clearMorphGhost();
|
||||||
hideLinkAc();
|
hideLinkAc();
|
||||||
hideTagAc();
|
hideTagAc();
|
||||||
hideSnippetAc();
|
hideSnippetAc();
|
||||||
|
closeFindBar();
|
||||||
|
closeAssetPicker();
|
||||||
modal.classList.remove('open');
|
modal.classList.remove('open');
|
||||||
state.editingId = null;
|
state.editingId = null;
|
||||||
state.returnToGalleryAfterEdit = false;
|
state.returnToGalleryAfterEdit = false;
|
||||||
@@ -366,6 +457,12 @@ export function closeModal({ animate = true } = {}) {
|
|||||||
state._returnToCalendar = false;
|
state._returnToCalendar = false;
|
||||||
window._openCalendar?.();
|
window._openCalendar?.();
|
||||||
}
|
}
|
||||||
|
window.dispatchEvent(new CustomEvent('hyprcrd:editor-close', { detail: { cardId: closingId } }));
|
||||||
|
// Return focus to body so board shortcuts (arrows, bare keys) work
|
||||||
|
// immediately after closing without the user having to click first.
|
||||||
|
if (document.activeElement && document.activeElement !== document.body) {
|
||||||
|
document.activeElement.blur();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatePreview() {
|
function updatePreview() {
|
||||||
@@ -385,13 +482,16 @@ function updatePreview() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function doSave(close, { animate = true } = {}) {
|
async function doSave(close, { animate = true } = {}) {
|
||||||
const data = { title: inpTitle.value, body: body.value, color: inpColor.value, bucket_id: inpBucket.value || null, due_date: inpDueValue?.value || null };
|
const scratch = scratchpadBody?.value || null;
|
||||||
|
const data = { title: inpTitle.value, body: body.value, color: inpColor.value, bucket_id: inpBucket.value || null, due_date: inpDueValue?.value || null, scratchpad: scratch };
|
||||||
if (!data.title.trim()) return;
|
if (!data.title.trim()) return;
|
||||||
const returnToGallery = state.returnToGalleryAfterEdit;
|
const returnToGallery = state.returnToGalleryAfterEdit;
|
||||||
|
const wasEditingId = state.editingId;
|
||||||
if (state.editingId) {
|
if (state.editingId) {
|
||||||
const prev = snapshotCard(state.cards.find(c => c.id == state.editingId));
|
const prev = snapshotCard(state.cards.find(c => c.id == state.editingId));
|
||||||
if (prev) pushCardEdit('edit', state.editingId, { title: prev.title, body: prev.body, color: prev.color, bucket_id: prev.bucket_id, due_date: prev.due_date ?? null });
|
if (prev) pushCardEdit('edit', state.editingId, { title: prev.title, body: prev.body, color: prev.color, bucket_id: prev.bucket_id, due_date: prev.due_date ?? null });
|
||||||
await api(`api/cards/${state.editingId}`, { method: 'PATCH', body: data });
|
await api(`api/cards/${state.editingId}`, { method: 'PATCH', body: data });
|
||||||
|
clearDraft(state.editingId);
|
||||||
} else {
|
} else {
|
||||||
if (state.activeGroup) {
|
if (state.activeGroup) {
|
||||||
const parent = state.cards.find(c => c.id == state.activeGroup);
|
const parent = state.cards.find(c => c.id == state.activeGroup);
|
||||||
@@ -406,11 +506,13 @@ async function doSave(close, { animate = true } = {}) {
|
|||||||
if (created?.id) {
|
if (created?.id) {
|
||||||
if (!close) state.editingId = created.id;
|
if (!close) state.editingId = created.id;
|
||||||
state._lastSavedId = created.id;
|
state._lastSavedId = created.id;
|
||||||
|
state.recentlyCreatedIds?.add(String(created.id));
|
||||||
}
|
}
|
||||||
|
clearDraft(null); // 'new' draft
|
||||||
}
|
}
|
||||||
await window._reloadAll();
|
await window._reloadAll();
|
||||||
// Auto-sync if card has #termin or #geburtstag
|
// Auto-sync if card has #termin or #geburtstag
|
||||||
if (data.body && /#(termin|geburtstag)\b/.test(data.body)) {
|
if (data.body && /#(termin|appointment|geburtstag|birthday)\b/.test(data.body)) {
|
||||||
window._triggerSync?.();
|
window._triggerSync?.();
|
||||||
}
|
}
|
||||||
if (close) {
|
if (close) {
|
||||||
@@ -524,18 +626,40 @@ function applyEditorSplit() {
|
|||||||
preview.style.flex = `${100 - editorSplit} 1 0`;
|
preview.style.flex = `${100 - editorSplit} 1 0`;
|
||||||
}
|
}
|
||||||
|
|
||||||
$('toggle-preview')?.addEventListener('click', () => {
|
function showSidePanel(which) {
|
||||||
state.previewVisible = !state.previewVisible;
|
const showPreview = which === 'preview';
|
||||||
preview.classList.toggle('hidden', !state.previewVisible);
|
const showScratch = which === 'scratchpad';
|
||||||
editorDivider?.classList.toggle('hidden', !state.previewVisible);
|
|
||||||
$('toggle-preview').classList.toggle('text-t-accent', state.previewVisible);
|
state.previewVisible = showPreview;
|
||||||
if (state.previewVisible) {
|
preview.classList.toggle('hidden', !showPreview);
|
||||||
|
scratchpadPanel?.classList.toggle('hidden', !showScratch);
|
||||||
|
editorDivider?.classList.toggle('hidden', !showPreview && !showScratch);
|
||||||
|
$('toggle-preview')?.classList.toggle('text-t-accent', showPreview);
|
||||||
|
$('toggle-scratchpad')?.classList.toggle('text-t-accent', showScratch);
|
||||||
|
|
||||||
|
if (showPreview || showScratch) {
|
||||||
applyEditorSplit();
|
applyEditorSplit();
|
||||||
|
if (showScratch) scratchpadPanel.style.flex = preview.style.flex || '1 1 0%';
|
||||||
} else {
|
} else {
|
||||||
if (editorPane) editorPane.style.flex = '1 1 0%';
|
if (editorPane) editorPane.style.flex = '1 1 0%';
|
||||||
preview.style.flex = '';
|
preview.style.flex = '';
|
||||||
|
if (scratchpadPanel) scratchpadPanel.style.flex = '';
|
||||||
}
|
}
|
||||||
updatePreview();
|
if (showPreview) updatePreview();
|
||||||
|
}
|
||||||
|
|
||||||
|
$('toggle-preview')?.addEventListener('click', () => {
|
||||||
|
showSidePanel(state.previewVisible ? null : 'preview');
|
||||||
|
});
|
||||||
|
|
||||||
|
$('toggle-scratchpad')?.addEventListener('click', () => {
|
||||||
|
const isOpen = !scratchpadPanel?.classList.contains('hidden');
|
||||||
|
showSidePanel(isOpen ? null : 'scratchpad');
|
||||||
|
if (!isOpen) scratchpadBody?.focus();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('scratchpad-clear')?.addEventListener('click', () => {
|
||||||
|
if (scratchpadBody) scratchpadBody.value = '';
|
||||||
});
|
});
|
||||||
|
|
||||||
if (editorDivider) {
|
if (editorDivider) {
|
||||||
@@ -979,15 +1103,133 @@ body.addEventListener('keydown', e => {
|
|||||||
|
|
||||||
body.addEventListener('blur', () => { setTimeout(hideLinkAc, 150); setTimeout(hideTagAc, 150); setTimeout(hideSnippetAc, 150); });
|
body.addEventListener('blur', () => { setTimeout(hideLinkAc, 150); setTimeout(hideTagAc, 150); setTimeout(hideSnippetAc, 150); });
|
||||||
|
|
||||||
|
// ── Find / Replace (Ctrl+H / Ctrl+F) ──
|
||||||
|
|
||||||
|
const findBar = $('editor-find-bar');
|
||||||
|
const findInput = $('find-input');
|
||||||
|
const replInput = $('replace-input');
|
||||||
|
const findCount = $('find-count');
|
||||||
|
const replRow = $('replace-row');
|
||||||
|
|
||||||
|
let findMatches = [];
|
||||||
|
let findCurrent = -1;
|
||||||
|
|
||||||
|
export function openFindBar(withReplace = true) {
|
||||||
|
if (!findBar) return;
|
||||||
|
findBar.classList.remove('hidden');
|
||||||
|
replRow?.classList.toggle('hidden', !withReplace);
|
||||||
|
findInput?.focus();
|
||||||
|
if (findInput?.value) runFind();
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeFindBar() {
|
||||||
|
findBar?.classList.add('hidden');
|
||||||
|
findMatches = [];
|
||||||
|
findCurrent = -1;
|
||||||
|
if (findCount) findCount.textContent = '';
|
||||||
|
body.focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
function runFind() {
|
||||||
|
const needle = findInput?.value;
|
||||||
|
findMatches = [];
|
||||||
|
findCurrent = -1;
|
||||||
|
if (!needle) { if (findCount) findCount.textContent = ''; return; }
|
||||||
|
const text = body.value;
|
||||||
|
const lower = text.toLowerCase();
|
||||||
|
const nLower = needle.toLowerCase();
|
||||||
|
let pos = 0;
|
||||||
|
while (true) {
|
||||||
|
const idx = lower.indexOf(nLower, pos);
|
||||||
|
if (idx === -1) break;
|
||||||
|
findMatches.push(idx);
|
||||||
|
pos = idx + 1;
|
||||||
|
}
|
||||||
|
if (findCount) findCount.textContent = findMatches.length ? `${findMatches.length} found` : 'no match';
|
||||||
|
if (findMatches.length) jumpTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
function jumpTo(idx) {
|
||||||
|
findCurrent = idx;
|
||||||
|
const pos = findMatches[idx];
|
||||||
|
const needle = findInput?.value || '';
|
||||||
|
body.focus();
|
||||||
|
body.setSelectionRange(pos, pos + needle.length);
|
||||||
|
if (findCount) findCount.textContent = `${idx + 1} / ${findMatches.length}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function findNext() {
|
||||||
|
if (!findMatches.length) return;
|
||||||
|
jumpTo((findCurrent + 1) % findMatches.length);
|
||||||
|
}
|
||||||
|
function findPrev() {
|
||||||
|
if (!findMatches.length) return;
|
||||||
|
jumpTo((findCurrent - 1 + findMatches.length) % findMatches.length);
|
||||||
|
}
|
||||||
|
|
||||||
|
function replaceOne() {
|
||||||
|
if (findCurrent < 0 || !findMatches.length) return;
|
||||||
|
const needle = findInput?.value || '';
|
||||||
|
const repl = replInput?.value ?? '';
|
||||||
|
const pos = findMatches[findCurrent];
|
||||||
|
body.setRangeText(repl, pos, pos + needle.length, 'end');
|
||||||
|
updatePreview();
|
||||||
|
runFind();
|
||||||
|
if (findMatches.length && findCurrent >= findMatches.length) findCurrent = 0;
|
||||||
|
if (findMatches.length) jumpTo(findCurrent < 0 ? 0 : findCurrent);
|
||||||
|
}
|
||||||
|
|
||||||
|
function replaceAll() {
|
||||||
|
const needle = findInput?.value;
|
||||||
|
const repl = replInput?.value ?? '';
|
||||||
|
if (!needle) return;
|
||||||
|
// Simple case-insensitive global replace via regex
|
||||||
|
const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||||
|
body.value = body.value.replace(new RegExp(escaped, 'gi'), repl);
|
||||||
|
updatePreview();
|
||||||
|
runFind();
|
||||||
|
}
|
||||||
|
|
||||||
|
findInput?.addEventListener('input', runFind);
|
||||||
|
findInput?.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Enter') { e.preventDefault(); e.shiftKey ? findPrev() : findNext(); }
|
||||||
|
if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); closeFindBar(); }
|
||||||
|
});
|
||||||
|
replInput?.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Enter') { e.preventDefault(); replaceOne(); }
|
||||||
|
if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); closeFindBar(); }
|
||||||
|
});
|
||||||
|
$('find-next')?.addEventListener('click', findNext);
|
||||||
|
$('find-prev')?.addEventListener('click', findPrev);
|
||||||
|
$('find-close')?.addEventListener('click', closeFindBar);
|
||||||
|
$('replace-one')?.addEventListener('click', replaceOne);
|
||||||
|
$('replace-all')?.addEventListener('click', replaceAll);
|
||||||
|
|
||||||
|
// Ctrl+H = find+replace, Ctrl+F = find only (within editor)
|
||||||
|
document.addEventListener('keydown', e => {
|
||||||
|
if (!modal.classList.contains('open')) return;
|
||||||
|
if ((e.key === 'h' || e.key === 'f') && (e.ctrlKey || e.metaKey)) {
|
||||||
|
e.preventDefault();
|
||||||
|
// If already open and same mode, toggle off
|
||||||
|
if (!findBar?.classList.contains('hidden')) {
|
||||||
|
const wantReplace = e.key === 'h';
|
||||||
|
const hasReplace = !replRow?.classList.contains('hidden');
|
||||||
|
if (wantReplace === hasReplace) { closeFindBar(); return; }
|
||||||
|
}
|
||||||
|
openFindBar(e.key === 'h');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// ── File upload (paste + drag-drop) ──
|
// ── File upload (paste + drag-drop) ──
|
||||||
|
|
||||||
async function uploadFile(file) {
|
async function uploadFile(file) {
|
||||||
const isAudio = file.type.startsWith('audio/');
|
const isAudio = file.type.startsWith('audio/');
|
||||||
const isImage = file.type.startsWith('image/');
|
const isImage = file.type.startsWith('image/');
|
||||||
if (!isAudio && !isImage) return;
|
const isPdf = file.type === 'application/pdf' || file.name?.toLowerCase().endsWith('.pdf');
|
||||||
|
if (!isAudio && !isImage && !isPdf) return;
|
||||||
|
|
||||||
const ext = file.name?.split('.').pop() || file.type.split('/')[1] || 'bin';
|
const ext = file.name?.split('.').pop() || file.type.split('/')[1] || 'bin';
|
||||||
const placeholder = isAudio ? '[uploading audio...]' : '![uploading...]()';
|
const placeholder = isPdf ? '[uploading pdf...]' : isAudio ? '[uploading audio...]' : '![uploading...]()';
|
||||||
const pos = body.selectionStart;
|
const pos = body.selectionStart;
|
||||||
body.setRangeText(placeholder, pos, body.selectionEnd, 'end');
|
body.setRangeText(placeholder, pos, body.selectionEnd, 'end');
|
||||||
updatePreview();
|
updatePreview();
|
||||||
@@ -1000,9 +1242,11 @@ async function uploadFile(file) {
|
|||||||
const data = JSON.parse(text);
|
const data = JSON.parse(text);
|
||||||
if (data.error) throw new Error(data.error);
|
if (data.error) throw new Error(data.error);
|
||||||
if (data.url) {
|
if (data.url) {
|
||||||
const md = isAudio
|
const md = isPdf
|
||||||
? `<audio controls preload="metadata" src="${data.url}"></audio>`
|
? `[📄 ${file.name || data.name}](${data.url})`
|
||||||
: ``;
|
: isAudio
|
||||||
|
? `<audio controls preload="metadata" src="${data.url}"></audio>`
|
||||||
|
: ``;
|
||||||
const idx = body.value.indexOf(placeholder);
|
const idx = body.value.indexOf(placeholder);
|
||||||
if (idx !== -1) {
|
if (idx !== -1) {
|
||||||
body.value = body.value.substring(0, idx) + md + body.value.substring(idx + placeholder.length);
|
body.value = body.value.substring(0, idx) + md + body.value.substring(idx + placeholder.length);
|
||||||
@@ -1023,7 +1267,7 @@ body.addEventListener('paste', e => {
|
|||||||
const items = e.clipboardData?.items;
|
const items = e.clipboardData?.items;
|
||||||
if (!items) return;
|
if (!items) return;
|
||||||
for (const item of items) {
|
for (const item of items) {
|
||||||
if (item.type.startsWith('image/') || item.type.startsWith('audio/')) {
|
if (item.type.startsWith('image/') || item.type.startsWith('audio/') || item.type === 'application/pdf') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
const file = item.getAsFile();
|
const file = item.getAsFile();
|
||||||
if (file) uploadFile(file);
|
if (file) uploadFile(file);
|
||||||
@@ -1037,7 +1281,7 @@ body.addEventListener('drop', e => {
|
|||||||
const files = e.dataTransfer?.files;
|
const files = e.dataTransfer?.files;
|
||||||
if (!files?.length) return;
|
if (!files?.length) return;
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
if (file.type.startsWith('image/') || file.type.startsWith('audio/')) {
|
if (file.type.startsWith('image/') || file.type.startsWith('audio/') || file.type === 'application/pdf') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
uploadFile(file);
|
uploadFile(file);
|
||||||
return;
|
return;
|
||||||
@@ -1045,9 +1289,122 @@ body.addEventListener('drop', e => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// PDF upload toolbar button
|
||||||
|
$('md-upload-pdf')?.addEventListener('click', () => $('md-upload-pdf-file')?.click());
|
||||||
|
$('md-upload-pdf-file')?.addEventListener('change', e => {
|
||||||
|
const file = e.target.files?.[0];
|
||||||
|
if (file) uploadFile(file);
|
||||||
|
e.target.value = '';
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Asset picker (insert from uploads) ──
|
||||||
|
|
||||||
|
const ASSET_IMAGE_EXT = /\.(png|jpe?g|gif|webp)$/i;
|
||||||
|
const ASSET_AUDIO_EXT = /\.(mp3|ogg|wav|m4a)$/i;
|
||||||
|
const ASSET_PDF_EXT = /\.pdf$/i;
|
||||||
|
|
||||||
|
function assetType(name) {
|
||||||
|
if (ASSET_IMAGE_EXT.test(name)) return 'image';
|
||||||
|
if (ASSET_AUDIO_EXT.test(name)) return 'audio';
|
||||||
|
if (ASSET_PDF_EXT.test(name)) return 'pdf';
|
||||||
|
return 'other';
|
||||||
|
}
|
||||||
|
|
||||||
|
let assetPickerEl = null;
|
||||||
|
|
||||||
|
function closeAssetPicker() {
|
||||||
|
if (assetPickerEl) { assetPickerEl.remove(); assetPickerEl = null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
$('md-asset-picker')?.addEventListener('click', async () => {
|
||||||
|
if (assetPickerEl) { closeAssetPicker(); return; }
|
||||||
|
|
||||||
|
let files = [];
|
||||||
|
try { files = await api('api/uploads'); } catch {}
|
||||||
|
if (!Array.isArray(files)) files = [];
|
||||||
|
|
||||||
|
const btn = $('md-asset-picker');
|
||||||
|
const rect = btn.getBoundingClientRect();
|
||||||
|
|
||||||
|
const picker = document.createElement('div');
|
||||||
|
picker.id = 'asset-picker-flyout';
|
||||||
|
picker.style.cssText = `position:fixed;top:${rect.bottom + 4}px;right:${window.innerWidth - rect.right}px;width:340px;max-height:400px;background:var(--t-surface);border:1px solid var(--t-border);border-radius:6px;box-shadow:0 12px 40px rgba(0,0,0,0.5);z-index:200;display:flex;flex-direction:column;overflow:hidden;`;
|
||||||
|
|
||||||
|
const searchHtml = `<div style="padding:8px;border-bottom:1px solid var(--t-border);">
|
||||||
|
<input id="asset-picker-search" type="text" placeholder="search assets..." autocomplete="off"
|
||||||
|
style="width:100%;background:var(--t-bg);border:1px solid var(--t-border);color:var(--t-bright);padding:5px 8px;font-size:11px;font-family:var(--t-font-content,'JetBrains Mono',monospace);border-radius:4px;outline:none;"
|
||||||
|
class="focus:border-t-accent">
|
||||||
|
</div>`;
|
||||||
|
|
||||||
|
const gridId = 'asset-picker-grid';
|
||||||
|
picker.innerHTML = searchHtml + `<div id="${gridId}" style="flex:1;overflow-y:auto;padding:8px;display:grid;grid-template-columns:repeat(4,1fr);gap:6px;"></div>`;
|
||||||
|
document.body.appendChild(picker);
|
||||||
|
assetPickerEl = picker;
|
||||||
|
|
||||||
|
const grid = picker.querySelector(`#${gridId}`);
|
||||||
|
const searchInput = picker.querySelector('#asset-picker-search');
|
||||||
|
|
||||||
|
function renderTiles(filter) {
|
||||||
|
const q = (filter || '').toLowerCase();
|
||||||
|
const filtered = q ? files.filter(f => f.name.toLowerCase().includes(q)) : files;
|
||||||
|
if (!filtered.length) {
|
||||||
|
grid.innerHTML = `<div style="grid-column:1/-1;text-align:center;padding:24px 0;color:var(--t-dim);font-size:10px;font-style:italic;">${files.length ? 'no matches' : 'no assets'}</div>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
grid.innerHTML = filtered.map(f => {
|
||||||
|
const type = assetType(f.name);
|
||||||
|
const label = f.name.replace(/\.[^.]+$/, '');
|
||||||
|
if (type === 'image') {
|
||||||
|
return `<div class="asset-pick-tile" data-url="${esc(f.url)}" data-name="${esc(f.name)}" data-type="image" data-tip="${esc(f.name)}" style="cursor:pointer;border-radius:4px;overflow:hidden;aspect-ratio:1;background:var(--t-bg);border:1px solid var(--t-border);">
|
||||||
|
<img src="${esc(f.url)}" style="width:100%;height:100%;object-fit:cover;" loading="lazy">
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
|
const icon = type === 'audio' ? 'ph-music-note' : type === 'pdf' ? 'ph-file-pdf' : 'ph-file';
|
||||||
|
const iconColor = type === 'pdf' ? 'color:var(--t-danger)' : 'color:var(--t-dim)';
|
||||||
|
return `<div class="asset-pick-tile" data-url="${esc(f.url)}" data-name="${esc(f.name)}" data-type="${type}" data-tip="${esc(f.name)}" style="cursor:pointer;border-radius:4px;overflow:hidden;aspect-ratio:1;background:var(--t-bg);border:1px solid var(--t-border);display:flex;flex-direction:column;align-items:center;justify-content:center;gap:4px;padding:4px;">
|
||||||
|
<i class="ph ${icon}" style="font-size:20px;${iconColor}"></i>
|
||||||
|
<span style="font-size:7px;color:var(--t-muted);max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-family:var(--t-font-pixel,'Silkscreen',monospace);">${esc(label)}</span>
|
||||||
|
</div>`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
grid.querySelectorAll('.asset-pick-tile').forEach(tile => {
|
||||||
|
tile.addEventListener('click', () => {
|
||||||
|
const url = tile.dataset.url;
|
||||||
|
const name = tile.dataset.name;
|
||||||
|
const type = tile.dataset.type;
|
||||||
|
let md;
|
||||||
|
if (type === 'image') md = `![${name.replace(/\.[^.]+$/, '')}](${url})`;
|
||||||
|
else if (type === 'pdf') md = `[📄 ${name}](${url})`;
|
||||||
|
else if (type === 'audio') md = `<audio controls src="${url}"></audio>`;
|
||||||
|
else md = `[${name}](${url})`;
|
||||||
|
insertMd(md);
|
||||||
|
closeAssetPicker();
|
||||||
|
});
|
||||||
|
tile.addEventListener('mouseenter', () => { tile.style.borderColor = 'var(--t-accent)'; });
|
||||||
|
tile.addEventListener('mouseleave', () => { tile.style.borderColor = 'var(--t-border)'; });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
renderTiles('');
|
||||||
|
setTimeout(() => searchInput.focus(), 0);
|
||||||
|
searchInput.addEventListener('input', () => renderTiles(searchInput.value));
|
||||||
|
searchInput.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); closeAssetPicker(); }
|
||||||
|
});
|
||||||
|
|
||||||
|
const onClickOutside = e => {
|
||||||
|
if (!picker.contains(e.target) && e.target !== btn && !btn.contains(e.target)) {
|
||||||
|
closeAssetPicker();
|
||||||
|
document.removeEventListener('mousedown', onClickOutside);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.addEventListener('mousedown', onClickOutside);
|
||||||
|
});
|
||||||
|
|
||||||
// ── Image resize ──
|
// ── Image resize ──
|
||||||
|
|
||||||
document.addEventListener('mousedown', e => {
|
document.addEventListener('mousedown', e => {
|
||||||
|
if (e.button !== 0) return;
|
||||||
const img = e.target.closest('.prose img');
|
const img = e.target.closest('.prose img');
|
||||||
if (!img || img.closest('.md-gallery-item')) return;
|
if (!img || img.closest('.md-gallery-item')) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|||||||
+118
-20
@@ -1,44 +1,79 @@
|
|||||||
// ── Image gallery ──
|
// ── Assets (images, audio, PDFs) ──
|
||||||
|
|
||||||
import { $, esc, api, getCsrf } from './util.js';
|
import { $, esc, api, getCsrf } from './util.js';
|
||||||
|
|
||||||
const AUDIO_EXT = /\.(mp3|ogg|wav|m4a)$/i;
|
const AUDIO_EXT = /\.(mp3|ogg|wav|m4a)$/i;
|
||||||
|
const PDF_EXT = /\.pdf$/i;
|
||||||
|
const IMAGE_EXT = /\.(png|jpe?g|gif|webp)$/i;
|
||||||
|
|
||||||
|
function fileType(url) {
|
||||||
|
if (IMAGE_EXT.test(url)) return 'image';
|
||||||
|
if (AUDIO_EXT.test(url)) return 'audio';
|
||||||
|
if (PDF_EXT.test(url)) return 'pdf';
|
||||||
|
return 'other';
|
||||||
|
}
|
||||||
function isAudio(url) { return AUDIO_EXT.test(url); }
|
function isAudio(url) { return AUDIO_EXT.test(url); }
|
||||||
|
|
||||||
function mediaTile(url, extraClass = '') {
|
function mediaTile(url, extraClass = '') {
|
||||||
if (isAudio(url)) {
|
const type = fileType(url);
|
||||||
|
if (type === 'audio') {
|
||||||
return `<div class="aspect-square bg-t-bg border ${extraClass} rounded overflow-hidden flex flex-col items-center justify-center gap-2 p-2">
|
return `<div class="aspect-square bg-t-bg border ${extraClass} rounded overflow-hidden flex flex-col items-center justify-center gap-2 p-2">
|
||||||
<i class="ph ph-music-note text-2xl text-t-dim"></i>
|
<i class="ph ph-music-note text-2xl text-t-dim"></i>
|
||||||
<audio controls preload="metadata" src="${url}" class="w-full" style="height:28px"></audio>
|
<audio controls preload="metadata" src="${url}" class="w-full" style="height:28px"></audio>
|
||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
|
if (type === 'pdf') {
|
||||||
|
const name = url.split('/').pop();
|
||||||
|
return `<div class="aspect-square bg-t-bg border ${extraClass} rounded overflow-hidden flex flex-col items-center justify-center gap-2 p-3">
|
||||||
|
<i class="ph ph-file-pdf text-3xl text-t-danger"></i>
|
||||||
|
<span class="font-pixel text-[8px] text-t-muted truncate w-full text-center">${esc(name)}</span>
|
||||||
|
</div>`;
|
||||||
|
}
|
||||||
return `<div class="aspect-square bg-t-bg border ${extraClass} rounded overflow-hidden">
|
return `<div class="aspect-square bg-t-bg border ${extraClass} rounded overflow-hidden">
|
||||||
<img src="${url}" class="w-full h-full object-cover ${extraClass.includes('danger') ? 'opacity-60' : ''}" loading="lazy">
|
<img src="${url}" class="w-full h-full object-cover ${extraClass.includes('danger') ? 'opacity-60' : ''}" loading="lazy">
|
||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let activeFilter = 'all';
|
||||||
import { state } from './state.js';
|
import { state } from './state.js';
|
||||||
import { showDialog } from './dialog.js';
|
import { showDialog } from './dialog.js';
|
||||||
|
|
||||||
|
// Cards with full bodies — fetched fresh by openGallery so we don't
|
||||||
|
// depend on state.cards which may have body=null during the two-phase
|
||||||
|
// lazy load (loadCards loads /api/cards/meta first, then batches of 25
|
||||||
|
// with bodies). Without this, most cards look body-less and every file
|
||||||
|
// appears orphaned until the last batch completes.
|
||||||
|
let galleryCards = [];
|
||||||
|
|
||||||
function getReferencedUrls() {
|
function getReferencedUrls() {
|
||||||
const urls = new Set();
|
const urls = new Set();
|
||||||
for (const card of state.cards) {
|
for (const card of galleryCards) {
|
||||||
const body = card.body || '';
|
const body = card.body || '';
|
||||||
let m;
|
let m;
|
||||||
|
// Markdown images: 
|
||||||
const mdRe = /!\[[^\]]*\]\(([^)]+)\)/g;
|
const mdRe = /!\[[^\]]*\]\(([^)]+)\)/g;
|
||||||
while ((m = mdRe.exec(body)) !== null) urls.add(m[1].split(/\s/)[0]);
|
while ((m = mdRe.exec(body)) !== null) urls.add(m[1].split(/\s/)[0]);
|
||||||
|
// HTML images
|
||||||
const htmlRe = /<img[^>]+src=["']([^"']+)["'][^>]*>/gi;
|
const htmlRe = /<img[^>]+src=["']([^"']+)["'][^>]*>/gi;
|
||||||
while ((m = htmlRe.exec(body)) !== null) urls.add(m[1]);
|
while ((m = htmlRe.exec(body)) !== null) urls.add(m[1]);
|
||||||
|
// Slide-image blocks
|
||||||
const slideRe = /```slide-image\s*\n([\s\S]*?)(?:\n```|$)/g;
|
const slideRe = /```slide-image\s*\n([\s\S]*?)(?:\n```|$)/g;
|
||||||
while ((m = slideRe.exec(body)) !== null) {
|
while ((m = slideRe.exec(body)) !== null) {
|
||||||
const srcMatch = m[1].match(/^\s*src\s*:\s*([^\n]+)/m);
|
const srcMatch = m[1].match(/^\s*src\s*:\s*([^\n]+)/m);
|
||||||
if (srcMatch) urls.add(srcMatch[1].trim());
|
if (srcMatch) urls.add(srcMatch[1].trim());
|
||||||
}
|
}
|
||||||
|
// Markdown links to uploads (PDFs, other assets): [text](uploads/...)
|
||||||
|
const linkRe = /\[[^\]]*\]\((uploads\/[^)]+)\)/g;
|
||||||
|
while ((m = linkRe.exec(body)) !== null) urls.add(m[1]);
|
||||||
|
// Plain URL mentions (catches any format we missed above)
|
||||||
|
const plainRe = /uploads\/[a-f0-9]{32}\.[a-z0-9]+/gi;
|
||||||
|
while ((m = plainRe.exec(body)) !== null) urls.add(m[0]);
|
||||||
}
|
}
|
||||||
return urls;
|
return urls;
|
||||||
}
|
}
|
||||||
|
|
||||||
function findCardForUrl(url) {
|
function findCardForUrl(url) {
|
||||||
for (const card of state.cards) {
|
for (const card of galleryCards) {
|
||||||
const body = card.body || '';
|
const body = card.body || '';
|
||||||
if (body.includes(url)) return card;
|
if (body.includes(url)) return card;
|
||||||
}
|
}
|
||||||
@@ -49,7 +84,19 @@ export async function openGallery() {
|
|||||||
const el = $('gallery');
|
const el = $('gallery');
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
|
|
||||||
const files = await api('api/uploads');
|
// Fetch both file list and full card bodies in parallel. Using
|
||||||
|
// api('api/cards') (not state.cards) guarantees bodies are present
|
||||||
|
// — state.cards may still be in the two-phase lazy-load with
|
||||||
|
// body=null on most entries.
|
||||||
|
let files = [], cards = [];
|
||||||
|
try {
|
||||||
|
[files, cards] = await Promise.all([
|
||||||
|
api('api/uploads'),
|
||||||
|
api('api/cards'),
|
||||||
|
]);
|
||||||
|
} catch {}
|
||||||
|
files = Array.isArray(files) ? files : [];
|
||||||
|
galleryCards = Array.isArray(cards) ? cards : [];
|
||||||
const referenced = getReferencedUrls();
|
const referenced = getReferencedUrls();
|
||||||
const grid = $('gallery-grid');
|
const grid = $('gallery-grid');
|
||||||
const count = $('gallery-count');
|
const count = $('gallery-count');
|
||||||
@@ -66,25 +113,66 @@ export async function openGallery() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const total = linked.length + orphaned.length;
|
const total = linked.length + orphaned.length;
|
||||||
if (count) count.textContent = `${total} image${total !== 1 ? 's' : ''}${orphaned.length ? ` · ${orphaned.length} orphaned` : ''}`;
|
if (count) count.textContent = `${total} asset${total !== 1 ? 's' : ''}${orphaned.length ? ` · ${orphaned.length} orphaned` : ''}`;
|
||||||
|
|
||||||
|
// Tab filter
|
||||||
|
const allFiles = [...orphaned, ...linked];
|
||||||
|
const applyFilter = (filter) => {
|
||||||
|
activeFilter = filter;
|
||||||
|
document.querySelectorAll('#gallery-tabs .gallery-tab').forEach(t => {
|
||||||
|
t.classList.toggle('active', t.dataset.filter === filter);
|
||||||
|
});
|
||||||
|
let visibleCount = 0;
|
||||||
|
grid.querySelectorAll('.gallery-item').forEach(item => {
|
||||||
|
const url = item.dataset.url || '';
|
||||||
|
const type = fileType(url);
|
||||||
|
const show = filter === 'all' || type === filter;
|
||||||
|
item.style.display = show ? '' : 'none';
|
||||||
|
if (show) visibleCount++;
|
||||||
|
});
|
||||||
|
// Hide section headers when no items in that section are visible
|
||||||
|
grid.querySelectorAll('[data-section]:not(.gallery-item)').forEach(hdr => {
|
||||||
|
const section = hdr.dataset.section;
|
||||||
|
const hasVisible = !!grid.querySelector(`.gallery-item[data-section="${section}"]:not([style*="display: none"])`);
|
||||||
|
hdr.style.display = hasVisible ? '' : 'none';
|
||||||
|
});
|
||||||
|
// Show/hide the empty-filter placeholder
|
||||||
|
let placeholder = grid.querySelector('.gallery-filter-empty');
|
||||||
|
if (visibleCount === 0 && total > 0) {
|
||||||
|
if (!placeholder) {
|
||||||
|
placeholder = document.createElement('div');
|
||||||
|
placeholder.className = 'gallery-filter-empty col-span-full text-center py-16';
|
||||||
|
const icons = { image: 'ph-image', audio: 'ph-music-note', pdf: 'ph-file-pdf' };
|
||||||
|
const icon = icons[filter] || 'ph-folder-open';
|
||||||
|
placeholder.innerHTML = `<i class="ph ${icon} text-4xl text-t-dim mb-2 block"></i><p class="font-pixel text-[10px] text-t-dim">no ${filter} assets</p>`;
|
||||||
|
grid.appendChild(placeholder);
|
||||||
|
}
|
||||||
|
placeholder.style.display = '';
|
||||||
|
} else if (placeholder) {
|
||||||
|
placeholder.style.display = 'none';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
document.querySelectorAll('#gallery-tabs .gallery-tab').forEach(t => {
|
||||||
|
t.onclick = () => applyFilter(t.dataset.filter);
|
||||||
|
});
|
||||||
|
|
||||||
if (!total) {
|
if (!total) {
|
||||||
grid.innerHTML = `<div class="col-span-full text-center py-16">
|
grid.innerHTML = `<div class="col-span-full text-center py-16">
|
||||||
<i class="ph ph-image text-4xl text-t-dim mb-2 block"></i>
|
<i class="ph ph-folder-open text-4xl text-t-dim mb-2 block"></i>
|
||||||
<p class="font-pixel text-[10px] text-t-dim">no images</p></div>`;
|
<p class="font-pixel text-[10px] text-t-dim cursor-blink">no assets</p></div>`;
|
||||||
} else {
|
} else {
|
||||||
let html = '';
|
let html = '';
|
||||||
|
|
||||||
if (orphaned.length) {
|
if (orphaned.length) {
|
||||||
html += `<div class="col-span-full font-pixel text-[10px] text-t-danger flex items-center gap-1.5 pt-2"><i class="ph ph-warning text-xs"></i>orphaned (not used by any card)</div>`;
|
html += `<div class="col-span-full font-pixel text-[10px] text-t-danger flex items-center gap-1.5 pt-2" data-section="orphaned"><i class="ph ph-warning text-xs"></i>orphaned (not used by any card)</div>`;
|
||||||
html += orphaned.map(f => `
|
html += orphaned.map(f => `
|
||||||
<div class="gallery-item group cursor-pointer" data-orphan="${f.name}">
|
<div class="gallery-item group cursor-pointer" data-orphan="${f.name}" data-url="${esc(f.url)}" data-section="orphaned">
|
||||||
<div class="relative aspect-square bg-t-bg border border-t-danger/30 rounded overflow-visible">
|
<div class="relative">
|
||||||
<img src="${f.url}" class="w-full h-full object-cover opacity-60 rounded" loading="lazy">
|
${mediaTile(f.url, 'border-t-danger/30 opacity-60')}
|
||||||
<div style="position:absolute;top:4px;right:4px;display:flex;gap:4px;" class="opacity-0 group-hover:opacity-100 transition-opacity">
|
<div style="position:absolute;top:4px;right:4px;display:flex;gap:4px;" class="opacity-0 group-hover:opacity-100 transition-opacity">
|
||||||
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-accent rounded border-0 cursor-pointer hover:bg-t-accent hover:text-t-bg transition-colors" data-new-orphan="${f.name}" title="new card"><i class="ph ph-plus text-sm"></i></button>
|
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-accent rounded border-0 cursor-pointer hover:bg-t-accent hover:text-t-bg transition-colors" data-new-orphan="${f.name}" data-tip="new card"><i class="ph ph-plus text-sm"></i></button>
|
||||||
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-accent rounded border-0 cursor-pointer hover:bg-t-accent hover:text-t-bg transition-colors" data-new-slide="${f.name}" title="new slide (background)"><i class="ph ph-image-square text-sm"></i></button>
|
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-accent rounded border-0 cursor-pointer hover:bg-t-accent hover:text-t-bg transition-colors" data-new-slide="${f.name}" data-tip="new slide"><i class="ph ph-image-square text-sm"></i></button>
|
||||||
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-danger rounded border-0 cursor-pointer hover:bg-t-danger hover:text-t-bg transition-colors" data-del-orphan="${f.name}" title="delete"><i class="ph ph-trash text-sm"></i></button>
|
<button class="w-6 h-6 flex items-center justify-center bg-black/80 text-t-danger rounded border-0 cursor-pointer hover:bg-t-danger hover:text-t-bg transition-colors" data-del-orphan="${f.name}" data-tip="delete"><i class="ph ph-trash text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-1 font-pixel text-[8px] text-t-dim truncate">${esc(f.name)}</div>
|
<div class="mt-1 font-pixel text-[8px] text-t-dim truncate">${esc(f.name)}</div>
|
||||||
@@ -92,9 +180,9 @@ export async function openGallery() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (linked.length) {
|
if (linked.length) {
|
||||||
if (orphaned.length) html += `<div class="col-span-full font-pixel text-[10px] text-t-muted flex items-center gap-1.5 pt-3"><i class="ph ph-link text-xs"></i>linked to cards</div>`;
|
if (orphaned.length) html += `<div class="col-span-full font-pixel text-[10px] text-t-muted flex items-center gap-1.5 pt-3" data-section="linked"><i class="ph ph-link text-xs"></i>linked to cards</div>`;
|
||||||
html += linked.map(img => `
|
html += linked.map(img => `
|
||||||
<div class="gallery-item group relative cursor-pointer" data-card-id="${img.cardId}" data-gallery-origin="${encodeURIComponent(img.url)}">
|
<div class="gallery-item group relative cursor-pointer" data-card-id="${img.cardId}" data-gallery-origin="${encodeURIComponent(img.url)}" data-url="${esc(img.url)}" data-section="linked">
|
||||||
${mediaTile(img.url, 'border-t-border')}
|
${mediaTile(img.url, 'border-t-border')}
|
||||||
<div class="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity rounded flex flex-col justify-end p-2">
|
<div class="absolute inset-0 bg-black/60 opacity-0 group-hover:opacity-100 transition-opacity rounded flex flex-col justify-end p-2">
|
||||||
<div class="flex items-center gap-1.5">
|
<div class="flex items-center gap-1.5">
|
||||||
@@ -117,13 +205,16 @@ export async function openGallery() {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Orphan: click to enlarge
|
// Orphan: click to enlarge (images) or open in new tab (PDFs)
|
||||||
grid.querySelectorAll('[data-orphan]').forEach(item => {
|
grid.querySelectorAll('[data-orphan]').forEach(item => {
|
||||||
item.addEventListener('click', e => {
|
item.addEventListener('click', e => {
|
||||||
if (e.target.closest('button')) return;
|
if (e.target.closest('button')) return;
|
||||||
const name = item.dataset.orphan;
|
const name = item.dataset.orphan;
|
||||||
const f = orphaned.find(o => o.name === name);
|
const f = orphaned.find(o => o.name === name);
|
||||||
if (f && !isAudio(f.url)) openOrphanLightbox(f);
|
if (!f) return;
|
||||||
|
const type = fileType(f.url);
|
||||||
|
if (type === 'pdf') window.open(f.url, '_blank');
|
||||||
|
else if (type === 'image') openOrphanLightbox(f);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -134,7 +225,11 @@ export async function openGallery() {
|
|||||||
const name = btn.dataset.newOrphan;
|
const name = btn.dataset.newOrphan;
|
||||||
const label = name.replace(/\.[^.]+$/, '');
|
const label = name.replace(/\.[^.]+$/, '');
|
||||||
closeGallery();
|
closeGallery();
|
||||||
window._openModal({ id: null, title: label, body: ``, color: '#38bdf8', bucket_id: null });
|
const type = fileType('uploads/' + name);
|
||||||
|
const body = type === 'pdf'
|
||||||
|
? `[📄 ${name}](uploads/${name})`
|
||||||
|
: ``;
|
||||||
|
window._openModal({ id: null, title: label, body, color: '#38bdf8', bucket_id: null });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -165,6 +260,9 @@ export async function openGallery() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Apply the active filter (persists across re-opens within a session)
|
||||||
|
applyFilter(activeFilter);
|
||||||
|
|
||||||
el.classList.add('open');
|
el.classList.add('open');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ export function renderMd(src) {
|
|||||||
const linked = processed.replace(/\[\[([^\]]+)\]\]/g, (_, title) => {
|
const linked = processed.replace(/\[\[([^\]]+)\]\]/g, (_, title) => {
|
||||||
const card = state.cards.find(c => c.title.toLowerCase() === title.toLowerCase());
|
const card = state.cards.find(c => c.title.toLowerCase() === title.toLowerCase());
|
||||||
if (card) return `<span class="card-link" data-card-id="${card.id}">${esc(title)}</span>`;
|
if (card) return `<span class="card-link" data-card-id="${card.id}">${esc(title)}</span>`;
|
||||||
return `<span class="card-link broken" title="card not found">${esc(title)}</span>`;
|
return `<span class="card-link broken" data-tip="card not found">${esc(title)}</span>`;
|
||||||
});
|
});
|
||||||
|
|
||||||
let html = marked.parse(linked);
|
let html = marked.parse(linked);
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ export function render() {
|
|||||||
<span>${esc(i.label)}</span>
|
<span>${esc(i.label)}</span>
|
||||||
${i.dismissable !== false ? `<button class="upcoming-dismiss" data-dismiss="${i.id}"><i class="ph ph-x text-xs"></i></button>` : ''}
|
${i.dismissable !== false ? `<button class="upcoming-dismiss" data-dismiss="${i.id}"><i class="ph ph-x text-xs"></i></button>` : ''}
|
||||||
</div>`).join('')}
|
</div>`).join('')}
|
||||||
<button id="dismiss-all" class="shrink-0 ml-auto text-t-dim hover:text-t-danger transition-colors" title="dismiss all"><i class="ph ph-x-circle text-sm"></i></button>
|
<button id="dismiss-all" class="shrink-0 ml-auto text-t-dim hover:text-t-danger transition-colors" data-tip="dismiss all"><i class="ph ph-x-circle text-sm"></i></button>
|
||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
banner.querySelectorAll('[data-notif-id]').forEach(el => {
|
banner.querySelectorAll('[data-notif-id]').forEach(el => {
|
||||||
@@ -148,7 +148,7 @@ function renderStream() {
|
|||||||
const all = getAllItems();
|
const all = getAllItems();
|
||||||
|
|
||||||
if (!all.length) {
|
if (!all.length) {
|
||||||
stream.innerHTML = '<div class="text-xs text-t-dim font-pixel text-center py-4">no notifications</div>';
|
stream.innerHTML = '<div class="text-xs text-t-dim font-pixel text-center py-4 cursor-blink">no notifications</div>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
// ── Plugin Settings UI ──
|
// ── Plugin Settings UI ──
|
||||||
// Renders the list of installed plugins with on/off toggles in the
|
// Toggles collect pending changes client-side and commit together via
|
||||||
// settings overlay. Disabled plugins are skipped at PHP render time;
|
// the Apply button. Only reloads once all changes are committed.
|
||||||
// toggling requires a reload to take effect (page must re-fetch the
|
|
||||||
// new script/css/html tag set).
|
|
||||||
|
|
||||||
import { $, esc, api } from './util.js';
|
import { $, esc, api } from './util.js';
|
||||||
|
|
||||||
let pluginsCache = null;
|
let pluginsCache = null;
|
||||||
let dirtyAfterToggle = false;
|
let pending = new Map(); // name -> desired enabled state
|
||||||
|
|
||||||
async function fetchPlugins() {
|
async function fetchPlugins() {
|
||||||
const res = await fetch('api/plugins');
|
const res = await fetch('api/plugins');
|
||||||
@@ -23,63 +21,86 @@ function render(list) {
|
|||||||
container.innerHTML = '<p class="text-xs text-t-dim italic">No plugins installed. Drop a plugin folder into <code>public/plugins/</code> to add one.</p>';
|
container.innerHTML = '<p class="text-xs text-t-dim italic">No plugins installed. Drop a plugin folder into <code>public/plugins/</code> to add one.</p>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
container.innerHTML = list.map(p => `
|
container.innerHTML = list.map(p => {
|
||||||
<div class="flex items-start gap-3 px-3 py-2 border border-t-border bg-t-bg rounded-sm" data-plugin="${esc(p.name)}">
|
const effectiveEnabled = pending.has(p.name) ? pending.get(p.name) : p.enabled;
|
||||||
|
const isPending = pending.has(p.name);
|
||||||
|
return `
|
||||||
|
<div class="flex items-start gap-3 px-3 py-2 border ${isPending ? 'border-t-accent' : 'border-t-border'} bg-t-bg rounded-sm" data-plugin="${esc(p.name)}">
|
||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<span class="font-pixel text-[11px] text-t-bright">${esc(p.name)}</span>
|
<span class="font-pixel text-[11px] text-t-bright">${esc(p.name)}</span>
|
||||||
<span class="font-pixel text-[9px] text-t-dim">v${esc(p.version || '?')}</span>
|
<span class="font-pixel text-[9px] text-t-dim">v${esc(p.version || '?')}</span>
|
||||||
${p.hasBackend ? '<span class="font-pixel text-[8px] px-1 py-0.5 border border-t-border text-t-muted uppercase">php</span>' : ''}
|
${p.hasBackend ? '<span class="font-pixel text-[8px] px-1 py-0.5 border border-t-border text-t-muted uppercase">php</span>' : ''}
|
||||||
|
${isPending ? `<span class="font-pixel text-[8px] px-1 py-0.5 text-t-accent border border-t-accent uppercase">${effectiveEnabled ? 'will enable' : 'will disable'}</span>` : ''}
|
||||||
</div>
|
</div>
|
||||||
${p.description ? `<div class="text-[10px] text-t-muted leading-snug mt-1">${esc(p.description)}</div>` : ''}
|
${p.description ? `<div class="text-[10px] text-t-muted leading-snug mt-1">${esc(p.description)}</div>` : ''}
|
||||||
</div>
|
</div>
|
||||||
<label class="flex items-center cursor-pointer shrink-0 mt-0.5">
|
<label class="flex items-center cursor-pointer shrink-0 mt-0.5">
|
||||||
<input type="checkbox" class="plugin-toggle accent-t-accent w-4 h-4" ${p.enabled ? 'checked' : ''} data-name="${esc(p.name)}">
|
<input type="checkbox" class="plugin-toggle accent-t-accent w-4 h-4" ${effectiveEnabled ? 'checked' : ''} data-name="${esc(p.name)}" data-original="${p.enabled ? '1' : '0'}">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>`;
|
||||||
`).join('');
|
}).join('');
|
||||||
|
|
||||||
container.querySelectorAll('.plugin-toggle').forEach(input => {
|
container.querySelectorAll('.plugin-toggle').forEach(input => {
|
||||||
input.addEventListener('change', onToggle);
|
input.addEventListener('change', onToggle);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
updateApplyBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
let reloadTimer = null;
|
function onToggle(e) {
|
||||||
|
|
||||||
async function onToggle(e) {
|
|
||||||
const input = e.currentTarget;
|
const input = e.currentTarget;
|
||||||
const name = input.dataset.name;
|
const name = input.dataset.name;
|
||||||
const enabled = input.checked;
|
const original = input.dataset.original === '1';
|
||||||
input.disabled = true;
|
const desired = input.checked;
|
||||||
try {
|
if (desired === original) {
|
||||||
const res = await api('api/plugins/toggle', {
|
pending.delete(name);
|
||||||
method: 'POST',
|
} else {
|
||||||
body: { name, enabled },
|
pending.set(name, desired);
|
||||||
});
|
|
||||||
if (res.error) throw new Error(res.error);
|
|
||||||
pluginsCache = res.plugins;
|
|
||||||
dirtyAfterToggle = true;
|
|
||||||
$('plugins-reload-notice')?.classList.remove('hidden');
|
|
||||||
// Auto-reload so the effect of the toggle is visible immediately.
|
|
||||||
// Debounced so rapid successive toggles only trigger one reload.
|
|
||||||
if (reloadTimer) clearTimeout(reloadTimer);
|
|
||||||
reloadTimer = setTimeout(() => location.reload(), 400);
|
|
||||||
} catch (err) {
|
|
||||||
// Revert UI on failure
|
|
||||||
input.checked = !enabled;
|
|
||||||
console.error('[plugins] toggle failed:', err);
|
|
||||||
} finally {
|
|
||||||
input.disabled = false;
|
|
||||||
}
|
}
|
||||||
|
render(pluginsCache); // re-render to update badge and border
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateApplyBar() {
|
||||||
|
const bar = $('plugins-apply-bar');
|
||||||
|
if (!bar) return;
|
||||||
|
if (pending.size === 0) {
|
||||||
|
bar.classList.add('hidden');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bar.classList.remove('hidden');
|
||||||
|
const count = pending.size;
|
||||||
|
const label = $('plugins-apply-count');
|
||||||
|
if (label) label.textContent = `${count} pending change${count !== 1 ? 's' : ''}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function applyChanges() {
|
||||||
|
if (pending.size === 0) return;
|
||||||
|
const btn = $('plugins-apply-btn');
|
||||||
|
if (btn) { btn.disabled = true; btn.textContent = 'applying...'; }
|
||||||
|
try {
|
||||||
|
for (const [name, enabled] of pending) {
|
||||||
|
const res = await api('api/plugins/toggle', { method: 'POST', body: { name, enabled } });
|
||||||
|
if (res.error) throw new Error(`${name}: ${res.error}`);
|
||||||
|
}
|
||||||
|
pending.clear();
|
||||||
|
// Reload so the new plugin set takes effect
|
||||||
|
location.reload();
|
||||||
|
} catch (err) {
|
||||||
|
if (btn) { btn.disabled = false; btn.textContent = 'Apply'; }
|
||||||
|
alert('Failed to apply: ' + err.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function discardChanges() {
|
||||||
|
pending.clear();
|
||||||
|
render(pluginsCache);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function openPluginSettings() {
|
export async function openPluginSettings() {
|
||||||
const container = $('plugins-list');
|
const container = $('plugins-list');
|
||||||
if (!container) return;
|
if (!container) return;
|
||||||
container.innerHTML = '<p class="text-xs text-t-dim italic">Loading...</p>';
|
container.innerHTML = '<p class="text-xs text-t-dim italic">Loading...</p>';
|
||||||
if (!dirtyAfterToggle) {
|
|
||||||
$('plugins-reload-notice')?.classList.add('hidden');
|
|
||||||
}
|
|
||||||
try {
|
try {
|
||||||
const list = await fetchPlugins();
|
const list = await fetchPlugins();
|
||||||
render(list);
|
render(list);
|
||||||
@@ -88,9 +109,5 @@ export async function openPluginSettings() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wire reload button once at module load
|
$('plugins-apply-btn')?.addEventListener('click', applyChanges);
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
$('plugins-discard-btn')?.addEventListener('click', discardChanges);
|
||||||
$('plugins-reload-btn')?.addEventListener('click', () => location.reload());
|
|
||||||
}, { once: true });
|
|
||||||
// In case DOMContentLoaded already fired (modules are deferred but safe to retry)
|
|
||||||
$('plugins-reload-btn')?.addEventListener('click', () => location.reload());
|
|
||||||
+254
-12
@@ -3,6 +3,7 @@
|
|||||||
import { $, esc, escRe, api, fuzzyMatch, countSubstring, highlight } from './util.js';
|
import { $, esc, escRe, api, fuzzyMatch, countSubstring, highlight } from './util.js';
|
||||||
import { state, parseTags, tagChipHtml, getChildren } from './state.js';
|
import { state, parseTags, tagChipHtml, getChildren } from './state.js';
|
||||||
import { renderMd, stripMd } from './markdown.js';
|
import { renderMd, stripMd } from './markdown.js';
|
||||||
|
import { showDialog } from './dialog.js';
|
||||||
|
|
||||||
const overlay = $('search');
|
const overlay = $('search');
|
||||||
const input = $('search-input');
|
const input = $('search-input');
|
||||||
@@ -11,29 +12,74 @@ const footer = $('search-footer');
|
|||||||
const previewEmpty = $('search-preview-empty');
|
const previewEmpty = $('search-preview-empty');
|
||||||
const previewContent = $('search-preview-content');
|
const previewContent = $('search-preview-content');
|
||||||
const bucketFilter = $('search-bucket-filter');
|
const bucketFilter = $('search-bucket-filter');
|
||||||
let active = -1, hits = [];
|
const replaceToggle = $('search-replace-toggle');
|
||||||
|
const replaceRow = $('search-replace-row');
|
||||||
|
const replaceInput = $('search-replace-input');
|
||||||
|
const replaceStatus = $('search-replace-status');
|
||||||
|
const replaceAllBtn = $('search-replace-all');
|
||||||
|
let active = -1, hits = [], replaceMode = false, freshCards = null;
|
||||||
|
|
||||||
export function openSearch() {
|
export function openSearch({ replace = false } = {}) {
|
||||||
window._closeTasks?.();
|
window._closeTasks?.();
|
||||||
input.value = '';
|
input.value = '';
|
||||||
results.innerHTML = '';
|
results.innerHTML = '';
|
||||||
footer.classList.add('hidden');
|
footer.classList.add('hidden');
|
||||||
active = -1;
|
active = -1;
|
||||||
overlay.classList.add('open');
|
overlay.classList.add('open');
|
||||||
|
setReplaceMode(replace);
|
||||||
input.focus();
|
input.focus();
|
||||||
clearPreview();
|
clearPreview();
|
||||||
renderHome();
|
renderHome();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function closeSearch() { overlay.classList.remove('open'); }
|
async function setReplaceMode(on) {
|
||||||
|
replaceMode = on;
|
||||||
|
replaceRow?.classList.toggle('hidden', !on);
|
||||||
|
replaceToggle?.classList.toggle('active', on);
|
||||||
|
if (on) {
|
||||||
|
replaceInput.value = '';
|
||||||
|
freshCards = await api('api/cards') || [];
|
||||||
|
} else {
|
||||||
|
freshCards = null;
|
||||||
|
}
|
||||||
|
updateReplaceState();
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateReplaceState() {
|
||||||
|
if (!replaceMode || !replaceAllBtn) return;
|
||||||
|
const q = input.value.trim();
|
||||||
|
const hasRepl = replaceInput?.value.length > 0;
|
||||||
|
const hasMatch = hits.length > 0 && q.length > 0;
|
||||||
|
replaceAllBtn.disabled = !(hasMatch && hasRepl);
|
||||||
|
if (q && hits.length) {
|
||||||
|
let total = 0;
|
||||||
|
const nLower = q.toLowerCase();
|
||||||
|
for (const c of hits) {
|
||||||
|
const body = (c.body || '').toLowerCase();
|
||||||
|
let pos = 0;
|
||||||
|
while (true) { const i = body.indexOf(nLower, pos); if (i === -1) break; total++; pos = i + 1; }
|
||||||
|
}
|
||||||
|
replaceStatus.textContent = total ? `${total} in ${hits.length} card${hits.length !== 1 ? 's' : ''}` : '';
|
||||||
|
} else {
|
||||||
|
replaceStatus.textContent = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function closeSearch() {
|
||||||
|
overlay.classList.remove('open');
|
||||||
|
if (document.activeElement && document.activeElement !== document.body) {
|
||||||
|
document.activeElement.blur();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function clearPreview() { previewEmpty.classList.remove('hidden'); previewContent.classList.add('hidden'); }
|
function clearPreview() { previewEmpty.classList.remove('hidden'); previewContent.classList.add('hidden'); }
|
||||||
|
|
||||||
function getPool() {
|
function getPool() {
|
||||||
|
const cards = (replaceMode && freshCards) ? freshCards : state.cards;
|
||||||
const bv = bucketFilter.value;
|
const bv = bucketFilter.value;
|
||||||
if (!bv) return state.cards;
|
if (!bv) return cards;
|
||||||
if (bv === 'none') return state.cards.filter(c => !c.bucket_id);
|
if (bv === 'none') return cards.filter(c => !c.bucket_id);
|
||||||
return state.cards.filter(c => c.bucket_id == bv);
|
return cards.filter(c => c.bucket_id == bv);
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatePreview() {
|
function updatePreview() {
|
||||||
@@ -80,12 +126,12 @@ function updatePreview() {
|
|||||||
|
|
||||||
function renderHome() {
|
function renderHome() {
|
||||||
const recent = [...getPool()].sort((a, b) => (b.updated_at || '').localeCompare(a.updated_at || '')).slice(0, 6);
|
const recent = [...getPool()].sort((a, b) => (b.updated_at || '').localeCompare(a.updated_at || '')).slice(0, 6);
|
||||||
if (!recent.length) { results.innerHTML = `<div class="px-4 py-8 text-center text-t-dim text-xs font-pixel">no cards yet</div>`; return; }
|
if (!recent.length) { results.innerHTML = `<div class="px-4 py-8 text-center text-t-dim text-xs font-pixel cursor-blink">no cards yet</div>`; return; }
|
||||||
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">recent</span></div>` +
|
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">recent</span></div>` +
|
||||||
recent.map((c, i) => hitHtml(c, i, null)).join('');
|
recent.map((c, i) => hitHtml(c, i, null)).join('');
|
||||||
hits = recent; active = recent.length ? 0 : -1;
|
hits = recent; active = recent.length ? 0 : -1;
|
||||||
footer.classList.remove('hidden');
|
footer.classList.remove('hidden');
|
||||||
bindHits(); updateActive(); updatePreview();
|
bindHits(); updateActive(); updatePreview(); updateReplaceState();
|
||||||
}
|
}
|
||||||
|
|
||||||
function search(query) {
|
function search(query) {
|
||||||
@@ -110,10 +156,10 @@ function search(query) {
|
|||||||
// Tag-only search (no words)
|
// Tag-only search (no words)
|
||||||
if (!words.length) {
|
if (!words.length) {
|
||||||
hits = pool; active = pool.length ? 0 : -1;
|
hits = pool; active = pool.length ? 0 : -1;
|
||||||
if (!pool.length) { results.innerHTML = `<div class="px-4 py-8 text-center"><i class="ph ph-hash text-2xl text-t-dim mb-2 block"></i><p class="text-xs text-t-dim font-pixel">no cards with ${tagFilters.map(t => '#' + t).join(' + ')}</p></div>`; footer.classList.add('hidden'); clearPreview(); return; }
|
if (!pool.length) { results.innerHTML = `<div class="px-4 py-8 text-center"><i class="ph ph-hash text-2xl text-t-dim mb-2 block"></i><p class="text-xs text-t-dim font-pixel cursor-blink">no cards with ${tagFilters.map(t => '#' + t).join(' + ')}</p></div>`; footer.classList.add('hidden'); clearPreview(); updateReplaceState(); return; }
|
||||||
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">${pool.length} tagged</span></div>` +
|
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">${pool.length} tagged</span></div>` +
|
||||||
pool.map((c, i) => hitHtml(c, i, null)).join('');
|
pool.map((c, i) => hitHtml(c, i, null)).join('');
|
||||||
footer.classList.remove('hidden'); bindHits(); updateActive(); updatePreview(); return;
|
footer.classList.remove('hidden'); bindHits(); updateActive(); updatePreview(); updateReplaceState(); return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const scored = pool.map(c => {
|
const scored = pool.map(c => {
|
||||||
@@ -141,10 +187,10 @@ function search(query) {
|
|||||||
}).filter(Boolean).sort((a, b) => b.score - a.score);
|
}).filter(Boolean).sort((a, b) => b.score - a.score);
|
||||||
|
|
||||||
hits = scored.map(s => s.card); active = scored.length ? 0 : -1;
|
hits = scored.map(s => s.card); active = scored.length ? 0 : -1;
|
||||||
if (!scored.length) { results.innerHTML = `<div class="px-4 py-8 text-center"><i class="ph ph-magnifying-glass text-2xl text-t-dim mb-2 block"></i><p class="text-xs text-t-dim font-pixel">no results for "${esc(query)}"</p></div>`; footer.classList.add('hidden'); clearPreview(); return; }
|
if (!scored.length) { results.innerHTML = `<div class="px-4 py-8 text-center"><i class="ph ph-magnifying-glass text-2xl text-t-dim mb-2 block"></i><p class="text-xs text-t-dim font-pixel cursor-blink">no results for "${esc(query)}"</p></div>`; footer.classList.add('hidden'); clearPreview(); updateReplaceState(); return; }
|
||||||
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">${scored.length} result${scored.length > 1 ? 's' : ''}</span></div>` +
|
results.innerHTML = `<div class="px-4 pt-3 pb-1"><span class="font-pixel text-[9px] text-t-dim uppercase tracking-wider">${scored.length} result${scored.length > 1 ? 's' : ''}</span></div>` +
|
||||||
scored.map((s, i) => hitHtml(s.card, i, words)).join('');
|
scored.map((s, i) => hitHtml(s.card, i, words)).join('');
|
||||||
footer.classList.remove('hidden'); bindHits(); updateActive(); updatePreview();
|
footer.classList.remove('hidden'); bindHits(); updateActive(); updatePreview(); updateReplaceState();
|
||||||
}
|
}
|
||||||
|
|
||||||
function hitHtml(card, idx, words) {
|
function hitHtml(card, idx, words) {
|
||||||
@@ -180,6 +226,66 @@ function hitHtml(card, idx, words) {
|
|||||||
${htags.length ? `<div class="flex flex-wrap gap-1 mt-1">${htags.slice(0, 3).map(t => `<span class="tag-chip" style="font-size:8px;padding:0 4px;">#${esc(t)}</span>`).join('')}</div>` : ''}</div></div>`;
|
${htags.length ? `<div class="flex flex-wrap gap-1 mt-1">${htags.slice(0, 3).map(t => `<span class="tag-chip" style="font-size:8px;padding:0 4px;">#${esc(t)}</span>`).join('')}</div>` : ''}</div></div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function openBucketPicker(cardId, x, y) {
|
||||||
|
document.querySelector('.search-bucket-picker')?.remove();
|
||||||
|
const picker = document.createElement('div');
|
||||||
|
picker.className = 'search-bucket-picker';
|
||||||
|
// Clamp to viewport so a click near the bottom-right doesn't flow
|
||||||
|
// off-screen — rendered invisibly first to measure, then placed.
|
||||||
|
picker.style.cssText = `position:fixed;left:0;top:0;visibility:hidden;z-index:300;background:var(--t-surface);border:1px solid var(--t-border);border-radius:4px;box-shadow:0 4px 20px rgba(0,0,0,0.4);min-width:180px;max-height:280px;display:flex;flex-direction:column;`;
|
||||||
|
|
||||||
|
const list = document.createElement('div');
|
||||||
|
list.style.cssText = 'overflow-y:auto;flex:1;';
|
||||||
|
|
||||||
|
const addRow = (label, color, onClick) => {
|
||||||
|
const item = document.createElement('button');
|
||||||
|
item.style.cssText = 'display:flex;align-items:center;gap:8px;width:100%;padding:6px 12px;background:none;border:none;color:var(--t-muted);font-size:12px;cursor:pointer;text-align:left;';
|
||||||
|
item.innerHTML = `<span style="width:8px;height:8px;border-radius:2px;background:${color};flex-shrink:0;"></span><span style="font-family:var(--t-font-pixel);font-size:10px;">${esc(label)}</span>`;
|
||||||
|
item.addEventListener('mouseenter', () => { item.style.color = 'var(--t-bright)'; });
|
||||||
|
item.addEventListener('mouseleave', () => { item.style.color = 'var(--t-muted)'; });
|
||||||
|
item.addEventListener('click', onClick);
|
||||||
|
list.appendChild(item);
|
||||||
|
};
|
||||||
|
|
||||||
|
addRow('(unsorted)', 'transparent', async () => {
|
||||||
|
picker.remove();
|
||||||
|
await api(`api/cards/${cardId}`, { method: 'PATCH', body: { bucket_id: null } });
|
||||||
|
await window._reloadAll();
|
||||||
|
search(input.value);
|
||||||
|
});
|
||||||
|
state.buckets.forEach(b => {
|
||||||
|
addRow(b.name, b.color || '#64748b', async () => {
|
||||||
|
picker.remove();
|
||||||
|
await api(`api/cards/${cardId}`, { method: 'PATCH', body: { bucket_id: b.id } });
|
||||||
|
await window._reloadAll();
|
||||||
|
search(input.value);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
picker.appendChild(list);
|
||||||
|
document.body.appendChild(picker);
|
||||||
|
|
||||||
|
// Place, then flip if we'd overflow the viewport.
|
||||||
|
const r = picker.getBoundingClientRect();
|
||||||
|
let left = x, top = y;
|
||||||
|
if (left + r.width > window.innerWidth - 8) left = Math.max(8, window.innerWidth - r.width - 8);
|
||||||
|
if (top + r.height > window.innerHeight - 8) top = Math.max(8, window.innerHeight - r.height - 8);
|
||||||
|
picker.style.left = left + 'px';
|
||||||
|
picker.style.top = top + 'px';
|
||||||
|
picker.style.visibility = '';
|
||||||
|
|
||||||
|
const onDown = (e) => { if (!picker.contains(e.target)) { picker.remove(); cleanup(); } };
|
||||||
|
const onEsc = (e) => { if (e.key === 'Escape') { e.stopPropagation(); picker.remove(); cleanup(); } };
|
||||||
|
const cleanup = () => {
|
||||||
|
document.removeEventListener('mousedown', onDown, true);
|
||||||
|
document.removeEventListener('keydown', onEsc, true);
|
||||||
|
};
|
||||||
|
setTimeout(() => {
|
||||||
|
document.addEventListener('mousedown', onDown, true);
|
||||||
|
document.addEventListener('keydown', onEsc, true);
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
function bindHits() {
|
function bindHits() {
|
||||||
results.querySelectorAll('.search-hit').forEach(el => {
|
results.querySelectorAll('.search-hit').forEach(el => {
|
||||||
el.addEventListener('click', () => {
|
el.addEventListener('click', () => {
|
||||||
@@ -188,6 +294,16 @@ function bindHits() {
|
|||||||
else { active = i; updateActive(); }
|
else { active = i; updateActive(); }
|
||||||
});
|
});
|
||||||
el.addEventListener('dblclick', () => { const i = parseInt(el.dataset.idx); if (hits[i]) window._openDetail(hits[i].id); });
|
el.addEventListener('dblclick', () => { const i = parseInt(el.dataset.idx); if (hits[i]) window._openDetail(hits[i].id); });
|
||||||
|
el.addEventListener('contextmenu', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
const id = el.dataset.cardId;
|
||||||
|
if (!id) return;
|
||||||
|
// Highlight the row so the user sees which card the picker
|
||||||
|
// will move — mirrors the active-on-click behaviour.
|
||||||
|
const i = parseInt(el.dataset.idx);
|
||||||
|
if (!isNaN(i)) { active = i; updateActive(); }
|
||||||
|
openBucketPicker(id, e.clientX, e.clientY);
|
||||||
|
});
|
||||||
|
|
||||||
// Drag: only non-group, non-child cards
|
// Drag: only non-group, non-child cards
|
||||||
if (el.draggable) {
|
if (el.draggable) {
|
||||||
@@ -246,3 +362,129 @@ input.addEventListener('keydown', e => {
|
|||||||
overlay.addEventListener('click', e => { if (e.target === overlay) closeSearch(); });
|
overlay.addEventListener('click', e => { if (e.target === overlay) closeSearch(); });
|
||||||
$('search-btn')?.addEventListener('click', openSearch);
|
$('search-btn')?.addEventListener('click', openSearch);
|
||||||
$('search-close')?.addEventListener('click', closeSearch);
|
$('search-close')?.addEventListener('click', closeSearch);
|
||||||
|
replaceToggle?.addEventListener('click', () => setReplaceMode(!replaceMode));
|
||||||
|
replaceInput?.addEventListener('input', updateReplaceState);
|
||||||
|
|
||||||
|
replaceAllBtn?.addEventListener('click', async () => {
|
||||||
|
const needle = input.value.trim();
|
||||||
|
const repl = replaceInput.value;
|
||||||
|
if (!needle || !hits.length) return;
|
||||||
|
let totalOcc = 0;
|
||||||
|
const nLower = needle.toLowerCase();
|
||||||
|
for (const c of hits) {
|
||||||
|
let pos = 0;
|
||||||
|
const body = (c.body || '').toLowerCase();
|
||||||
|
while (true) { const i = body.indexOf(nLower, pos); if (i === -1) break; totalOcc++; pos = i + 1; }
|
||||||
|
}
|
||||||
|
const ok = await showDialog({
|
||||||
|
title: 'replace_all',
|
||||||
|
message: `Replace ${totalOcc} occurrence${totalOcc !== 1 ? 's' : ''} of "${needle}" with "${repl}" across ${hits.length} card${hits.length !== 1 ? 's' : ''}?`,
|
||||||
|
danger: true, okLabel: `Replace ${totalOcc}`,
|
||||||
|
});
|
||||||
|
if (!ok) return;
|
||||||
|
const freshCards = await api('api/cards') || [];
|
||||||
|
const freshMap = new Map(freshCards.map(c => [c.id, c]));
|
||||||
|
const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||||
|
const re = new RegExp(escaped, 'gi');
|
||||||
|
let patched = 0;
|
||||||
|
for (const c of hits) {
|
||||||
|
const fresh = freshMap.get(c.id);
|
||||||
|
const body = fresh?.body || c.body || '';
|
||||||
|
const newBody = body.replace(re, repl);
|
||||||
|
if (newBody !== body) {
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'PATCH', body: { body: newBody } });
|
||||||
|
patched++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
replaceStatus.textContent = `done — ${patched} card${patched !== 1 ? 's' : ''} updated`;
|
||||||
|
replaceStatus.style.color = 'var(--t-accent)';
|
||||||
|
replaceAllBtn.disabled = true;
|
||||||
|
await window._reloadAll();
|
||||||
|
search(input.value);
|
||||||
|
setTimeout(() => { replaceStatus.style.color = ''; }, 3000);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Saved searches ──────────────────────────────────────────────
|
||||||
|
// localStorage-persisted list of search strings. The bookmark button
|
||||||
|
// toggles a popup that lets the user pick one (fills input + runs),
|
||||||
|
// save the current input value, or delete saved entries.
|
||||||
|
|
||||||
|
const SAVED_KEY = 'hyprcrd-saved-searches';
|
||||||
|
const savedBtn = $('search-saved-btn');
|
||||||
|
const savedPopup = $('search-saved-popup');
|
||||||
|
const savedList = $('search-saved-list');
|
||||||
|
const savedAdd = $('search-saved-add');
|
||||||
|
|
||||||
|
function loadSaved() {
|
||||||
|
try { return JSON.parse(localStorage.getItem(SAVED_KEY) || '[]'); } catch { return []; }
|
||||||
|
}
|
||||||
|
function storeSaved(arr) {
|
||||||
|
localStorage.setItem(SAVED_KEY, JSON.stringify(arr));
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderSavedList() {
|
||||||
|
if (!savedList) return;
|
||||||
|
const items = loadSaved();
|
||||||
|
if (!items.length) {
|
||||||
|
savedList.innerHTML = '<div class="px-3 py-3 text-[10px] text-t-dim font-pixel text-center">no saved searches</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
savedList.innerHTML = items.map((q, i) => `
|
||||||
|
<div class="flex items-center gap-2 px-3 py-1.5 hover:bg-t-raised cursor-pointer transition-colors search-saved-row" data-idx="${i}">
|
||||||
|
<i class="ph ph-magnifying-glass text-xs text-t-dim"></i>
|
||||||
|
<span class="flex-1 text-xs text-t-muted truncate">${esc(q)}</span>
|
||||||
|
<button class="search-saved-del text-t-dim hover:text-t-danger text-xs px-1" data-idx="${i}" title="remove"><i class="ph ph-x"></i></button>
|
||||||
|
</div>
|
||||||
|
`).join('');
|
||||||
|
savedList.querySelectorAll('.search-saved-row').forEach(row => {
|
||||||
|
row.addEventListener('click', (e) => {
|
||||||
|
if (e.target.closest('.search-saved-del')) return;
|
||||||
|
const q = items[parseInt(row.dataset.idx)];
|
||||||
|
if (q !== undefined) {
|
||||||
|
input.value = q;
|
||||||
|
search(q);
|
||||||
|
closeSavedPopup();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
savedList.querySelectorAll('.search-saved-del').forEach(btn => {
|
||||||
|
btn.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
const idx = parseInt(btn.dataset.idx);
|
||||||
|
const arr = loadSaved();
|
||||||
|
arr.splice(idx, 1);
|
||||||
|
storeSaved(arr);
|
||||||
|
renderSavedList();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function openSavedPopup() {
|
||||||
|
renderSavedList();
|
||||||
|
savedPopup?.classList.remove('hidden');
|
||||||
|
const close = (e) => {
|
||||||
|
if (savedPopup?.contains(e.target) || e.target === savedBtn) return;
|
||||||
|
closeSavedPopup();
|
||||||
|
document.removeEventListener('mousedown', close, true);
|
||||||
|
};
|
||||||
|
setTimeout(() => document.addEventListener('mousedown', close, true), 0);
|
||||||
|
}
|
||||||
|
function closeSavedPopup() {
|
||||||
|
savedPopup?.classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
savedBtn?.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
if (savedPopup?.classList.contains('hidden')) openSavedPopup();
|
||||||
|
else closeSavedPopup();
|
||||||
|
});
|
||||||
|
|
||||||
|
savedAdd?.addEventListener('click', () => {
|
||||||
|
const q = input.value.trim();
|
||||||
|
if (!q) return;
|
||||||
|
const arr = loadSaved();
|
||||||
|
if (arr.includes(q)) return; // no dupes
|
||||||
|
arr.unshift(q);
|
||||||
|
storeSaved(arr);
|
||||||
|
renderSavedList();
|
||||||
|
});
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
// ── Central keyboard shortcut registry ──
|
||||||
|
//
|
||||||
|
// Every keyboard shortcut — bare keys, combos, context-specific — is
|
||||||
|
// registered here via registerShortcut(). A single document-level
|
||||||
|
// keydown listener dispatches to the matching handler. The registry
|
||||||
|
// also drives the auto-generated #shortcuts help screen so the UI
|
||||||
|
// and the code always agree on what's available.
|
||||||
|
//
|
||||||
|
// Shortcuts that live on specific DOM elements (editor textarea,
|
||||||
|
// search input, canvas overlay, dialog) stay element-scoped because
|
||||||
|
// they depend on local module state (autocomplete visibility, etc.).
|
||||||
|
// Only document-level shortcuts are centralized here.
|
||||||
|
|
||||||
|
const registry = [];
|
||||||
|
|
||||||
|
const OVERLAY_IDS = ['modal', 'detail', 'search', 'calendar', 'gallery',
|
||||||
|
'settings-overlay', 'help', 'shortcuts', 'email-overlay', 'tasks',
|
||||||
|
'dialog', 'ascii-canvas-overlay'];
|
||||||
|
|
||||||
|
function isOpen(id) {
|
||||||
|
return document.getElementById(id)?.classList.contains('open');
|
||||||
|
}
|
||||||
|
|
||||||
|
function noOverlay() {
|
||||||
|
return !OVERLAY_IDS.some(isOpen);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bodyFocused() {
|
||||||
|
return document.activeElement === document.body;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register a keyboard shortcut.
|
||||||
|
*
|
||||||
|
* @param {object} opts
|
||||||
|
* @param {string} opts.key — e.key value to match (e.g. 'a', 'Enter', 'Escape', '?')
|
||||||
|
* @param {boolean} [opts.ctrl] — require Ctrl/Cmd
|
||||||
|
* @param {boolean} [opts.shift] — require Shift
|
||||||
|
* @param {boolean} [opts.alt] — require Alt
|
||||||
|
* @param {function} [opts.match] — custom predicate (e) => bool; overrides key/ctrl/shift/alt
|
||||||
|
* @param {function} [opts.guard] — extra runtime check; shortcut only fires when guard() is truthy
|
||||||
|
* @param {number} [opts.priority] — higher = checked first (default 0)
|
||||||
|
* @param {boolean} [opts.stop] — call e.stopPropagation() + e.stopImmediatePropagation()
|
||||||
|
* @param {string} opts.section — help-screen section header
|
||||||
|
* @param {string} opts.label — human description for the help screen
|
||||||
|
* @param {string} [opts.keys] — display string for the help screen (e.g. '⌃ S'); auto-built if omitted
|
||||||
|
* @param {boolean} [opts.hidden] — true to suppress from the help screen
|
||||||
|
* @param {function} opts.handler — (e: KeyboardEvent) => void
|
||||||
|
*/
|
||||||
|
export function registerShortcut(opts) {
|
||||||
|
registry.push({
|
||||||
|
key: opts.key ?? null,
|
||||||
|
ctrl: !!opts.ctrl,
|
||||||
|
shift: !!opts.shift,
|
||||||
|
alt: !!opts.alt,
|
||||||
|
match: opts.match ?? null,
|
||||||
|
guard: opts.guard ?? null,
|
||||||
|
priority: opts.priority ?? 0,
|
||||||
|
stop: !!opts.stop,
|
||||||
|
section: opts.section ?? 'misc',
|
||||||
|
label: opts.label ?? '',
|
||||||
|
keys: opts.keys ?? null,
|
||||||
|
hidden: !!opts.hidden,
|
||||||
|
handler: opts.handler,
|
||||||
|
});
|
||||||
|
// Keep sorted by priority desc so the dispatch loop can short-circuit.
|
||||||
|
registry.sort((a, b) => b.priority - a.priority);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Return the full registry for the auto-generated help screen. */
|
||||||
|
export function getShortcuts() {
|
||||||
|
return registry.filter(s => !s.hidden);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Utility guards for use in shortcut definitions. */
|
||||||
|
export const guards = {
|
||||||
|
board: () => bodyFocused() && noOverlay(),
|
||||||
|
editor: () => isOpen('modal'),
|
||||||
|
detail: () => isOpen('detail'),
|
||||||
|
search: () => isOpen('search'),
|
||||||
|
email: () => isOpen('email-overlay'),
|
||||||
|
canvas: () => isOpen('ascii-canvas-overlay'),
|
||||||
|
noOverlay,
|
||||||
|
bodyFocused,
|
||||||
|
isOpen,
|
||||||
|
};
|
||||||
|
|
||||||
|
// ── Dispatcher ──
|
||||||
|
|
||||||
|
function isEditableTarget() {
|
||||||
|
const el = document.activeElement;
|
||||||
|
if (!el) return false;
|
||||||
|
const tag = el.tagName;
|
||||||
|
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return true;
|
||||||
|
if (el.isContentEditable) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('keydown', (e) => {
|
||||||
|
const inEditable = isEditableTarget();
|
||||||
|
|
||||||
|
for (const s of registry) {
|
||||||
|
// Key match
|
||||||
|
let matched;
|
||||||
|
if (s.match) {
|
||||||
|
matched = s.match(e);
|
||||||
|
} else {
|
||||||
|
if (s.key !== e.key) continue;
|
||||||
|
if (s.ctrl !== (e.ctrlKey || e.metaKey)) continue;
|
||||||
|
if (s.shift !== e.shiftKey) continue;
|
||||||
|
if (s.alt !== e.altKey) continue;
|
||||||
|
matched = true;
|
||||||
|
}
|
||||||
|
if (!matched) continue;
|
||||||
|
|
||||||
|
// Suppress non-modifier shortcuts when focus is in an editable field
|
||||||
|
// (allow Escape and function keys like F1 through)
|
||||||
|
if (inEditable && !s.ctrl && !s.alt && !s.match && e.key !== 'Escape' && !e.key.startsWith('F')) continue;
|
||||||
|
|
||||||
|
// Guard
|
||||||
|
if (s.guard && !s.guard()) continue;
|
||||||
|
|
||||||
|
// Fire
|
||||||
|
e.preventDefault();
|
||||||
|
if (s.stop) {
|
||||||
|
e.stopPropagation();
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
}
|
||||||
|
s.handler(e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Auto-generated help screen ──
|
||||||
|
|
||||||
|
/** Render the #shortcuts overlay content from the registry.
|
||||||
|
* Called once after all modules have registered their shortcuts
|
||||||
|
* (typically at the end of app.js boot). */
|
||||||
|
export function renderShortcutHelp() {
|
||||||
|
const container = document.querySelector('#shortcuts .shortcut-help-content');
|
||||||
|
if (!container) return;
|
||||||
|
|
||||||
|
const visible = getShortcuts();
|
||||||
|
// Group by section, preserve registration order within each section
|
||||||
|
const sections = new Map();
|
||||||
|
for (const s of visible) {
|
||||||
|
if (!sections.has(s.section)) sections.set(s.section, []);
|
||||||
|
sections.get(s.section).push(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build HTML — each section is a block with a header + table.
|
||||||
|
let html = '';
|
||||||
|
for (const [name, shortcuts] of sections) {
|
||||||
|
html += `<section>
|
||||||
|
<h3 class="font-pixel text-[10px] text-t-accent mb-2 uppercase tracking-wider">${esc(name)}</h3>
|
||||||
|
<table class="shortcut-table"><tbody>`;
|
||||||
|
for (const s of shortcuts) {
|
||||||
|
const keysHtml = s.keys
|
||||||
|
? s.keys // pre-formatted HTML (kbd tags etc.)
|
||||||
|
: `<kbd>${esc(s.key || '?')}</kbd>`;
|
||||||
|
html += `<tr><td>${keysHtml}</td><td>${esc(s.label)}</td></tr>`;
|
||||||
|
}
|
||||||
|
html += `</tbody></table></section>`;
|
||||||
|
}
|
||||||
|
container.innerHTML = html;
|
||||||
|
}
|
||||||
|
|
||||||
|
function esc(s) {
|
||||||
|
return String(s ?? '').replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
|
||||||
|
}
|
||||||
@@ -6,9 +6,18 @@ export const state = {
|
|||||||
// Data
|
// Data
|
||||||
cards: [],
|
cards: [],
|
||||||
buckets: [],
|
buckets: [],
|
||||||
|
// True once we've got a real response from api/cards (or the
|
||||||
|
// cached-cards hydration). Until then the board shows a spinner
|
||||||
|
// instead of the "no cards found" placeholder — an empty board on
|
||||||
|
// first load is an honest "still fetching" state, not a real empty.
|
||||||
|
cardsLoaded: false,
|
||||||
|
|
||||||
// Filters & view
|
// Filters & view — activeBucket is persisted across reloads via
|
||||||
activeBucket: 'all',
|
// localStorage. Numeric ids are stringified; the special filters
|
||||||
|
// ('all', 'current', 'favorites', 'journal', 'none') are stored
|
||||||
|
// as-is. Validity is re-checked after buckets load — see
|
||||||
|
// ensureActiveBucketValid() below.
|
||||||
|
activeBucket: localStorage.getItem('hyprcrd-active-bucket') || 'all',
|
||||||
activeTags: [],
|
activeTags: [],
|
||||||
activeGroup: null,
|
activeGroup: null,
|
||||||
sortMode: localStorage.getItem('hyprcrd-sort') || 'manual',
|
sortMode: localStorage.getItem('hyprcrd-sort') || 'manual',
|
||||||
@@ -23,6 +32,21 @@ export const state = {
|
|||||||
|
|
||||||
// Multi-select
|
// Multi-select
|
||||||
selectedIds: new Set(),
|
selectedIds: new Set(),
|
||||||
|
// True when at least one bulk gesture (rubber-band) participated in
|
||||||
|
// building the current selection. Used by the join/merge action to
|
||||||
|
// pick the title strategy: false → first selected wins, true →
|
||||||
|
// longest title wins (since "first" isn't meaningful for bulk).
|
||||||
|
selectionWasBulk: false,
|
||||||
|
// Card ids that have arrived since the user last entered the "all"
|
||||||
|
// view. Drives the unread dot on the all bucket-tab and the brief
|
||||||
|
// accent pulse on the cards themselves once the user looks at them.
|
||||||
|
// Updated by board.js renderBoard() — see the diff there.
|
||||||
|
unseenCardIds: new Set(),
|
||||||
|
// Ids of cards the user just created locally (editor save, quick
|
||||||
|
// capture, duplicate, undo-recreate). These get a single-pulse (1x)
|
||||||
|
// instead of the triple-pulse (3x) that relay-synced cards get.
|
||||||
|
// Consumed by renderBoard's diff — once used, the id is removed.
|
||||||
|
recentlyCreatedIds: new Set(),
|
||||||
|
|
||||||
// Detail / editor
|
// Detail / editor
|
||||||
editingId: null,
|
editingId: null,
|
||||||
@@ -47,6 +71,28 @@ export const state = {
|
|||||||
export const SORT_MODES = ['manual', 'newest', 'oldest', 'alpha', 'tag'];
|
export const SORT_MODES = ['manual', 'newest', 'oldest', 'alpha', 'tag'];
|
||||||
export const SORT_ICONS = { manual: 'ph-dots-six', newest: 'ph-sort-descending', oldest: 'ph-sort-ascending', alpha: 'ph-text-aa', tag: 'ph-hash' };
|
export const SORT_ICONS = { manual: 'ph-dots-six', newest: 'ph-sort-descending', oldest: 'ph-sort-ascending', alpha: 'ph-text-aa', tag: 'ph-hash' };
|
||||||
|
|
||||||
|
const SPECIAL_BUCKETS = new Set(['all', 'current', 'favorites', 'journal', 'none']);
|
||||||
|
|
||||||
|
/** Set state.activeBucket and persist it to localStorage so it survives
|
||||||
|
* page reloads. Use this instead of `state.activeBucket = …` everywhere
|
||||||
|
* except tests (tests reset directly to avoid touching localStorage). */
|
||||||
|
export function setActiveBucket(value) {
|
||||||
|
state.activeBucket = value;
|
||||||
|
if (value == null) localStorage.removeItem('hyprcrd-active-bucket');
|
||||||
|
else localStorage.setItem('hyprcrd-active-bucket', String(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Called from loadBuckets after the fresh bucket list arrives. If the
|
||||||
|
* persisted activeBucket points to a bucket id that no longer exists
|
||||||
|
* (deleted from another tab, removed in import, etc.), fall back to
|
||||||
|
* 'all'. Special filters are always valid. */
|
||||||
|
export function ensureActiveBucketValid() {
|
||||||
|
const cur = state.activeBucket;
|
||||||
|
if (!cur || SPECIAL_BUCKETS.has(cur)) return;
|
||||||
|
const exists = state.buckets.some(b => String(b.id) === String(cur));
|
||||||
|
if (!exists) setActiveBucket('all');
|
||||||
|
}
|
||||||
|
|
||||||
export const CARD_COLORS = [
|
export const CARD_COLORS = [
|
||||||
{ name: 'sky', hex: '#38bdf8' }, { name: 'violet', hex: '#8b5cf6' },
|
{ name: 'sky', hex: '#38bdf8' }, { name: 'violet', hex: '#8b5cf6' },
|
||||||
{ name: 'rose', hex: '#fb7185' }, { name: 'amber', hex: '#fbbf24' },
|
{ name: 'rose', hex: '#fb7185' }, { name: 'amber', hex: '#fbbf24' },
|
||||||
|
|||||||
@@ -0,0 +1,377 @@
|
|||||||
|
// ── Sync Orchestration ─────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Owns the single source of truth for "time to sync". Every scheduled
|
||||||
|
// poller — core CalDAV + relay mail pull, the collab-buckets card sync,
|
||||||
|
// the chat plugin — hangs off the same interval via the `sync.tick` hook
|
||||||
|
// instead of running its own setInterval. That way:
|
||||||
|
//
|
||||||
|
// - The header Sync button triggers ALL syncs (emits `sync.tick`).
|
||||||
|
// - The Autosync toggle pauses ALL syncs (stops the single timer).
|
||||||
|
// - The configurable interval changes ALL cadences at once.
|
||||||
|
//
|
||||||
|
// This module also owns the autosync button UI, the sync-event toast
|
||||||
|
// feed, and the relay settings panel (which hosts the interval input).
|
||||||
|
//
|
||||||
|
// Hooks emitted:
|
||||||
|
// sync.tick — fire all pollers now
|
||||||
|
// sync.pulse — pulse the header dot (subset of tick)
|
||||||
|
// sync.interval.changed — restart timers with new cadence
|
||||||
|
// autosync.changed — user paused/resumed scheduled polling
|
||||||
|
//
|
||||||
|
// CalDAV-specific UI (calendar config rendering, CalDAV settings) lives
|
||||||
|
// in caldav.js. This file has no CalDAV icons/colors concerns.
|
||||||
|
|
||||||
|
import { $, api, getCsrf } from './util.js';
|
||||||
|
import { state } from './state.js';
|
||||||
|
|
||||||
|
const syncStatus = $('caldav-sync-status');
|
||||||
|
|
||||||
|
// ── Manual "Sync now" trigger ───────────────────────────────────
|
||||||
|
// Fired by the header Sync button, the CalDAV panel "sync now" button,
|
||||||
|
// and the `autoSync()` throttled helper. Always runs regardless of the
|
||||||
|
// autosync-paused setting — the user pressed a button, we honor that.
|
||||||
|
// Fans out to every plugin poller via `sync.tick`.
|
||||||
|
export async function triggerSync() {
|
||||||
|
pulseAutosyncDot();
|
||||||
|
const btn = $('cal-sync');
|
||||||
|
if (btn) btn.style.opacity = '0.5';
|
||||||
|
const headerIcon = $('header-sync-icon');
|
||||||
|
if (headerIcon) headerIcon.classList.add('card-spinner');
|
||||||
|
if (syncStatus) { syncStatus.textContent = 'syncing...'; syncStatus.style.color = 'var(--t-dim)'; }
|
||||||
|
|
||||||
|
const res = await fetch('api/caldav/sync', {
|
||||||
|
method: 'POST', headers: { 'X-CSRF-Token': getCsrf() },
|
||||||
|
}).then(r => r.json()).catch(() => ({ ok: false, error: 'network error' }));
|
||||||
|
|
||||||
|
if (btn) btn.style.opacity = '';
|
||||||
|
|
||||||
|
// Also poll relay for mail-style messages. Header spinner stays on
|
||||||
|
// until this completes too.
|
||||||
|
const relayRes = await fetch('api/relay/poll', {
|
||||||
|
method: 'POST', headers: { 'X-CSRF-Token': getCsrf() },
|
||||||
|
}).then(r => r.ok ? r.json() : null).catch(() => null);
|
||||||
|
drainSyncEvents(relayRes);
|
||||||
|
|
||||||
|
// Fan out to plugin pollers (collab-buckets, chat, …). They run
|
||||||
|
// concurrently with us — no await needed here.
|
||||||
|
window.hyprcrd?.hooks?.emit?.('sync.tick');
|
||||||
|
|
||||||
|
if (res.ok) {
|
||||||
|
const s = res.stats || {};
|
||||||
|
const rp = relayRes?.pulled || 0;
|
||||||
|
const caldavStats = { pushed: s.pushed || 0, pulled: s.pulled || 0, deleted: s.deleted || 0 };
|
||||||
|
const relayStats = { pulled: rp };
|
||||||
|
const allLog = res.log || [];
|
||||||
|
const hasErrors = allLog.some(l => l.status === 'error');
|
||||||
|
const msg = `pushed:${caldavStats.pushed} pulled:${caldavStats.pulled + rp} del:${caldavStats.deleted}${rp ? ' relay:' + rp : ''}`;
|
||||||
|
if (syncStatus) { syncStatus.textContent = msg; syncStatus.style.color = hasErrors ? 'var(--t-danger)' : 'var(--t-accent)'; }
|
||||||
|
await window._reloadAll?.();
|
||||||
|
showLog(allLog);
|
||||||
|
showSyncNotification('CalDAV', 'ph-cloud-arrow-down', caldavStats);
|
||||||
|
showSyncNotification('Relay', 'ph-broadcast', relayStats);
|
||||||
|
} else {
|
||||||
|
if (syncStatus) { syncStatus.textContent = res.error || 'sync failed'; syncStatus.style.color = 'var(--t-danger)'; }
|
||||||
|
}
|
||||||
|
if (headerIcon) headerIcon.classList.remove('card-spinner');
|
||||||
|
}
|
||||||
|
|
||||||
|
// CalDAV log display inside the Settings → CalDAV panel. Lives here
|
||||||
|
// (not in caldav.js) because triggerSync writes to it.
|
||||||
|
function showLog(log) {
|
||||||
|
const logEl = $('caldav-log');
|
||||||
|
if (!logEl || !log?.length) return;
|
||||||
|
logEl.classList.remove('hidden');
|
||||||
|
logEl.innerHTML = log.map(l =>
|
||||||
|
`<div class="${l.status === 'error' ? 'text-t-danger' : 'text-t-dim'}">${l.dir} ${l.action} ${l.status}${l.detail ? ' — ' + l.detail : ''}</div>`
|
||||||
|
).join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Auto-sync throttle ──────────────────────────────────────────
|
||||||
|
// Used by the CalDAV module when the user saves a card with #termin or
|
||||||
|
// #geburtstag — we want to fire a sync immediately but not storm the
|
||||||
|
// server if they paste a big batch. 60s cooldown between auto-fires.
|
||||||
|
let lastAutoSync = 0;
|
||||||
|
export function autoSync() {
|
||||||
|
if (window._testRunning) return;
|
||||||
|
const now = Date.now();
|
||||||
|
if (now - lastAutoSync < 60000) return;
|
||||||
|
lastAutoSync = now;
|
||||||
|
triggerSync();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Sync notifications ──────────────────────────────────────────
|
||||||
|
|
||||||
|
/** Per-source sync toast. Caller picks the label ("CalDAV" vs "Relay")
|
||||||
|
* and icon so the user knows which pipeline just finished, instead of
|
||||||
|
* the old always-CalDAV banner that lumped relay traffic in silently. */
|
||||||
|
let syncNoteOffset = 0;
|
||||||
|
function showSyncNotification(label, icon, stats) {
|
||||||
|
const s = stats || {};
|
||||||
|
const parts = [];
|
||||||
|
if (s.pulled) parts.push(`${s.pulled} received`);
|
||||||
|
if (s.pushed) parts.push(`${s.pushed} sent`);
|
||||||
|
if (s.deleted) parts.push(`${s.deleted} deleted`);
|
||||||
|
if (!parts.length) return;
|
||||||
|
|
||||||
|
const bottom = 60 + syncNoteOffset * 48;
|
||||||
|
syncNoteOffset++;
|
||||||
|
const note = document.createElement('div');
|
||||||
|
note.style.cssText = `position:fixed;bottom:${bottom}px;right:16px;z-index:200;background:var(--t-surface);border:1px solid var(--t-accent);border-radius:4px;padding:10px 14px;box-shadow:0 4px 20px rgba(0,0,0,0.4);max-width:300px;`;
|
||||||
|
note.innerHTML = `<div style="font-family:var(--t-font-pixel);font-size:10px;color:var(--t-accent);display:flex;align-items:center;gap:6px;"><i class="ph ${icon}"></i>${label}: ${parts.join(', ')}</div>`;
|
||||||
|
document.body.appendChild(note);
|
||||||
|
setTimeout(() => {
|
||||||
|
note.style.transition = 'opacity 0.3s';
|
||||||
|
note.style.opacity = '0';
|
||||||
|
setTimeout(() => { note.remove(); syncNoteOffset = Math.max(0, syncNoteOffset - 1); }, 350);
|
||||||
|
}, 4000);
|
||||||
|
}
|
||||||
|
|
||||||
|
// One toast per incoming sync event: "alice synced: Card Title".
|
||||||
|
// Stacks downward so a burst of multiple doesn't overlay each other.
|
||||||
|
let syncEventToastOffset = 0;
|
||||||
|
function showSyncEventToast(ev) {
|
||||||
|
const body = String(ev?.body || '').trim();
|
||||||
|
if (!body) return;
|
||||||
|
const bottom = 110 + syncEventToastOffset * 48;
|
||||||
|
syncEventToastOffset++;
|
||||||
|
const note = document.createElement('div');
|
||||||
|
note.style.cssText = `position:fixed;bottom:${bottom}px;right:16px;z-index:200;background:var(--t-surface);border:1px solid var(--t-accent2);border-radius:4px;padding:9px 14px;box-shadow:0 4px 20px rgba(0,0,0,0.4);max-width:320px;`;
|
||||||
|
note.innerHTML = `<div style="font-family:var(--t-font-pixel);font-size:10px;color:var(--t-accent2);display:flex;align-items:center;gap:6px;"><i class="ph ph-check-circle"></i>${body.replace(/[&<>"']/g, c => ({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]))}</div>`;
|
||||||
|
document.body.appendChild(note);
|
||||||
|
setTimeout(() => {
|
||||||
|
note.style.transition = 'opacity 0.3s';
|
||||||
|
note.style.opacity = '0';
|
||||||
|
setTimeout(() => {
|
||||||
|
note.remove();
|
||||||
|
syncEventToastOffset = Math.max(0, syncEventToastOffset - 1);
|
||||||
|
}, 350);
|
||||||
|
}, 5000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function drainSyncEvents(relayRes) {
|
||||||
|
if (relayRes?.sync_debug) {
|
||||||
|
console.debug('[sync-events]', relayRes.sync_debug);
|
||||||
|
}
|
||||||
|
const events = Array.isArray(relayRes?.sync_events) ? relayRes.sync_events : [];
|
||||||
|
for (const ev of events) showSyncEventToast(ev);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Scheduled background pull ───────────────────────────────────
|
||||||
|
// Internal helper — the CalDAV + relay mail side of a tick. Plugin
|
||||||
|
// pollers run concurrently via the `sync.tick` hook.
|
||||||
|
async function backgroundPull() {
|
||||||
|
if (state.bgSyncRunning) return;
|
||||||
|
state.bgSyncRunning = true;
|
||||||
|
try {
|
||||||
|
const headers = { 'X-CSRF-Token': getCsrf() };
|
||||||
|
const [res, relayRes] = await Promise.all([
|
||||||
|
fetch('api/caldav/sync', { method: 'POST', headers }).then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
fetch('api/relay/poll', { method: 'POST', headers }).then(r => r.ok ? r.json() : null).catch(() => null),
|
||||||
|
]);
|
||||||
|
const s = res?.stats || {};
|
||||||
|
const rp = relayRes?.pulled || 0;
|
||||||
|
const total = { pushed: s.pushed || 0, pulled: (s.pulled || 0) + rp, deleted: s.deleted || 0 };
|
||||||
|
if (total.pulled > 0 || total.pushed > 0 || total.deleted > 0) {
|
||||||
|
await window._reloadAll?.();
|
||||||
|
showSyncNotification(total);
|
||||||
|
}
|
||||||
|
drainSyncEvents(relayRes);
|
||||||
|
} catch {} finally {
|
||||||
|
state.bgSyncRunning = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Central tick: the one and only scheduled sync heartbeat. Fires the
|
||||||
|
// CalDAV+relay pull and emits `sync.tick` for every other poller.
|
||||||
|
function tick() {
|
||||||
|
pulseAutosyncDot();
|
||||||
|
backgroundPull();
|
||||||
|
window.hyprcrd?.hooks?.emit?.('sync.tick');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Configurable sync interval ────────────────────────────────
|
||||||
|
// One setting drives every scheduled poller. Changed via the Relay
|
||||||
|
// settings panel; emits `sync.interval.changed` so the central timer
|
||||||
|
// restarts on the new cadence without a page reload.
|
||||||
|
const SYNC_INTERVAL_KEY = 'hyprcrd-sync-interval-sec';
|
||||||
|
const SYNC_INTERVAL_DEFAULT = 15;
|
||||||
|
const SYNC_INTERVAL_MIN = 5;
|
||||||
|
const SYNC_INTERVAL_MAX = 3600;
|
||||||
|
export function getSyncIntervalSec() {
|
||||||
|
const v = parseInt(localStorage.getItem(SYNC_INTERVAL_KEY));
|
||||||
|
return Number.isFinite(v) && v >= SYNC_INTERVAL_MIN ? v : SYNC_INTERVAL_DEFAULT;
|
||||||
|
}
|
||||||
|
export function setSyncIntervalSec(sec) {
|
||||||
|
const n = parseInt(sec);
|
||||||
|
const clamped = Math.max(SYNC_INTERVAL_MIN, Math.min(SYNC_INTERVAL_MAX, Number.isFinite(n) ? n : SYNC_INTERVAL_DEFAULT));
|
||||||
|
localStorage.setItem(SYNC_INTERVAL_KEY, String(clamped));
|
||||||
|
window.hyprcrd?.hooks?.emit?.('sync.interval.changed', clamped);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Autosync on/off toggle ────────────────────────────────────
|
||||||
|
const AUTOSYNC_KEY = 'hyprcrd-autosync-enabled';
|
||||||
|
export function isAutoSyncEnabled() {
|
||||||
|
return localStorage.getItem(AUTOSYNC_KEY) !== '0';
|
||||||
|
}
|
||||||
|
export function setAutoSyncEnabled(on) {
|
||||||
|
localStorage.setItem(AUTOSYNC_KEY, on ? '1' : '0');
|
||||||
|
if (on) startBackgroundSync();
|
||||||
|
else stopBackgroundSync();
|
||||||
|
updateAutosyncButton();
|
||||||
|
window.hyprcrd?.hooks?.emit?.('autosync.changed', on);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Central tick timer ────────────────────────────────────────
|
||||||
|
let tickInterval = null;
|
||||||
|
export function startBackgroundSync() {
|
||||||
|
if (tickInterval) return;
|
||||||
|
if (!isAutoSyncEnabled()) { updateAutosyncButton(); return; }
|
||||||
|
tick();
|
||||||
|
tickInterval = setInterval(tick, getSyncIntervalSec() * 1000);
|
||||||
|
updateAutosyncButton();
|
||||||
|
}
|
||||||
|
export function stopBackgroundSync() {
|
||||||
|
if (tickInterval) { clearInterval(tickInterval); tickInterval = null; }
|
||||||
|
updateAutosyncButton();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Restart the central timer when the user changes the interval.
|
||||||
|
window.hyprcrd?.hooks?.on?.('sync.interval.changed', () => {
|
||||||
|
if (tickInterval) {
|
||||||
|
clearInterval(tickInterval);
|
||||||
|
tickInterval = setInterval(tick, getSyncIntervalSec() * 1000);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Header autosync button ────────────────────────────────────
|
||||||
|
function updateAutosyncButton() {
|
||||||
|
const btn = $('header-autosync');
|
||||||
|
if (!btn) return;
|
||||||
|
const on = isAutoSyncEnabled();
|
||||||
|
btn.dataset.autosync = on ? 'on' : 'off';
|
||||||
|
btn.setAttribute('data-tip', on
|
||||||
|
? `auto-sync: on (every ${getSyncIntervalSec()}s) — click to pause`
|
||||||
|
: 'auto-sync: paused — click to resume');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pulse the dot once. Rip and re-add the class after a reflow so
|
||||||
|
// re-triggering mid-animation restarts cleanly.
|
||||||
|
export function pulseAutosyncDot() {
|
||||||
|
const dot = $('header-autosync-dot');
|
||||||
|
if (!dot) return;
|
||||||
|
dot.classList.remove('pulsing');
|
||||||
|
void dot.offsetWidth;
|
||||||
|
dot.classList.add('pulsing');
|
||||||
|
}
|
||||||
|
window.hyprcrd?.hooks?.on?.('sync.pulse', pulseAutosyncDot);
|
||||||
|
$('header-autosync')?.addEventListener('click', () => setAutoSyncEnabled(!isAutoSyncEnabled()));
|
||||||
|
window.hyprcrd?.hooks?.on?.('sync.interval.changed', updateAutosyncButton);
|
||||||
|
updateAutosyncButton();
|
||||||
|
|
||||||
|
// ── Sync-adjacent button wiring ───────────────────────────────
|
||||||
|
$('cal-sync')?.addEventListener('click', () => triggerSync());
|
||||||
|
$('header-sync')?.addEventListener('click', () => triggerSync());
|
||||||
|
$('caldav-sync-now')?.addEventListener('click', () => triggerSync());
|
||||||
|
|
||||||
|
// ── Relay settings panel ──────────────────────────────────────
|
||||||
|
// The relay panel lives in Settings → Relay. It holds the URL /
|
||||||
|
// username / shared-key inputs plus the shared sync-interval number
|
||||||
|
// input that drives every scheduled poller.
|
||||||
|
|
||||||
|
function setRelayStatus(text, kind = 'info') {
|
||||||
|
const el = $('relay-status');
|
||||||
|
if (!el) return;
|
||||||
|
if (!text) {
|
||||||
|
el.classList.add('hidden');
|
||||||
|
el.textContent = '';
|
||||||
|
el.style.borderColor = '';
|
||||||
|
el.style.color = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
el.classList.remove('hidden');
|
||||||
|
el.textContent = text;
|
||||||
|
if (kind === 'error') { el.style.borderColor = 'var(--t-danger)'; el.style.color = 'var(--t-danger)'; }
|
||||||
|
else if (kind === 'success') { el.style.borderColor = 'var(--t-accent)'; el.style.color = 'var(--t-accent)'; }
|
||||||
|
else { el.style.borderColor = 'var(--t-border)'; el.style.color = 'var(--t-muted)'; }
|
||||||
|
}
|
||||||
|
|
||||||
|
$('relay-save')?.addEventListener('click', async () => {
|
||||||
|
const body = {
|
||||||
|
url: $('relay-url')?.value || '',
|
||||||
|
username: $('relay-username')?.value || '',
|
||||||
|
key: $('relay-key')?.value || '',
|
||||||
|
};
|
||||||
|
setRelayStatus('saving...');
|
||||||
|
await api('api/relay/settings', { method: 'POST', body });
|
||||||
|
setRelayStatus('saved', 'success');
|
||||||
|
setTimeout(() => setRelayStatus(''), 1500);
|
||||||
|
});
|
||||||
|
|
||||||
|
$('relay-test')?.addEventListener('click', async () => {
|
||||||
|
setRelayStatus('testing...');
|
||||||
|
const res = await fetch('api/relay/poll', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': getCsrf() },
|
||||||
|
body: JSON.stringify({ strict: true }),
|
||||||
|
}).then(r => r.json()).catch(() => null);
|
||||||
|
if (res?.ok) {
|
||||||
|
setRelayStatus(`ok — ${res.pulled} pulled`, 'success');
|
||||||
|
if (res.pulled) await window._reloadAll?.();
|
||||||
|
drainSyncEvents(res);
|
||||||
|
} else {
|
||||||
|
const detail = res?.sent_username ? ` (sent username: ${res.sent_username})` : '';
|
||||||
|
setRelayStatus((res?.error || 'failed') + detail, 'error');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export async function loadRelaySettings() {
|
||||||
|
const s = await api('api/relay/settings');
|
||||||
|
if (!s) return;
|
||||||
|
const urlInput = $('relay-url');
|
||||||
|
const userInput = $('relay-username');
|
||||||
|
const keyInput = $('relay-key');
|
||||||
|
if (urlInput) urlInput.value = s.url || '';
|
||||||
|
if (userInput) userInput.value = s.username || '';
|
||||||
|
if (keyInput) {
|
||||||
|
// The server no longer echoes the stored secret. Leave the field
|
||||||
|
// blank; placeholder tells the user whether one is set. An empty
|
||||||
|
// save is treated as "field untouched" server-side.
|
||||||
|
keyInput.value = '';
|
||||||
|
keyInput.placeholder = s.has_key ? '•••••••• (saved — type to change)' : 'shared secret';
|
||||||
|
}
|
||||||
|
// Sync-interval slider lives in the Relay panel but drives every
|
||||||
|
// poller. Snap points span 5s..1h; live label updates on drag,
|
||||||
|
// persisted value commits on release.
|
||||||
|
const intervalInp = $('setting-sync-interval');
|
||||||
|
const intervalVal = $('setting-sync-interval-val');
|
||||||
|
if (intervalInp) {
|
||||||
|
const STEPS = [5, 10, 15, 20, 30, 45, 60, 90, 120, 180, 300, 600, 900, 1800, 3600];
|
||||||
|
const fmt = (s) => {
|
||||||
|
if (s < 60) return `${s}s`;
|
||||||
|
if (s === 3600) return '1h';
|
||||||
|
const m = Math.floor(s / 60), r = s % 60;
|
||||||
|
return r ? `${m}m ${r}s` : `${m}m`;
|
||||||
|
};
|
||||||
|
const idxFor = (sec) => {
|
||||||
|
let best = 0, bestDiff = Infinity;
|
||||||
|
for (let i = 0; i < STEPS.length; i++) {
|
||||||
|
const d = Math.abs(STEPS[i] - sec);
|
||||||
|
if (d < bestDiff) { bestDiff = d; best = i; }
|
||||||
|
}
|
||||||
|
return best;
|
||||||
|
};
|
||||||
|
intervalInp.max = String(STEPS.length - 1);
|
||||||
|
const sync = (idx) => {
|
||||||
|
const sec = STEPS[idx];
|
||||||
|
if (intervalVal) intervalVal.textContent = fmt(sec);
|
||||||
|
return sec;
|
||||||
|
};
|
||||||
|
intervalInp.value = String(idxFor(getSyncIntervalSec()));
|
||||||
|
sync(parseInt(intervalInp.value));
|
||||||
|
intervalInp.oninput = () => sync(parseInt(intervalInp.value));
|
||||||
|
intervalInp.onchange = () => {
|
||||||
|
const sec = sync(parseInt(intervalInp.value));
|
||||||
|
setSyncIntervalSec(sec);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,8 +13,13 @@ const summary = $('tasks-summary');
|
|||||||
const countBadge = $('tasks-open-count');
|
const countBadge = $('tasks-open-count');
|
||||||
|
|
||||||
function collectTasks() {
|
function collectTasks() {
|
||||||
|
const showShopping = localStorage.getItem('hyprcrd-tasks-show-shopping') === '1';
|
||||||
const all = [];
|
const all = [];
|
||||||
for (const card of state.cards) {
|
for (const card of state.cards) {
|
||||||
|
if (!showShopping) {
|
||||||
|
const tags = (card.tags || '').split(',').map(s => s.trim());
|
||||||
|
if (tags.includes('einkauf') || tags.includes('shopping')) continue;
|
||||||
|
}
|
||||||
const re = /- \[([ xX])\][ \t]*([^\n\r]*)/g;
|
const re = /- \[([ xX])\][ \t]*([^\n\r]*)/g;
|
||||||
let m, idx = 0;
|
let m, idx = 0;
|
||||||
while ((m = re.exec(card.body || '')) !== null) {
|
while ((m = re.exec(card.body || '')) !== null) {
|
||||||
|
|||||||
+22
-17
@@ -96,8 +96,6 @@ function updatePreview() {
|
|||||||
set('--tp-bar-height', d.barHeight + 'px');
|
set('--tp-bar-height', d.barHeight + 'px');
|
||||||
set('--tp-pad-card', d.padCard + 'px');
|
set('--tp-pad-card', d.padCard + 'px');
|
||||||
set('--tp-shadow-card', shadows[d.shadowCard] || 'none');
|
set('--tp-shadow-card', shadows[d.shadowCard] || 'none');
|
||||||
const scan = $('theme-preview-scan');
|
|
||||||
if (scan) scan.style.display = String(d.scanlines) === '1' ? '' : 'none';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function fillFontSelect(id, value) {
|
function fillFontSelect(id, value) {
|
||||||
@@ -129,8 +127,6 @@ function syncControlsFromPending() {
|
|||||||
const valEl = $(valId);
|
const valEl = $(valId);
|
||||||
if (valEl) valEl.textContent = v;
|
if (valEl) valEl.textContent = v;
|
||||||
}
|
}
|
||||||
const scanEl = $('setting-scanlines');
|
|
||||||
if (scanEl) scanEl.classList.toggle('on', String(designPending.scanlines) === '1');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function commitDesign() {
|
function commitDesign() {
|
||||||
@@ -167,16 +163,6 @@ function initDesignSettings() {
|
|||||||
if (designWired) return;
|
if (designWired) return;
|
||||||
designWired = true;
|
designWired = true;
|
||||||
|
|
||||||
// Scanlines toggle
|
|
||||||
const scanEl = $('setting-scanlines');
|
|
||||||
const scanRow = scanEl?.closest('.toggle-row');
|
|
||||||
if (scanRow) scanRow.onclick = () => {
|
|
||||||
const nowOn = !scanEl.classList.contains('on');
|
|
||||||
scanEl.classList.toggle('on', nowOn);
|
|
||||||
designPending.scanlines = nowOn ? '1' : '0';
|
|
||||||
commitDesign();
|
|
||||||
};
|
|
||||||
|
|
||||||
// Selects
|
// Selects
|
||||||
for (const [id, key] of SELECT_FIELDS) {
|
for (const [id, key] of SELECT_FIELDS) {
|
||||||
const el = $(id);
|
const el = $(id);
|
||||||
@@ -232,7 +218,10 @@ function saveUserPresets(p) {
|
|||||||
function refreshPresetSelect() {
|
function refreshPresetSelect() {
|
||||||
const sel = $('design-preset-select');
|
const sel = $('design-preset-select');
|
||||||
if (!sel) return;
|
if (!sel) return;
|
||||||
const cur = sel.value;
|
// localStorage wins over sel.value: the <select> survives settings
|
||||||
|
// close/reopen, so its lingering value would otherwise mask the
|
||||||
|
// persisted selection on the next refresh.
|
||||||
|
const cur = localStorage.getItem('hyprcrd-design-active-preset') || sel.value || '';
|
||||||
sel.innerHTML = '';
|
sel.innerHTML = '';
|
||||||
const builtinGroup = document.createElement('optgroup');
|
const builtinGroup = document.createElement('optgroup');
|
||||||
builtinGroup.label = 'built-in';
|
builtinGroup.label = 'built-in';
|
||||||
@@ -254,7 +243,15 @@ function refreshPresetSelect() {
|
|||||||
}
|
}
|
||||||
sel.appendChild(userGroup);
|
sel.appendChild(userGroup);
|
||||||
}
|
}
|
||||||
if (cur) sel.value = cur;
|
if (cur && sel.querySelector(`option[value="${CSS.escape(cur)}"]`)) sel.value = cur;
|
||||||
|
// Disable delete button when a built-in preset is selected
|
||||||
|
const delBtn = $('design-preset-delete');
|
||||||
|
if (delBtn) {
|
||||||
|
const isUser = sel.value?.startsWith('user:');
|
||||||
|
delBtn.disabled = !isUser;
|
||||||
|
delBtn.style.opacity = isUser ? '' : '0.35';
|
||||||
|
delBtn.style.cursor = isUser ? '' : 'not-allowed';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getSelectedPreset() {
|
function getSelectedPreset() {
|
||||||
@@ -274,6 +271,8 @@ function loadSelectedPreset() {
|
|||||||
syncControlsFromPending();
|
syncControlsFromPending();
|
||||||
commitDesign();
|
commitDesign();
|
||||||
renderThemes();
|
renderThemes();
|
||||||
|
const sel = $('design-preset-select');
|
||||||
|
if (sel?.value) localStorage.setItem('hyprcrd-design-active-preset', sel.value);
|
||||||
}
|
}
|
||||||
$('design-preset-select')?.addEventListener('change', loadSelectedPreset);
|
$('design-preset-select')?.addEventListener('change', loadSelectedPreset);
|
||||||
|
|
||||||
@@ -288,6 +287,7 @@ $('design-preset-save')?.addEventListener('click', () => {
|
|||||||
refreshPresetSelect();
|
refreshPresetSelect();
|
||||||
const sel = $('design-preset-select');
|
const sel = $('design-preset-select');
|
||||||
if (sel) sel.value = 'user:' + name;
|
if (sel) sel.value = 'user:' + name;
|
||||||
|
localStorage.setItem('hyprcrd-design-active-preset', 'user:' + name);
|
||||||
const status = $('design-status');
|
const status = $('design-status');
|
||||||
if (status) { status.textContent = `preset "${name}" saved`; status.style.color = 'var(--t-accent)'; }
|
if (status) { status.textContent = `preset "${name}" saved`; status.style.color = 'var(--t-accent)'; }
|
||||||
});
|
});
|
||||||
@@ -299,6 +299,9 @@ $('design-preset-delete')?.addEventListener('click', () => {
|
|||||||
const presets = loadUserPresets();
|
const presets = loadUserPresets();
|
||||||
delete presets[name];
|
delete presets[name];
|
||||||
saveUserPresets(presets);
|
saveUserPresets(presets);
|
||||||
|
if (localStorage.getItem('hyprcrd-design-active-preset') === 'user:' + name) {
|
||||||
|
localStorage.removeItem('hyprcrd-design-active-preset');
|
||||||
|
}
|
||||||
refreshPresetSelect();
|
refreshPresetSelect();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -408,7 +411,7 @@ $('settings-pw-save')?.addEventListener('click', async () => {
|
|||||||
|
|
||||||
if (!current || !newPw) { if (status) { status.textContent = 'fill all fields'; status.style.color = 'var(--t-danger)'; } return; }
|
if (!current || !newPw) { if (status) { status.textContent = 'fill all fields'; status.style.color = 'var(--t-danger)'; } return; }
|
||||||
if (newPw !== confirm) { if (status) { status.textContent = 'passwords do not match'; status.style.color = 'var(--t-danger)'; } return; }
|
if (newPw !== confirm) { if (status) { status.textContent = 'passwords do not match'; status.style.color = 'var(--t-danger)'; } return; }
|
||||||
if (newPw.length < 4) { if (status) { status.textContent = 'min 4 characters'; status.style.color = 'var(--t-danger)'; } return; }
|
if (newPw.length < 10) { if (status) { status.textContent = 'min 10 characters'; status.style.color = 'var(--t-danger)'; } return; }
|
||||||
|
|
||||||
const res = await fetch('api/auth/password', {
|
const res = await fetch('api/auth/password', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -447,6 +450,8 @@ function initBehaviorSettings() {
|
|||||||
'setting-show-done-badge': { key: 'hyprcrd-show-done-badge', def: '1' },
|
'setting-show-done-badge': { key: 'hyprcrd-show-done-badge', def: '1' },
|
||||||
'setting-confirm-delete': { key: 'hyprcrd-confirm-delete', def: '1' },
|
'setting-confirm-delete': { key: 'hyprcrd-confirm-delete', def: '1' },
|
||||||
'setting-auto-save': { key: 'hyprcrd-auto-save', def: '0' },
|
'setting-auto-save': { key: 'hyprcrd-auto-save', def: '0' },
|
||||||
|
'setting-open-switches-bucket': { key: 'hyprcrd-open-switches-bucket', def: '0' },
|
||||||
|
'setting-tasks-show-shopping': { key: 'hyprcrd-tasks-show-shopping', def: '0' },
|
||||||
};
|
};
|
||||||
for (const [id, cfg] of Object.entries(selects)) {
|
for (const [id, cfg] of Object.entries(selects)) {
|
||||||
const el = $(id);
|
const el = $(id);
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
// ── Global tooltip system ──
|
||||||
|
// Replaces native title="" with styled tooltips. Supports:
|
||||||
|
// data-tip="short text" — single-line tooltip (replaces title)
|
||||||
|
// data-help="line1\nline2" — multi-line inline help (shown on hover)
|
||||||
|
|
||||||
|
const SHOW_DELAY = 400;
|
||||||
|
const HIDE_DELAY = 100;
|
||||||
|
const MAX_LIFE = 5000; // watchdog: tooltip never outlives this
|
||||||
|
const OFFSET = 8;
|
||||||
|
|
||||||
|
let tipEl = null;
|
||||||
|
let showTimer = null;
|
||||||
|
let hideTimer = null;
|
||||||
|
let lifeTimer = null;
|
||||||
|
let currentTarget = null;
|
||||||
|
|
||||||
|
function create() {
|
||||||
|
if (tipEl) return;
|
||||||
|
tipEl = document.createElement('div');
|
||||||
|
tipEl.id = 'tooltip';
|
||||||
|
tipEl.setAttribute('role', 'tooltip');
|
||||||
|
document.body.appendChild(tipEl);
|
||||||
|
}
|
||||||
|
|
||||||
|
function show(target) {
|
||||||
|
clearTimeout(hideTimer);
|
||||||
|
if (currentTarget === target) return;
|
||||||
|
currentTarget = target;
|
||||||
|
create();
|
||||||
|
|
||||||
|
const tip = target.dataset.tip || '';
|
||||||
|
const help = target.dataset.help || '';
|
||||||
|
if (!tip && !help) { hide(); return; }
|
||||||
|
|
||||||
|
if (help) {
|
||||||
|
tipEl.classList.add('tooltip-help');
|
||||||
|
tipEl.innerHTML = help.replace(/\\n/g, '<br>');
|
||||||
|
} else {
|
||||||
|
tipEl.classList.remove('tooltip-help');
|
||||||
|
tipEl.textContent = tip;
|
||||||
|
}
|
||||||
|
|
||||||
|
tipEl.style.visibility = 'hidden';
|
||||||
|
tipEl.style.display = 'block';
|
||||||
|
|
||||||
|
const rect = target.getBoundingClientRect();
|
||||||
|
const tipRect = tipEl.getBoundingClientRect();
|
||||||
|
|
||||||
|
let top, left;
|
||||||
|
const spaceBelow = window.innerHeight - rect.bottom;
|
||||||
|
const spaceAbove = rect.top;
|
||||||
|
|
||||||
|
if (spaceBelow >= tipRect.height + OFFSET || spaceBelow >= spaceAbove) {
|
||||||
|
top = rect.bottom + OFFSET;
|
||||||
|
tipEl.classList.remove('tooltip-above');
|
||||||
|
} else {
|
||||||
|
top = rect.top - tipRect.height - OFFSET;
|
||||||
|
tipEl.classList.add('tooltip-above');
|
||||||
|
}
|
||||||
|
|
||||||
|
left = rect.left + rect.width / 2 - tipRect.width / 2;
|
||||||
|
left = Math.max(8, Math.min(left, window.innerWidth - tipRect.width - 8));
|
||||||
|
top = Math.max(4, top);
|
||||||
|
|
||||||
|
tipEl.style.top = top + 'px';
|
||||||
|
tipEl.style.left = left + 'px';
|
||||||
|
tipEl.style.visibility = '';
|
||||||
|
|
||||||
|
// Watchdog: if pointerleave never fires (fast flick off the
|
||||||
|
// element, target removed from the DOM mid-hover, focus taken by
|
||||||
|
// another window), the tooltip would sit forever. Force-hide
|
||||||
|
// after MAX_LIFE regardless.
|
||||||
|
clearTimeout(lifeTimer);
|
||||||
|
lifeTimer = setTimeout(hide, MAX_LIFE);
|
||||||
|
}
|
||||||
|
|
||||||
|
function hide() {
|
||||||
|
currentTarget = null;
|
||||||
|
clearTimeout(lifeTimer);
|
||||||
|
if (tipEl) tipEl.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
function onEnter(e) {
|
||||||
|
const el = e.target?.nodeType === 1 ? e.target : e.target?.parentElement;
|
||||||
|
const target = el?.closest?.('[data-tip],[data-help]');
|
||||||
|
if (!target) return;
|
||||||
|
clearTimeout(hideTimer);
|
||||||
|
showTimer = setTimeout(() => show(target), SHOW_DELAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onLeave(e) {
|
||||||
|
const el = e.target?.nodeType === 1 ? e.target : e.target?.parentElement;
|
||||||
|
const target = el?.closest?.('[data-tip],[data-help]');
|
||||||
|
if (!target) return;
|
||||||
|
clearTimeout(showTimer);
|
||||||
|
hideTimer = setTimeout(hide, HIDE_DELAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('pointerenter', onEnter, true);
|
||||||
|
document.addEventListener('pointerleave', onLeave, true);
|
||||||
|
document.addEventListener('pointerdown', () => { clearTimeout(showTimer); hide(); }, true);
|
||||||
|
document.addEventListener('keydown', () => { clearTimeout(showTimer); hide(); }, true);
|
||||||
|
document.addEventListener('scroll', () => { clearTimeout(showTimer); hide(); }, true);
|
||||||
|
|
||||||
|
// Belt-and-suspenders sanity check on every move: if the pointer is
|
||||||
|
// no longer over the tip-owning target (or the target has been
|
||||||
|
// detached from the DOM since show time), hide. Catches fast flicks
|
||||||
|
// that skip the expected pointerleave and DOM churn that yanks the
|
||||||
|
// element out from under us.
|
||||||
|
document.addEventListener('pointermove', (e) => {
|
||||||
|
if (!currentTarget) return;
|
||||||
|
if (!currentTarget.isConnected) { hide(); return; }
|
||||||
|
const el = document.elementFromPoint(e.clientX, e.clientY);
|
||||||
|
if (!el || !currentTarget.contains(el)) hide();
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
// Window losing focus / tab hidden — nothing to hover over while
|
||||||
|
// we're not there, kill any lingering tip.
|
||||||
|
window.addEventListener('blur', () => { clearTimeout(showTimer); hide(); });
|
||||||
|
document.addEventListener('visibilitychange', () => { if (document.hidden) { clearTimeout(showTimer); hide(); } });
|
||||||
@@ -66,21 +66,29 @@ export function pushBatch(label, patches) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Toast hint
|
// Toast hint
|
||||||
|
//
|
||||||
|
// Centering note: tailwind v4 compiles `-translate-x-1/2` to the *new*
|
||||||
|
// CSS `translate` property, which then stacks with any inline `transform`
|
||||||
|
// we set — the box ended up shifted ~ -100% (utility translate + JS
|
||||||
|
// transform translate both applied) and looked left-anchored. Fix: drop
|
||||||
|
// the tailwind translate utility and centre purely via the modern
|
||||||
|
// `translate` property in inline styles, which is one source of truth.
|
||||||
let hintTimer = null;
|
let hintTimer = null;
|
||||||
function showHint(text) {
|
function showHint(text) {
|
||||||
let el = document.getElementById('undo-hint');
|
let el = document.getElementById('undo-hint');
|
||||||
if (!el) {
|
if (!el) {
|
||||||
el = document.createElement('div');
|
el = document.createElement('div');
|
||||||
el.id = 'undo-hint';
|
el.id = 'undo-hint';
|
||||||
el.className = 'fixed bottom-16 left-1/2 -translate-x-1/2 z-[95] bg-t-surface border border-t-border px-4 py-2 text-xs font-pixel text-t-muted shadow-lg transition-all';
|
el.className = 'fixed bottom-16 left-1/2 z-[95] bg-t-surface border border-t-border px-4 py-2 text-xs font-pixel text-t-muted shadow-lg transition-all';
|
||||||
|
el.style.translate = '-50% 0';
|
||||||
document.body.appendChild(el);
|
document.body.appendChild(el);
|
||||||
}
|
}
|
||||||
el.textContent = text + ' (ctrl+z undo)';
|
el.textContent = text + ' (ctrl+z undo)';
|
||||||
el.style.opacity = '1';
|
el.style.opacity = '1';
|
||||||
el.style.transform = 'translateX(-50%) translateY(0)';
|
el.style.translate = '-50% 0';
|
||||||
clearTimeout(hintTimer);
|
clearTimeout(hintTimer);
|
||||||
hintTimer = setTimeout(() => {
|
hintTimer = setTimeout(() => {
|
||||||
el.style.opacity = '0';
|
el.style.opacity = '0';
|
||||||
el.style.transform = 'translateX(-50%) translateY(8px)';
|
el.style.translate = '-50% 8px';
|
||||||
}, 2500);
|
}, 2500);
|
||||||
}
|
}
|
||||||
@@ -15,13 +15,23 @@ export function setCsrf(token) { csrfToken = token; }
|
|||||||
export function getCsrf() { return csrfToken; }
|
export function getCsrf() { return csrfToken; }
|
||||||
|
|
||||||
export async function api(path, opts = {}) {
|
export async function api(path, opts = {}) {
|
||||||
const headers = { 'Content-Type': 'application/json' };
|
const doFetch = () => {
|
||||||
if (csrfToken) headers['X-CSRF-Token'] = csrfToken;
|
const headers = { 'Content-Type': 'application/json' };
|
||||||
const res = await fetch(path, {
|
if (csrfToken) headers['X-CSRF-Token'] = csrfToken;
|
||||||
headers,
|
return fetch(path, {
|
||||||
...opts,
|
headers,
|
||||||
body: opts.body ? JSON.stringify(opts.body) : undefined,
|
...opts,
|
||||||
});
|
body: opts.body ? JSON.stringify(opts.body) : undefined,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
let res = await doFetch();
|
||||||
|
// Session expired mid-use: prompt for re-login, then retry once. Avoid
|
||||||
|
// recursion on auth endpoints themselves — promptLogin handles its own
|
||||||
|
// fetches directly.
|
||||||
|
if (res.status === 401 && !path.startsWith('api/auth/') && typeof window._reauth === 'function') {
|
||||||
|
await window._reauth();
|
||||||
|
res = await doFetch();
|
||||||
|
}
|
||||||
return res.json();
|
return res.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bookmarks Plugin: backend.
|
||||||
|
*
|
||||||
|
* Single endpoint that fetches a URL's <title> and favicon so the
|
||||||
|
* frontend doesn't have to deal with CORS. Light and stateless —
|
||||||
|
* the bookmarks themselves live in the card body (JSON blob).
|
||||||
|
*
|
||||||
|
* Routes:
|
||||||
|
* GET /api/bookmarks/fetch-meta?url=... → { title, favicon }
|
||||||
|
*/
|
||||||
|
|
||||||
|
PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
||||||
|
if ($route !== '/api/bookmarks/fetch-meta' || $method !== 'GET') return;
|
||||||
|
|
||||||
|
$url = trim((string)($_GET['url'] ?? ''));
|
||||||
|
if ($url === '' || !filter_var($url, FILTER_VALIDATE_URL)) {
|
||||||
|
http_response_code(400);
|
||||||
|
echo json_encode(['error' => 'valid url required']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
$scheme = strtolower((string)parse_url($url, PHP_URL_SCHEME));
|
||||||
|
if ($scheme !== 'http' && $scheme !== 'https') {
|
||||||
|
http_response_code(400);
|
||||||
|
echo json_encode(['error' => 'only http/https URLs allowed']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
if (!hyprcrdUrlHostIsPublic($url)) {
|
||||||
|
http_response_code(400);
|
||||||
|
echo json_encode(['error' => 'URL host is not publicly reachable']);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ch = curl_init($url);
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_FOLLOWLOCATION => true,
|
||||||
|
CURLOPT_MAXREDIRS => 5,
|
||||||
|
CURLOPT_TIMEOUT => 8,
|
||||||
|
CURLOPT_USERAGENT => 'Mozilla/5.0 (compatible; hyprcrd-bookmarks/1.0)',
|
||||||
|
CURLOPT_SSL_VERIFYPEER => true,
|
||||||
|
]);
|
||||||
|
hyprcrdApplySafeCurlOpts($ch);
|
||||||
|
$html = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
$finalUrl = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL) ?: $url;
|
||||||
|
curl_close($ch);
|
||||||
|
|
||||||
|
$title = '';
|
||||||
|
if ($html && $status >= 200 && $status < 400) {
|
||||||
|
// Extract <title>
|
||||||
|
if (preg_match('/<title[^>]*>(.*?)<\/title>/si', $html, $m)) {
|
||||||
|
$title = trim(html_entity_decode($m[1], ENT_QUOTES | ENT_HTML5, 'UTF-8'));
|
||||||
|
}
|
||||||
|
// og:title fallback
|
||||||
|
if ($title === '' && preg_match('/<meta[^>]+property=["\']og:title["\'][^>]+content=["\']([^"\']+)/si', $html, $m)) {
|
||||||
|
$title = trim(html_entity_decode($m[1], ENT_QUOTES | ENT_HTML5, 'UTF-8'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Favicon: resolve the URL, then download the bytes and return a
|
||||||
|
// self-contained data: URI so the card body is fully offline-capable
|
||||||
|
// and opening the overlay doesn't leak requests to every bookmarked
|
||||||
|
// site. Caps at 32 KB — anything bigger is probably not an icon.
|
||||||
|
$parsed = parse_url($finalUrl);
|
||||||
|
$origin = ($parsed['scheme'] ?? 'https') . '://' . ($parsed['host'] ?? '');
|
||||||
|
$faviconUrl = $origin . '/favicon.ico';
|
||||||
|
if ($html && preg_match('/<link[^>]+rel=["\'](?:shortcut )?icon["\'][^>]+href=["\']([^"\']+)/si', $html, $m)) {
|
||||||
|
$href = $m[1];
|
||||||
|
if (str_starts_with($href, '//')) $href = ($parsed['scheme'] ?? 'https') . ':' . $href;
|
||||||
|
elseif (str_starts_with($href, '/')) $href = $origin . $href;
|
||||||
|
elseif (!str_starts_with($href, 'http')) $href = rtrim($finalUrl, '/') . '/' . $href;
|
||||||
|
$faviconUrl = $href;
|
||||||
|
}
|
||||||
|
|
||||||
|
$faviconData = '';
|
||||||
|
$faviconScheme = strtolower((string)parse_url($faviconUrl, PHP_URL_SCHEME));
|
||||||
|
$favCh = ($faviconScheme === 'http' || $faviconScheme === 'https') && hyprcrdUrlHostIsPublic($faviconUrl);
|
||||||
|
$ch2 = $favCh ? curl_init($faviconUrl) : null;
|
||||||
|
if ($ch2) curl_setopt_array($ch2, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_FOLLOWLOCATION => true,
|
||||||
|
CURLOPT_MAXREDIRS => 3,
|
||||||
|
CURLOPT_TIMEOUT => 5,
|
||||||
|
CURLOPT_USERAGENT => 'Mozilla/5.0 (compatible; hyprcrd-bookmarks/1.0)',
|
||||||
|
]);
|
||||||
|
if ($ch2) hyprcrdApplySafeCurlOpts($ch2);
|
||||||
|
$favBytes = $ch2 ? curl_exec($ch2) : false;
|
||||||
|
$favStatus = $ch2 ? curl_getinfo($ch2, CURLINFO_HTTP_CODE) : 0;
|
||||||
|
$favMime = $ch2 ? (curl_getinfo($ch2, CURLINFO_CONTENT_TYPE) ?: 'image/x-icon') : 'image/x-icon';
|
||||||
|
if ($ch2) curl_close($ch2);
|
||||||
|
|
||||||
|
if ($favBytes && $favStatus >= 200 && $favStatus < 400 && strlen($favBytes) <= 32768) {
|
||||||
|
$mime = preg_replace('/;.*$/', '', $favMime);
|
||||||
|
$faviconData = 'data:' . $mime . ';base64,' . base64_encode($favBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo json_encode([
|
||||||
|
'ok' => true,
|
||||||
|
'url' => $finalUrl,
|
||||||
|
'title' => mb_substr($title, 0, 200),
|
||||||
|
'favicon' => $faviconData,
|
||||||
|
]);
|
||||||
|
exit;
|
||||||
|
});
|
||||||
@@ -0,0 +1,257 @@
|
|||||||
|
/* ── Bookmarks plugin ── */
|
||||||
|
|
||||||
|
/* Board card override: the MutationObserver replaces the card's
|
||||||
|
innerHTML with a coloured tile (card.color as bg) showing a
|
||||||
|
centered link icon + the title. No body preview, no tags, no
|
||||||
|
metadata — just a clean, recognisable tile. */
|
||||||
|
.board-card.bm-card {
|
||||||
|
border: none !important;
|
||||||
|
cursor: pointer;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.bm-card-inner {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
height: 100%;
|
||||||
|
min-height: 100px;
|
||||||
|
}
|
||||||
|
.bm-card-center {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 20px 14px 8px;
|
||||||
|
}
|
||||||
|
.bm-card-icon {
|
||||||
|
font-size: 42px;
|
||||||
|
color: rgba(0,0,0,0.2);
|
||||||
|
}
|
||||||
|
.bm-card-title {
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 11px;
|
||||||
|
color: rgba(0,0,0,0.55);
|
||||||
|
text-align: center;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
.bm-card-meta {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 12px;
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 9px;
|
||||||
|
color: rgba(255,255,255,0.55);
|
||||||
|
text-shadow: 0 1px 3px rgba(0,0,0,0.3);
|
||||||
|
}
|
||||||
|
.bm-card-meta i { font-size: 10px; margin-right: 2px; }
|
||||||
|
|
||||||
|
/* Overlay shell */
|
||||||
|
.bookmarks-shell {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
background: var(--t-surface);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bookmarks-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 16px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
background: var(--t-bg);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.bm-btn {
|
||||||
|
background: none;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
padding: 4px 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.12s, color 0.12s;
|
||||||
|
}
|
||||||
|
.bm-btn:hover { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
|
||||||
|
/* Column width slider — full width */
|
||||||
|
.bookmarks-slider-row {
|
||||||
|
padding: 6px 16px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
background: var(--t-bg);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.bookmarks-slider {
|
||||||
|
width: 100%;
|
||||||
|
height: 4px;
|
||||||
|
-webkit-appearance: none;
|
||||||
|
appearance: none;
|
||||||
|
background: var(--t-border);
|
||||||
|
border-radius: 2px;
|
||||||
|
outline: none;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
.bookmarks-slider::-webkit-slider-thumb {
|
||||||
|
-webkit-appearance: none;
|
||||||
|
width: 14px; height: 14px; border-radius: 50%;
|
||||||
|
background: var(--t-accent); cursor: pointer; border: none;
|
||||||
|
}
|
||||||
|
.bookmarks-slider::-moz-range-thumb {
|
||||||
|
width: 14px; height: 14px; border-radius: 50%;
|
||||||
|
background: var(--t-accent); cursor: pointer; border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Column container — horizontal scroll, wheel redirected by JS */
|
||||||
|
.bookmarks-columns {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 14px 16px;
|
||||||
|
overflow-x: auto;
|
||||||
|
overflow-y: hidden;
|
||||||
|
scrollbar-width: none;
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
}
|
||||||
|
.bookmarks-columns::-webkit-scrollbar { display: none; }
|
||||||
|
|
||||||
|
/* Single column */
|
||||||
|
.bm-col {
|
||||||
|
flex: 0 0 var(--bm-col-w, 220px);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 6px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.bm-col-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
padding: 4px 6px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.bm-col-header .bm-col-name {
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-bright);
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.12s;
|
||||||
|
}
|
||||||
|
.bm-col-header .bm-col-name:hover { color: var(--t-accent); }
|
||||||
|
.bm-col-header .bm-col-add {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--t-dim);
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
padding: 2px;
|
||||||
|
transition: color 0.12s;
|
||||||
|
}
|
||||||
|
.bm-col-header .bm-col-add:hover { color: var(--t-accent); }
|
||||||
|
|
||||||
|
.bm-col-items {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bookmark item */
|
||||||
|
.bm-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 7px 10px;
|
||||||
|
background: var(--t-raised, var(--t-surface));
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-card, 3px);
|
||||||
|
cursor: pointer;
|
||||||
|
user-select: none;
|
||||||
|
transition: border-color 0.12s, background 0.12s;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.bm-item:hover {
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
background: color-mix(in srgb, var(--t-accent) 6%, var(--t-surface));
|
||||||
|
}
|
||||||
|
.bm-item .bm-favicon {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
border-radius: 2px;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
.bm-item .bm-favicon-placeholder {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: var(--t-dim);
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.bm-item .bm-item-title {
|
||||||
|
flex: 1;
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--t-muted);
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.bm-item:hover .bm-item-title { color: var(--t-bright); }
|
||||||
|
.bm-item.dragging { opacity: 0.4; }
|
||||||
|
.bm-item.bm-drop-above {
|
||||||
|
box-shadow: 0 -2px 0 0 var(--t-accent);
|
||||||
|
}
|
||||||
|
.bm-item.bm-drop-below {
|
||||||
|
box-shadow: 0 2px 0 0 var(--t-accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Context menu */
|
||||||
|
.bm-ctx {
|
||||||
|
position: fixed;
|
||||||
|
z-index: 300;
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
box-shadow: 0 4px 20px rgba(0,0,0,0.4);
|
||||||
|
border-radius: var(--ui-radius-modal, 4px);
|
||||||
|
min-width: 140px;
|
||||||
|
padding: 4px 0;
|
||||||
|
}
|
||||||
|
.bm-ctx button {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
width: 100%;
|
||||||
|
padding: 6px 12px;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--t-muted);
|
||||||
|
font-size: 11px;
|
||||||
|
cursor: pointer;
|
||||||
|
text-align: left;
|
||||||
|
transition: background 0.08s, color 0.08s;
|
||||||
|
}
|
||||||
|
.bm-ctx button:hover { background: var(--t-raised); color: var(--t-bright); }
|
||||||
|
.bm-ctx button.danger:hover { color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* Empty column state */
|
||||||
|
.bm-col-empty {
|
||||||
|
padding: 16px 8px;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<!-- Bookmarks overlay. Opens when the user clicks a #bookmarks card
|
||||||
|
on the board (instead of the normal detail view). Column-based
|
||||||
|
layout; each column is a topic, each item is a bookmark with
|
||||||
|
favicon + title. -->
|
||||||
|
<div id="bookmarks-overlay" class="overlay fixed inset-0 z-[80]" style="background:var(--t-overlay)">
|
||||||
|
<div class="bookmarks-shell">
|
||||||
|
<div class="bookmarks-header">
|
||||||
|
<i class="ph ph-link text-t-accent text-base"></i>
|
||||||
|
<span id="bookmarks-title" class="font-pixel text-sm text-t-accent flex-1 truncate cursor-pointer hover:text-t-bright transition-colors" data-tip="click to rename"></span>
|
||||||
|
<button id="bookmarks-add-btn" class="bm-btn" data-tip="new bookmark (paste URL)"><i class="ph ph-plus text-sm"></i></button>
|
||||||
|
<button id="bookmarks-col-add" class="bm-btn" data-tip="new column"><i class="ph ph-columns-plus-right text-sm"></i></button>
|
||||||
|
<button id="bookmarks-close" class="bm-btn hover:text-t-danger"><i class="ph ph-x text-sm"></i></button>
|
||||||
|
</div>
|
||||||
|
<div class="bookmarks-slider-row">
|
||||||
|
<input type="range" id="bookmarks-col-width" min="140" max="400" step="10" value="220" class="bookmarks-slider">
|
||||||
|
</div>
|
||||||
|
<div id="bookmarks-columns" class="bookmarks-columns"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,618 @@
|
|||||||
|
// ── Bookmarks Plugin ──
|
||||||
|
//
|
||||||
|
// A bookmark list is a card tagged #bookmarks. Its body is a JSON
|
||||||
|
// blob: { type:"bookmarks", columns:[{name, items:[{url,title,favicon}]}], columnWidth }.
|
||||||
|
// On the board the card renders as a coloured tile with a link icon
|
||||||
|
// and no body preview. Clicking opens a column-based overlay; each
|
||||||
|
// item is a small box with favicon + title. Click → open URL.
|
||||||
|
//
|
||||||
|
// Phase 1+2: skeleton, board decoration, overlay (read + write),
|
||||||
|
// add/delete/rename, clipboard paste + server-side meta fetch.
|
||||||
|
|
||||||
|
const hyprcrd = window.hyprcrd;
|
||||||
|
if (!hyprcrd) throw new Error('[bookmarks] window.hyprcrd missing');
|
||||||
|
|
||||||
|
const $ = (id) => document.getElementById(id);
|
||||||
|
|
||||||
|
function esc(s) {
|
||||||
|
return String(s ?? '').replace(/&/g, '&').replace(/</g, '<')
|
||||||
|
.replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, ''');
|
||||||
|
}
|
||||||
|
|
||||||
|
const TAG = 'bookmarks';
|
||||||
|
let activeCardId = null; // card id currently open in the overlay
|
||||||
|
let data = null; // parsed JSON body of the active card
|
||||||
|
|
||||||
|
// ── Helpers ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function isBookmarkCard(card) {
|
||||||
|
return (card.tags || '').split(',').map(s => s.trim()).includes(TAG);
|
||||||
|
}
|
||||||
|
|
||||||
|
function emptyData() {
|
||||||
|
return { type: 'bookmarks', columns: [{ name: 'General', items: [] }], columnWidth: 220 };
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseBody(body) {
|
||||||
|
const text = (body || '').trim();
|
||||||
|
// Full string might be pure JSON (legacy) or JSON + trailing
|
||||||
|
// "\n\n#bookmarks" tag line that extractTags needs on the server.
|
||||||
|
try {
|
||||||
|
const d = JSON.parse(text);
|
||||||
|
if (d?.type === 'bookmarks' && Array.isArray(d.columns)) return d;
|
||||||
|
} catch {}
|
||||||
|
// Strip trailing tag line and retry.
|
||||||
|
const jsonEnd = text.lastIndexOf('}');
|
||||||
|
if (jsonEnd >= 0) {
|
||||||
|
try {
|
||||||
|
const d = JSON.parse(text.substring(0, jsonEnd + 1));
|
||||||
|
if (d?.type === 'bookmarks' && Array.isArray(d.columns)) return d;
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
return emptyData();
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUrl(s) {
|
||||||
|
return /^https?:\/\/.+/i.test((s || '').trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
function isCardLink(s) {
|
||||||
|
return /^card:\d+$/i.test((s || '').trim());
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseCardId(s) {
|
||||||
|
const m = /^card:(\d+)$/i.exec((s || '').trim());
|
||||||
|
return m ? m[1] : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!activeCardId || !data) return;
|
||||||
|
// The trailing #bookmarks tag is essential: the server's
|
||||||
|
// extractTags() parses hashtags from the body text to populate
|
||||||
|
// the `tags` column. Without it, isBookmarkCard (which checks
|
||||||
|
// tags, not body) wouldn't recognise the card on meta-only
|
||||||
|
// loads where body is still null.
|
||||||
|
const body = JSON.stringify(data) + '\n\n#bookmarks';
|
||||||
|
await hyprcrd.api(`api/cards/${activeCardId}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
body: { body },
|
||||||
|
});
|
||||||
|
// Keep the local state in sync so the next openOverlay (which
|
||||||
|
// reads from state.cards, not the server) sees the latest body.
|
||||||
|
const local = (window.state?.cards || []).find(c => c.id == activeCardId);
|
||||||
|
if (local) local.body = body;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Board card decoration ────────────────────────────────────────
|
||||||
|
// MutationObserver on #board: any card whose tags include "bookmarks"
|
||||||
|
// gets the .bm-card class + a link icon. Click is intercepted to
|
||||||
|
// open the overlay instead of the detail view.
|
||||||
|
|
||||||
|
function decorateBoard() {
|
||||||
|
const board = $('board');
|
||||||
|
if (!board) return;
|
||||||
|
const cards = window.state?.cards || [];
|
||||||
|
board.querySelectorAll('.board-card[data-id]').forEach(el => {
|
||||||
|
const card = cards.find(c => String(c.id) === el.dataset.id);
|
||||||
|
if (!card || !isBookmarkCard(card)) return;
|
||||||
|
if (el.dataset.bmDone) return;
|
||||||
|
el.dataset.bmDone = '1';
|
||||||
|
el.classList.add('bm-card');
|
||||||
|
// Replace the entire card content with a coloured tile
|
||||||
|
// showing just a big link icon and the title. The original
|
||||||
|
// innerHTML (bar + body preview + tags + meta) is noise for
|
||||||
|
// a bookmark list card.
|
||||||
|
const color = card.color || '#38bdf8';
|
||||||
|
el.style.background = `color-mix(in srgb, ${color} 70%, var(--t-surface))`;
|
||||||
|
el.style.borderColor = color;
|
||||||
|
const date = (card.updated_at || card.created_at || '').substring(0, 10);
|
||||||
|
const bucket = card.bucket_name || '';
|
||||||
|
el.innerHTML = `
|
||||||
|
<div class="bm-card-inner">
|
||||||
|
<div class="bm-card-center">
|
||||||
|
<i class="ph ph-link bm-card-icon"></i>
|
||||||
|
<span class="bm-card-title">${esc(card.title)}</span>
|
||||||
|
</div>
|
||||||
|
<div class="bm-card-meta">
|
||||||
|
<span><i class="ph ph-clock"></i>${esc(date)}</span>
|
||||||
|
${bucket ? `<span><i class="ph ph-folder"></i>${esc(bucket)}</span>` : ''}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
el.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault(); e.stopPropagation(); e.stopImmediatePropagation();
|
||||||
|
openOverlay(card.id);
|
||||||
|
}, true);
|
||||||
|
el.addEventListener('dblclick', (e) => {
|
||||||
|
e.preventDefault(); e.stopPropagation(); e.stopImmediatePropagation();
|
||||||
|
openOverlay(card.id);
|
||||||
|
}, true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-decorate after every board render.
|
||||||
|
new MutationObserver(decorateBoard).observe(
|
||||||
|
$('board') || document.body,
|
||||||
|
{ childList: true, subtree: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
// ── Overlay ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const overlay = $('bookmarks-overlay');
|
||||||
|
const colsEl = $('bookmarks-columns');
|
||||||
|
const slider = $('bookmarks-col-width');
|
||||||
|
|
||||||
|
async function openOverlay(cardId) {
|
||||||
|
activeCardId = cardId;
|
||||||
|
let card = (window.state?.cards || []).find(c => c.id == cardId);
|
||||||
|
if (!card) return;
|
||||||
|
// Body might still be null if Phase-2 hasn't loaded it yet.
|
||||||
|
// Fetch it explicitly so we don't clobber the stored JSON
|
||||||
|
// (including columnWidth) with emptyData() defaults.
|
||||||
|
if (card.body == null) {
|
||||||
|
const full = await hyprcrd.api('api/cards?ids=' + cardId);
|
||||||
|
if (Array.isArray(full) && full[0]) {
|
||||||
|
const idx = (window.state?.cards || []).findIndex(c => c.id == cardId);
|
||||||
|
if (idx >= 0) window.state.cards[idx] = full[0];
|
||||||
|
card = full[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$('bookmarks-title').textContent = card.title || 'Bookmarks';
|
||||||
|
data = parseBody(card.body);
|
||||||
|
if (slider) slider.value = data.columnWidth || 220;
|
||||||
|
applyColumnWidth();
|
||||||
|
renderColumns();
|
||||||
|
overlay?.classList.add('open');
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeOverlay() {
|
||||||
|
overlay?.classList.remove('open');
|
||||||
|
activeCardId = null;
|
||||||
|
data = null;
|
||||||
|
hideCtx();
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyColumnWidth() {
|
||||||
|
const w = slider ? parseInt(slider.value) : 220;
|
||||||
|
colsEl?.style.setProperty('--bm-col-w', w + 'px');
|
||||||
|
if (data) data.columnWidth = w;
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderColumns() {
|
||||||
|
if (!colsEl || !data) return;
|
||||||
|
colsEl.innerHTML = '';
|
||||||
|
data.columns.forEach((col, ci) => {
|
||||||
|
const div = document.createElement('div');
|
||||||
|
div.className = 'bm-col';
|
||||||
|
div.dataset.col = ci;
|
||||||
|
|
||||||
|
// Header
|
||||||
|
const hdr = document.createElement('div');
|
||||||
|
hdr.className = 'bm-col-header';
|
||||||
|
hdr.innerHTML = `
|
||||||
|
<span class="bm-col-name" title="${esc(col.name)}">${esc(col.name)}</span>
|
||||||
|
<button class="bm-col-add" data-col="${ci}" title="add bookmark"><i class="ph ph-plus"></i></button>
|
||||||
|
`;
|
||||||
|
hdr.querySelector('.bm-col-name').addEventListener('click', () => renameColumn(ci));
|
||||||
|
hdr.querySelector('.bm-col-name').addEventListener('contextmenu', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showColCtx(ci, e.clientX, e.clientY);
|
||||||
|
});
|
||||||
|
hdr.querySelector('.bm-col-add').addEventListener('click', () => addBookmark(ci));
|
||||||
|
div.appendChild(hdr);
|
||||||
|
|
||||||
|
// Items
|
||||||
|
const items = document.createElement('div');
|
||||||
|
items.className = 'bm-col-items';
|
||||||
|
items.dataset.col = ci;
|
||||||
|
if (!col.items.length) {
|
||||||
|
items.innerHTML = '<div class="bm-col-empty">no bookmarks</div>';
|
||||||
|
} else {
|
||||||
|
col.items.forEach((it, ii) => {
|
||||||
|
const el = document.createElement('div');
|
||||||
|
el.className = 'bm-item';
|
||||||
|
el.dataset.col = ci;
|
||||||
|
el.dataset.idx = ii;
|
||||||
|
el.draggable = true;
|
||||||
|
const cardId = parseCardId(it.url);
|
||||||
|
const isCard = !!cardId;
|
||||||
|
let fav;
|
||||||
|
if (isCard) {
|
||||||
|
// Card link: show a card icon instead of a web favicon.
|
||||||
|
const linked = (window.state?.cards || []).find(c => String(c.id) === cardId);
|
||||||
|
const linkedColor = linked?.color || 'var(--t-accent)';
|
||||||
|
fav = `<i class="ph ph-card bm-favicon-placeholder" style="color:${esc(linkedColor)}"></i>`;
|
||||||
|
} else {
|
||||||
|
fav = it.favicon
|
||||||
|
? `<img class="bm-favicon" src="${esc(it.favicon)}" onerror="this.outerHTML='<i class=\\'ph ph-globe bm-favicon-placeholder\\'></i>'">`
|
||||||
|
: '<i class="ph ph-globe bm-favicon-placeholder"></i>';
|
||||||
|
}
|
||||||
|
el.innerHTML = `${fav}<span class="bm-item-title" title="${esc(it.title || it.url)}">${esc(it.title || it.url)}</span>`;
|
||||||
|
el.addEventListener('click', () => {
|
||||||
|
if (isCard) {
|
||||||
|
// Check if the linked card is itself a bookmark list.
|
||||||
|
const linked = (window.state?.cards || []).find(c => String(c.id) === cardId);
|
||||||
|
if (linked && isBookmarkCard(linked)) {
|
||||||
|
openOverlay(linked.id);
|
||||||
|
} else {
|
||||||
|
closeOverlay();
|
||||||
|
window._openDetail?.(parseInt(cardId));
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (it.url) window.open(it.url, '_blank', 'noopener');
|
||||||
|
});
|
||||||
|
el.addEventListener('contextmenu', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
showItemCtx(ci, ii, e.clientX, e.clientY);
|
||||||
|
});
|
||||||
|
// Drag
|
||||||
|
el.addEventListener('dragstart', (e) => {
|
||||||
|
e.dataTransfer.setData('application/x-bm', JSON.stringify({ col: ci, idx: ii }));
|
||||||
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
el.classList.add('dragging');
|
||||||
|
});
|
||||||
|
el.addEventListener('dragend', () => el.classList.remove('dragging'));
|
||||||
|
items.appendChild(el);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// Drop target — positional: a drop indicator line appears
|
||||||
|
// between items based on the cursor's vertical position.
|
||||||
|
// The item is inserted AT that position, not always at the end.
|
||||||
|
items.addEventListener('dragover', (e) => {
|
||||||
|
if (!e.dataTransfer.types.includes('application/x-bm')) return;
|
||||||
|
e.preventDefault();
|
||||||
|
e.dataTransfer.dropEffect = 'move';
|
||||||
|
// Show a drop indicator between items.
|
||||||
|
clearDropIndicator(items);
|
||||||
|
const after = getDropIndex(items, e.clientY);
|
||||||
|
const children = [...items.querySelectorAll('.bm-item')];
|
||||||
|
if (after < children.length) {
|
||||||
|
children[after].classList.add('bm-drop-above');
|
||||||
|
} else if (children.length) {
|
||||||
|
children[children.length - 1].classList.add('bm-drop-below');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
items.addEventListener('dragleave', () => clearDropIndicator(items));
|
||||||
|
items.addEventListener('drop', (e) => {
|
||||||
|
clearDropIndicator(items);
|
||||||
|
const raw = e.dataTransfer.getData('application/x-bm');
|
||||||
|
if (!raw) return;
|
||||||
|
e.preventDefault();
|
||||||
|
const src = JSON.parse(raw);
|
||||||
|
const destCol = ci;
|
||||||
|
if (!data) return;
|
||||||
|
const [item] = data.columns[src.col].items.splice(src.idx, 1);
|
||||||
|
if (!item) return;
|
||||||
|
// Compute insertion index from cursor position.
|
||||||
|
const insertAt = getDropIndex(items, e.clientY);
|
||||||
|
// If source and dest are the same column, the splice above
|
||||||
|
// shifted indices — getDropIndex already sees the shortened
|
||||||
|
// list, so insertAt is correct as-is.
|
||||||
|
data.columns[destCol].items.splice(insertAt, 0, item);
|
||||||
|
save();
|
||||||
|
renderColumns();
|
||||||
|
});
|
||||||
|
div.appendChild(items);
|
||||||
|
colsEl.appendChild(div);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Drag-and-drop helpers ─────────────────────────────────────────
|
||||||
|
|
||||||
|
function getDropIndex(container, clientY) {
|
||||||
|
const children = [...container.querySelectorAll('.bm-item')];
|
||||||
|
for (let i = 0; i < children.length; i++) {
|
||||||
|
const r = children[i].getBoundingClientRect();
|
||||||
|
if (clientY < r.top + r.height / 2) return i;
|
||||||
|
}
|
||||||
|
return children.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearDropIndicator(container) {
|
||||||
|
container.querySelectorAll('.bm-drop-above,.bm-drop-below').forEach(el => {
|
||||||
|
el.classList.remove('bm-drop-above', 'bm-drop-below');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Wheel → horizontal scroll ────────────────────────────────────
|
||||||
|
colsEl?.addEventListener('wheel', (e) => {
|
||||||
|
if (e.deltaY === 0) return;
|
||||||
|
if (colsEl.scrollWidth <= colsEl.clientWidth) return;
|
||||||
|
e.preventDefault();
|
||||||
|
colsEl.scrollLeft += e.deltaY;
|
||||||
|
}, { passive: false });
|
||||||
|
|
||||||
|
// ── Slider ───────────────────────────────────────────────────────
|
||||||
|
slider?.addEventListener('input', () => {
|
||||||
|
applyColumnWidth();
|
||||||
|
renderColumns();
|
||||||
|
});
|
||||||
|
slider?.addEventListener('change', () => save());
|
||||||
|
|
||||||
|
// ── Context menus ────────────────────────────────────────────────
|
||||||
|
|
||||||
|
let ctxEl = null;
|
||||||
|
|
||||||
|
function hideCtx() {
|
||||||
|
ctxEl?.remove();
|
||||||
|
ctxEl = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showCtx(x, y, buttons) {
|
||||||
|
hideCtx();
|
||||||
|
ctxEl = document.createElement('div');
|
||||||
|
ctxEl.className = 'bm-ctx';
|
||||||
|
ctxEl.style.left = x + 'px';
|
||||||
|
ctxEl.style.top = y + 'px';
|
||||||
|
buttons.forEach(([label, icon, cls, fn]) => {
|
||||||
|
const b = document.createElement('button');
|
||||||
|
if (cls) b.className = cls;
|
||||||
|
b.innerHTML = `<i class="ph ${icon} text-sm"></i>${esc(label)}`;
|
||||||
|
b.addEventListener('click', () => { hideCtx(); fn(); });
|
||||||
|
ctxEl.appendChild(b);
|
||||||
|
});
|
||||||
|
document.body.appendChild(ctxEl);
|
||||||
|
// Clamp to viewport
|
||||||
|
const r = ctxEl.getBoundingClientRect();
|
||||||
|
if (r.right > window.innerWidth - 8) ctxEl.style.left = Math.max(8, window.innerWidth - r.width - 8) + 'px';
|
||||||
|
if (r.bottom > window.innerHeight - 8) ctxEl.style.top = Math.max(8, window.innerHeight - r.height - 8) + 'px';
|
||||||
|
setTimeout(() => {
|
||||||
|
const off = (e) => { if (!ctxEl?.contains(e.target)) { hideCtx(); document.removeEventListener('mousedown', off, true); } };
|
||||||
|
document.addEventListener('mousedown', off, true);
|
||||||
|
}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showItemCtx(col, idx, x, y) {
|
||||||
|
const item = data?.columns?.[col]?.items?.[idx];
|
||||||
|
if (!item) return;
|
||||||
|
showCtx(x, y, [
|
||||||
|
['Rename', 'ph-pencil-simple', '', async () => {
|
||||||
|
const name = await hyprcrd.dialog.show({ title: 'rename bookmark', input: true, defaultValue: item.title || '', okLabel: 'Save' });
|
||||||
|
if (name === false || name === null) return;
|
||||||
|
item.title = name;
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
}],
|
||||||
|
['Delete', 'ph-trash', 'danger', async () => {
|
||||||
|
data.columns[col].items.splice(idx, 1);
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
}],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function renameColumn(col) {
|
||||||
|
const column = data?.columns?.[col];
|
||||||
|
if (!column) return;
|
||||||
|
const name = await hyprcrd.dialog.show({ title: 'rename column', input: true, defaultValue: column.name, okLabel: 'Save' });
|
||||||
|
if (name === false || name === null || name.trim() === '') return;
|
||||||
|
column.name = name.trim();
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showColCtx(col, x, y) {
|
||||||
|
const column = data?.columns?.[col];
|
||||||
|
if (!column) return;
|
||||||
|
showCtx(x, y, [
|
||||||
|
['Rename column', 'ph-pencil-simple', '', () => renameColumn(col)],
|
||||||
|
['Delete column', 'ph-trash', 'danger', async () => {
|
||||||
|
if (column.items.length) {
|
||||||
|
const ok = await hyprcrd.dialog.show({ title: 'delete column', message: `"${column.name}" has ${column.items.length} bookmark(s). Delete anyway?`, danger: true, okLabel: 'Delete' });
|
||||||
|
if (!ok) return;
|
||||||
|
}
|
||||||
|
data.columns.splice(col, 1);
|
||||||
|
if (!data.columns.length) data.columns.push({ name: 'General', items: [] });
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
}],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Add bookmark (clipboard + meta-fetch) ────────────────────────
|
||||||
|
|
||||||
|
async function addBookmark(colIdx) {
|
||||||
|
let url = '';
|
||||||
|
try {
|
||||||
|
const clip = await navigator.clipboard.readText();
|
||||||
|
if (isUrl(clip) || isCardLink(clip)) url = clip.trim();
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
if (!url) {
|
||||||
|
const entered = await hyprcrd.dialog.show({
|
||||||
|
title: 'new bookmark',
|
||||||
|
input: true,
|
||||||
|
placeholder: 'https://... or card:123',
|
||||||
|
okLabel: 'Add',
|
||||||
|
});
|
||||||
|
if (!entered || !entered.trim()) return;
|
||||||
|
url = entered.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
const item = { url, title: url, favicon: '' };
|
||||||
|
|
||||||
|
if (isCardLink(url)) {
|
||||||
|
// Resolve card title for the display label.
|
||||||
|
const cid = parseCardId(url);
|
||||||
|
const card = (window.state?.cards || []).find(c => String(c.id) === cid);
|
||||||
|
if (card) item.title = card.title || url;
|
||||||
|
} else if (isUrl(url)) {
|
||||||
|
try {
|
||||||
|
const meta = await hyprcrd.api('api/bookmarks/fetch-meta?url=' + encodeURIComponent(url));
|
||||||
|
if (meta?.ok) {
|
||||||
|
if (meta.title) item.title = meta.title;
|
||||||
|
if (meta.favicon) item.favicon = meta.favicon;
|
||||||
|
if (meta.url) item.url = meta.url;
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
data.columns[colIdx].items.push(item);
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Add column ───────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function addColumn() {
|
||||||
|
const name = await hyprcrd.dialog.show({
|
||||||
|
title: 'new column',
|
||||||
|
input: true,
|
||||||
|
placeholder: 'column name',
|
||||||
|
okLabel: 'Create',
|
||||||
|
});
|
||||||
|
if (!name || !name.trim()) return;
|
||||||
|
data.columns.push({ name: name.trim(), items: [] });
|
||||||
|
await save();
|
||||||
|
renderColumns();
|
||||||
|
// Scroll to the new column
|
||||||
|
setTimeout(() => { colsEl.scrollLeft = colsEl.scrollWidth; }, 50);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Header button injection ──────────────────────────────────────
|
||||||
|
// Creates a new #bookmarks card (or opens the most recent one).
|
||||||
|
|
||||||
|
function injectHeaderButton() {
|
||||||
|
if ($('bookmarks-btn')) return;
|
||||||
|
const header = document.querySelector('header#main-header');
|
||||||
|
if (!header) return;
|
||||||
|
const rows = header.querySelectorAll('.flex.items-center.gap-3');
|
||||||
|
const group = rows[rows.length - 1];
|
||||||
|
if (!group) return;
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.id = 'bookmarks-btn';
|
||||||
|
btn.className = 'flex items-center gap-2 px-2.5 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors';
|
||||||
|
btn.innerHTML = '<i class="ph ph-link text-sm"></i><span class="font-pixel text-[10px]">Bookmarks</span>';
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
const cards = (window.state?.cards || []).filter(isBookmarkCard)
|
||||||
|
.sort((a, b) => (b.updated_at || '').localeCompare(a.updated_at || ''));
|
||||||
|
if (cards.length === 0) {
|
||||||
|
createBookmarkCard();
|
||||||
|
} else {
|
||||||
|
// Always show picker so the user can create new lists
|
||||||
|
// even when only one exists.
|
||||||
|
showBookmarkPicker(btn, cards);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
group.insertBefore(btn, group.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Rename the currently open bookmark card ──────────────────
|
||||||
|
|
||||||
|
async function renameCard() {
|
||||||
|
if (!activeCardId) return;
|
||||||
|
const card = (window.state?.cards || []).find(c => c.id == activeCardId);
|
||||||
|
const current = card?.title || '';
|
||||||
|
const name = await hyprcrd.dialog.show({
|
||||||
|
title: 'rename bookmark list',
|
||||||
|
input: true,
|
||||||
|
defaultValue: current,
|
||||||
|
okLabel: 'Save',
|
||||||
|
});
|
||||||
|
if (name === false || name === null || !name.trim()) return;
|
||||||
|
await hyprcrd.api(`api/cards/${activeCardId}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
body: { title: name.trim() },
|
||||||
|
});
|
||||||
|
$('bookmarks-title').textContent = name.trim();
|
||||||
|
await window._reloadAll?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Create bookmark card with name prompt ────────────────────
|
||||||
|
|
||||||
|
async function createBookmarkCard() {
|
||||||
|
const name = await hyprcrd.dialog.show({
|
||||||
|
title: 'new bookmark list',
|
||||||
|
input: true,
|
||||||
|
placeholder: 'list name...',
|
||||||
|
okLabel: 'Create',
|
||||||
|
});
|
||||||
|
if (!name || !name.trim()) return;
|
||||||
|
const active = window.state?.activeBucket;
|
||||||
|
const virtualBuckets = ['all', 'none', 'current', 'favorites', 'journal'];
|
||||||
|
const bucketId = active && !virtualBuckets.includes(active) ? active : null;
|
||||||
|
const created = await hyprcrd.api('api/cards', {
|
||||||
|
method: 'POST',
|
||||||
|
body: {
|
||||||
|
title: name.trim(),
|
||||||
|
body: JSON.stringify(emptyData()) + '\n\n#bookmarks',
|
||||||
|
color: '#38bdf8',
|
||||||
|
bucket_id: bucketId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (created?.id) {
|
||||||
|
await window._reloadAll?.();
|
||||||
|
openOverlay(created.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Picker popup (multiple bookmark cards) ───────────────────
|
||||||
|
|
||||||
|
function showBookmarkPicker(anchor, cards) {
|
||||||
|
document.querySelector('.bm-picker')?.remove();
|
||||||
|
const rect = anchor.getBoundingClientRect();
|
||||||
|
const pop = document.createElement('div');
|
||||||
|
pop.className = 'bm-picker';
|
||||||
|
pop.style.cssText = `position:fixed;left:${rect.left}px;top:${rect.bottom + 4}px;z-index:200;background:var(--t-surface);border:1px solid var(--t-border);box-shadow:0 4px 20px rgba(0,0,0,0.4);min-width:200px;max-height:300px;display:flex;flex-direction:column;border-radius:var(--ui-radius-modal,4px);`;
|
||||||
|
|
||||||
|
const list = document.createElement('div');
|
||||||
|
list.style.cssText = 'overflow-y:auto;flex:1;';
|
||||||
|
cards.forEach(c => {
|
||||||
|
const row = document.createElement('button');
|
||||||
|
row.style.cssText = 'display:flex;align-items:center;gap:8px;width:100%;padding:8px 12px;background:none;border:none;color:var(--t-muted);font-size:12px;cursor:pointer;text-align:left;';
|
||||||
|
row.innerHTML = `<span style="width:10px;height:10px;border-radius:2px;background:${c.color || '#38bdf8'};flex-shrink:0;"></span><span style="font-family:var(--t-font-pixel);font-size:10px;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${esc(c.title)}</span>`;
|
||||||
|
row.addEventListener('mouseenter', () => { row.style.color = 'var(--t-bright)'; });
|
||||||
|
row.addEventListener('mouseleave', () => { row.style.color = 'var(--t-muted)'; });
|
||||||
|
row.addEventListener('click', () => { pop.remove(); openOverlay(c.id); });
|
||||||
|
list.appendChild(row);
|
||||||
|
});
|
||||||
|
pop.appendChild(list);
|
||||||
|
|
||||||
|
const addBtn = document.createElement('button');
|
||||||
|
addBtn.style.cssText = 'display:flex;align-items:center;gap:6px;width:100%;padding:8px 12px;background:none;border:none;border-top:1px solid var(--t-border);color:var(--t-accent);font-size:10px;font-family:var(--t-font-pixel);cursor:pointer;text-align:left;';
|
||||||
|
addBtn.innerHTML = '<i class="ph ph-plus text-xs"></i> new list';
|
||||||
|
addBtn.addEventListener('click', () => { pop.remove(); createBookmarkCard(); });
|
||||||
|
pop.appendChild(addBtn);
|
||||||
|
|
||||||
|
document.body.appendChild(pop);
|
||||||
|
// Clamp
|
||||||
|
const r = pop.getBoundingClientRect();
|
||||||
|
if (r.right > window.innerWidth - 8) pop.style.left = Math.max(8, window.innerWidth - r.width - 8) + 'px';
|
||||||
|
if (r.bottom > window.innerHeight - 8) pop.style.top = Math.max(8, window.innerHeight - r.height - 8) + 'px';
|
||||||
|
|
||||||
|
const close = (e) => { if (!pop.contains(e.target) && e.target !== anchor) { pop.remove(); document.removeEventListener('mousedown', close, true); } };
|
||||||
|
setTimeout(() => document.addEventListener('mousedown', close, true), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Init ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function init() {
|
||||||
|
injectHeaderButton();
|
||||||
|
$('bookmarks-close')?.addEventListener('click', closeOverlay);
|
||||||
|
$('bookmarks-col-add')?.addEventListener('click', addColumn);
|
||||||
|
$('bookmarks-add-btn')?.addEventListener('click', () => {
|
||||||
|
if (data?.columns?.length) addBookmark(0);
|
||||||
|
});
|
||||||
|
$('bookmarks-title')?.addEventListener('click', renameCard);
|
||||||
|
overlay?.addEventListener('click', (e) => { if (e.target === overlay) closeOverlay(); });
|
||||||
|
document.addEventListener('keydown', (e) => {
|
||||||
|
if (e.key === 'Escape' && overlay?.classList.contains('open')) {
|
||||||
|
e.stopPropagation();
|
||||||
|
closeOverlay();
|
||||||
|
}
|
||||||
|
}, true);
|
||||||
|
decorateBoard();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', init);
|
||||||
|
} else {
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
hyprcrd.registerPlugin?.({
|
||||||
|
name: 'bookmarks',
|
||||||
|
version: '1.0.0',
|
||||||
|
description: 'Column-based bookmark manager stored as cards',
|
||||||
|
});
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"name": "bookmarks",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "Bookmark manager stored as cards. Column-based view with favicon fetch, clipboard paste, and drag-and-drop.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["bookmarks.js"],
|
||||||
|
"css": ["bookmarks.css"],
|
||||||
|
"html": ["bookmarks.html"]
|
||||||
|
},
|
||||||
|
"backend": "backend.php"
|
||||||
|
}
|
||||||
@@ -3,13 +3,13 @@
|
|||||||
<div class="ascii-canvas-modal bg-t-surface border border-t-border rounded-lg shadow-xl flex flex-col" style="width:90vw;max-width:960px;height:85vh;max-height:700px;margin:auto;position:absolute;inset:0;">
|
<div class="ascii-canvas-modal bg-t-surface border border-t-border rounded-lg shadow-xl flex flex-col" style="width:90vw;max-width:960px;height:85vh;max-height:700px;margin:auto;position:absolute;inset:0;">
|
||||||
<!-- Toolbar -->
|
<!-- Toolbar -->
|
||||||
<div class="flex items-center gap-1 px-3 py-2 border-b border-t-border shrink-0 flex-wrap" id="ascii-canvas-toolbar">
|
<div class="flex items-center gap-1 px-3 py-2 border-b border-t-border shrink-0 flex-wrap" id="ascii-canvas-toolbar">
|
||||||
<button data-tool="brush" class="toolbar-btn active" title="Brush (B)"><i class="ph ph-pencil-simple text-sm"></i></button>
|
<button data-tool="brush" class="toolbar-btn active" data-tip="Brush (B)"><i class="ph ph-pencil-simple text-sm"></i></button>
|
||||||
<button data-tool="eraser" class="toolbar-btn" title="Eraser (E)"><i class="ph ph-eraser text-sm"></i></button>
|
<button data-tool="eraser" class="toolbar-btn" data-tip="Eraser (E)"><i class="ph ph-eraser text-sm"></i></button>
|
||||||
<button data-tool="line" class="toolbar-btn" title="Line (L)"><i class="ph ph-line-segment text-sm"></i></button>
|
<button data-tool="line" class="toolbar-btn" data-tip="Line (L)"><i class="ph ph-line-segment text-sm"></i></button>
|
||||||
<button data-tool="rect" class="toolbar-btn" title="Rectangle (R)"><i class="ph ph-rectangle text-sm"></i></button>
|
<button data-tool="rect" class="toolbar-btn" data-tip="Rectangle (R)"><i class="ph ph-rectangle text-sm"></i></button>
|
||||||
<button data-tool="circle" class="toolbar-btn" title="Ellipse (O)"><i class="ph ph-circle text-sm"></i></button>
|
<button data-tool="circle" class="toolbar-btn" data-tip="Ellipse (O)"><i class="ph ph-circle text-sm"></i></button>
|
||||||
<button data-tool="fill" class="toolbar-btn" title="Fill (F)"><i class="ph ph-paint-bucket text-sm"></i></button>
|
<button data-tool="fill" class="toolbar-btn" data-tip="Fill (F)"><i class="ph ph-paint-bucket text-sm"></i></button>
|
||||||
<button data-tool="text" class="toolbar-btn" title="Text (T)"><i class="ph ph-text-t text-sm"></i></button>
|
<button data-tool="text" class="toolbar-btn" data-tip="Text (T)"><i class="ph ph-text-t text-sm"></i></button>
|
||||||
<div class="w-px h-4 bg-t-border mx-1"></div>
|
<div class="w-px h-4 bg-t-border mx-1"></div>
|
||||||
<label class="flex items-center gap-1 text-t-muted text-xs">
|
<label class="flex items-center gap-1 text-t-muted text-xs">
|
||||||
<span>Char:</span>
|
<span>Char:</span>
|
||||||
@@ -24,9 +24,9 @@
|
|||||||
<span>H:</span>
|
<span>H:</span>
|
||||||
<input id="ascii-canvas-height" type="number" value="20" min="3" max="100" class="w-12 bg-t-bg border border-t-border rounded text-t-text text-xs text-center px-1 py-0">
|
<input id="ascii-canvas-height" type="number" value="20" min="3" max="100" class="w-12 bg-t-bg border border-t-border rounded text-t-text text-xs text-center px-1 py-0">
|
||||||
</label>
|
</label>
|
||||||
<button id="ascii-canvas-resize" class="toolbar-btn text-xs" title="Resize"><i class="ph ph-arrows-out text-sm"></i></button>
|
<button id="ascii-canvas-resize" class="toolbar-btn text-xs" data-tip="Resize"><i class="ph ph-arrows-out text-sm"></i></button>
|
||||||
<div class="w-px h-4 bg-t-border mx-1"></div>
|
<div class="w-px h-4 bg-t-border mx-1"></div>
|
||||||
<button id="ascii-canvas-clear" class="toolbar-btn text-xs" title="Clear"><i class="ph ph-trash text-sm"></i></button>
|
<button id="ascii-canvas-clear" class="toolbar-btn text-xs" data-tip="Clear"><i class="ph ph-trash text-sm"></i></button>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<span id="ascii-canvas-coords" class="text-t-dim text-xs font-mono">1:1</span>
|
<span id="ascii-canvas-coords" class="text-t-dim text-xs font-mono">1:1</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+479
-37
@@ -32,6 +32,57 @@
|
|||||||
");
|
");
|
||||||
$db->exec("CREATE INDEX IF NOT EXISTS idx_chat_peer ON chat_messages(peer, sent_at)");
|
$db->exec("CREATE INDEX IF NOT EXISTS idx_chat_peer ON chat_messages(peer, sent_at)");
|
||||||
$db->exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_relay_id ON chat_messages(relay_id) WHERE relay_id IS NOT NULL");
|
$db->exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_relay_id ON chat_messages(relay_id) WHERE relay_id IS NOT NULL");
|
||||||
|
// Read receipts for outgoing messages: `delivered` = recipient polled
|
||||||
|
// (single check), `seen` = recipient opened the thread (double check).
|
||||||
|
// Both filled in via /api/chat/sent receipt-poll on the relay side.
|
||||||
|
$cols = $db->query("PRAGMA table_info(chat_messages)")->fetchAll();
|
||||||
|
$colNames = array_column($cols, 'name');
|
||||||
|
if (!in_array('delivered', $colNames)) {
|
||||||
|
$db->exec("ALTER TABLE chat_messages ADD COLUMN delivered INTEGER NOT NULL DEFAULT 0");
|
||||||
|
}
|
||||||
|
if (!in_array('seen', $colNames)) {
|
||||||
|
$db->exec("ALTER TABLE chat_messages ADD COLUMN seen INTEGER NOT NULL DEFAULT 0");
|
||||||
|
}
|
||||||
|
// Group chat: `room_uid` set → message belongs to a room (group
|
||||||
|
// thread), and `peer` holds the author's username (always — 1:1
|
||||||
|
// messages use peer for the other party, group messages reuse the
|
||||||
|
// column for the sender). NULL room_uid = classic 1:1.
|
||||||
|
if (!in_array('room_uid', $colNames)) {
|
||||||
|
$db->exec("ALTER TABLE chat_messages ADD COLUMN room_uid TEXT");
|
||||||
|
$db->exec("CREATE INDEX IF NOT EXISTS idx_chat_room ON chat_messages(room_uid, id)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Chat rooms + membership, mirrored from the relay on poll. The
|
||||||
|
// client is the read-through cache; relay remains the source of
|
||||||
|
// truth so a second device can join a room just by polling.
|
||||||
|
$db->exec("
|
||||||
|
CREATE TABLE IF NOT EXISTS chat_rooms (
|
||||||
|
uid TEXT PRIMARY KEY,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
owner_username TEXT NOT NULL,
|
||||||
|
created_at TEXT NOT NULL,
|
||||||
|
synced_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
");
|
||||||
|
$db->exec("
|
||||||
|
CREATE TABLE IF NOT EXISTS chat_room_members (
|
||||||
|
room_uid TEXT NOT NULL,
|
||||||
|
username TEXT NOT NULL,
|
||||||
|
PRIMARY KEY (room_uid, username)
|
||||||
|
)
|
||||||
|
");
|
||||||
|
|
||||||
|
// Per-thread settings. Currently: `disposable` flag for 1:1 threads
|
||||||
|
// — when true, the relay drops the messages after the 7-day window
|
||||||
|
// instead of keeping them in the long-term store. Rooms are always
|
||||||
|
// persistent (enforced relay-side), so this only applies to peers.
|
||||||
|
$db->exec("
|
||||||
|
CREATE TABLE IF NOT EXISTS chat_thread_settings (
|
||||||
|
peer TEXT PRIMARY KEY,
|
||||||
|
disposable INTEGER NOT NULL DEFAULT 0
|
||||||
|
)
|
||||||
|
");
|
||||||
|
|
||||||
// Track the largest relay msg id we've ever seen (so the next poll uses since=that)
|
// Track the largest relay msg id we've ever seen (so the next poll uses since=that)
|
||||||
$db->exec("
|
$db->exec("
|
||||||
CREATE TABLE IF NOT EXISTS chat_state (
|
CREATE TABLE IF NOT EXISTS chat_state (
|
||||||
@@ -57,24 +108,20 @@ function chatRelaySettings(): array {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Same envelope format as the existing relay sync (HYPRCRD-RELAY-V1). */
|
/** Dual-format envelope shared with the relay sync path. Writes V2
|
||||||
|
* (AES-GCM + HKDF), reads V2 + legacy V1 (CBC). Delegates to the central
|
||||||
|
* helpers so the format stays in lock-step with src/bootstrap.php and
|
||||||
|
* the relay's crypto.php. */
|
||||||
function chatEncrypt(string $plain, string $relayKey): string {
|
function chatEncrypt(string $plain, string $relayKey): string {
|
||||||
$encKey = substr(hash('sha256', $relayKey), 0, 32);
|
return hyprcrdRelayEncrypt($plain, $relayKey);
|
||||||
$iv = random_bytes(16);
|
|
||||||
$cipher = openssl_encrypt($plain, 'aes-256-cbc', $encKey, OPENSSL_RAW_DATA, $iv);
|
|
||||||
return "HYPRCRD-RELAY-V1\n" . base64_encode($iv . $cipher);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function chatDecrypt(string $envelope, string $relayKey): string {
|
function chatDecrypt(string $envelope, string $relayKey): string {
|
||||||
if (!str_starts_with($envelope, 'HYPRCRD-RELAY-V1')) return '';
|
// Old behaviour returned '' for non-envelope strings; preserve that.
|
||||||
$b64 = trim(substr($envelope, strlen('HYPRCRD-RELAY-V1') + 1));
|
if (!str_starts_with($envelope, HYPRCRD_RELAY_GCM_MAGIC) && !str_starts_with($envelope, HYPRCRD_RELAY_CBC_MAGIC)) {
|
||||||
$raw = base64_decode($b64);
|
return '';
|
||||||
if (!$raw || strlen($raw) < 17) return '';
|
}
|
||||||
$encKey = substr(hash('sha256', $relayKey), 0, 32);
|
return hyprcrdRelayDecrypt($envelope, $relayKey);
|
||||||
$iv = substr($raw, 0, 16);
|
|
||||||
$cipher = substr($raw, 16);
|
|
||||||
$result = openssl_decrypt($cipher, 'aes-256-cbc', $encKey, OPENSSL_RAW_DATA, $iv);
|
|
||||||
return $result !== false ? $result : '';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function chatGetState(string $key, $default = null) {
|
function chatGetState(string $key, $default = null) {
|
||||||
@@ -95,49 +142,102 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
|
|
||||||
if ($route === '/api/chat/conversations' && $method === 'GET') {
|
if ($route === '/api/chat/conversations' && $method === 'GET') {
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
// Latest message per peer + unread count, single query
|
// 1:1 threads — one row per peer (room_uid IS NULL).
|
||||||
$rows = $db->query("
|
$oneOnOne = $db->query("
|
||||||
SELECT
|
SELECT
|
||||||
peer,
|
'peer' AS kind,
|
||||||
|
peer AS key,
|
||||||
|
peer AS label,
|
||||||
MAX(sent_at) AS last_at,
|
MAX(sent_at) AS last_at,
|
||||||
(SELECT body FROM chat_messages c2 WHERE c2.peer = c1.peer ORDER BY id DESC LIMIT 1) AS last_body,
|
(SELECT body FROM chat_messages c2 WHERE c2.peer = c1.peer AND c2.room_uid IS NULL ORDER BY id DESC LIMIT 1) AS last_body,
|
||||||
(SELECT direction FROM chat_messages c3 WHERE c3.peer = c1.peer ORDER BY id DESC LIMIT 1) AS last_direction,
|
(SELECT direction FROM chat_messages c3 WHERE c3.peer = c1.peer AND c3.room_uid IS NULL ORDER BY id DESC LIMIT 1) AS last_direction,
|
||||||
SUM(CASE WHEN direction = 'in' AND is_read = 0 THEN 1 ELSE 0 END) AS unread
|
SUM(CASE WHEN direction = 'in' AND is_read = 0 THEN 1 ELSE 0 END) AS unread
|
||||||
FROM chat_messages c1
|
FROM chat_messages c1
|
||||||
|
WHERE room_uid IS NULL
|
||||||
GROUP BY peer
|
GROUP BY peer
|
||||||
ORDER BY last_at DESC
|
|
||||||
")->fetchAll();
|
")->fetchAll();
|
||||||
$totalUnread = array_sum(array_map(fn($r) => (int)$r['unread'], $rows));
|
|
||||||
|
// Group rooms — join rooms to their newest message (if any); rooms
|
||||||
|
// with no messages yet still render so the user can post there.
|
||||||
|
$rooms = $db->query("
|
||||||
|
SELECT
|
||||||
|
'room' AS kind,
|
||||||
|
r.uid AS key,
|
||||||
|
r.name AS label,
|
||||||
|
r.owner_username AS owner,
|
||||||
|
(SELECT MAX(sent_at) FROM chat_messages WHERE room_uid = r.uid) AS last_at,
|
||||||
|
(SELECT body FROM chat_messages WHERE room_uid = r.uid ORDER BY id DESC LIMIT 1) AS last_body,
|
||||||
|
(SELECT peer FROM chat_messages WHERE room_uid = r.uid ORDER BY id DESC LIMIT 1) AS last_author,
|
||||||
|
(SELECT COUNT(*) FROM chat_messages WHERE room_uid = r.uid AND direction = 'in' AND is_read = 0) AS unread
|
||||||
|
FROM chat_rooms r
|
||||||
|
")->fetchAll();
|
||||||
|
|
||||||
|
$rows = array_merge($oneOnOne, $rooms);
|
||||||
|
// Sort newest-first, nulls (empty rooms) to the bottom.
|
||||||
|
usort($rows, function ($a, $b) {
|
||||||
|
$al = $a['last_at'] ?? ''; $bl = $b['last_at'] ?? '';
|
||||||
|
if ($al === $bl) return 0;
|
||||||
|
if ($al === '') return 1;
|
||||||
|
if ($bl === '') return -1;
|
||||||
|
return strcmp($bl, $al);
|
||||||
|
});
|
||||||
|
$totalUnread = array_sum(array_map(fn($r) => (int)($r['unread'] ?? 0), $rows));
|
||||||
chatJson(['conversations' => $rows, 'total_unread' => $totalUnread]);
|
chatJson(['conversations' => $rows, 'total_unread' => $totalUnread]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($route === '/api/chat/messages' && $method === 'GET') {
|
if ($route === '/api/chat/messages' && $method === 'GET') {
|
||||||
$peer = trim((string)($_GET['peer'] ?? ''));
|
$peer = trim((string)($_GET['peer'] ?? ''));
|
||||||
if ($peer === '') chatJson(['error' => 'peer required'], 400);
|
$roomUid = trim((string)($_GET['room_uid'] ?? ''));
|
||||||
|
if ($peer === '' && $roomUid === '') chatJson(['error' => 'peer or room_uid required'], 400);
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
$stmt = $db->prepare('SELECT id, direction, body, sent_at, is_read FROM chat_messages WHERE peer = :p ORDER BY id ASC LIMIT 500');
|
if ($roomUid !== '') {
|
||||||
$stmt->execute(['p' => $peer]);
|
// Group thread: return all messages for the room. `peer` is the
|
||||||
|
// author username; UI uses author === self to decide bubble
|
||||||
|
// alignment instead of the direction flag (direction is set
|
||||||
|
// from THIS device's perspective, so a message sent from
|
||||||
|
// another device comes in as direction='in' while peer==self).
|
||||||
|
$stmt = $db->prepare('SELECT id, peer, direction, body, sent_at, is_read, delivered, seen, room_uid FROM chat_messages WHERE room_uid = :r ORDER BY id ASC LIMIT 500');
|
||||||
|
$stmt->execute(['r' => $roomUid]);
|
||||||
|
} else {
|
||||||
|
$stmt = $db->prepare('SELECT id, peer, direction, body, sent_at, is_read, delivered, seen FROM chat_messages WHERE peer = :p AND room_uid IS NULL ORDER BY id ASC LIMIT 500');
|
||||||
|
$stmt->execute(['p' => $peer]);
|
||||||
|
}
|
||||||
chatJson(['messages' => $stmt->fetchAll()]);
|
chatJson(['messages' => $stmt->fetchAll()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($route === '/api/chat/send' && $method === 'POST') {
|
if ($route === '/api/chat/send' && $method === 'POST') {
|
||||||
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
$peer = trim((string)($input['peer'] ?? ''));
|
$peer = trim((string)($input['peer'] ?? ''));
|
||||||
|
$roomUid = trim((string)($input['room_uid'] ?? ''));
|
||||||
$body = (string)($input['body'] ?? '');
|
$body = (string)($input['body'] ?? '');
|
||||||
if ($peer === '' || $body === '') chatJson(['error' => 'peer and body required'], 400);
|
if ($body === '') chatJson(['error' => 'body required'], 400);
|
||||||
|
if ($peer === '' && $roomUid === '') chatJson(['error' => 'peer or room_uid required'], 400);
|
||||||
|
|
||||||
$r = chatRelaySettings();
|
$r = chatRelaySettings();
|
||||||
if (!$r['url'] || !$r['user'] || !$r['key']) {
|
if (!$r['url'] || !$r['user'] || !$r['key']) {
|
||||||
chatJson(['error' => 'relay not configured (set URL, username, and secret in settings)'], 400);
|
chatJson(['error' => 'relay not configured (set URL, username, and secret in settings)'], 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$db = Database::connect();
|
||||||
|
// Look up per-thread disposable flag (1:1 only; rooms are always
|
||||||
|
// persistent on the relay).
|
||||||
|
$disposable = 0;
|
||||||
|
if ($peer !== '') {
|
||||||
|
$stmt = $db->prepare('SELECT disposable FROM chat_thread_settings WHERE peer = :p');
|
||||||
|
$stmt->execute(['p' => $peer]);
|
||||||
|
$disposable = (int)($stmt->fetchColumn() ?: 0);
|
||||||
|
}
|
||||||
|
|
||||||
$envelope = chatEncrypt($body, $r['key']);
|
$envelope = chatEncrypt($body, $r['key']);
|
||||||
|
$payload = $roomUid !== ''
|
||||||
|
? ['room_uid' => $roomUid, 'body' => $envelope]
|
||||||
|
: ['recipient' => $peer, 'body' => $envelope, 'disposable' => $disposable];
|
||||||
$relayChatUrl = rtrim($r['url'], '/') . '/api/chat';
|
$relayChatUrl = rtrim($r['url'], '/') . '/api/chat';
|
||||||
$ch = curl_init($relayChatUrl);
|
$ch = curl_init($relayChatUrl);
|
||||||
curl_setopt_array($ch, [
|
curl_setopt_array($ch, [
|
||||||
CURLOPT_RETURNTRANSFER => true,
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
CURLOPT_POST => true,
|
CURLOPT_POST => true,
|
||||||
CURLOPT_POSTFIELDS => json_encode(['recipient' => $peer, 'body' => $envelope]),
|
CURLOPT_POSTFIELDS => json_encode($payload),
|
||||||
CURLOPT_HTTPHEADER => [
|
CURLOPT_HTTPHEADER => [
|
||||||
'Content-Type: application/json',
|
'Content-Type: application/json',
|
||||||
'X-Relay-User: ' . $r['user'],
|
'X-Relay-User: ' . $r['user'],
|
||||||
@@ -164,10 +264,17 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
$resData = json_decode($response, true);
|
$resData = json_decode($response, true);
|
||||||
$relayId = isset($resData['id']) ? (int)$resData['id'] : null;
|
$relayId = isset($resData['id']) ? (int)$resData['id'] : null;
|
||||||
|
|
||||||
// Store the outgoing message locally so the UI can render it immediately
|
// Store the outgoing message locally so the UI can render it
|
||||||
$db = Database::connect();
|
// immediately. For group messages `peer` holds the author
|
||||||
$db->prepare('INSERT INTO chat_messages (peer, direction, body, relay_id, sent_at, is_read) VALUES (:p, "out", :b, NULL, datetime("now"), 1)')
|
// (= self); for 1:1 it holds the other party as before.
|
||||||
->execute(['p' => $peer, 'b' => $body]);
|
$localPeer = $roomUid !== '' ? $r['user'] : $peer;
|
||||||
|
$db->prepare('INSERT INTO chat_messages (peer, direction, body, relay_id, sent_at, is_read, delivered, seen, room_uid) VALUES (:p, "out", :b, :rid, datetime("now"), 1, 0, 0, :ru)')
|
||||||
|
->execute([
|
||||||
|
'p' => $localPeer,
|
||||||
|
'b' => $body,
|
||||||
|
'rid' => $relayId,
|
||||||
|
'ru' => $roomUid !== '' ? $roomUid : null,
|
||||||
|
]);
|
||||||
chatJson(['ok' => true, 'id' => (int)$db->lastInsertId()]);
|
chatJson(['ok' => true, 'id' => (int)$db->lastInsertId()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,30 +311,170 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
|
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
$newCount = 0;
|
$newCount = 0;
|
||||||
$insert = $db->prepare('INSERT OR IGNORE INTO chat_messages (peer, direction, body, relay_id, sent_at, is_read) VALUES (:p, "in", :b, :rid, :ts, 0)');
|
// `mine` on group messages (== came back from the relay because
|
||||||
|
// another device of ours sent it) gets direction='out' so the UI
|
||||||
|
// renders it aligned right; relay_id uniqueness dedupes against
|
||||||
|
// the local insert we did on send.
|
||||||
|
$insert = $db->prepare('
|
||||||
|
INSERT OR IGNORE INTO chat_messages
|
||||||
|
(peer, direction, body, relay_id, sent_at, is_read, room_uid)
|
||||||
|
VALUES (:p, :dir, :b, :rid, :ts, 0, :ru)
|
||||||
|
');
|
||||||
foreach ($messages as $m) {
|
foreach ($messages as $m) {
|
||||||
$plain = chatDecrypt($m['body'] ?? '', $r['key']);
|
$plain = chatDecrypt($m['body'] ?? '', $r['key']);
|
||||||
if ($plain === '') continue;
|
if ($plain === '') continue;
|
||||||
|
$isGroup = !empty($m['room_uid']);
|
||||||
|
$mine = !empty($m['mine']);
|
||||||
$insert->execute([
|
$insert->execute([
|
||||||
'p' => $m['sender_username'] ?? '?',
|
'p' => $m['sender_username'] ?? '?',
|
||||||
'b' => $plain,
|
'dir' => $mine ? 'out' : 'in',
|
||||||
|
'b' => $plain,
|
||||||
'rid' => (int)$m['id'],
|
'rid' => (int)$m['id'],
|
||||||
'ts' => $m['created_at'] ?? date('Y-m-d H:i:s'),
|
'ts' => $m['created_at'] ?? date('Y-m-d H:i:s'),
|
||||||
|
'ru' => $isGroup ? $m['room_uid'] : null,
|
||||||
]);
|
]);
|
||||||
if ($insert->rowCount() > 0) $newCount++;
|
if ($insert->rowCount() > 0) $newCount++;
|
||||||
}
|
}
|
||||||
if ($maxId > $since) chatSetState('last_relay_id', $maxId);
|
if ($maxId > $since) chatSetState('last_relay_id', $maxId);
|
||||||
|
|
||||||
chatJson(['ok' => true, 'new' => $newCount]);
|
// Mirror rooms + membership into the local cache on every poll.
|
||||||
|
// Cheap (one extra GET), and it lets a second device see a room
|
||||||
|
// it was just added to without a separate fetch.
|
||||||
|
$ch3 = curl_init(rtrim($r['url'], '/') . '/api/chat/rooms');
|
||||||
|
curl_setopt_array($ch3, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_HTTPHEADER => ['X-Relay-User: ' . $r['user'], 'X-Relay-Key: ' . $r['key']],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
]);
|
||||||
|
$resp3 = curl_exec($ch3);
|
||||||
|
$st3 = curl_getinfo($ch3, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch3);
|
||||||
|
if ($st3 === 200) {
|
||||||
|
$roomsData = json_decode($resp3, true) ?: [];
|
||||||
|
$rooms = $roomsData['rooms'] ?? [];
|
||||||
|
$remoteUids = [];
|
||||||
|
$upsert = $db->prepare('INSERT OR REPLACE INTO chat_rooms (uid, name, owner_username, created_at, synced_at) VALUES (:u, :n, :o, :c, datetime("now"))');
|
||||||
|
$delMem = $db->prepare('DELETE FROM chat_room_members WHERE room_uid = :u');
|
||||||
|
$insMem = $db->prepare('INSERT OR IGNORE INTO chat_room_members (room_uid, username) VALUES (:u, :un)');
|
||||||
|
foreach ($rooms as $room) {
|
||||||
|
$uid = (string)($room['uid'] ?? '');
|
||||||
|
if ($uid === '') continue;
|
||||||
|
$remoteUids[] = $uid;
|
||||||
|
$upsert->execute([
|
||||||
|
'u' => $uid,
|
||||||
|
'n' => (string)($room['name'] ?? $uid),
|
||||||
|
'o' => (string)($room['owner_username'] ?? ''),
|
||||||
|
'c' => (string)($room['created_at'] ?? date('Y-m-d H:i:s')),
|
||||||
|
]);
|
||||||
|
$delMem->execute(['u' => $uid]);
|
||||||
|
foreach (($room['members'] ?? []) as $member) {
|
||||||
|
$insMem->execute(['u' => $uid, 'un' => (string)$member]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Drop local rooms we were removed from (owner kick / self-leave
|
||||||
|
// on another device). Messages for them stay on disk — harmless,
|
||||||
|
// UI won't list them without a room entry.
|
||||||
|
$existing = $db->query('SELECT uid FROM chat_rooms')->fetchAll(PDO::FETCH_COLUMN);
|
||||||
|
foreach ($existing as $uid) {
|
||||||
|
if (!in_array($uid, $remoteUids, true)) {
|
||||||
|
$db->prepare('DELETE FROM chat_rooms WHERE uid = :u')->execute(['u' => $uid]);
|
||||||
|
$db->prepare('DELETE FROM chat_room_members WHERE room_uid = :u')->execute(['u' => $uid]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Receipt poll for our SENT messages ──────────────────
|
||||||
|
// Pulls fetched/seen state for everything we've sent. Updates
|
||||||
|
// local outgoing rows by relay_id. Uses an independent `since`
|
||||||
|
// cursor so we keep getting state changes even on rows we
|
||||||
|
// already saw before.
|
||||||
|
$sentSince = (int)chatGetState('last_sent_relay_id', 0);
|
||||||
|
$ch2 = curl_init(rtrim($r['url'], '/') . '/api/chat/sent?since=' . $sentSince);
|
||||||
|
curl_setopt_array($ch2, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_HTTPHEADER => [
|
||||||
|
'X-Relay-User: ' . $r['user'],
|
||||||
|
'X-Relay-Key: ' . $r['key'],
|
||||||
|
],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
]);
|
||||||
|
$resp2 = curl_exec($ch2);
|
||||||
|
$st2 = curl_getinfo($ch2, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch2);
|
||||||
|
$receiptUpdates = 0;
|
||||||
|
if ($st2 === 200) {
|
||||||
|
$sentData = json_decode($resp2, true) ?: [];
|
||||||
|
$receipts = $sentData['receipts'] ?? [];
|
||||||
|
$sentMaxId = (int)($sentData['max_id'] ?? $sentSince);
|
||||||
|
$upd = $db->prepare('UPDATE chat_messages SET delivered = :d, seen = :s WHERE relay_id = :rid AND direction = "out"');
|
||||||
|
foreach ($receipts as $rcpt) {
|
||||||
|
$upd->execute([
|
||||||
|
'd' => (int)($rcpt['fetched'] ?? 0),
|
||||||
|
's' => (int)($rcpt['seen'] ?? 0),
|
||||||
|
'rid' => (int)$rcpt['id'],
|
||||||
|
]);
|
||||||
|
$receiptUpdates += $upd->rowCount();
|
||||||
|
}
|
||||||
|
// Cursor only advances when EVERY row's state is final (seen=1).
|
||||||
|
// Otherwise we need to keep re-polling those rows for updates.
|
||||||
|
// Cheap implementation: if every row in this batch is seen, bump
|
||||||
|
// cursor to maxId; else keep polling from the lowest non-seen id.
|
||||||
|
$allSeen = true;
|
||||||
|
$minPending = $sentMaxId;
|
||||||
|
foreach ($receipts as $rcpt) {
|
||||||
|
if ((int)($rcpt['seen'] ?? 0) !== 1) {
|
||||||
|
$allSeen = false;
|
||||||
|
if ((int)$rcpt['id'] - 1 < $minPending) $minPending = (int)$rcpt['id'] - 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($allSeen && $sentMaxId > $sentSince) {
|
||||||
|
chatSetState('last_sent_relay_id', $sentMaxId);
|
||||||
|
} else if (!$allSeen && $minPending > $sentSince) {
|
||||||
|
chatSetState('last_sent_relay_id', $minPending);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
chatJson(['ok' => true, 'new' => $newCount, 'receipts' => $receiptUpdates]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($route === '/api/chat/read' && $method === 'POST') {
|
if ($route === '/api/chat/read' && $method === 'POST') {
|
||||||
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
$peer = trim((string)($input['peer'] ?? ''));
|
$peer = trim((string)($input['peer'] ?? ''));
|
||||||
if ($peer === '') chatJson(['error' => 'peer required'], 400);
|
$roomUid = trim((string)($input['room_uid'] ?? ''));
|
||||||
|
if ($peer === '' && $roomUid === '') chatJson(['error' => 'peer or room_uid required'], 400);
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
$db->prepare('UPDATE chat_messages SET is_read = 1 WHERE peer = :p AND direction = "in" AND is_read = 0')
|
if ($roomUid !== '') {
|
||||||
|
$db->prepare('UPDATE chat_messages SET is_read = 1 WHERE room_uid = :r AND direction = "in" AND is_read = 0')
|
||||||
|
->execute(['r' => $roomUid]);
|
||||||
|
// Group "seen" receipts aren't a thing in v1 — skip the relay
|
||||||
|
// notification. The local is_read flag is enough for badge UI.
|
||||||
|
chatJson(['ok' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$db->prepare('UPDATE chat_messages SET is_read = 1 WHERE peer = :p AND room_uid IS NULL AND direction = "in" AND is_read = 0')
|
||||||
->execute(['p' => $peer]);
|
->execute(['p' => $peer]);
|
||||||
|
|
||||||
|
// Tell the relay this peer's messages have been seen by us so the
|
||||||
|
// peer's next /api/chat/sent poll picks up the double-check state.
|
||||||
|
$r = chatRelaySettings();
|
||||||
|
if ($r['url'] && $r['user'] && $r['key']) {
|
||||||
|
$ch = curl_init(rtrim($r['url'], '/') . '/api/chat/seen');
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_POST => true,
|
||||||
|
CURLOPT_POSTFIELDS => json_encode(['peer' => $peer]),
|
||||||
|
CURLOPT_HTTPHEADER => [
|
||||||
|
'Content-Type: application/json',
|
||||||
|
'X-Relay-User: ' . $r['user'],
|
||||||
|
'X-Relay-Key: ' . $r['key'],
|
||||||
|
],
|
||||||
|
CURLOPT_TIMEOUT => 5,
|
||||||
|
]);
|
||||||
|
curl_exec($ch);
|
||||||
|
curl_close($ch);
|
||||||
|
// Failures are silent — the user already saw the messages
|
||||||
|
// locally, the relay state is just lagging.
|
||||||
|
}
|
||||||
chatJson(['ok' => true]);
|
chatJson(['ok' => true]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,4 +499,199 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
$data = json_decode($response, true) ?: [];
|
$data = json_decode($response, true) ?: [];
|
||||||
chatJson(['ok' => true, 'tenants' => $data['tenants'] ?? [], 'self' => $data['self'] ?? $r['user']]);
|
chatJson(['ok' => true, 'tenants' => $data['tenants'] ?? [], 'self' => $data['self'] ?? $r['user']]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Rooms CRUD (proxy to relay) ──────────────────────────────
|
||||||
|
|
||||||
|
if ($route === '/api/chat/rooms' && $method === 'GET') {
|
||||||
|
$db = Database::connect();
|
||||||
|
$rooms = $db->query('SELECT uid, name, owner_username, created_at FROM chat_rooms ORDER BY created_at DESC')->fetchAll();
|
||||||
|
$mstmt = $db->prepare('SELECT username FROM chat_room_members WHERE room_uid = :u ORDER BY username');
|
||||||
|
foreach ($rooms as &$room) {
|
||||||
|
$mstmt->execute(['u' => $room['uid']]);
|
||||||
|
$room['members'] = array_column($mstmt->fetchAll(), 'username');
|
||||||
|
}
|
||||||
|
chatJson(['ok' => true, 'rooms' => $rooms]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/chat/rooms' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$name = trim((string)($input['name'] ?? ''));
|
||||||
|
$members = is_array($input['members'] ?? null) ? $input['members'] : [];
|
||||||
|
if ($name === '') chatJson(['error' => 'name required'], 400);
|
||||||
|
if (count(array_filter($members, fn($m) => trim((string)$m) !== '')) === 0) {
|
||||||
|
chatJson(['error' => 'at least one other member required'], 400);
|
||||||
|
}
|
||||||
|
$r = chatRelaySettings();
|
||||||
|
if (!$r['url'] || !$r['user'] || !$r['key']) chatJson(['error' => 'relay not configured'], 400);
|
||||||
|
|
||||||
|
// Client-generated UID, same convention as collab buckets.
|
||||||
|
$uid = bin2hex(random_bytes(8));
|
||||||
|
$relayUrl = rtrim($r['url'], '/') . '/api/chat/rooms';
|
||||||
|
$ch = curl_init($relayUrl);
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_POST => true,
|
||||||
|
CURLOPT_POSTFIELDS => json_encode(['uid' => $uid, 'name' => $name, 'members' => $members]),
|
||||||
|
CURLOPT_HTTPHEADER => [
|
||||||
|
'Content-Type: application/json',
|
||||||
|
'X-Relay-User: ' . $r['user'],
|
||||||
|
'X-Relay-Key: ' . $r['key'],
|
||||||
|
],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
]);
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
if ($status !== 200) {
|
||||||
|
$err = json_decode($response, true);
|
||||||
|
$detail = $err['error'] ?? "relay HTTP $status";
|
||||||
|
// 404 on this path almost always means the relay is running a
|
||||||
|
// pre-group-chat build. Surface that explicitly so the user
|
||||||
|
// doesn't go hunting for data issues.
|
||||||
|
if ($status === 404) {
|
||||||
|
$detail = "relay does not know /api/chat/rooms — it's likely running old code. Restart the relay after pulling the latest commits.";
|
||||||
|
}
|
||||||
|
chatJson(['ok' => false, 'error' => $detail, 'url' => $relayUrl, 'relay_status' => $status]);
|
||||||
|
}
|
||||||
|
$data = json_decode($response, true) ?: [];
|
||||||
|
// Mirror locally right away so the next conversations list shows
|
||||||
|
// the room without waiting for a poll.
|
||||||
|
$db = Database::connect();
|
||||||
|
$db->prepare('INSERT OR REPLACE INTO chat_rooms (uid, name, owner_username, created_at, synced_at) VALUES (:u, :n, :o, datetime("now"), datetime("now"))')
|
||||||
|
->execute(['u' => $uid, 'n' => $name, 'o' => $r['user']]);
|
||||||
|
$db->prepare('DELETE FROM chat_room_members WHERE room_uid = :u')->execute(['u' => $uid]);
|
||||||
|
$insMem = $db->prepare('INSERT INTO chat_room_members (room_uid, username) VALUES (:u, :un)');
|
||||||
|
foreach (($data['members'] ?? []) as $mu) {
|
||||||
|
$insMem->execute(['u' => $uid, 'un' => $mu]);
|
||||||
|
}
|
||||||
|
chatJson(['ok' => true, 'uid' => $uid, 'members' => $data['members'] ?? []]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^/api/chat/rooms/([a-zA-Z0-9_-]+)$#', $route, $m) && $method === 'PATCH') {
|
||||||
|
$uid = $m[1];
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$r = chatRelaySettings();
|
||||||
|
if (!$r['url'] || !$r['user'] || !$r['key']) chatJson(['error' => 'relay not configured'], 400);
|
||||||
|
$ch = curl_init(rtrim($r['url'], '/') . '/api/chat/rooms/' . urlencode($uid));
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_CUSTOMREQUEST => 'PATCH',
|
||||||
|
CURLOPT_POSTFIELDS => json_encode($input),
|
||||||
|
CURLOPT_HTTPHEADER => [
|
||||||
|
'Content-Type: application/json',
|
||||||
|
'X-Relay-User: ' . $r['user'],
|
||||||
|
'X-Relay-Key: ' . $r['key'],
|
||||||
|
],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
]);
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
// The next poll will refresh the local room mirror with the new
|
||||||
|
// name / member list. No need to replay the update here.
|
||||||
|
chatJson(json_decode($response, true) ?: ['ok' => $status === 200]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^/api/chat/rooms/([a-zA-Z0-9_-]+)$#', $route, $m) && $method === 'DELETE') {
|
||||||
|
$uid = $m[1];
|
||||||
|
$r = chatRelaySettings();
|
||||||
|
if (!$r['url'] || !$r['user'] || !$r['key']) chatJson(['error' => 'relay not configured'], 400);
|
||||||
|
$ch = curl_init(rtrim($r['url'], '/') . '/api/chat/rooms/' . urlencode($uid));
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_CUSTOMREQUEST => 'DELETE',
|
||||||
|
CURLOPT_HTTPHEADER => ['X-Relay-User: ' . $r['user'], 'X-Relay-Key: ' . $r['key']],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
]);
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
if ($status === 200) {
|
||||||
|
$db = Database::connect();
|
||||||
|
$db->prepare('DELETE FROM chat_rooms WHERE uid = :u')->execute(['u' => $uid]);
|
||||||
|
$db->prepare('DELETE FROM chat_room_members WHERE room_uid = :u')->execute(['u' => $uid]);
|
||||||
|
}
|
||||||
|
chatJson(json_decode($response, true) ?: ['ok' => $status === 200]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Backfill older messages for a thread (scrollback / cold start) ──
|
||||||
|
|
||||||
|
if ($route === '/api/chat/backfill' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$peer = trim((string)($input['peer'] ?? ''));
|
||||||
|
$roomUid = trim((string)($input['room_uid'] ?? ''));
|
||||||
|
$before = (int)($input['before'] ?? 0);
|
||||||
|
$limit = max(1, min(500, (int)($input['limit'] ?? 100)));
|
||||||
|
if ($peer === '' && $roomUid === '') chatJson(['error' => 'peer or room_uid required'], 400);
|
||||||
|
|
||||||
|
$r = chatRelaySettings();
|
||||||
|
if (!$r['url'] || !$r['user'] || !$r['key']) chatJson(['error' => 'relay not configured'], 400);
|
||||||
|
|
||||||
|
$qs = http_build_query(array_filter([
|
||||||
|
'room_uid' => $roomUid ?: null,
|
||||||
|
'peer' => $peer ?: null,
|
||||||
|
'before' => $before > 0 ? $before : null,
|
||||||
|
'limit' => $limit,
|
||||||
|
], fn($v) => $v !== null));
|
||||||
|
$ch = curl_init(rtrim($r['url'], '/') . '/api/chat/backfill?' . $qs);
|
||||||
|
curl_setopt_array($ch, [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_HTTPHEADER => ['X-Relay-User: ' . $r['user'], 'X-Relay-Key: ' . $r['key']],
|
||||||
|
CURLOPT_TIMEOUT => 15,
|
||||||
|
]);
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
if ($status !== 200) {
|
||||||
|
$err = json_decode($response, true);
|
||||||
|
chatJson(['ok' => false, 'error' => $err['error'] ?? "relay HTTP $status"]);
|
||||||
|
}
|
||||||
|
$data = json_decode($response, true) ?: [];
|
||||||
|
$messages = $data['messages'] ?? [];
|
||||||
|
|
||||||
|
$db = Database::connect();
|
||||||
|
$newCount = 0;
|
||||||
|
$insert = $db->prepare('
|
||||||
|
INSERT OR IGNORE INTO chat_messages
|
||||||
|
(peer, direction, body, relay_id, sent_at, is_read, room_uid)
|
||||||
|
VALUES (:p, :dir, :b, :rid, :ts, 1, :ru)
|
||||||
|
');
|
||||||
|
foreach ($messages as $m) {
|
||||||
|
$plain = chatDecrypt($m['body'] ?? '', $r['key']);
|
||||||
|
if ($plain === '') continue;
|
||||||
|
$insert->execute([
|
||||||
|
'p' => $m['sender_username'] ?? '?',
|
||||||
|
'dir' => !empty($m['mine']) ? 'out' : 'in',
|
||||||
|
'b' => $plain,
|
||||||
|
'rid' => (int)$m['id'],
|
||||||
|
'ts' => $m['created_at'] ?? date('Y-m-d H:i:s'),
|
||||||
|
'ru' => !empty($m['room_uid']) ? $m['room_uid'] : null,
|
||||||
|
]);
|
||||||
|
if ($insert->rowCount() > 0) $newCount++;
|
||||||
|
}
|
||||||
|
chatJson(['ok' => true, 'backfilled' => $newCount]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Per-thread settings (currently just the disposable flag) ──
|
||||||
|
|
||||||
|
if ($route === '/api/chat/thread-settings' && $method === 'GET') {
|
||||||
|
$peer = trim((string)($_GET['peer'] ?? ''));
|
||||||
|
if ($peer === '') chatJson(['error' => 'peer required'], 400);
|
||||||
|
$db = Database::connect();
|
||||||
|
$stmt = $db->prepare('SELECT disposable FROM chat_thread_settings WHERE peer = :p');
|
||||||
|
$stmt->execute(['p' => $peer]);
|
||||||
|
$disposable = (int)($stmt->fetchColumn() ?: 0);
|
||||||
|
chatJson(['ok' => true, 'peer' => $peer, 'disposable' => $disposable]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/chat/thread-settings' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$peer = trim((string)($input['peer'] ?? ''));
|
||||||
|
$disposable = !empty($input['disposable']) ? 1 : 0;
|
||||||
|
if ($peer === '') chatJson(['error' => 'peer required'], 400);
|
||||||
|
$db = Database::connect();
|
||||||
|
$db->prepare('INSERT OR REPLACE INTO chat_thread_settings (peer, disposable) VALUES (:p, :d)')
|
||||||
|
->execute(['p' => $peer, 'd' => $disposable]);
|
||||||
|
chatJson(['ok' => true, 'peer' => $peer, 'disposable' => $disposable]);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
@@ -29,6 +29,23 @@
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Combined caret + title trigger. Navigable (cursor + accent hover)
|
||||||
|
only when there's somewhere to go back to — toggled by JS via the
|
||||||
|
`.navigable` class. On the list it reads like a static label. */
|
||||||
|
.chat-header-nav {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
padding: 0;
|
||||||
|
color: var(--t-bright);
|
||||||
|
cursor: default;
|
||||||
|
transition: color 0.12s;
|
||||||
|
}
|
||||||
|
.chat-header-nav.navigable { cursor: pointer; color: var(--t-muted); }
|
||||||
|
.chat-header-nav.navigable:hover { color: var(--t-accent); }
|
||||||
|
|
||||||
.chat-view {
|
.chat-view {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -142,15 +159,58 @@
|
|||||||
|
|
||||||
/* ── Thread view ── */
|
/* ── Thread view ── */
|
||||||
|
|
||||||
#chat-thread-header {
|
/* Horizontal peer strip above the thread header. Lets the user hop
|
||||||
|
between conversations without bouncing back to the list. Scrollbar
|
||||||
|
hidden — wheel-over scrolls horizontally (see chat.js). */
|
||||||
|
.chat-thread-peers {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
gap: 5px;
|
||||||
gap: 8px;
|
padding: 6px 8px;
|
||||||
padding: 8px 12px;
|
|
||||||
border-bottom: 1px solid var(--t-border);
|
border-bottom: 1px solid var(--t-border);
|
||||||
background: var(--t-bg);
|
background: var(--t-bg);
|
||||||
|
overflow-x: auto;
|
||||||
|
overflow-y: hidden;
|
||||||
|
flex-shrink: 0;
|
||||||
|
scrollbar-width: none;
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
}
|
||||||
|
.chat-thread-peers::-webkit-scrollbar { display: none; }
|
||||||
|
.chat-thread-peers:empty { display: none; }
|
||||||
|
|
||||||
|
.chat-peer-tab {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
padding: 3px 8px;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-button, 3px);
|
||||||
|
background: var(--t-surface);
|
||||||
|
color: var(--t-muted);
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
flex-shrink: 0;
|
||||||
|
white-space: nowrap;
|
||||||
|
transition: border-color 0.12s, color 0.12s, background 0.12s;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.chat-peer-tab:hover {
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
color: var(--t-accent);
|
||||||
|
}
|
||||||
|
.chat-peer-tab.active {
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
background: var(--t-accent);
|
||||||
|
color: var(--t-bg);
|
||||||
|
}
|
||||||
|
.chat-peer-tab .chat-peer-dot {
|
||||||
|
width: 6px;
|
||||||
|
height: 6px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--t-accent);
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
.chat-peer-tab.active .chat-peer-dot { background: var(--t-bg); }
|
||||||
|
|
||||||
.chat-thread-messages {
|
.chat-thread-messages {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@@ -170,6 +230,9 @@
|
|||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
line-height: 1.4;
|
line-height: 1.4;
|
||||||
border: 1px solid var(--t-border);
|
border: 1px solid var(--t-border);
|
||||||
|
/* Pick up the user's card-radius design token so chat bubbles look
|
||||||
|
consistent with the rest of the surface (sharp / rounded / pill). */
|
||||||
|
border-radius: var(--ui-radius-card, 0px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-bubble.in {
|
.chat-bubble.in {
|
||||||
@@ -192,11 +255,25 @@
|
|||||||
color: var(--t-dim);
|
color: var(--t-dim);
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
font-family: var(--t-font-pixel);
|
font-family: var(--t-font-pixel);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-bubble.out + .chat-bubble-time { align-self: flex-end; }
|
.chat-bubble.out + .chat-bubble-time { align-self: flex-end; }
|
||||||
.chat-bubble.in + .chat-bubble-time { align-self: flex-start; }
|
.chat-bubble.in + .chat-bubble-time { align-self: flex-start; }
|
||||||
|
|
||||||
|
/* Read receipts: clock = sent (relay not yet acked), single check =
|
||||||
|
delivered (recipient polled), double check = seen (recipient opened
|
||||||
|
the thread). Single/double share the same icon size as the timestamp. */
|
||||||
|
.chat-receipt {
|
||||||
|
font-size: 11px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
.chat-receipt.pending { color: var(--t-dim); }
|
||||||
|
.chat-receipt.delivered { color: var(--t-muted); }
|
||||||
|
.chat-receipt.seen { color: var(--t-accent); }
|
||||||
|
|
||||||
#chat-thread-form {
|
#chat-thread-form {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -269,6 +346,148 @@
|
|||||||
color: var(--t-accent);
|
color: var(--t-accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.chat-pick-row.selected {
|
||||||
|
background: var(--t-raised);
|
||||||
|
color: var(--t-accent);
|
||||||
|
}
|
||||||
|
.chat-pick-row .chat-pick-check {
|
||||||
|
margin-left: auto;
|
||||||
|
color: var(--t-accent);
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.chat-pick-row:not(.selected) .chat-pick-check { visibility: hidden; }
|
||||||
|
|
||||||
|
/* Picker mode switch (1:1 vs. group). */
|
||||||
|
.chat-pick-mode {
|
||||||
|
display: flex;
|
||||||
|
gap: 4px;
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
background: var(--t-bg);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.chat-pick-mode-btn {
|
||||||
|
flex: 1;
|
||||||
|
padding: 3px 8px;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--t-muted);
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.12s, color 0.12s, background 0.12s;
|
||||||
|
}
|
||||||
|
.chat-pick-mode-btn:hover { color: var(--t-accent); border-color: var(--t-accent); }
|
||||||
|
.chat-pick-mode-btn.active {
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
background: var(--t-accent);
|
||||||
|
color: var(--t-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-group-name {
|
||||||
|
margin: 8px 10px 4px;
|
||||||
|
padding: 5px 8px;
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-bright);
|
||||||
|
font-size: 11px;
|
||||||
|
font-family: var(--t-font-mono, monospace);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.chat-group-name:focus { border-color: var(--t-accent); }
|
||||||
|
.chat-group-name.hidden { display: none; }
|
||||||
|
|
||||||
|
.chat-group-actions {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-top: 1px solid var(--t-border);
|
||||||
|
background: var(--t-bg);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.chat-group-actions.hidden { display: none; }
|
||||||
|
|
||||||
|
/* Room-info view: member list + owner actions. */
|
||||||
|
#chat-room-info-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
background: var(--t-bg);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.chat-room-info-body {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 10px 12px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
.chat-room-info-body .section-label {
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 9px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
color: var(--t-dim);
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
.chat-room-member-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 3px 0;
|
||||||
|
}
|
||||||
|
.chat-room-member-row .owner-badge {
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 8px;
|
||||||
|
color: var(--t-accent);
|
||||||
|
background: var(--t-raised);
|
||||||
|
padding: 1px 5px;
|
||||||
|
border: 1px solid var(--t-accent);
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
.chat-room-info-body .btn {
|
||||||
|
padding: 4px 10px;
|
||||||
|
font-size: 10px;
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
background: transparent;
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.12s;
|
||||||
|
}
|
||||||
|
.chat-room-info-body .btn:hover { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
.chat-room-info-body .btn.danger:hover { border-color: var(--t-danger); color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* Author name above group-thread bubbles. Shown only when the author
|
||||||
|
changes, so consecutive bubbles from the same person aren't repeated.
|
||||||
|
Left-aligned so it sits above the left-aligned incoming bubble. */
|
||||||
|
.chat-bubble-author {
|
||||||
|
align-self: flex-start;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--t-accent2, var(--t-accent));
|
||||||
|
margin-top: 6px;
|
||||||
|
padding: 0 2px;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Peer-tab variant for rooms — group icon instead of initial. */
|
||||||
|
.chat-peer-tab .chat-peer-tab-icon {
|
||||||
|
font-size: 10px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Disposable / info icons in flyout header. */
|
||||||
|
#chat-thread-disposable.active {
|
||||||
|
color: var(--t-accent);
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Footer button ── */
|
/* ── Footer button ── */
|
||||||
|
|
||||||
#chat-footer-btn {
|
#chat-footer-btn {
|
||||||
@@ -332,3 +551,10 @@
|
|||||||
#chat-footer-btn.blinking {
|
#chat-footer-btn.blinking {
|
||||||
animation: chatBlink 1.2s ease-in-out infinite;
|
animation: chatBlink 1.2s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
/* Ignore the global anim-speed override — the unread blink has a
|
||||||
|
deliberate cadence that becomes an unreadable strobe when sped up. */
|
||||||
|
body.anim-fast #chat-footer-btn.blinking,
|
||||||
|
body.anim-slow #chat-footer-btn.blinking {
|
||||||
|
animation: chatBlink 1.2s ease-in-out infinite !important;
|
||||||
|
animation-duration: 1.2s !important;
|
||||||
|
}
|
||||||
@@ -3,9 +3,19 @@
|
|||||||
<div id="chat-flyout" class="hidden">
|
<div id="chat-flyout" class="hidden">
|
||||||
<div id="chat-flyout-header">
|
<div id="chat-flyout-header">
|
||||||
<i class="ph ph-chats-circle text-t-accent text-sm"></i>
|
<i class="ph ph-chats-circle text-t-accent text-sm"></i>
|
||||||
<span id="chat-flyout-title" class="font-pixel text-[10px] text-t-bright flex-1">chat</span>
|
<!-- Caret + "chat" label are a single trigger with one tooltip.
|
||||||
<button id="chat-new-btn" class="text-t-muted hover:text-t-accent transition-colors" title="new conversation"><i class="ph ph-plus-square text-sm"></i></button>
|
The caret shows only when there's somewhere to go back to
|
||||||
<button id="chat-refresh-btn" class="text-t-muted hover:text-t-accent transition-colors" title="refresh"><i class="ph ph-arrows-clockwise text-sm" id="chat-refresh-icon"></i></button>
|
(thread / pick / room-info); on the list itself the click
|
||||||
|
is a no-op and the button styles itself as inert. -->
|
||||||
|
<button id="chat-header-nav" type="button" class="chat-header-nav" data-tip="back to conversations">
|
||||||
|
<i id="chat-header-back-caret" class="ph ph-caret-left text-sm hidden"></i>
|
||||||
|
<span id="chat-flyout-title" class="font-pixel text-[10px]">chat</span>
|
||||||
|
</button>
|
||||||
|
<span class="flex-1"></span>
|
||||||
|
<button id="chat-thread-disposable" class="hidden text-t-muted hover:text-t-accent transition-colors" data-tip="disposable: messages drop after delivery"><i class="ph ph-fire text-sm"></i></button>
|
||||||
|
<button id="chat-thread-info" class="hidden text-t-muted hover:text-t-accent transition-colors" data-tip="room info"><i class="ph ph-info text-sm"></i></button>
|
||||||
|
<button id="chat-new-btn" class="text-t-muted hover:text-t-accent transition-colors" data-tip="new conversation"><i class="ph ph-plus-square text-sm"></i></button>
|
||||||
|
<button id="chat-refresh-btn" class="text-t-muted hover:text-t-accent transition-colors" data-tip="refresh"><i class="ph ph-arrows-clockwise text-sm" id="chat-refresh-icon"></i></button>
|
||||||
<button id="chat-close-btn" class="text-t-muted hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i></button>
|
<button id="chat-close-btn" class="text-t-muted hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -14,31 +24,50 @@
|
|||||||
<div id="chat-list" class="chat-list"></div>
|
<div id="chat-list" class="chat-list"></div>
|
||||||
<div id="chat-empty" class="hidden chat-empty">
|
<div id="chat-empty" class="hidden chat-empty">
|
||||||
<i class="ph ph-chats text-2xl text-t-dim mb-2"></i>
|
<i class="ph ph-chats text-2xl text-t-dim mb-2"></i>
|
||||||
<p class="font-pixel text-[10px] text-t-dim">no conversations yet</p>
|
<p class="font-pixel text-[10px] text-t-dim cursor-blink">no conversations yet</p>
|
||||||
<button id="chat-empty-start" class="mt-3 px-2 py-1 text-[10px] font-pixel border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors">Start chat</button>
|
<button id="chat-empty-start" class="mt-3 px-2 py-1 text-[10px] font-pixel border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors">Start chat</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Conversation thread view -->
|
<!-- Conversation thread view -->
|
||||||
<div id="chat-thread-view" class="chat-view hidden">
|
<div id="chat-thread-view" class="chat-view hidden">
|
||||||
<div id="chat-thread-header">
|
<div id="chat-thread-peers" class="chat-thread-peers"></div>
|
||||||
<button id="chat-thread-back" class="text-t-muted hover:text-t-accent transition-colors"><i class="ph ph-caret-left text-sm"></i></button>
|
|
||||||
<i class="ph ph-user-circle text-t-accent text-sm"></i>
|
|
||||||
<span id="chat-thread-peer" class="font-pixel text-[10px] text-t-bright flex-1 truncate"></span>
|
|
||||||
</div>
|
|
||||||
<div id="chat-thread-messages" class="chat-thread-messages"></div>
|
<div id="chat-thread-messages" class="chat-thread-messages"></div>
|
||||||
<form id="chat-thread-form">
|
<form id="chat-thread-form">
|
||||||
<input id="chat-thread-input" type="text" autocomplete="off" placeholder="type a message..." maxlength="2000">
|
<input id="chat-thread-input" type="text" autocomplete="off" placeholder="type a message..." maxlength="2000">
|
||||||
<button type="submit" id="chat-thread-send" class="text-t-accent hover:brightness-125" title="send"><i class="ph ph-paper-plane-tilt text-sm"></i></button>
|
<button type="submit" id="chat-thread-send" class="text-t-accent hover:brightness-125" data-tip="send"><i class="ph ph-paper-plane-tilt text-sm"></i></button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- New-conversation peer picker -->
|
<!-- New-conversation peer picker / group creation.
|
||||||
|
Shared view: a mode toggle at top switches between picking one
|
||||||
|
peer (1:1) and building a group (name + multi-select). -->
|
||||||
<div id="chat-pick-view" class="chat-view hidden">
|
<div id="chat-pick-view" class="chat-view hidden">
|
||||||
<div id="chat-pick-header">
|
<div id="chat-pick-header">
|
||||||
<button id="chat-pick-back" class="text-t-muted hover:text-t-accent transition-colors"><i class="ph ph-caret-left text-sm"></i></button>
|
<button id="chat-pick-back" class="text-t-muted hover:text-t-accent transition-colors"><i class="ph ph-caret-left text-sm"></i></button>
|
||||||
<span class="font-pixel text-[10px] text-t-bright flex-1">pick a recipient</span>
|
<span id="chat-pick-title" class="font-pixel text-[10px] text-t-bright flex-1">new conversation</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="chat-pick-mode" class="chat-pick-mode">
|
||||||
|
<button class="chat-pick-mode-btn active" data-mode="peer" type="button">1:1</button>
|
||||||
|
<button class="chat-pick-mode-btn" data-mode="group" type="button">group</button>
|
||||||
|
</div>
|
||||||
|
<input id="chat-group-name" class="chat-group-name hidden" type="text" autocomplete="off" placeholder="group name..." maxlength="80">
|
||||||
<div id="chat-pick-list" class="chat-pick-list"></div>
|
<div id="chat-pick-list" class="chat-pick-list"></div>
|
||||||
|
<div id="chat-group-actions" class="chat-group-actions hidden">
|
||||||
|
<span id="chat-group-count" class="font-pixel text-[9px] text-t-dim"></span>
|
||||||
|
<span style="flex:1"></span>
|
||||||
|
<button id="chat-group-create" type="button" class="px-2 py-1 text-[10px] font-pixel border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors">Create</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Room info / member management view.
|
||||||
|
Shown when the user taps the info icon in a room thread. -->
|
||||||
|
<div id="chat-room-info-view" class="chat-view hidden">
|
||||||
|
<div id="chat-room-info-header">
|
||||||
|
<button id="chat-room-info-back" class="text-t-muted hover:text-t-accent transition-colors"><i class="ph ph-caret-left text-sm"></i></button>
|
||||||
|
<i class="ph ph-users-three text-t-accent text-sm"></i>
|
||||||
|
<span id="chat-room-info-name" class="font-pixel text-[10px] text-t-bright flex-1 truncate"></span>
|
||||||
|
</div>
|
||||||
|
<div id="chat-room-info-body" class="chat-room-info-body"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
+489
-78
@@ -3,6 +3,12 @@
|
|||||||
// Footer button + bottom-right flyout. Polls /api/chat/poll on a loop
|
// Footer button + bottom-right flyout. Polls /api/chat/poll on a loop
|
||||||
// (faster while open, slower while closed). Blinks the footer button
|
// (faster while open, slower while closed). Blinks the footer button
|
||||||
// when new incoming messages arrive while the flyout is closed.
|
// when new incoming messages arrive while the flyout is closed.
|
||||||
|
//
|
||||||
|
// Threads come in two kinds:
|
||||||
|
// peer — classic 1:1 with a single relay tenant. Disposable flag per
|
||||||
|
// thread drops messages from the relay after delivery.
|
||||||
|
// room — named group chat with a member list. Always persistent on
|
||||||
|
// the relay so every device / late joiner has full history.
|
||||||
|
|
||||||
const hyprcrd = window.hyprcrd;
|
const hyprcrd = window.hyprcrd;
|
||||||
if (!hyprcrd) throw new Error('[chat plugin] window.hyprcrd missing');
|
if (!hyprcrd) throw new Error('[chat plugin] window.hyprcrd missing');
|
||||||
@@ -12,16 +18,18 @@ const $ = (id) => document.getElementById(id);
|
|||||||
// ── State ─────────────────────────────────────────────────────────
|
// ── State ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
let conversations = [];
|
let conversations = [];
|
||||||
let currentPeer = null;
|
// Null = list view. Otherwise: { kind: 'peer'|'room', key, label }.
|
||||||
|
let currentThread = null;
|
||||||
let currentMessages = [];
|
let currentMessages = [];
|
||||||
let pollHandle = null;
|
let pollHandle = null;
|
||||||
let pollIntervalMs = 20000; // closed default
|
let pollIntervalMs = 20000;
|
||||||
let recipientCache = null; // { tenants: [...], self: '...' }
|
let recipientCache = null; // { tenants: [...], self: '...' }
|
||||||
let initialPollDone = false;
|
let initialPollDone = false;
|
||||||
|
|
||||||
// Chat polls aggressively because the endpoint is cheap (single indexed
|
// Group creation pick-view state. Reset on every pick-view open.
|
||||||
// SELECT with LIMIT 500). Card sync stays on its own slower interval —
|
let pickMode = 'peer'; // 'peer' or 'group'
|
||||||
// CalDAV is the expensive one. Tab-hidden pauses the timer entirely.
|
let selectedMembers = new Set();
|
||||||
|
|
||||||
const POLL_OPEN_MS = 8000;
|
const POLL_OPEN_MS = 8000;
|
||||||
const POLL_CLOSED_MS = 20000;
|
const POLL_CLOSED_MS = 20000;
|
||||||
|
|
||||||
@@ -49,6 +57,36 @@ function isOpen() {
|
|||||||
return !$('chat-flyout')?.classList.contains('hidden');
|
return !$('chat-flyout')?.classList.contains('hidden');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function threadFromItem(item) {
|
||||||
|
return { kind: item.kind || 'peer', key: item.key ?? item.peer, label: item.label ?? item.peer };
|
||||||
|
}
|
||||||
|
|
||||||
|
function sameThread(a, b) {
|
||||||
|
return a && b && a.kind === b.kind && a.key === b.key;
|
||||||
|
}
|
||||||
|
|
||||||
|
function threadBody(thread) {
|
||||||
|
return thread.kind === 'room' ? { room_uid: thread.key } : { peer: thread.key };
|
||||||
|
}
|
||||||
|
|
||||||
|
function threadStorageKey(thread) {
|
||||||
|
return `${thread.kind}:${thread.key}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseStorageKey(str) {
|
||||||
|
if (!str) return null;
|
||||||
|
const i = str.indexOf(':');
|
||||||
|
if (i < 0) return { kind: 'peer', key: str, label: str };
|
||||||
|
return { kind: str.slice(0, i), key: str.slice(i + 1), label: str.slice(i + 1) };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getSelfUsername() {
|
||||||
|
if (recipientCache?.self) return recipientCache.self;
|
||||||
|
const res = await fetch('api/chat/recipients').then(r => r.json()).catch(() => null);
|
||||||
|
if (res?.ok) recipientCache = res;
|
||||||
|
return recipientCache?.self || '';
|
||||||
|
}
|
||||||
|
|
||||||
// ── Footer button ─────────────────────────────────────────────────
|
// ── Footer button ─────────────────────────────────────────────────
|
||||||
|
|
||||||
function injectFooterButton() {
|
function injectFooterButton() {
|
||||||
@@ -56,7 +94,6 @@ function injectFooterButton() {
|
|||||||
if (!footer) return;
|
if (!footer) return;
|
||||||
if (document.getElementById('chat-footer-btn')) return;
|
if (document.getElementById('chat-footer-btn')) return;
|
||||||
|
|
||||||
// Append next to the help button on the right side of the footer
|
|
||||||
const rightGroup = footer.querySelector('.flex.items-center.gap-2:last-of-type');
|
const rightGroup = footer.querySelector('.flex.items-center.gap-2:last-of-type');
|
||||||
if (!rightGroup) return;
|
if (!rightGroup) return;
|
||||||
|
|
||||||
@@ -101,29 +138,29 @@ async function toggleFlyout() {
|
|||||||
|
|
||||||
async function openFlyout() {
|
async function openFlyout() {
|
||||||
$('chat-flyout').classList.remove('hidden');
|
$('chat-flyout').classList.remove('hidden');
|
||||||
// Capture blink state BEFORE we clear it — it tells us a peer wrote since last close
|
|
||||||
const wasBlinking = $('chat-footer-btn')?.classList.contains('blinking');
|
const wasBlinking = $('chat-footer-btn')?.classList.contains('blinking');
|
||||||
stopBlink();
|
stopBlink();
|
||||||
pollIntervalMs = POLL_OPEN_MS;
|
pollIntervalMs = POLL_OPEN_MS;
|
||||||
restartPoll();
|
restartPoll();
|
||||||
await loadConversations();
|
await loadConversations();
|
||||||
await pollOnce(); // immediate refresh on open
|
await pollOnce();
|
||||||
await loadConversations();
|
await loadConversations();
|
||||||
|
|
||||||
// Pick the right initial view:
|
// Initial view: newest unread thread after a blink, else the last
|
||||||
// 1. If blinking → newest peer with unread (= someone wrote to us)
|
// thread the user opened (peer or room), else the list.
|
||||||
// 2. Else → last peer the user opened manually (persisted)
|
|
||||||
// 3. Else → list view
|
|
||||||
let target = null;
|
let target = null;
|
||||||
if (wasBlinking) {
|
if (wasBlinking) {
|
||||||
const unread = conversations
|
const unread = conversations
|
||||||
.filter(c => parseInt(c.unread) > 0)
|
.filter(c => parseInt(c.unread) > 0)
|
||||||
.sort((a, b) => String(b.last_at).localeCompare(String(a.last_at)));
|
.sort((a, b) => String(b.last_at || '').localeCompare(String(a.last_at || '')));
|
||||||
if (unread.length) target = unread[0].peer;
|
if (unread.length) target = threadFromItem(unread[0]);
|
||||||
}
|
}
|
||||||
if (!target) {
|
if (!target) {
|
||||||
const lastPeer = localStorage.getItem('chat-last-peer');
|
const remembered = parseStorageKey(localStorage.getItem('chat-last-thread'));
|
||||||
if (lastPeer && conversations.some(c => c.peer === lastPeer)) target = lastPeer;
|
if (remembered && conversations.some(c => c.kind === remembered.kind && c.key === remembered.key)) {
|
||||||
|
const item = conversations.find(c => c.kind === remembered.kind && c.key === remembered.key);
|
||||||
|
target = threadFromItem(item);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (target) await openConversation(target);
|
if (target) await openConversation(target);
|
||||||
else showListView();
|
else showListView();
|
||||||
@@ -137,27 +174,55 @@ function closeFlyout() {
|
|||||||
|
|
||||||
// ── Views ─────────────────────────────────────────────────────────
|
// ── Views ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
function showListView() {
|
function hideAllViews() {
|
||||||
$('chat-list-view').classList.remove('hidden');
|
['chat-list-view', 'chat-thread-view', 'chat-pick-view', 'chat-room-info-view']
|
||||||
$('chat-thread-view').classList.add('hidden');
|
.forEach(id => $(id)?.classList.add('hidden'));
|
||||||
$('chat-pick-view').classList.add('hidden');
|
|
||||||
$('chat-flyout-title').textContent = 'chat';
|
|
||||||
currentPeer = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function showThreadView(peer) {
|
// Toggle the caret + make the "chat" trigger look/feel clickable only
|
||||||
$('chat-list-view').classList.add('hidden');
|
// when there's actually somewhere to go back to.
|
||||||
$('chat-thread-view').classList.remove('hidden');
|
function setNavState(canBack) {
|
||||||
$('chat-pick-view').classList.add('hidden');
|
$('chat-header-back-caret')?.classList.toggle('hidden', !canBack);
|
||||||
|
$('chat-header-nav')?.classList.toggle('navigable', canBack);
|
||||||
|
}
|
||||||
|
|
||||||
|
function showListView() {
|
||||||
|
hideAllViews();
|
||||||
|
$('chat-list-view').classList.remove('hidden');
|
||||||
$('chat-flyout-title').textContent = 'chat';
|
$('chat-flyout-title').textContent = 'chat';
|
||||||
$('chat-thread-peer').textContent = peer;
|
setNavState(false);
|
||||||
currentPeer = peer;
|
$('chat-thread-disposable')?.classList.add('hidden');
|
||||||
|
$('chat-thread-info')?.classList.add('hidden');
|
||||||
|
currentThread = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function showThreadView(thread) {
|
||||||
|
hideAllViews();
|
||||||
|
$('chat-thread-view').classList.remove('hidden');
|
||||||
|
$('chat-flyout-title').textContent = 'chat';
|
||||||
|
setNavState(true);
|
||||||
|
currentThread = thread;
|
||||||
|
// Room-only: info icon. 1:1-only: disposable icon.
|
||||||
|
$('chat-thread-info')?.classList.toggle('hidden', thread.kind !== 'room');
|
||||||
|
$('chat-thread-disposable')?.classList.toggle('hidden', thread.kind !== 'peer');
|
||||||
|
if (thread.kind === 'peer') refreshDisposableIcon(thread.key);
|
||||||
|
renderPeerTabs();
|
||||||
}
|
}
|
||||||
|
|
||||||
function showPickView() {
|
function showPickView() {
|
||||||
$('chat-list-view').classList.add('hidden');
|
hideAllViews();
|
||||||
$('chat-thread-view').classList.add('hidden');
|
|
||||||
$('chat-pick-view').classList.remove('hidden');
|
$('chat-pick-view').classList.remove('hidden');
|
||||||
|
setNavState(false);
|
||||||
|
$('chat-thread-disposable')?.classList.add('hidden');
|
||||||
|
$('chat-thread-info')?.classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
function showRoomInfoView() {
|
||||||
|
hideAllViews();
|
||||||
|
$('chat-room-info-view').classList.remove('hidden');
|
||||||
|
setNavState(false);
|
||||||
|
$('chat-thread-disposable')?.classList.add('hidden');
|
||||||
|
$('chat-thread-info')?.classList.add('hidden');
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Conversation list ─────────────────────────────────────────────
|
// ── Conversation list ─────────────────────────────────────────────
|
||||||
@@ -174,6 +239,7 @@ function renderConversations() {
|
|||||||
const list = $('chat-list');
|
const list = $('chat-list');
|
||||||
const empty = $('chat-empty');
|
const empty = $('chat-empty');
|
||||||
if (!list || !empty) return;
|
if (!list || !empty) return;
|
||||||
|
renderPeerTabs();
|
||||||
if (!conversations.length) {
|
if (!conversations.length) {
|
||||||
list.innerHTML = '';
|
list.innerHTML = '';
|
||||||
empty.classList.remove('hidden');
|
empty.classList.remove('hidden');
|
||||||
@@ -181,19 +247,29 @@ function renderConversations() {
|
|||||||
}
|
}
|
||||||
empty.classList.add('hidden');
|
empty.classList.add('hidden');
|
||||||
list.innerHTML = conversations.map(c => {
|
list.innerHTML = conversations.map(c => {
|
||||||
const initial = (c.peer || '?').charAt(0).toUpperCase();
|
const isRoom = c.kind === 'room';
|
||||||
|
const label = c.label || c.key || '?';
|
||||||
|
const initial = label.charAt(0).toUpperCase();
|
||||||
|
const avatar = isRoom
|
||||||
|
? '<div class="chat-list-avatar"><i class="ph ph-users-three"></i></div>'
|
||||||
|
: `<div class="chat-list-avatar">${escapeHtml(initial)}</div>`;
|
||||||
const unreadBadge = parseInt(c.unread) > 0
|
const unreadBadge = parseInt(c.unread) > 0
|
||||||
? `<span class="chat-unread-badge">${c.unread}</span>` : '';
|
? `<span class="chat-unread-badge">${c.unread}</span>` : '';
|
||||||
const previewClass = c.last_direction === 'out' ? 'chat-list-preview outgoing' : 'chat-list-preview';
|
const previewClass = (!isRoom && c.last_direction === 'out')
|
||||||
|
? 'chat-list-preview outgoing'
|
||||||
|
: 'chat-list-preview';
|
||||||
|
const preview = isRoom && c.last_author
|
||||||
|
? `${escapeHtml(c.last_author)}: ${escapeHtml((c.last_body || '').slice(0, 70))}`
|
||||||
|
: escapeHtml((c.last_body || '').slice(0, 80));
|
||||||
return `
|
return `
|
||||||
<div class="chat-list-row" data-peer="${escapeHtml(c.peer)}">
|
<div class="chat-list-row" data-kind="${isRoom ? 'room' : 'peer'}" data-key="${escapeHtml(c.key)}">
|
||||||
<div class="chat-list-avatar">${escapeHtml(initial)}</div>
|
${avatar}
|
||||||
<div class="chat-list-info">
|
<div class="chat-list-info">
|
||||||
<div class="chat-list-peer">
|
<div class="chat-list-peer">
|
||||||
<span>${escapeHtml(c.peer)}</span>
|
<span>${escapeHtml(label)}</span>
|
||||||
<span class="chat-list-time">${escapeHtml(formatChatTime(c.last_at))}</span>
|
<span class="chat-list-time">${escapeHtml(formatChatTime(c.last_at))}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="${previewClass}">${escapeHtml((c.last_body || '').slice(0, 80))}</div>
|
<div class="${previewClass}">${preview}</div>
|
||||||
</div>
|
</div>
|
||||||
${unreadBadge}
|
${unreadBadge}
|
||||||
</div>
|
</div>
|
||||||
@@ -201,42 +277,133 @@ function renderConversations() {
|
|||||||
}).join('');
|
}).join('');
|
||||||
|
|
||||||
list.querySelectorAll('.chat-list-row').forEach(row => {
|
list.querySelectorAll('.chat-list-row').forEach(row => {
|
||||||
row.addEventListener('click', () => openConversation(row.dataset.peer));
|
row.addEventListener('click', () => {
|
||||||
|
const item = conversations.find(c => c.kind === row.dataset.kind && c.key === row.dataset.key);
|
||||||
|
if (item) openConversation(threadFromItem(item));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Peer tabs (thread-view quick-switch strip) ────────────────────
|
||||||
|
// Horizontal row above the thread so the user can hop between
|
||||||
|
// conversations without going back to the list. Hidden scrollbar;
|
||||||
|
// vertical wheel delta is redirected to horizontal scroll.
|
||||||
|
|
||||||
|
function renderPeerTabs() {
|
||||||
|
const strip = $('chat-thread-peers');
|
||||||
|
if (!strip) return;
|
||||||
|
const tabs = conversations.slice();
|
||||||
|
// Fold the current thread in even if it's brand-new (e.g. just
|
||||||
|
// created a room and haven't synced conversations yet), so the
|
||||||
|
// active tab is always visible.
|
||||||
|
if (currentThread && !tabs.some(c => c.kind === currentThread.kind && c.key === currentThread.key)) {
|
||||||
|
tabs.unshift({ kind: currentThread.kind, key: currentThread.key, label: currentThread.label, unread: 0 });
|
||||||
|
}
|
||||||
|
if (!tabs.length) { strip.innerHTML = ''; return; }
|
||||||
|
strip.innerHTML = tabs.map(c => {
|
||||||
|
const isRoom = c.kind === 'room';
|
||||||
|
const active = currentThread && currentThread.kind === c.kind && currentThread.key === c.key ? ' active' : '';
|
||||||
|
const notActive = !active;
|
||||||
|
const dot = parseInt(c.unread) > 0 && notActive
|
||||||
|
? '<span class="chat-peer-dot"></span>' : '';
|
||||||
|
const icon = isRoom
|
||||||
|
? '<i class="ph ph-users-three chat-peer-tab-icon"></i>'
|
||||||
|
: '';
|
||||||
|
const label = c.label || c.key || '?';
|
||||||
|
return `<button class="chat-peer-tab${active}" data-kind="${isRoom ? 'room' : 'peer'}" data-key="${escapeHtml(c.key)}" title="${escapeHtml(label)}">${dot}${icon}<span>${escapeHtml(label)}</span></button>`;
|
||||||
|
}).join('');
|
||||||
|
strip.querySelectorAll('.chat-peer-tab').forEach(tab => {
|
||||||
|
tab.addEventListener('click', () => {
|
||||||
|
const thread = { kind: tab.dataset.kind, key: tab.dataset.key, label: tab.querySelector('span')?.textContent || tab.dataset.key };
|
||||||
|
if (!sameThread(currentThread, thread)) openConversation(thread);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
const active = strip.querySelector('.chat-peer-tab.active');
|
||||||
|
if (active) active.scrollIntoView({ block: 'nearest', inline: 'nearest' });
|
||||||
|
}
|
||||||
|
|
||||||
|
function wirePeerStripWheel() {
|
||||||
|
const strip = $('chat-thread-peers');
|
||||||
|
if (!strip || strip.dataset.wheelWired) return;
|
||||||
|
strip.dataset.wheelWired = '1';
|
||||||
|
strip.addEventListener('wheel', (e) => {
|
||||||
|
if (e.deltaY === 0) return;
|
||||||
|
if (strip.scrollWidth <= strip.clientWidth) return;
|
||||||
|
e.preventDefault();
|
||||||
|
strip.scrollLeft += e.deltaY;
|
||||||
|
}, { passive: false });
|
||||||
|
}
|
||||||
|
|
||||||
// ── Thread ────────────────────────────────────────────────────────
|
// ── Thread ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
async function openConversation(peer) {
|
async function openConversation(thread) {
|
||||||
showThreadView(peer);
|
showThreadView(thread);
|
||||||
localStorage.setItem('chat-last-peer', peer);
|
localStorage.setItem('chat-last-thread', threadStorageKey(thread));
|
||||||
await loadThread(peer);
|
await loadThread(thread);
|
||||||
// Mark all incoming as read
|
// Backfill older messages from the relay on open so a second device /
|
||||||
await hyprcrd.api('api/chat/read', { method: 'POST', body: { peer } }).catch(() => {});
|
// cold cache catches up. Fire-and-forget: the re-render happens via
|
||||||
// Refresh badges in the background
|
// the subsequent conversations refresh and the next poll tick.
|
||||||
|
backfillThread(thread).catch(() => {});
|
||||||
|
await hyprcrd.api('api/chat/read', { method: 'POST', body: threadBody(thread) }).catch(() => {});
|
||||||
loadConversations();
|
loadConversations();
|
||||||
setTimeout(() => $('chat-thread-input')?.focus(), 50);
|
setTimeout(() => $('chat-thread-input')?.focus(), 50);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadThread(peer) {
|
async function loadThread(thread) {
|
||||||
const res = await fetch('api/chat/messages?peer=' + encodeURIComponent(peer))
|
const qs = thread.kind === 'room'
|
||||||
.then(r => r.json()).catch(() => null);
|
? 'room_uid=' + encodeURIComponent(thread.key)
|
||||||
|
: 'peer=' + encodeURIComponent(thread.key);
|
||||||
|
const res = await fetch('api/chat/messages?' + qs).then(r => r.json()).catch(() => null);
|
||||||
if (!res) return;
|
if (!res) return;
|
||||||
currentMessages = res.messages || [];
|
currentMessages = res.messages || [];
|
||||||
renderThread();
|
await renderThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderThread() {
|
async function backfillThread(thread) {
|
||||||
|
const body = threadBody(thread);
|
||||||
|
// Oldest id we have locally is the lower bound for the backfill —
|
||||||
|
// we want messages BEFORE it.
|
||||||
|
const lowest = currentMessages.reduce((min, m) => {
|
||||||
|
const id = Number(m.id || 0);
|
||||||
|
return min === 0 || (id > 0 && id < min) ? id : min;
|
||||||
|
}, 0);
|
||||||
|
const res = await hyprcrd.api('api/chat/backfill', {
|
||||||
|
method: 'POST',
|
||||||
|
body: { ...body, before: lowest, limit: 100 },
|
||||||
|
}).catch(() => null);
|
||||||
|
if (res?.ok && (res.backfilled || 0) > 0 && sameThread(thread, currentThread)) {
|
||||||
|
await loadThread(thread);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function renderThread() {
|
||||||
const wrap = $('chat-thread-messages');
|
const wrap = $('chat-thread-messages');
|
||||||
if (!wrap) return;
|
if (!wrap) return;
|
||||||
|
const self = await getSelfUsername();
|
||||||
|
const isRoom = currentThread?.kind === 'room';
|
||||||
|
let lastAuthor = null;
|
||||||
wrap.innerHTML = currentMessages.map(m => {
|
wrap.innerHTML = currentMessages.map(m => {
|
||||||
const cls = m.direction === 'out' ? 'out' : 'in';
|
// For groups: author == self → "out" bubble regardless of the
|
||||||
|
// stored direction (which reflects which device inserted the row).
|
||||||
|
const mine = isRoom ? (m.peer === self) : (m.direction === 'out');
|
||||||
|
const cls = mine ? 'out' : 'in';
|
||||||
|
let receipt = '';
|
||||||
|
if (!isRoom && mine) {
|
||||||
|
if (Number(m.seen)) receipt = '<i class="ph ph-checks chat-receipt seen"></i>';
|
||||||
|
else if (Number(m.delivered)) receipt = '<i class="ph ph-check chat-receipt delivered"></i>';
|
||||||
|
else receipt = '<i class="ph ph-clock chat-receipt pending"></i>';
|
||||||
|
}
|
||||||
|
let authorLine = '';
|
||||||
|
if (isRoom && !mine && m.peer !== lastAuthor) {
|
||||||
|
authorLine = `<div class="chat-bubble-author">${escapeHtml(m.peer || '')}</div>`;
|
||||||
|
}
|
||||||
|
lastAuthor = m.peer;
|
||||||
return `
|
return `
|
||||||
|
${authorLine}
|
||||||
<div class="chat-bubble ${cls}">${escapeHtml(m.body)}</div>
|
<div class="chat-bubble ${cls}">${escapeHtml(m.body)}</div>
|
||||||
<div class="chat-bubble-time">${escapeHtml(formatChatTime(m.sent_at))}</div>
|
<div class="chat-bubble-time">${escapeHtml(formatChatTime(m.sent_at))}${receipt}</div>
|
||||||
`;
|
`;
|
||||||
}).join('');
|
}).join('');
|
||||||
// Scroll to bottom
|
|
||||||
wrap.scrollTop = wrap.scrollHeight;
|
wrap.scrollTop = wrap.scrollHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -244,7 +411,7 @@ async function sendMessage(e) {
|
|||||||
e?.preventDefault();
|
e?.preventDefault();
|
||||||
const input = $('chat-thread-input');
|
const input = $('chat-thread-input');
|
||||||
const body = input.value.trim();
|
const body = input.value.trim();
|
||||||
if (!body || !currentPeer) return;
|
if (!body || !currentThread) return;
|
||||||
const sendBtn = $('chat-thread-send');
|
const sendBtn = $('chat-thread-send');
|
||||||
sendBtn.disabled = true;
|
sendBtn.disabled = true;
|
||||||
input.disabled = true;
|
input.disabled = true;
|
||||||
@@ -252,7 +419,7 @@ async function sendMessage(e) {
|
|||||||
try {
|
try {
|
||||||
const res = await hyprcrd.api('api/chat/send', {
|
const res = await hyprcrd.api('api/chat/send', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: { peer: currentPeer, body },
|
body: { ...threadBody(currentThread), body },
|
||||||
});
|
});
|
||||||
if (!res.ok) {
|
if (!res.ok) {
|
||||||
const detail = [
|
const detail = [
|
||||||
@@ -270,7 +437,7 @@ async function sendMessage(e) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
input.value = '';
|
input.value = '';
|
||||||
await loadThread(currentPeer);
|
await loadThread(currentThread);
|
||||||
await loadConversations();
|
await loadConversations();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
await hyprcrd.dialog.show({
|
await hyprcrd.dialog.show({
|
||||||
@@ -287,10 +454,15 @@ async function sendMessage(e) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Pick recipient ────────────────────────────────────────────────
|
// ── Pick recipient / group creation ───────────────────────────────
|
||||||
|
|
||||||
async function openPickView() {
|
async function openPickView() {
|
||||||
showPickView();
|
showPickView();
|
||||||
|
pickMode = 'peer';
|
||||||
|
selectedMembers = new Set();
|
||||||
|
applyPickMode();
|
||||||
|
$('chat-group-name').value = '';
|
||||||
|
|
||||||
const list = $('chat-pick-list');
|
const list = $('chat-pick-list');
|
||||||
list.innerHTML = '<div class="px-3 py-3 text-[10px] text-t-dim font-pixel">loading...</div>';
|
list.innerHTML = '<div class="px-3 py-3 text-[10px] text-t-dim font-pixel">loading...</div>';
|
||||||
|
|
||||||
@@ -302,25 +474,243 @@ async function openPickView() {
|
|||||||
}
|
}
|
||||||
recipientCache = res;
|
recipientCache = res;
|
||||||
}
|
}
|
||||||
|
renderPickList();
|
||||||
|
}
|
||||||
|
|
||||||
const tenants = recipientCache.tenants || [];
|
function applyPickMode() {
|
||||||
|
const nameInput = $('chat-group-name');
|
||||||
|
const actions = $('chat-group-actions');
|
||||||
|
const title = $('chat-pick-title');
|
||||||
|
document.querySelectorAll('.chat-pick-mode-btn').forEach(b => {
|
||||||
|
b.classList.toggle('active', b.dataset.mode === pickMode);
|
||||||
|
});
|
||||||
|
if (pickMode === 'group') {
|
||||||
|
nameInput.classList.remove('hidden');
|
||||||
|
actions.classList.remove('hidden');
|
||||||
|
if (title) title.textContent = 'new group';
|
||||||
|
updateGroupCount();
|
||||||
|
} else {
|
||||||
|
nameInput.classList.add('hidden');
|
||||||
|
actions.classList.add('hidden');
|
||||||
|
if (title) title.textContent = 'new conversation';
|
||||||
|
}
|
||||||
|
renderPickList();
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderPickList() {
|
||||||
|
const list = $('chat-pick-list');
|
||||||
|
if (!list || !recipientCache) return;
|
||||||
const self = recipientCache.self;
|
const self = recipientCache.self;
|
||||||
const others = tenants.filter(t => t.username !== self);
|
const others = (recipientCache.tenants || []).filter(t => t.username !== self);
|
||||||
if (!others.length) {
|
if (!others.length) {
|
||||||
list.innerHTML = '<div class="px-3 py-3 text-[10px] text-t-dim font-pixel">no other users on the relay</div>';
|
list.innerHTML = '<div class="px-3 py-3 text-[10px] text-t-dim font-pixel cursor-blink">no other users on the relay</div>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
list.innerHTML = others.map(t => `
|
list.innerHTML = others.map(t => {
|
||||||
<div class="chat-pick-row" data-peer="${escapeHtml(t.username)}">
|
const selected = selectedMembers.has(t.username);
|
||||||
<i class="ph ph-user-circle text-sm"></i>
|
const selCls = (pickMode === 'group' && selected) ? ' selected' : '';
|
||||||
<span>${escapeHtml(t.username)}</span>
|
const check = pickMode === 'group'
|
||||||
</div>
|
? `<i class="ph ph-check chat-pick-check"></i>`
|
||||||
`).join('');
|
: '';
|
||||||
|
return `
|
||||||
|
<div class="chat-pick-row${selCls}" data-peer="${escapeHtml(t.username)}">
|
||||||
|
<i class="ph ph-user-circle text-sm"></i>
|
||||||
|
<span>${escapeHtml(t.username)}</span>
|
||||||
|
${check}
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}).join('');
|
||||||
list.querySelectorAll('.chat-pick-row').forEach(row => {
|
list.querySelectorAll('.chat-pick-row').forEach(row => {
|
||||||
row.addEventListener('click', () => openConversation(row.dataset.peer));
|
row.addEventListener('click', () => {
|
||||||
|
const u = row.dataset.peer;
|
||||||
|
if (pickMode === 'group') {
|
||||||
|
if (selectedMembers.has(u)) selectedMembers.delete(u);
|
||||||
|
else selectedMembers.add(u);
|
||||||
|
renderPickList();
|
||||||
|
updateGroupCount();
|
||||||
|
} else {
|
||||||
|
openConversation({ kind: 'peer', key: u, label: u });
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateGroupCount() {
|
||||||
|
const el = $('chat-group-count');
|
||||||
|
if (!el) return;
|
||||||
|
const n = selectedMembers.size;
|
||||||
|
el.textContent = n ? `${n} member${n === 1 ? '' : 's'} selected` : 'pick at least one member';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createRoom() {
|
||||||
|
const name = $('chat-group-name').value.trim();
|
||||||
|
if (!name) {
|
||||||
|
await hyprcrd.dialog.show({ title: 'missing name', message: 'Give the group a name.', okLabel: 'Ok', cancelLabel: '' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!selectedMembers.size) {
|
||||||
|
await hyprcrd.dialog.show({ title: 'no members', message: 'Pick at least one other member.', okLabel: 'Ok', cancelLabel: '' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const res = await hyprcrd.api('api/chat/rooms', {
|
||||||
|
method: 'POST',
|
||||||
|
body: { name, members: [...selectedMembers] },
|
||||||
|
});
|
||||||
|
if (!res?.ok) {
|
||||||
|
await hyprcrd.dialog.show({
|
||||||
|
title: 'create failed',
|
||||||
|
message: res?.error || 'unknown error',
|
||||||
|
danger: true,
|
||||||
|
okLabel: 'Ok',
|
||||||
|
cancelLabel: '',
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await loadConversations();
|
||||||
|
openConversation({ kind: 'room', key: res.uid, label: name });
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Room info / member management ──────────────────────────────
|
||||||
|
|
||||||
|
async function openRoomInfo() {
|
||||||
|
if (currentThread?.kind !== 'room') return;
|
||||||
|
const savedThread = currentThread;
|
||||||
|
showRoomInfoView();
|
||||||
|
$('chat-room-info-name').textContent = savedThread.label || savedThread.key;
|
||||||
|
const body = $('chat-room-info-body');
|
||||||
|
body.innerHTML = '<div class="text-[10px] text-t-dim font-pixel">loading...</div>';
|
||||||
|
|
||||||
|
const res = await fetch('api/chat/rooms').then(r => r.json()).catch(() => null);
|
||||||
|
const room = (res?.rooms || []).find(r => r.uid === savedThread.key);
|
||||||
|
const self = await getSelfUsername();
|
||||||
|
if (!room) {
|
||||||
|
body.innerHTML = '<div class="text-[10px] text-t-danger font-pixel">room not found</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const isOwner = room.owner_username === self;
|
||||||
|
const others = (res?.tenants || recipientCache?.tenants || [])
|
||||||
|
.filter(t => t.username !== self && !(room.members || []).includes(t.username));
|
||||||
|
|
||||||
|
const memberRows = (room.members || []).map(u => {
|
||||||
|
const ownerTag = u === room.owner_username ? '<span class="owner-badge">owner</span>' : '';
|
||||||
|
const removeBtn = (isOwner && u !== room.owner_username)
|
||||||
|
? `<button class="btn danger" data-action="remove" data-user="${escapeHtml(u)}" style="margin-left:auto;padding:2px 8px;">remove</button>`
|
||||||
|
: '';
|
||||||
|
return `
|
||||||
|
<div class="chat-room-member-row">
|
||||||
|
<i class="ph ph-user-circle text-t-accent"></i>
|
||||||
|
<span>${escapeHtml(u)}</span>
|
||||||
|
${ownerTag}
|
||||||
|
${removeBtn}
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
const addSection = isOwner && (recipientCache?.tenants || []).length > (room.members || []).length
|
||||||
|
? `<div class="section-label">Add members</div>
|
||||||
|
<div id="chat-room-add-list">${
|
||||||
|
(recipientCache?.tenants || [])
|
||||||
|
.filter(t => t.username !== self && !(room.members || []).includes(t.username))
|
||||||
|
.map(t => `<div class="chat-room-member-row"><i class="ph ph-user-circle"></i><span>${escapeHtml(t.username)}</span><button class="btn" style="margin-left:auto;padding:2px 8px;" data-action="add" data-user="${escapeHtml(t.username)}">add</button></div>`)
|
||||||
|
.join('') || '<div class="text-[10px] text-t-dim font-pixel">everyone on the relay is already in</div>'
|
||||||
|
}</div>`
|
||||||
|
: '';
|
||||||
|
|
||||||
|
body.innerHTML = `
|
||||||
|
<div>
|
||||||
|
<div class="section-label">Members (${(room.members || []).length})</div>
|
||||||
|
${memberRows || '<div class="text-[10px] text-t-dim">no members</div>'}
|
||||||
|
</div>
|
||||||
|
${addSection}
|
||||||
|
<div style="display:flex;gap:8px;margin-top:12px;">
|
||||||
|
${isOwner
|
||||||
|
? '<button class="btn danger" data-action="delete" style="flex:1">Delete room</button>'
|
||||||
|
: '<button class="btn danger" data-action="leave" style="flex:1">Leave room</button>'
|
||||||
|
}
|
||||||
|
<button class="btn" data-action="back" style="flex:1">Back to chat</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
body.querySelectorAll('button[data-action]').forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => handleRoomAction(btn.dataset.action, btn.dataset.user, savedThread));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleRoomAction(action, user, thread) {
|
||||||
|
const uid = thread.key;
|
||||||
|
if (action === 'back') {
|
||||||
|
openConversation(thread);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (action === 'remove' || action === 'add') {
|
||||||
|
// Fetch current room, mutate members, PATCH.
|
||||||
|
const res = await fetch('api/chat/rooms').then(r => r.json()).catch(() => null);
|
||||||
|
const room = (res?.rooms || []).find(r => r.uid === uid);
|
||||||
|
if (!room) return;
|
||||||
|
let members = [...(room.members || [])];
|
||||||
|
if (action === 'remove') members = members.filter(m => m !== user);
|
||||||
|
else if (!members.includes(user)) members.push(user);
|
||||||
|
// Relay adds owner automatically, but we forward the full list
|
||||||
|
// minus the owner (owner ALWAYS stays on relay side).
|
||||||
|
const patchRes = await hyprcrd.api(`api/chat/rooms/${uid}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
body: { members },
|
||||||
|
});
|
||||||
|
if (!patchRes?.ok) {
|
||||||
|
await hyprcrd.dialog.show({ title: 'update failed', message: patchRes?.error || 'unknown', danger: true, okLabel: 'Ok', cancelLabel: '' });
|
||||||
|
}
|
||||||
|
await pollOnce(); // refresh local rooms mirror
|
||||||
|
await openRoomInfo(); // re-render
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (action === 'leave' || action === 'delete') {
|
||||||
|
const confirm = await hyprcrd.dialog.show({
|
||||||
|
title: action === 'delete' ? 'Delete room?' : 'Leave room?',
|
||||||
|
message: action === 'delete'
|
||||||
|
? 'All members lose access and the message history is wiped.'
|
||||||
|
: 'You will stop receiving messages in this room.',
|
||||||
|
danger: true,
|
||||||
|
okLabel: action === 'delete' ? 'Delete' : 'Leave',
|
||||||
|
});
|
||||||
|
if (!confirm) return;
|
||||||
|
const res = await hyprcrd.api(`api/chat/rooms/${uid}`, { method: 'DELETE' });
|
||||||
|
if (!res?.ok) {
|
||||||
|
await hyprcrd.dialog.show({ title: 'failed', message: res?.error || 'unknown', danger: true, okLabel: 'Ok', cancelLabel: '' });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await pollOnce();
|
||||||
|
await loadConversations();
|
||||||
|
showListView();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Disposable toggle (1:1) ──────────────────────────────────────
|
||||||
|
|
||||||
|
async function refreshDisposableIcon(peer) {
|
||||||
|
const btn = $('chat-thread-disposable');
|
||||||
|
if (!btn) return;
|
||||||
|
const res = await fetch('api/chat/thread-settings?peer=' + encodeURIComponent(peer))
|
||||||
|
.then(r => r.json()).catch(() => null);
|
||||||
|
const on = !!res?.disposable;
|
||||||
|
btn.classList.toggle('active', on);
|
||||||
|
btn.setAttribute('data-tip', on
|
||||||
|
? 'disposable: new messages drop after delivery — click to persist'
|
||||||
|
: 'persistent: messages live on the relay — click to make disposable');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleDisposable() {
|
||||||
|
if (currentThread?.kind !== 'peer') return;
|
||||||
|
const peer = currentThread.key;
|
||||||
|
const cur = await fetch('api/chat/thread-settings?peer=' + encodeURIComponent(peer))
|
||||||
|
.then(r => r.json()).catch(() => ({ disposable: 0 }));
|
||||||
|
const next = cur.disposable ? 0 : 1;
|
||||||
|
await hyprcrd.api('api/chat/thread-settings', {
|
||||||
|
method: 'POST',
|
||||||
|
body: { peer, disposable: next },
|
||||||
|
});
|
||||||
|
refreshDisposableIcon(peer);
|
||||||
|
}
|
||||||
|
|
||||||
// ── Polling ───────────────────────────────────────────────────────
|
// ── Polling ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
async function pollOnce() {
|
async function pollOnce() {
|
||||||
@@ -330,18 +720,18 @@ async function pollOnce() {
|
|||||||
const res = await hyprcrd.api('api/chat/poll', { method: 'POST' }).catch(() => null);
|
const res = await hyprcrd.api('api/chat/poll', { method: 'POST' }).catch(() => null);
|
||||||
if (!res?.ok) return;
|
if (!res?.ok) return;
|
||||||
const newCount = res.new || 0;
|
const newCount = res.new || 0;
|
||||||
|
const receiptUpdates = res.receipts || 0;
|
||||||
if (newCount > 0) {
|
if (newCount > 0) {
|
||||||
await loadConversations();
|
await loadConversations();
|
||||||
// If we're inside a thread for any peer, refresh + auto-read it
|
if (isOpen() && currentThread) {
|
||||||
if (isOpen() && currentPeer) {
|
await loadThread(currentThread);
|
||||||
await loadThread(currentPeer);
|
hyprcrd.api('api/chat/read', { method: 'POST', body: threadBody(currentThread) })
|
||||||
hyprcrd.api('api/chat/read', { method: 'POST', body: { peer: currentPeer } })
|
|
||||||
.then(() => loadConversations()).catch(() => {});
|
.then(() => loadConversations()).catch(() => {});
|
||||||
}
|
}
|
||||||
// Blink if the flyout is closed
|
|
||||||
if (!isOpen()) startBlink();
|
if (!isOpen()) startBlink();
|
||||||
|
} else if (receiptUpdates > 0 && isOpen() && currentThread) {
|
||||||
|
await loadThread(currentThread);
|
||||||
} else if (initialPollDone === false) {
|
} else if (initialPollDone === false) {
|
||||||
// First poll: refresh badges in case we have unread from a previous session
|
|
||||||
await loadConversations();
|
await loadConversations();
|
||||||
}
|
}
|
||||||
initialPollDone = true;
|
initialPollDone = true;
|
||||||
@@ -366,16 +756,36 @@ function init() {
|
|||||||
$('chat-refresh-btn').addEventListener('click', () => pollOnce().then(loadConversations));
|
$('chat-refresh-btn').addEventListener('click', () => pollOnce().then(loadConversations));
|
||||||
$('chat-new-btn').addEventListener('click', openPickView);
|
$('chat-new-btn').addEventListener('click', openPickView);
|
||||||
$('chat-empty-start')?.addEventListener('click', openPickView);
|
$('chat-empty-start')?.addEventListener('click', openPickView);
|
||||||
$('chat-thread-back').addEventListener('click', () => { showListView(); loadConversations(); });
|
// Caret + "chat" label are one button with one tooltip. Click is a
|
||||||
|
// no-op when the caret is hidden (already on the list) — the CSS
|
||||||
|
// .navigable class tracks whether the button looks clickable.
|
||||||
|
$('chat-header-nav')?.addEventListener('click', () => {
|
||||||
|
if (!$('chat-header-nav')?.classList.contains('navigable')) return;
|
||||||
|
showListView();
|
||||||
|
loadConversations();
|
||||||
|
});
|
||||||
$('chat-pick-back').addEventListener('click', showListView);
|
$('chat-pick-back').addEventListener('click', showListView);
|
||||||
$('chat-thread-form').addEventListener('submit', sendMessage);
|
$('chat-thread-form').addEventListener('submit', sendMessage);
|
||||||
|
$('chat-thread-info')?.addEventListener('click', openRoomInfo);
|
||||||
|
$('chat-thread-disposable')?.addEventListener('click', toggleDisposable);
|
||||||
|
$('chat-room-info-back')?.addEventListener('click', () => {
|
||||||
|
if (currentThread) openConversation(currentThread);
|
||||||
|
else showListView();
|
||||||
|
});
|
||||||
|
$('chat-group-create')?.addEventListener('click', createRoom);
|
||||||
|
document.querySelectorAll('.chat-pick-mode-btn').forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
pickMode = btn.dataset.mode;
|
||||||
|
applyPickMode();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
wirePeerStripWheel();
|
||||||
|
|
||||||
// Esc closes flyout when focus is inside it
|
|
||||||
$('chat-flyout').addEventListener('keydown', e => {
|
$('chat-flyout').addEventListener('keydown', e => {
|
||||||
if (e.key === 'Escape') { e.stopPropagation(); closeFlyout(); }
|
if (e.key === 'Escape') { e.stopPropagation(); closeFlyout(); }
|
||||||
});
|
});
|
||||||
|
|
||||||
// Defer the first POST (poll) until auth has set csrf. GETs are fine immediately.
|
|
||||||
loadConversations().catch(() => {});
|
loadConversations().catch(() => {});
|
||||||
const startPolling = () => {
|
const startPolling = () => {
|
||||||
pollOnce().catch(() => {});
|
pollOnce().catch(() => {});
|
||||||
@@ -387,7 +797,6 @@ function init() {
|
|||||||
hyprcrd.hooks.on('csrf.ready', startPolling);
|
hyprcrd.hooks.on('csrf.ready', startPolling);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pause polling when the page is hidden
|
|
||||||
document.addEventListener('visibilitychange', () => {
|
document.addEventListener('visibilitychange', () => {
|
||||||
if (document.hidden) {
|
if (document.hidden) {
|
||||||
if (pollHandle) { clearInterval(pollHandle); pollHandle = null; }
|
if (pollHandle) { clearInterval(pollHandle); pollHandle = null; }
|
||||||
@@ -396,6 +805,8 @@ function init() {
|
|||||||
restartPoll();
|
restartPoll();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
hyprcrd.hooks?.on?.('sync.tick', () => { pollOnce().catch(() => {}); });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (document.readyState === 'loading') {
|
if (document.readyState === 'loading') {
|
||||||
@@ -406,6 +817,6 @@ if (document.readyState === 'loading') {
|
|||||||
|
|
||||||
hyprcrd.registerPlugin?.({
|
hyprcrd.registerPlugin?.({
|
||||||
name: 'chat',
|
name: 'chat',
|
||||||
version: '1.0.0',
|
version: '1.1.0',
|
||||||
description: 'Encrypted chat between relay tenants',
|
description: 'Encrypted chat between relay tenants (1:1 + group rooms)',
|
||||||
});
|
});
|
||||||
@@ -0,0 +1,358 @@
|
|||||||
|
# collab-buckets plugin
|
||||||
|
|
||||||
|
Collaborative buckets shared between relay tenants. Each bucket has an owner
|
||||||
|
and a set of members; membership changes and metadata updates propagate
|
||||||
|
through the existing relay. Collab buckets are **first-class rows in the
|
||||||
|
normal bucket bar** — the plugin just owns the sync plus an unread
|
||||||
|
indicator (red dot + 3-cycle pulse) on any tab that has a fresh update.
|
||||||
|
|
||||||
|
**Phase 1 through 5 shipped.** Metadata + membership sync, bucket-bar
|
||||||
|
integration, full card sync (create / edit / delete, LWW conflict
|
||||||
|
resolution with local Conflicts-bucket stashing, encrypted round-trip
|
||||||
|
via the relay's decrypt-reencrypt hop), advisory per-card edit locks
|
||||||
|
with a 🔒 badge on cards another user is currently editing,
|
||||||
|
bucket-ownership transfer through a members & owner modal, and the
|
||||||
|
Phase 5 hardening pass: **"Make collaborative…"** upgrade path for
|
||||||
|
existing local buckets, **undo** for local bucket delete/leave,
|
||||||
|
**resilient create** via a local outbox that queues intents when the
|
||||||
|
relay is unreachable and retries on the next poll, and
|
||||||
|
**rate-limiting** on all collab endpoints. Remaining nice-to-haves
|
||||||
|
(position propagation, presence, read receipts, inline member picker,
|
||||||
|
owner approval flow) are in `TODO.md`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What it does
|
||||||
|
|
||||||
|
- **Create a collab bucket** from the normal `+ Bucket` button in the
|
||||||
|
bucket bar. The plugin intercepts the button click (via
|
||||||
|
`window._collabBucketsCreateDialog`) and shows a modal with an optional
|
||||||
|
"collaborative" checkbox. Unchecked → a regular local bucket, same as
|
||||||
|
before. Checked → reveals a member picker listing all other relay
|
||||||
|
tenants, and the submit path goes through `/api/collab-buckets` instead
|
||||||
|
of the core `/api/buckets`.
|
||||||
|
- **See other members' buckets** appear automatically in the bucket bar.
|
||||||
|
Every 30 seconds the plugin polls the relay for a full resync; any new
|
||||||
|
or updated bucket the current user is a member of is mirrored into the
|
||||||
|
main `buckets` table, so the core bar renders it alongside everything
|
||||||
|
else.
|
||||||
|
- **Collab tabs are visually distinguished**: the folder icon is swapped
|
||||||
|
for `ph-users-three`, there's a subtle left-edge accent stripe, and the
|
||||||
|
right-click menu's rename / color / delete actions route through the
|
||||||
|
plugin endpoints so changes reach the relay and other members.
|
||||||
|
- **Unread state**: brand-new buckets and ones whose `updated_at` exceeds
|
||||||
|
the local `last_seen_at` show a red dot top-right of the tab and pulse 3
|
||||||
|
times on the next render. Clicking the tab triggers `mark-seen` which
|
||||||
|
clears the dot/pulse immediately and persists to the plugin backend.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
Two places store bucket state locally:
|
||||||
|
|
||||||
|
1. **Main `buckets` table** (core) — gains a `collab_uid` column so collab
|
||||||
|
buckets are indistinguishable from local buckets in the bucket bar,
|
||||||
|
bucket selects, card-to-bucket joins, etc. `collab_uid` is unique and
|
||||||
|
NULL for regular local buckets.
|
||||||
|
2. **Plugin `collab_buckets` table** — holds collab-only metadata
|
||||||
|
(`members_json`, `owner_username`, `updated_at`, `last_seen_at`) that
|
||||||
|
the main table doesn't need. On every poll the plugin keeps both
|
||||||
|
tables in sync.
|
||||||
|
|
||||||
|
```
|
||||||
|
┌───── Browser ─────┐ ┌──── Relay ────┐
|
||||||
|
│ │ │ │
|
||||||
|
│ bucket-bar (core) │ │ │
|
||||||
|
│ ├─ bucket rows │ POST /api/collab-buckets │ collab- │
|
||||||
|
│ │ incl. collab │ (create via + Bucket modal) │ buckets.php │
|
||||||
|
│ │ collab_uid │ ───────────────────────────▶ │ │
|
||||||
|
│ │ │ │ collab_ │
|
||||||
|
│ collab-buckets.js │ POST /api/collab-buckets │ buckets │
|
||||||
|
│ ▲ observer │ /poll (every 30s) │ │
|
||||||
|
│ │ MutationObs │ ◀─────────────────────────── │ collab_ │
|
||||||
|
│ │ + delegation │ full resync │ bucket_ │
|
||||||
|
│ ▼ │ │ members │
|
||||||
|
│ backend.php │ │ │
|
||||||
|
│ ├─ collab_buckets│ │ │
|
||||||
|
│ │ plugin table │ │ │
|
||||||
|
│ └─ upserts/ │ │ │
|
||||||
|
│ deletes rows │ │ │
|
||||||
|
│ in main │ │ │
|
||||||
|
│ buckets table │ │ │
|
||||||
|
└───────────────────┘ └───────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
- **Relay is source of truth** for bucket metadata + membership. The two
|
||||||
|
local tables are mirrors that together add `last_seen_at` (unread state,
|
||||||
|
user-specific, never synced).
|
||||||
|
- **Full resync every 30 s.** Locally cached buckets that are no longer
|
||||||
|
returned by the relay for this user = we were kicked (or the bucket was
|
||||||
|
deleted); both tables drop them and any cards referencing them fall back
|
||||||
|
to unsorted via `ON DELETE SET NULL`.
|
||||||
|
- **LWW per bucket**: every patch bumps `updated_at` on the relay. The
|
||||||
|
local poll only re-saves rows whose `updated_at` actually changed,
|
||||||
|
otherwise it's a no-op and `last_seen_at` is untouched so unread state
|
||||||
|
survives unrelated polls.
|
||||||
|
|
||||||
|
## Files
|
||||||
|
|
||||||
|
| File | Purpose |
|
||||||
|
|---|---|
|
||||||
|
| `plugin.json` | Plugin manifest (auto-enabled unless listed in `data/plugins.json`) |
|
||||||
|
| `backend.php` | Plugin backend: `collab_buckets` plugin table, relay proxy, full-resync poll, mark-seen, + `collabUpsertMainBucket` / `collabDeleteMainBucket` helpers that keep the core `buckets` table in sync |
|
||||||
|
| `collab-buckets.js` | Frontend: polling loop, exposes `window._collabBucketsCreateDialog` for the core `+ Bucket` button, MutationObserver on `#bucket-bar` to decorate collab tabs with unread dot + pulse, delegated click handler for mark-seen, helpers for rename / color / delete that core's context menu calls for `collab_uid` buckets |
|
||||||
|
| `collab-buckets.css` | Collab-tab decoration (left accent stripe, unread dot, pulse animation) + the create / edit modal styling |
|
||||||
|
| `README.md` | This file |
|
||||||
|
| `TODO.md` | Deferred features + Phase 3 roadmap |
|
||||||
|
|
||||||
|
### Core-side touchpoints (not in this directory)
|
||||||
|
|
||||||
|
| File | What changes |
|
||||||
|
|---|---|
|
||||||
|
| `src/Database.php` | Migration adds `buckets.collab_uid TEXT` + a unique partial index |
|
||||||
|
| `public/index.php` | `api/buckets` GET returns `collab_uid` (via `SELECT *`). `PATCH` only allows `position` on collab buckets (name/color must go through the plugin so other members see them). `DELETE` refuses collab buckets with a 400 pointing to `/api/collab-buckets/{uid}` |
|
||||||
|
| `public/js/app.js` | Exposes `window.state = state` so the plugin's observer can read `state.buckets` to resolve `collab_uid` per tab |
|
||||||
|
| `public/js/modules/buckets.js` | `+ Bucket` click checks `window._collabBucketsCreateDialog` before falling back to the simple dialog. Rename / color / delete actions check `bucket.collab_uid` and route through `window._collabBucketsPatch` / `_collabBucketsDelete` when set |
|
||||||
|
|
||||||
|
Relay-side files (not in this directory, part of the main relay deployment):
|
||||||
|
|
||||||
|
| File | Purpose |
|
||||||
|
|---|---|
|
||||||
|
| `relay/inc/bootstrap.php` | Adds `collab_buckets` + `collab_bucket_members` tables (auto-migrated on first boot) |
|
||||||
|
| `relay/inc/routes/collab-buckets.php` | `POST/GET/PATCH/DELETE /api/collab-buckets[/{uid}]` |
|
||||||
|
| `relay/index.php` | `require`s the new route file after `chat.php` |
|
||||||
|
|
||||||
|
## API (local)
|
||||||
|
|
||||||
|
All routes live under `/api/collab-buckets` and are registered via
|
||||||
|
`PluginManager::instance()->onApiRoute()`.
|
||||||
|
|
||||||
|
| Method | Path | Purpose |
|
||||||
|
|---|---|---|
|
||||||
|
| `GET` | `/api/collab-buckets` | List local mirror. Each row has `has_unread` computed from `last_seen_at` vs `updated_at`. |
|
||||||
|
| `POST` | `/api/collab-buckets` | `{name, color, members[]}` — generates UID, pushes to relay, mirrors local. The creator's own `last_seen_at = now` so the tile isn't unread for them. |
|
||||||
|
| `PATCH` | `/api/collab-buckets/{uid}` | `{name?, color?, members?}` — owner-only, proxied to relay. Local row updates on next poll. |
|
||||||
|
| `DELETE` | `/api/collab-buckets/{uid}` | Owner → delete; member → leave. Relay decides based on the authenticated caller. |
|
||||||
|
| `POST` | `/api/collab-buckets/poll` | Full resync. Drops stale local rows, upserts changed remote rows, preserves `last_seen_at`. |
|
||||||
|
| `POST` | `/api/collab-buckets/mark-seen` | `{uid}` — sets `last_seen_at = now` so the dot / pulse clear. |
|
||||||
|
| `GET` | `/api/collab-buckets/relay-tenants` | Proxy to relay `/api/tenants` for the member-picker. |
|
||||||
|
|
||||||
|
## API (relay)
|
||||||
|
|
||||||
|
Exact endpoints the local plugin forwards to. Authentication: the standard
|
||||||
|
`X-Relay-User` / `X-Relay-Key` client-API headers that the existing chat and
|
||||||
|
messages routes also use.
|
||||||
|
|
||||||
|
### Buckets
|
||||||
|
|
||||||
|
| Method | Path | Behaviour |
|
||||||
|
|---|---|---|
|
||||||
|
| `POST` | `/api/collab-buckets` | `{uid, name, color, members: [usernames]}`. Unknown usernames are silently dropped; the owner is always added to the member list regardless of whether they included themselves. |
|
||||||
|
| `GET` | `/api/collab-buckets` | Returns all buckets where the caller is a member (owner or otherwise). Each row carries its full member list as `members: [usernames]`. |
|
||||||
|
| `PATCH` | `/api/collab-buckets/{uid}` | Owner-only. Member-list replacement is total — pass the full desired list. |
|
||||||
|
| `DELETE` | `/api/collab-buckets/{uid}` | Owner → `DELETE` of bucket + memberships (with `action: deleted`). Member → just that one membership row (with `action: left`); the bucket's `updated_at` is bumped so the owner sees the change on next poll. |
|
||||||
|
|
||||||
|
### Cards (Phase 3)
|
||||||
|
|
||||||
|
| Method | Path | Behaviour |
|
||||||
|
|---|---|---|
|
||||||
|
| `POST` | `/api/collab-cards` | `{bucket_uid, card_uid, payload}` — upsert. `payload` is a `HYPRCRD-RELAY-V1` envelope encrypted with the sender's client secret. The relay decrypts it with the sender's secret (via `masterDecrypt` of their stored `secret_encrypted`), re-encrypts with the inter-tenant key, stores. Server generates `updated_at` so all clients agree on the authoritative LWW timestamp. Membership-guarded. |
|
||||||
|
| `GET` | `/api/collab-cards?since=<ts>` | Pull cards updated since `<ts>` (ISO string from a previous response's `max_updated_at`) across all buckets the caller is a member of. Each row is re-encrypted under the caller's client secret on the way out. Tombstoned rows return with `deleted: true` and no payload. Hard-capped to 1000 cards per response. |
|
||||||
|
| `DELETE` | `/api/collab-cards/{bucket_uid}/{card_uid}` | Mark tombstone (not hard-delete) so late pollers still observe the deletion within the 7-day TTL. Membership-guarded. |
|
||||||
|
|
||||||
|
## Schema (local)
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE collab_buckets (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
uid TEXT UNIQUE NOT NULL, -- 16-hex string generated by this client
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
color TEXT NOT NULL DEFAULT '#38bdf8',
|
||||||
|
owner_username TEXT NOT NULL,
|
||||||
|
members_json TEXT NOT NULL DEFAULT '[]',
|
||||||
|
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
last_seen_at TEXT -- NULL = never opened → unread
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Phase 3: per-card sync state. Attached to the core `cards` table via
|
||||||
|
-- card_id FK. `last_push_at` mirrors the updated_at we last sent to the
|
||||||
|
-- relay; the push phase picks up cards where c.updated_at > last_push_at.
|
||||||
|
-- `last_remote_at` mirrors the updated_at we last applied from the relay.
|
||||||
|
CREATE TABLE collab_card_state (
|
||||||
|
card_id INTEGER PRIMARY KEY,
|
||||||
|
relay_uid TEXT NOT NULL,
|
||||||
|
bucket_uid TEXT NOT NULL,
|
||||||
|
last_push_at TEXT,
|
||||||
|
last_remote_at TEXT,
|
||||||
|
FOREIGN KEY (card_id) REFERENCES cards(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Phase 3: deletion outbox. Populated by a BEFORE DELETE trigger on the
|
||||||
|
-- cards table; drained in the push phase of the next poll.
|
||||||
|
CREATE TABLE collab_tombstones (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
relay_uid TEXT NOT NULL,
|
||||||
|
bucket_uid TEXT NOT NULL,
|
||||||
|
queued_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
`members_json` is a JSON array of usernames — flat and cheap to render.
|
||||||
|
Because the relay is the source of truth, we don't need to normalise
|
||||||
|
members into a separate local table.
|
||||||
|
|
||||||
|
The plugin also creates a BEFORE-DELETE trigger on `cards` that inserts a
|
||||||
|
tombstone row whenever a card in a collab bucket is deleted — unless the
|
||||||
|
suppress temp table `collab_suppress_outbox` has a row, which the plugin
|
||||||
|
sets during the poll's apply phase so remotely-triggered deletes don't
|
||||||
|
re-enqueue.
|
||||||
|
|
||||||
|
## Schema (relay)
|
||||||
|
|
||||||
|
```sql
|
||||||
|
CREATE TABLE collab_buckets (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
uid TEXT UNIQUE NOT NULL,
|
||||||
|
owner_id INTEGER NOT NULL,
|
||||||
|
owner_username TEXT NOT NULL,
|
||||||
|
name TEXT NOT NULL,
|
||||||
|
color TEXT NOT NULL DEFAULT '#38bdf8',
|
||||||
|
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
FOREIGN KEY (owner_id) REFERENCES tenants(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
CREATE TABLE collab_bucket_members (
|
||||||
|
bucket_uid TEXT NOT NULL,
|
||||||
|
tenant_id INTEGER NOT NULL,
|
||||||
|
username TEXT NOT NULL,
|
||||||
|
added_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
PRIMARY KEY (bucket_uid, tenant_id),
|
||||||
|
FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Phase 3: the actual synced card content. `payload` is the re-encrypted
|
||||||
|
-- envelope stored at rest under the inter-tenant key. `deleted = 1`
|
||||||
|
-- marks a tombstone; bootstrap.php prunes them after 7 days.
|
||||||
|
CREATE TABLE collab_cards (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
bucket_uid TEXT NOT NULL,
|
||||||
|
card_uid TEXT NOT NULL,
|
||||||
|
author_username TEXT NOT NULL,
|
||||||
|
payload TEXT NOT NULL,
|
||||||
|
updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
deleted INTEGER NOT NULL DEFAULT 0,
|
||||||
|
UNIQUE (bucket_uid, card_uid)
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
Owner deletion cascades via `ON DELETE CASCADE` on the `owner_id` FK.
|
||||||
|
Member rows are pruned explicitly on leave (or cascade when a tenant is
|
||||||
|
deleted outright). `collab_cards` rows belonging to a deleted bucket are
|
||||||
|
orphaned but unreachable — the GET query joins `collab_bucket_members`
|
||||||
|
and returns nothing for them, so they're effectively gone. Future hardening
|
||||||
|
could add a cascade trigger.
|
||||||
|
|
||||||
|
## Card sync flow (Phase 3)
|
||||||
|
|
||||||
|
Every poll does three things in strict order inside one request:
|
||||||
|
|
||||||
|
1. **Drain tombstones.** The `collab_tombstones` outbox table is populated
|
||||||
|
by a BEFORE DELETE trigger on `cards` — whenever a user deletes a card
|
||||||
|
that sits in a collab bucket, the trigger inserts a row `{relay_uid,
|
||||||
|
bucket_uid}` into the outbox. The poll pushes each row to
|
||||||
|
`DELETE /api/collab-cards/{bucket}/{card}` and drops the outbox entry
|
||||||
|
on success. Failed pushes stay queued and retry next poll.
|
||||||
|
|
||||||
|
2. **Push dirty cards.** One query finds every card in a collab bucket
|
||||||
|
whose `updated_at` is greater than `collab_card_state.last_push_at`
|
||||||
|
(or never-pushed). Each is encrypted with the local `relay_key` and
|
||||||
|
POSTed to `/api/collab-cards`. On success, `last_push_at` is stamped
|
||||||
|
with the server's returned `updated_at` so the next poll skips it.
|
||||||
|
Cards without a `relay_uid` get one assigned (16 hex chars) and the
|
||||||
|
core `cards.relay_uid` column is updated so the card has a stable
|
||||||
|
cross-tenant identity.
|
||||||
|
|
||||||
|
3. **Pull deltas.** `GET /api/collab-cards?since=<stored>` fetches every
|
||||||
|
card updated or tombstoned since the stored marker (core `settings`
|
||||||
|
row `collab_cards_last_remote_at`). For each incoming card:
|
||||||
|
- If `deleted: true` → look up the local card by `relay_uid` and
|
||||||
|
`DELETE` it. The BEFORE DELETE trigger is suppressed via the
|
||||||
|
`collab_suppress_outbox` temp-table flag so it doesn't re-enqueue
|
||||||
|
the tombstone back into the outbox.
|
||||||
|
- Otherwise, decrypt the payload, find the local card by `relay_uid`,
|
||||||
|
and apply LWW (`remote.updated_at > local.updated_at` → overwrite).
|
||||||
|
New cards are INSERTed with `bucket_id` resolved via
|
||||||
|
`buckets.collab_uid`. In both cases `collab_card_state.last_push_at`
|
||||||
|
and `last_remote_at` are set to the remote's `updated_at` so the
|
||||||
|
next push phase doesn't re-send what was just received.
|
||||||
|
|
||||||
|
Conflict resolution is strict LWW on `updated_at`. If two users save the
|
||||||
|
same card within the same second, the second writer wins; the first
|
||||||
|
writer's changes are silently overwritten on their next pull. Phase 4
|
||||||
|
adds optional edit-locks to surface the conflict before it happens.
|
||||||
|
|
||||||
|
## Unread / pulse state
|
||||||
|
|
||||||
|
`has_unread` is computed by the plugin backend on every read of
|
||||||
|
`/api/collab-buckets`:
|
||||||
|
|
||||||
|
```
|
||||||
|
has_unread = (last_seen_at IS NULL) OR (updated_at > last_seen_at)
|
||||||
|
```
|
||||||
|
|
||||||
|
- **Brand-new bucket** → poll inserts the plugin row with `last_seen_at =
|
||||||
|
NULL` → unread.
|
||||||
|
- **Metadata / member change** → relay bumps `updated_at` → poll upserts →
|
||||||
|
`updated_at > last_seen_at` → unread.
|
||||||
|
- **Click tab** → `mark-seen` sets `last_seen_at = now` → unread clears on
|
||||||
|
the next render.
|
||||||
|
|
||||||
|
The plugin frontend watches `#bucket-bar` via `MutationObserver`. After
|
||||||
|
every core re-render, it walks the tabs, looks up each bucket in
|
||||||
|
`state.buckets`, and applies `.bucket-tab-collab` plus (if unread) the
|
||||||
|
`.pulsing` class and an injected `.collab-tab-dot` element. The pulse
|
||||||
|
animation is CSS-driven (`collab-bucket-pulse 1.2s ease-in-out 3`), and
|
||||||
|
the JS strips `.pulsing` after 3.7 s so subsequent re-renders don't
|
||||||
|
retrigger it mid-cycle.
|
||||||
|
|
||||||
|
## Theming
|
||||||
|
|
||||||
|
All chrome hooks into the standard design tokens:
|
||||||
|
|
||||||
|
- `--ui-radius-button` — tile and button rounding
|
||||||
|
- `--ui-radius-modal` — create/edit modal
|
||||||
|
- `--ui-radius-input` — form inputs
|
||||||
|
- `--ui-shadow-modal` — modal drop shadow
|
||||||
|
- `--ui-blur-overlay` — modal backdrop blur
|
||||||
|
- `--collab-tile-color` (per-tile) — bucket color, mixed into border, text,
|
||||||
|
hover background, and pulse ring
|
||||||
|
|
||||||
|
So a collab tile automatically inherits the currently selected theme and the
|
||||||
|
user's design-token choices without any plugin-side theming code.
|
||||||
|
|
||||||
|
## Why this shape
|
||||||
|
|
||||||
|
- **First-class bucket rows, not a separate UI.** Collab buckets show up
|
||||||
|
exactly where users already look for buckets. No extra header tiles, no
|
||||||
|
second "collab+" button — the existing `+ Bucket` workflow just gains a
|
||||||
|
"collaborative" checkbox. The mental model stays "this is a bucket", the
|
||||||
|
plugin only layers sync on top.
|
||||||
|
- **Polling, not push.** No long-lived connection, no WebSocket, no daemon.
|
||||||
|
30-second cadence is perfectly fine for the "someone added a card to our
|
||||||
|
shared bucket" latency envelope and reuses the existing relay HTTP path.
|
||||||
|
- **Relay as source of truth.** The local mirror is almost stateless — only
|
||||||
|
`last_seen_at` is user-specific and never leaves the device. Wipes and
|
||||||
|
re-syncs are trivial.
|
||||||
|
- **Owner-only writes.** Simpler than ACLs. Owners who want to hand off
|
||||||
|
control can delete-and-recreate, or we add a transfer endpoint in Phase 4.
|
||||||
|
- **Soft coupling to core.** Core exposes two tiny hooks
|
||||||
|
(`window._collabBucketsCreateDialog`, `window.state`) plus a single
|
||||||
|
column on the buckets table. Everything else — dialog, decoration,
|
||||||
|
polling, mark-seen — lives in the plugin directory and goes away when
|
||||||
|
the plugin is disabled.
|
||||||
|
|
||||||
|
## Disabling
|
||||||
|
|
||||||
|
Like every other plugin, add `"collab-buckets"` to the `disabled` array in
|
||||||
|
`data/plugins.json`. The local table is left in place (not dropped) so
|
||||||
|
re-enabling doesn't lose unread state.
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
# collab-buckets plugin — roadmap
|
||||||
|
|
||||||
|
> Phase 1, 2 and 3 are shipped: metadata + membership sync, bucket-bar
|
||||||
|
> integration, and full card sync with encrypted round-trip and LWW
|
||||||
|
> conflict resolution. Phase 4 is polish — edit locks, ownership
|
||||||
|
> transfer, member presence, etc. Phase 5 is hardening.
|
||||||
|
|
||||||
|
## Phase 3 — card sync (DONE ✓)
|
||||||
|
|
||||||
|
- [x] **`collab_card_state` table (local)** — maps a local `cards.id` to
|
||||||
|
a collab `bucket_uid` + `relay_uid` plus `last_push_at` and
|
||||||
|
`last_remote_at` for LWW tracking. Poll phase 1 finds dirty cards
|
||||||
|
via `c.updated_at > cs.last_push_at`.
|
||||||
|
- [x] **Save propagation without editor coupling** — the poll's push
|
||||||
|
phase is query-based (no trigger, no hook). Whenever the user
|
||||||
|
saves a card and the core bumps `cards.updated_at`, the next
|
||||||
|
poll within 30s finds it dirty and pushes.
|
||||||
|
- [x] **Relay `collab_cards` table + routes** — `POST /api/collab-cards`
|
||||||
|
decrypts-reencrypts via inter-tenant key; `GET ?since=<ts>`
|
||||||
|
re-encrypts per recipient; `DELETE /{bucket}/{card}` marks a
|
||||||
|
tombstone with a 7-day TTL (cleaned up by bootstrap.php).
|
||||||
|
- [x] **Poll extension** — `collabSyncCards()` runs three phases
|
||||||
|
(tombstones → push → pull) with a temp-table suppress flag so the
|
||||||
|
delete trigger doesn't re-enqueue during apply.
|
||||||
|
- [x] **Card visibility** — collab buckets already take part in the core
|
||||||
|
bucket-bar's click-to-filter flow, so cards synced into them
|
||||||
|
automatically show up on the board.
|
||||||
|
- [x] **Card deletion propagation** — BEFORE DELETE trigger writes to
|
||||||
|
`collab_tombstones`. Drained in the next poll as a DELETE.
|
||||||
|
Suppressed during the apply phase so remote deletes don't loop
|
||||||
|
back as local tombstones.
|
||||||
|
- [x] **Conflict losers as "(conflict from X)" duplicates** — when the
|
||||||
|
apply phase is about to LWW-clobber a local card that had edits
|
||||||
|
since our last push (`local.updated_at > collab_card_state.last_push_at`),
|
||||||
|
we now INSERT a copy of the local version into a local-only
|
||||||
|
"Conflicts" bucket with a `(conflict from <author>) ...` title
|
||||||
|
prefix before the overwrite. The poll response carries a
|
||||||
|
`conflicts` count; the frontend pops a toast pointing the user at
|
||||||
|
the Conflicts bucket when it's non-zero.
|
||||||
|
- [x] **Moving a card between collab buckets (or out to a local one)**
|
||||||
|
— the push phase now has a pre-pass that finds cards where
|
||||||
|
`collab_card_state.bucket_uid` no longer matches the card's
|
||||||
|
current bucket collab_uid. For each such card it sends a
|
||||||
|
tombstone to the old bucket. If the card is still in a (different)
|
||||||
|
collab bucket, state is rewritten with the new `bucket_uid` and
|
||||||
|
`last_push_at = NULL` so the main push loop re-uploads under the
|
||||||
|
new bucket. If the card left collab entirely, the state row is
|
||||||
|
removed.
|
||||||
|
|
||||||
|
## Phase 4 — polish
|
||||||
|
|
||||||
|
- [x] **Per-card edit lock** — when the editor opens on a collab card the
|
||||||
|
plugin heartbeats `POST /api/collab-locks {bucket_uid, card_uid}`
|
||||||
|
every 30 s with a 60 s TTL on the relay. The lock list is folded
|
||||||
|
into the regular `/api/collab-buckets/poll` response so no extra
|
||||||
|
round-trips are needed. Foreign locks show a 🔒 badge on the
|
||||||
|
affected board card + a subtle inset outline. Releases on editor
|
||||||
|
close and best-effort on `beforeunload` via `fetch(..., keepalive)`.
|
||||||
|
Advisory only — users can still force-edit; LWW + conflict stashing
|
||||||
|
remain the final arbiter. Core `editor.js` dispatches
|
||||||
|
`hyprcrd:editor-open` / `hyprcrd:editor-close` `CustomEvent`s so
|
||||||
|
the plugin hooks in without monkey-patching.
|
||||||
|
- [x] **Ownership transfer** — `PATCH /api/collab-buckets/{uid}`
|
||||||
|
accepts `{owner: <username>}`. The relay validates that the new
|
||||||
|
owner is currently a member, swaps `owner_id` + `owner_username`,
|
||||||
|
and forces both the caller and the new owner to stay in the member
|
||||||
|
list on the same request. Surfaced in the UI via a new "Members &
|
||||||
|
owner…" entry in the bucket context menu that opens a plugin
|
||||||
|
dialog with a member picker + owner dropdown (only shown when the
|
||||||
|
caller is the current owner; other members see a read-only view).
|
||||||
|
- [ ] **Position propagation (optional)** — reorder is purely local right
|
||||||
|
now. If multiple members expect the same order, we'd need to sync
|
||||||
|
`position` via the relay, but it's probably fine to leave this as a
|
||||||
|
per-user preference.
|
||||||
|
- [ ] **Member presence indicator** — show a small dot next to usernames in
|
||||||
|
the members panel when they were seen by the relay within the last
|
||||||
|
minute (reuse chat's heartbeat or add a collab-specific ping).
|
||||||
|
- [ ] **"Recently active members"** — show avatars (first letter) of
|
||||||
|
members who touched a card in the last hour, on the collab bucket tab.
|
||||||
|
- [ ] **Read receipts** — "3 / 5 seen" for the latest update on each
|
||||||
|
collab bucket. Requires the relay to store per-member `last_seen_at`
|
||||||
|
— bigger schema change.
|
||||||
|
|
||||||
|
## Phase 5 — hardening & UX
|
||||||
|
|
||||||
|
- [x] **Migration of existing local buckets** — the bucket context menu
|
||||||
|
on a non-collab bucket shows a "Make collaborative…" entry when
|
||||||
|
the plugin is loaded. It opens a plugin dialog where the owner
|
||||||
|
picks members, then `POST /api/collab-buckets/upgrade
|
||||||
|
{bucket_id, members}` generates a new `uid`, pushes it to the
|
||||||
|
relay, and writes `collab_uid` onto the same local `buckets` row
|
||||||
|
— no card shuffling, no id rewrite. The first poll after the
|
||||||
|
upgrade sees every card in the bucket as dirty (no
|
||||||
|
`collab_card_state`) and pushes them.
|
||||||
|
- [x] **Undo for destructive actions** — local bucket delete/leave now
|
||||||
|
hooks into the existing `pushUndo` system: the undo entry
|
||||||
|
recreates the bucket via `POST /api/buckets`, restores the
|
||||||
|
original color+position with PATCH, and re-attaches every card
|
||||||
|
that pointed at the old row. Collab bucket delete/leave is
|
||||||
|
intentionally *not* wired — restoring would need to recreate on
|
||||||
|
the relay under a new uid and re-attach cards there too, which
|
||||||
|
is messy and less valuable since collab deletes are usually
|
||||||
|
deliberate.
|
||||||
|
- [x] **Resilient create via outbox** — a new
|
||||||
|
`collab_bucket_outbox(id, bucket_id, members_json, queued_at)`
|
||||||
|
table. The create/upgrade flow always creates the local `buckets`
|
||||||
|
row first and then tries `collabAttemptUpgrade()`. On relay
|
||||||
|
failure the intent is queued in the outbox and the next poll
|
||||||
|
retries. The response includes `queued: true` so the frontend can
|
||||||
|
show a "saved locally, will sync later" info toast; a follow-up
|
||||||
|
poll that successfully drains the outbox fires a second toast.
|
||||||
|
Stale outbox entries for deleted buckets are dropped automatically.
|
||||||
|
- [x] **Rate limiting on collab endpoints** — every collab route now
|
||||||
|
funnels through the existing relay `isRateLimited()` helper with
|
||||||
|
generous caps (120/min for GET, 240/min for POST). Over-limit
|
||||||
|
requests get a clean `429 rate limited` response.
|
||||||
|
- [ ] **Inline member picker in the bucket context menu** — currently
|
||||||
|
needs the manage-modal for any change. A quick `+user` / `-user`
|
||||||
|
flyout would help for tiny edits.
|
||||||
|
- [ ] **Owner-side member approval flow** — owners can still add any
|
||||||
|
relay user unilaterally. A pending-invite state with accept/reject
|
||||||
|
on the invitee side would be nicer for consent but requires a new
|
||||||
|
relay table + plumbing.
|
||||||
|
|
||||||
|
## Known limitations (current)
|
||||||
|
|
||||||
|
- **LWW conflicts still clobber on the remote side.** When two users save
|
||||||
|
the same card within a few seconds, the later writer wins. The earlier
|
||||||
|
writer gets their local version stashed into a `Conflicts` bucket and
|
||||||
|
a toast notification — nothing is lost — but their version is no
|
||||||
|
longer the canonical one anyone else sees. Phase 4 edit-locks prevent
|
||||||
|
the race in the first place.
|
||||||
|
- **Up to ~30 s sync latency.** Changes propagate on the next poll, not
|
||||||
|
instantly. Acceptable for MVP; a "push now" hook after save would cut
|
||||||
|
latency to ~1 s.
|
||||||
|
- **Full resync on every poll.** Cheap for small member counts but grows
|
||||||
|
O(N_buckets × N_members) on the relay side. A `since=updated_at` filter
|
||||||
|
would help — adding it is safe because the poll also has to handle full
|
||||||
|
removals (kicked from bucket), and we can fold the deletion list into the
|
||||||
|
response.
|
||||||
|
- **Bucket metadata is plaintext on the relay.** Name + color + member list
|
||||||
|
are visible to a relay admin with DB access. Card content (Phase 3) will
|
||||||
|
be encrypted end-to-end via the existing decrypt-reencrypt hop; bucket
|
||||||
|
metadata could follow the same pattern but adds complexity for minimal
|
||||||
|
gain and makes member picking harder.
|
||||||
|
- **No offline support.** Creating a bucket while the relay is unreachable
|
||||||
|
fails hard. Phase 5 outbox pattern would fix this.
|
||||||
|
- **Race on UID generation.** The client generates `bin2hex(random_bytes(8))`
|
||||||
|
= 64 bits of entropy. Collisions between independent clients are
|
||||||
|
astronomically unlikely, but the relay rejects them with 409 if they ever
|
||||||
|
happen. No retry on the client side yet.
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,379 @@
|
|||||||
|
/* ── Collab buckets plugin ── */
|
||||||
|
|
||||||
|
/* Decoration for bucket-bar tabs that represent a collab bucket. The core
|
||||||
|
still renders the tab via its normal `.bucket-tab` rule; the plugin only
|
||||||
|
layers a few extras on top: a small 👥 icon swap (done in JS), an unread
|
||||||
|
dot pinned top-right, and a 3-cycle pulse animation when a fresh update
|
||||||
|
arrives. */
|
||||||
|
|
||||||
|
.bucket-tab.bucket-tab-collab {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bucket-tab.bucket-tab-collab .collab-tab-dot {
|
||||||
|
position: absolute;
|
||||||
|
top: -3px;
|
||||||
|
right: -3px;
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--t-danger);
|
||||||
|
border: 1px solid var(--t-bg);
|
||||||
|
box-shadow: 0 0 6px color-mix(in srgb, var(--t-danger) 60%, transparent);
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bucket-tab.bucket-tab-collab.pulsing {
|
||||||
|
animation: collab-bucket-pulse 1.2s ease-in-out 3;
|
||||||
|
}
|
||||||
|
/* Keep the 3-cycle cadence regardless of global animation-speed override */
|
||||||
|
body.anim-fast .bucket-tab.bucket-tab-collab.pulsing,
|
||||||
|
body.anim-slow .bucket-tab.bucket-tab-collab.pulsing {
|
||||||
|
animation: collab-bucket-pulse 1.2s ease-in-out 3 !important;
|
||||||
|
animation-duration: 1.2s !important;
|
||||||
|
}
|
||||||
|
@keyframes collab-bucket-pulse {
|
||||||
|
0%, 100% { box-shadow: 0 0 0 0 color-mix(in srgb, var(--t-danger) 60%, transparent); }
|
||||||
|
50% { box-shadow: 0 0 0 4px color-mix(in srgb, var(--t-danger) 0%, transparent); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Create / edit modal (used by the + Bucket button when the plugin
|
||||||
|
is loaded) ── */
|
||||||
|
.collab-modal-overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 240;
|
||||||
|
background: var(--t-overlay, rgba(0,0,0,0.6));
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 24px;
|
||||||
|
backdrop-filter: blur(var(--ui-blur-overlay, 0px));
|
||||||
|
-webkit-backdrop-filter: blur(var(--ui-blur-overlay, 0px));
|
||||||
|
}
|
||||||
|
.collab-modal {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 480px;
|
||||||
|
max-height: 85vh;
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-modal);
|
||||||
|
box-shadow: var(--ui-shadow-modal);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
.collab-modal-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 12px 16px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.collab-modal-close {
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 4px 8px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
transition: color 0.12s, border-color 0.12s;
|
||||||
|
}
|
||||||
|
.collab-modal-close:hover { color: var(--t-danger); border-color: var(--t-danger); }
|
||||||
|
.collab-modal-body {
|
||||||
|
padding: 16px;
|
||||||
|
overflow-y: auto;
|
||||||
|
flex: 1;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
.collab-field { display: block; margin-bottom: 14px; }
|
||||||
|
.collab-field:last-child { margin-bottom: 0; }
|
||||||
|
.collab-field.hidden { display: none; }
|
||||||
|
.collab-label {
|
||||||
|
display: block;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
.collab-input {
|
||||||
|
width: 100%;
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-input);
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 7px 10px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
outline: none;
|
||||||
|
transition: border-color 0.12s;
|
||||||
|
}
|
||||||
|
.collab-input:focus { border-color: var(--t-accent); }
|
||||||
|
.collab-color {
|
||||||
|
width: 52px;
|
||||||
|
height: 32px;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-input);
|
||||||
|
background: transparent;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.collab-toggle-row {
|
||||||
|
display: flex !important;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 6px 0;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--t-text);
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.collab-toggle-row input { accent-color: var(--t-accent); cursor: pointer; }
|
||||||
|
.collab-toggle-row:hover { color: var(--t-bright); }
|
||||||
|
|
||||||
|
.collab-members-wrap { margin-top: 10px; }
|
||||||
|
.collab-members {
|
||||||
|
max-height: 200px;
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
.collab-members-empty {
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
font-style: italic;
|
||||||
|
padding: 8px 10px;
|
||||||
|
}
|
||||||
|
.collab-member-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 5px 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--t-text);
|
||||||
|
border-radius: 2px;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.collab-member-row:hover {
|
||||||
|
background: var(--t-raised);
|
||||||
|
color: var(--t-bright);
|
||||||
|
}
|
||||||
|
.collab-member-row input { cursor: pointer; accent-color: var(--t-accent); }
|
||||||
|
|
||||||
|
.collab-modal-footer {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 12px 16px;
|
||||||
|
border-top: 1px solid var(--t-border);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.collab-modal-status {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
min-height: 14px;
|
||||||
|
}
|
||||||
|
.collab-btn-cancel,
|
||||||
|
.collab-btn-submit {
|
||||||
|
padding: 6px 14px;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
background: transparent;
|
||||||
|
cursor: pointer;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
color: var(--t-muted);
|
||||||
|
transition: color 0.12s, border-color 0.12s, background 0.12s;
|
||||||
|
}
|
||||||
|
.collab-btn-cancel:hover {
|
||||||
|
color: var(--t-danger);
|
||||||
|
border-color: var(--t-danger);
|
||||||
|
}
|
||||||
|
.collab-btn-submit {
|
||||||
|
color: var(--t-accent);
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
}
|
||||||
|
.collab-btn-submit:hover {
|
||||||
|
background: color-mix(in srgb, var(--t-accent) 12%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.collab-readonly {
|
||||||
|
display: block;
|
||||||
|
padding: 7px 10px;
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-input);
|
||||||
|
color: var(--t-text);
|
||||||
|
font-family: var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.collab-hint {
|
||||||
|
margin-top: 4px;
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Phase 4: exclusive edit-lock indicator on board cards ──
|
||||||
|
Locked cards get a frosted overlay + centered lock icon. The card
|
||||||
|
content underneath stays visible enough to read but is clearly
|
||||||
|
"off-limits" — the cue is intentionally heavier than the old badge
|
||||||
|
so the user can't miss it. */
|
||||||
|
.board-card.collab-locked {
|
||||||
|
box-shadow: inset 0 0 0 2px color-mix(in srgb, var(--t-accent2) 70%, transparent);
|
||||||
|
}
|
||||||
|
.board-card.collab-locked > *:not(.collab-lock-badge) {
|
||||||
|
filter: blur(2px);
|
||||||
|
opacity: 0.55;
|
||||||
|
transition: filter 0.15s, opacity 0.15s;
|
||||||
|
}
|
||||||
|
.collab-lock-badge {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 4px;
|
||||||
|
color: var(--t-accent2);
|
||||||
|
background: color-mix(in srgb, var(--t-surface) 60%, transparent);
|
||||||
|
backdrop-filter: blur(1px);
|
||||||
|
-webkit-backdrop-filter: blur(1px);
|
||||||
|
z-index: 6;
|
||||||
|
pointer-events: none;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
text-align: center;
|
||||||
|
padding: 4px 8px;
|
||||||
|
}
|
||||||
|
.collab-lock-badge i {
|
||||||
|
font-size: 22px;
|
||||||
|
}
|
||||||
|
.collab-lock-badge span {
|
||||||
|
color: var(--t-text);
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Editor takeover (foreign lock arrived while editing) ── */
|
||||||
|
.collab-readonly-modal #inp-title,
|
||||||
|
.collab-readonly-modal #editor-body {
|
||||||
|
opacity: 0.7;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
.collab-readonly-modal #editor-body {
|
||||||
|
background: color-mix(in srgb, var(--t-danger) 6%, transparent) !important;
|
||||||
|
}
|
||||||
|
.collab-save-blocked {
|
||||||
|
opacity: 0.4 !important;
|
||||||
|
cursor: not-allowed !important;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
.collab-takeover-banner {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 14px;
|
||||||
|
background: color-mix(in srgb, var(--t-danger) 12%, transparent);
|
||||||
|
border-bottom: 1px solid var(--t-danger);
|
||||||
|
color: var(--t-bright);
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
.collab-takeover-banner i {
|
||||||
|
color: var(--t-danger);
|
||||||
|
font-size: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.collab-takeover-banner b { color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* ── Conflict toast (LWW losers stashed into the Conflicts bucket) ── */
|
||||||
|
.collab-conflict-toast {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 24px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 220;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 14px 10px 12px;
|
||||||
|
max-width: 480px;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-bright);
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-danger);
|
||||||
|
border-radius: var(--ui-radius-modal);
|
||||||
|
box-shadow: var(--ui-shadow-modal);
|
||||||
|
transition: opacity 0.4s;
|
||||||
|
}
|
||||||
|
.collab-conflict-toast i.ph-warning { color: var(--t-danger); flex-shrink: 0; }
|
||||||
|
.collab-conflict-toast b { color: var(--t-danger); font-weight: 700; }
|
||||||
|
.collab-conflict-toast.fade-out { opacity: 0; }
|
||||||
|
/* Queued variant reuses the layout but switches the danger accents for
|
||||||
|
a neutral info color — used for "relay was down, bucket is queued" and
|
||||||
|
"queued bucket finally synced" messages. */
|
||||||
|
.collab-conflict-toast.collab-queued-toast {
|
||||||
|
border-color: var(--t-accent2);
|
||||||
|
}
|
||||||
|
.collab-conflict-toast.collab-queued-toast i.ph-cloud-arrow-up {
|
||||||
|
color: var(--t-accent2);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.collab-conflict-close {
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
color: var(--t-dim);
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 2px 4px;
|
||||||
|
margin-left: 6px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.collab-conflict-close:hover { color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* Lock toast: same shape as the conflict toast but accented with the
|
||||||
|
collab/lock color. Reused for both the editor-takeover notification
|
||||||
|
and the "your push was queued because someone else is editing" toast. */
|
||||||
|
.collab-conflict-toast.collab-lock-toast {
|
||||||
|
border-color: var(--t-accent2);
|
||||||
|
}
|
||||||
|
.collab-conflict-toast.collab-lock-toast i.ph-lock-simple-fill {
|
||||||
|
color: var(--t-accent2);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
.collab-conflict-toast.collab-lock-toast b {
|
||||||
|
color: var(--t-accent2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Per-card unread indicator ──
|
||||||
|
Mirror of the bucket-tab red dot: a card with a foreign edit we haven't
|
||||||
|
opened yet gets a small glowing dot pinned to the top-right corner. */
|
||||||
|
.board-card.collab-card-unread { position: relative; }
|
||||||
|
.board-card.collab-card-unread .collab-card-dot {
|
||||||
|
position: absolute;
|
||||||
|
top: -3px;
|
||||||
|
right: -3px;
|
||||||
|
width: 9px;
|
||||||
|
height: 9px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--t-danger);
|
||||||
|
border: 1px solid var(--t-bg);
|
||||||
|
box-shadow: 0 0 6px color-mix(in srgb, var(--t-danger) 60%, transparent);
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 3;
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"name": "collab-buckets",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "Collaborative buckets shared between relay tenants. Polls the relay for bucket updates and shows pulsing header tiles with unread indicators.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["collab-buckets.js"],
|
||||||
|
"css": ["collab-buckets.css"]
|
||||||
|
},
|
||||||
|
"backend": "backend.php"
|
||||||
|
}
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
<!-- Email Plugin: full-screen mail viewer overlay -->
|
<!-- Email Plugin: full-screen mail viewer overlay -->
|
||||||
<div class="overlay fixed inset-0" id="email-overlay" style="z-index:75;">
|
<div class="overlay fixed inset-0" id="email-overlay" style="z-index:75;">
|
||||||
<div class="email-modal bg-t-bg border border-t-border shadow-2xl flex flex-col" style="position:absolute;inset:24px;border-radius:4px;">
|
<div class="email-modal bg-t-bg flex flex-col" style="position:absolute;inset:0;">
|
||||||
|
|
||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
<div class="flex items-center gap-3 px-4 py-2 border-b border-t-border shrink-0 bg-t-surface">
|
<div class="flex items-center gap-3 px-4 py-2 border-b border-t-border shrink-0 bg-t-surface">
|
||||||
<i class="ph ph-envelope text-t-accent text-base"></i>
|
<i class="ph ph-envelope text-t-accent text-base"></i>
|
||||||
<h2 class="font-pixel text-xs text-t-accent">mail</h2>
|
<h2 class="font-pixel text-xs text-t-accent">mail</h2>
|
||||||
<select id="email-account-select" class="bg-t-bg border border-t-border text-t-bright text-xs font-pixel px-2 py-1 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer min-w-32"></select>
|
<select id="email-account-select" class="bg-t-bg border border-t-border text-t-bright text-xs font-pixel px-2 py-1 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer min-w-32"></select>
|
||||||
<button id="email-refresh" class="toolbar-btn" title="Refresh"><i class="ph ph-arrows-clockwise text-sm"></i></button>
|
<button id="email-refresh" class="toolbar-btn" data-tip="refresh"><i class="ph ph-arrows-clockwise text-sm"></i></button>
|
||||||
<span id="email-status" class="text-[10px] text-t-dim font-pixel"></span>
|
<span id="email-status" class="text-[10px] text-t-dim font-pixel"></span>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<button id="email-show-settings" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" title="Manage accounts in settings"><i class="ph ph-gear text-sm"></i><span class="font-pixel text-[10px]">Accounts</span></button>
|
<button id="email-show-settings" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="manage accounts"><i class="ph ph-gear text-sm"></i><span class="font-pixel text-[10px]">Accounts</span></button>
|
||||||
<button id="email-close" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Close</span></button>
|
<button id="email-close" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Close</span></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -41,11 +41,11 @@
|
|||||||
<div class="sticky top-0 z-20 bg-t-bg">
|
<div class="sticky top-0 z-20 bg-t-bg">
|
||||||
<!-- List toolbar: pagination + spam quick-select -->
|
<!-- List toolbar: pagination + spam quick-select -->
|
||||||
<div id="email-list-toolbar" class="hidden flex items-center gap-2 px-3 py-1.5 border-b border-t-border">
|
<div id="email-list-toolbar" class="hidden flex items-center gap-2 px-3 py-1.5 border-b border-t-border">
|
||||||
<button id="email-page-prev" class="toolbar-btn" title="Previous page"><i class="ph ph-caret-left text-sm"></i></button>
|
<button id="email-page-prev" class="toolbar-btn" data-tip="previous page"><i class="ph ph-caret-left text-sm"></i></button>
|
||||||
<button id="email-page-next" class="toolbar-btn" title="Next page"><i class="ph ph-caret-right text-sm"></i></button>
|
<button id="email-page-next" class="toolbar-btn" data-tip="next page"><i class="ph ph-caret-right text-sm"></i></button>
|
||||||
<span id="email-page-info" class="font-pixel text-[9px] text-t-dim">—</span>
|
<span id="email-page-info" class="font-pixel text-[9px] text-t-dim">—</span>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<button id="email-select-spam" class="hidden flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" title="Select all messages flagged as spam">
|
<button id="email-select-spam" class="hidden flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" data-tip="select spam">
|
||||||
<i class="ph ph-warning-octagon text-sm"></i>
|
<i class="ph ph-warning-octagon text-sm"></i>
|
||||||
<span class="font-pixel text-[9px]">select spam (<span id="email-spam-count">0</span>)</span>
|
<span class="font-pixel text-[9px]">select spam (<span id="email-spam-count">0</span>)</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -54,16 +54,16 @@
|
|||||||
<div id="email-selection-bar" class="hidden flex items-center gap-2 px-3 py-2 border-b border-t-accent bg-t-raised">
|
<div id="email-selection-bar" class="hidden flex items-center gap-2 px-3 py-2 border-b border-t-accent bg-t-raised">
|
||||||
<span id="email-selection-count" class="font-pixel text-[10px] text-t-accent">0 selected</span>
|
<span id="email-selection-count" class="font-pixel text-[10px] text-t-accent">0 selected</span>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<button id="email-selection-mark-spam" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" title="Mark sender as spam (future mail from same sender will be flagged)">
|
<button id="email-selection-mark-spam" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" data-tip="mark as spam">
|
||||||
<i class="ph ph-warning-octagon text-sm"></i><span class="font-pixel text-[9px]">Spam</span>
|
<i class="ph ph-warning-octagon text-sm"></i><span class="font-pixel text-[9px]">Spam</span>
|
||||||
</button>
|
</button>
|
||||||
<button id="email-selection-mark-ham" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors" title="Mark sender as not spam (allowlist)">
|
<button id="email-selection-mark-ham" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors" data-tip="not spam">
|
||||||
<i class="ph ph-check-circle text-sm"></i><span class="font-pixel text-[9px]">Not spam</span>
|
<i class="ph ph-check-circle text-sm"></i><span class="font-pixel text-[9px]">Not spam</span>
|
||||||
</button>
|
</button>
|
||||||
<button id="email-selection-delete" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" title="Delete selected on server">
|
<button id="email-selection-delete" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-danger text-t-danger hover:bg-t-danger/10 transition-colors" data-tip="Delete selected on server">
|
||||||
<i class="ph ph-trash text-sm"></i><span class="font-pixel text-[9px]">Delete</span>
|
<i class="ph ph-trash text-sm"></i><span class="font-pixel text-[9px]">Delete</span>
|
||||||
</button>
|
</button>
|
||||||
<button id="email-selection-clear" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" title="Clear selection">
|
<button id="email-selection-clear" class="flex items-center gap-1 px-2 py-0.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="Clear selection">
|
||||||
<i class="ph ph-x text-sm"></i>
|
<i class="ph ph-x text-sm"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -79,7 +79,7 @@
|
|||||||
<div id="email-body-empty" class="flex items-center justify-center flex-1 text-t-dim text-xs font-pixel">
|
<div id="email-body-empty" class="flex items-center justify-center flex-1 text-t-dim text-xs font-pixel">
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<i class="ph ph-envelope-open text-3xl mb-2 block"></i>
|
<i class="ph ph-envelope-open text-3xl mb-2 block"></i>
|
||||||
select a message
|
<span class="cursor-blink">select a message</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="email-body" class="hidden flex flex-col flex-1 min-h-0">
|
<div id="email-body" class="hidden flex flex-col flex-1 min-h-0">
|
||||||
@@ -91,9 +91,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mt-3 flex items-center gap-2 flex-wrap">
|
<div class="mt-3 flex items-center gap-2 flex-wrap">
|
||||||
<button id="email-extract-btn" class="flex items-center gap-1.5 px-3 py-1 text-xs bg-t-accent text-t-bg border border-t-accent hover:brightness-110 transition-all"><i class="ph ph-scissors text-sm"></i><span class="font-pixel text-[10px]">Extract as card</span></button>
|
<button id="email-extract-btn" class="flex items-center gap-1.5 px-3 py-1 text-xs bg-t-accent text-t-bg border border-t-accent hover:brightness-110 transition-all"><i class="ph ph-scissors text-sm"></i><span class="font-pixel text-[10px]">Extract as card</span></button>
|
||||||
<button id="email-view-html" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" title="Show HTML rendered version (external images blocked by default)"><i class="ph ph-code text-sm"></i><span class="font-pixel text-[10px]">View as html</span></button>
|
<button id="email-view-html" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="Show HTML rendered version (external images blocked by default)"><i class="ph ph-code text-sm"></i><span class="font-pixel text-[10px]">View as html</span></button>
|
||||||
<button id="email-view-text" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" title="Switch back to plain text"><i class="ph ph-text-aa text-sm"></i><span class="font-pixel text-[10px]">View as text</span></button>
|
<button id="email-view-text" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="Switch back to plain text"><i class="ph ph-text-aa text-sm"></i><span class="font-pixel text-[10px]">View as text</span></button>
|
||||||
<button id="email-load-images" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-accent2 text-t-accent2 hover:bg-t-accent2/10 transition-colors" title="Load external images (privacy: tracking pixels may be loaded)"><i class="ph ph-image text-sm"></i><span class="font-pixel text-[10px]">Load images (<span id="email-blocked-count">0</span>)</span></button>
|
<button id="email-load-images" class="hidden items-center gap-1.5 px-3 py-1 text-xs border border-t-accent2 text-t-accent2 hover:bg-t-accent2/10 transition-colors" data-tip="Load external images (privacy: tracking pixels may be loaded)"><i class="ph ph-image text-sm"></i><span class="font-pixel text-[10px]">Load images (<span id="email-blocked-count">0</span>)</span></button>
|
||||||
<span id="email-extract-status" class="font-pixel text-[9px] text-t-dim"></span>
|
<span id="email-extract-status" class="font-pixel text-[9px] text-t-dim"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -218,9 +218,9 @@ function renderAccountsList() {
|
|||||||
<div class="email-account-meta">${escapeHtml(a.username || '')} @ ${escapeHtml(a.host)}:${a.port} · ${escapeHtml(a.encryption)}</div>
|
<div class="email-account-meta">${escapeHtml(a.username || '')} @ ${escapeHtml(a.host)}:${a.port} · ${escapeHtml(a.encryption)}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="email-account-actions">
|
<div class="email-account-actions">
|
||||||
<button class="toolbar-btn email-edit-btn" title="Edit"><i class="ph ph-pencil-simple text-sm"></i></button>
|
<button class="toolbar-btn email-edit-btn" data-tip="edit"><i class="ph ph-pencil-simple text-sm"></i></button>
|
||||||
<button class="toolbar-btn email-test-btn" title="Test"><i class="ph ph-plug text-sm"></i></button>
|
<button class="toolbar-btn email-test-btn" data-tip="test"><i class="ph ph-plug text-sm"></i></button>
|
||||||
<button class="toolbar-btn email-del-btn" title="Delete"><i class="ph ph-trash text-sm"></i></button>
|
<button class="toolbar-btn email-del-btn" data-tip="delete"><i class="ph ph-trash text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`).join('');
|
`).join('');
|
||||||
@@ -441,7 +441,7 @@ function gotoNextPage() {
|
|||||||
function renderMessageList() {
|
function renderMessageList() {
|
||||||
const list = $('email-list');
|
const list = $('email-list');
|
||||||
if (!currentMessages.length) {
|
if (!currentMessages.length) {
|
||||||
list.innerHTML = '<div class="p-4 text-xs text-t-dim italic">no messages</div>';
|
list.innerHTML = '<div class="p-4 text-xs text-t-dim italic cursor-blink">no messages</div>';
|
||||||
renderSelectionBar();
|
renderSelectionBar();
|
||||||
renderSpamToolbar();
|
renderSpamToolbar();
|
||||||
return;
|
return;
|
||||||
@@ -452,13 +452,13 @@ function renderMessageList() {
|
|||||||
const spamScore = m.spam?.score ?? 0;
|
const spamScore = m.spam?.score ?? 0;
|
||||||
const spamReasons = (m.spam?.reasons || []).join(' · ');
|
const spamReasons = (m.spam?.reasons || []).join(' · ');
|
||||||
const spamBadge = spamLevel === 'spam'
|
const spamBadge = spamLevel === 'spam'
|
||||||
? `<span class="email-spam-badge spam" title="${escapeHtml(spamReasons)}">⚠ spam</span>`
|
? `<span class="email-spam-badge spam" data-tip="${escapeHtml(spamReasons)}">⚠ spam</span>`
|
||||||
: spamLevel === 'suspicious'
|
: spamLevel === 'suspicious'
|
||||||
? `<span class="email-spam-badge suspicious" title="${escapeHtml(spamReasons)}">? suspicious</span>`
|
? `<span class="email-spam-badge suspicious" data-tip="${escapeHtml(spamReasons)}">? suspicious</span>`
|
||||||
: '';
|
: '';
|
||||||
const rowTitle = spamReasons ? `spam score ${spamScore}: ${spamReasons}` : '';
|
const rowTitle = spamReasons ? `spam score ${spamScore}: ${spamReasons}` : '';
|
||||||
return `
|
return `
|
||||||
<div class="email-msg-row ${m.seen ? '' : 'unseen'} ${sel ? 'selected' : ''} spam-${spamLevel}" data-uid="${m.uid}" title="${escapeHtml(rowTitle)}">
|
<div class="email-msg-row ${m.seen ? '' : 'unseen'} ${sel ? 'selected' : ''} spam-${spamLevel}" data-uid="${m.uid}" data-tip="${escapeHtml(rowTitle)}">
|
||||||
<input type="checkbox" class="email-msg-check" ${sel ? 'checked' : ''} aria-label="select message">
|
<input type="checkbox" class="email-msg-check" ${sel ? 'checked' : ''} aria-label="select message">
|
||||||
<div class="email-msg-content">
|
<div class="email-msg-content">
|
||||||
<div class="flex items-baseline justify-between gap-2">
|
<div class="flex items-baseline justify-between gap-2">
|
||||||
@@ -877,8 +877,42 @@ function init() {
|
|||||||
$('email-overlay').addEventListener('click', e => {
|
$('email-overlay').addEventListener('click', e => {
|
||||||
if (e.target === $('email-overlay')) closeEmail();
|
if (e.target === $('email-overlay')) closeEmail();
|
||||||
});
|
});
|
||||||
$('email-overlay').addEventListener('keydown', e => {
|
// Document-level Escape: works regardless of which element is focused
|
||||||
if (e.key === 'Escape') { closeEmail(); e.stopPropagation(); }
|
// (the previous overlay-level keydown only fired when focus was inside
|
||||||
|
// the overlay, which is rarely the case after open).
|
||||||
|
document.addEventListener('keydown', e => {
|
||||||
|
if (e.key !== 'Escape') return;
|
||||||
|
if (!$('email-overlay')?.classList.contains('open')) return;
|
||||||
|
// Don't steal Escape from a sub-modal that lives over the overlay
|
||||||
|
const dialog = document.getElementById('dialog');
|
||||||
|
if (dialog?.classList.contains('open')) return;
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
closeEmail();
|
||||||
|
});
|
||||||
|
// Document-level "m" toggles the mail overlay. Suppressed when the
|
||||||
|
// user is typing into an input / textarea / contenteditable so it
|
||||||
|
// doesn't intercept normal text entry. Also suppressed if any modal
|
||||||
|
// overlay is open (editor, search, settings, …) so we don't fight
|
||||||
|
// those for the hotkey.
|
||||||
|
document.addEventListener('keydown', e => {
|
||||||
|
if (e.key !== 'm' && e.key !== 'M') return;
|
||||||
|
if (e.ctrlKey || e.metaKey || e.altKey) return;
|
||||||
|
const ae = document.activeElement;
|
||||||
|
if (ae) {
|
||||||
|
if (ae.isContentEditable) return;
|
||||||
|
const tag = ae.tagName;
|
||||||
|
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT') return;
|
||||||
|
}
|
||||||
|
// Don't toggle while another full-screen overlay is in front
|
||||||
|
const blockers = ['modal', 'detail', 'search', 'settings-overlay', 'gallery', 'help', 'calendar', 'tasks', 'dialog'];
|
||||||
|
for (const id of blockers) {
|
||||||
|
if (document.getElementById(id)?.classList.contains('open')) return;
|
||||||
|
}
|
||||||
|
e.preventDefault();
|
||||||
|
const overlay = $('email-overlay');
|
||||||
|
if (overlay?.classList.contains('open')) closeEmail();
|
||||||
|
else openEmail();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('email-account-select').addEventListener('change', e => {
|
$('email-account-select').addEventListener('change', e => {
|
||||||
|
|||||||
@@ -0,0 +1,487 @@
|
|||||||
|
// ── Example content plugin — one-click demo data ──
|
||||||
|
|
||||||
|
const h = window.hyprcrd;
|
||||||
|
const api = h?.api || window._exampleApi;
|
||||||
|
|
||||||
|
const COLORS = {
|
||||||
|
blue: '#38bdf8', purple: '#a78bfa', pink: '#f472b6', red: '#fb7185',
|
||||||
|
green: '#34d399', yellow: '#fbbf24', orange: '#fb923c', slate: '#64748b',
|
||||||
|
};
|
||||||
|
|
||||||
|
const CARDS = [
|
||||||
|
{
|
||||||
|
title: 'Architecture RFC',
|
||||||
|
color: COLORS.blue,
|
||||||
|
body: `## System Architecture
|
||||||
|
|
||||||
|
The new microservice layout separates auth, data, and notification layers.
|
||||||
|
|
||||||
|
### Key decisions
|
||||||
|
- PostgreSQL for persistent state
|
||||||
|
- Redis for session cache + pub/sub
|
||||||
|
- gRPC between internal services
|
||||||
|
- REST + WebSocket for client API
|
||||||
|
|
||||||
|
### Open questions
|
||||||
|
- [ ] Rate limiting strategy
|
||||||
|
- [ ] Multi-region failover
|
||||||
|
- [x] Auth token rotation scheme
|
||||||
|
- [x] Database migration tooling
|
||||||
|
|
||||||
|
See also: [[Deploy checklist]]
|
||||||
|
|
||||||
|
#project/api #architecture`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Sprint Planning Q3',
|
||||||
|
color: COLORS.purple,
|
||||||
|
body: `## Goals
|
||||||
|
|
||||||
|
1. Finish API v3 migration
|
||||||
|
2. Launch mobile auth flow
|
||||||
|
3. Load testing at 10k concurrent
|
||||||
|
4. Cut staging→prod deploy time to <5min
|
||||||
|
|
||||||
|
**Deadline:** 2026-07-01
|
||||||
|
**Owner:** @alice
|
||||||
|
|
||||||
|
### Capacity
|
||||||
|
| Team | Points | Allocated |
|
||||||
|
|----------|--------|-----------|
|
||||||
|
| Backend | 34 | 30 |
|
||||||
|
| Frontend | 21 | 18 |
|
||||||
|
| Infra | 13 | 13 |
|
||||||
|
|
||||||
|
#meeting #project`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Auth timeout on mobile',
|
||||||
|
color: COLORS.red,
|
||||||
|
body: `Users on iOS Safari report being logged out after ~3 minutes of inactivity.
|
||||||
|
|
||||||
|
### Repro
|
||||||
|
1. Login on iPhone 15 (Safari 18)
|
||||||
|
2. Switch to another app for 3 min
|
||||||
|
3. Return → "session expired"
|
||||||
|
|
||||||
|
### Investigation
|
||||||
|
- Cookie \`SameSite=Strict\` might be too aggressive
|
||||||
|
- Safari's ITP may be purging the session cookie
|
||||||
|
- Backend session TTL is 24h — not the issue
|
||||||
|
|
||||||
|
### Fix
|
||||||
|
Try \`SameSite=Lax\` + short-lived refresh token.
|
||||||
|
|
||||||
|
#bug #urgent #project/frontend/auth`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Deploy checklist',
|
||||||
|
color: COLORS.green,
|
||||||
|
body: `- [x] Run full test suite
|
||||||
|
- [x] Update CHANGELOG.md
|
||||||
|
- [x] Bump version in config
|
||||||
|
- [ ] Tag release in git
|
||||||
|
- [ ] Build Docker image
|
||||||
|
- [ ] Push to registry
|
||||||
|
- [ ] Roll out to staging
|
||||||
|
- [ ] Smoke test staging
|
||||||
|
- [ ] Promote to production
|
||||||
|
- [ ] Monitor Grafana for 30min
|
||||||
|
|
||||||
|
> Last deploy: 2026-04-08 by @bob
|
||||||
|
> Rollback: \`git revert HEAD && ./deploy.sh\`
|
||||||
|
|
||||||
|
#ops #deploy`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Meeting 2026-04-15 — Retro',
|
||||||
|
color: COLORS.yellow,
|
||||||
|
due_date: '2026-04-15',
|
||||||
|
body: `**Zeit:** 14:00-15:00
|
||||||
|
**Ort:** Room 42
|
||||||
|
**Teilnehmer:** Alice, Bob, Carol
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### What went well
|
||||||
|
- Deploy frequency improved (3x/week → daily)
|
||||||
|
- Zero P1 incidents this sprint
|
||||||
|
- New search feature got good feedback
|
||||||
|
|
||||||
|
### What to improve
|
||||||
|
- PR review turnaround still >24h
|
||||||
|
- Flaky integration tests causing false alarms
|
||||||
|
- Documentation gaps in relay module
|
||||||
|
|
||||||
|
### Action items
|
||||||
|
- [ ] @alice: set up PR review SLA
|
||||||
|
- [ ] @bob: fix top 5 flaky tests
|
||||||
|
- [ ] @carol: write relay onboarding doc
|
||||||
|
|
||||||
|
#meeting #termin #retro`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Reading list',
|
||||||
|
color: COLORS.slate,
|
||||||
|
body: `Papers and articles to read:
|
||||||
|
|
||||||
|
- [Designing Data-Intensive Applications](https://dataintensive.net/) — Ch. 7-9
|
||||||
|
- [The Twelve-Factor App](https://12factor.net/)
|
||||||
|
- \`CAP theorem revisited\` — Brewer 2012
|
||||||
|
- Local-first software — Kleppmann et al.
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
> "The truth is the log. The database is a cache."
|
||||||
|
> — Pat Helland
|
||||||
|
|
||||||
|
#personal #research`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'API v3 migration',
|
||||||
|
color: COLORS.blue,
|
||||||
|
body: `### Endpoints to migrate
|
||||||
|
|
||||||
|
| v2 | v3 | Status |
|
||||||
|
|----|-----|--------|
|
||||||
|
| GET /users | GET /api/v3/users | done |
|
||||||
|
| POST /auth | POST /api/v3/auth/token | done |
|
||||||
|
| GET /cards | GET /api/v3/cards | in progress |
|
||||||
|
| WS /stream | WS /api/v3/events | planned |
|
||||||
|
|
||||||
|
### Breaking changes
|
||||||
|
- Auth header: \`Bearer\` instead of \`X-Token\`
|
||||||
|
- Pagination: cursor-based instead of offset
|
||||||
|
- Error format: \`{"error": {"code": ..., "message": ...}}\`
|
||||||
|
|
||||||
|
[[Architecture RFC]]
|
||||||
|
|
||||||
|
#project/api #migration`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Infra cost review',
|
||||||
|
color: COLORS.orange,
|
||||||
|
body: `### Monthly breakdown (April)
|
||||||
|
|
||||||
|
\`\`\`
|
||||||
|
Compute (k8s) €340 ████████░░ 68%
|
||||||
|
Storage (S3) €85 ██░░░░░░░░ 17%
|
||||||
|
Database (RDS) €52 █░░░░░░░░░ 10%
|
||||||
|
CDN + DNS €18 ░░░░░░░░░░ 4%
|
||||||
|
Monitoring €8 ░░░░░░░░░░ 2%
|
||||||
|
─────────────────────────────────────
|
||||||
|
Total €503
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
Budget: €600 → **€97 headroom**
|
||||||
|
|
||||||
|
Next action: evaluate spot instances for batch workers.
|
||||||
|
|
||||||
|
#ops #infra #finance`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Birthday Alice',
|
||||||
|
color: COLORS.pink,
|
||||||
|
due_date: '2026-06-12',
|
||||||
|
body: `#geburtstag`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Onboarding: new developer',
|
||||||
|
color: COLORS.green,
|
||||||
|
body: `## First week checklist
|
||||||
|
|
||||||
|
- [ ] Laptop + accounts provisioned
|
||||||
|
- [ ] SSH key added to Gitea
|
||||||
|
- [ ] Access to staging cluster
|
||||||
|
- [x] Slack channels joined
|
||||||
|
- [x] 1:1 with team lead
|
||||||
|
- [ ] Read [[Architecture RFC]]
|
||||||
|
- [ ] First PR: fix a good-first-issue
|
||||||
|
|
||||||
|
### Contacts
|
||||||
|
| Role | Person |
|
||||||
|
|------|--------|
|
||||||
|
| Buddy | @carol |
|
||||||
|
| Team lead | @alice |
|
||||||
|
| Infra | @dave |
|
||||||
|
|
||||||
|
#onboarding #ops`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Competitive analysis',
|
||||||
|
color: COLORS.purple,
|
||||||
|
body: `### Landscape
|
||||||
|
|
||||||
|
| Product | Self-hosted | Offline | E2E encryption |
|
||||||
|
|---------|:-----------:|:-------:|:--------------:|
|
||||||
|
| Notion | no | no | no |
|
||||||
|
| Obsidian| yes | yes | paid |
|
||||||
|
| Logseq | yes | yes | no |
|
||||||
|
| **hyprcrd** | **yes** | **yes** | **yes** |
|
||||||
|
|
||||||
|
### Differentiators
|
||||||
|
- Tag extraction from body (zero-friction categorization)
|
||||||
|
- Relay model: multi-tenant sync without cloud dependency
|
||||||
|
- Plugin system: extensible without forking
|
||||||
|
- CalDAV native (not just ical export)
|
||||||
|
|
||||||
|
#research #strategy`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Security audit notes',
|
||||||
|
color: COLORS.red,
|
||||||
|
body: `## Audit 2026-Q1 findings
|
||||||
|
|
||||||
|
### Critical
|
||||||
|
~~1. Session token in URL parameter~~ → fixed in v1.2.1
|
||||||
|
|
||||||
|
### High
|
||||||
|
2. CSRF token not rotated on privilege change → [[Auth timeout on mobile]]
|
||||||
|
|
||||||
|
### Medium
|
||||||
|
3. Upload directory allows .svg (XSS vector)
|
||||||
|
4. Rate limiter not applied to /api/export
|
||||||
|
|
||||||
|
### Low
|
||||||
|
5. Server version exposed in HTTP headers
|
||||||
|
6. No CSP header on main app
|
||||||
|
|
||||||
|
> Next audit scheduled: 2026-07-15
|
||||||
|
|
||||||
|
#security #audit #urgent`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Design system tokens',
|
||||||
|
color: COLORS.purple,
|
||||||
|
body: `### Color palette
|
||||||
|
|
||||||
|
\`\`\`
|
||||||
|
--t-bg: #0f172a base background
|
||||||
|
--t-surface: #1e293b card/panel surface
|
||||||
|
--t-border: #334155 borders
|
||||||
|
--t-text: #94a3b8 body text
|
||||||
|
--t-bright: #e2e8f0 headlines
|
||||||
|
--t-accent: #38bdf8 primary accent
|
||||||
|
--t-accent2: #a78bfa secondary accent
|
||||||
|
--t-danger: #fb7185 errors/destructive
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
### Typography
|
||||||
|
- **UI:** Silkscreen (pixel font)
|
||||||
|
- **Content:** JetBrains Mono
|
||||||
|
- **Sizes:** 9px labels, 11px body, 13px headings
|
||||||
|
|
||||||
|
### Radius scale
|
||||||
|
\`--ui-radius-card\`, \`--ui-radius-modal\`, \`--ui-radius-input\`
|
||||||
|
|
||||||
|
All overridable per theme preset.
|
||||||
|
|
||||||
|
#design #frontend`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Customer feedback digest',
|
||||||
|
color: COLORS.yellow,
|
||||||
|
body: `### Week of 2026-04-07
|
||||||
|
|
||||||
|
**Positive:**
|
||||||
|
- "Search is blazing fast" — 3 mentions
|
||||||
|
- "CalDAV sync just works" — 2 mentions
|
||||||
|
- "Love the keyboard shortcuts" — @user42
|
||||||
|
|
||||||
|
**Requests:**
|
||||||
|
- Mobile app (→ Electron PWA?)
|
||||||
|
- Shared boards without relay (→ collab-buckets?)
|
||||||
|
- Dark mode for relay UI (→ already shipped!)
|
||||||
|
|
||||||
|
**Issues:**
|
||||||
|
- Image upload fails >5MB on shared hosting
|
||||||
|
- Calendar popup overlaps on 13" screens
|
||||||
|
|
||||||
|
#feedback #product`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Database schema notes',
|
||||||
|
color: COLORS.slate,
|
||||||
|
body: `### Core tables
|
||||||
|
|
||||||
|
\`\`\`sql
|
||||||
|
cards (id, title, body, color, tags,
|
||||||
|
bucket_id, parent_id, position,
|
||||||
|
due_date, relay_uid,
|
||||||
|
created_at, updated_at)
|
||||||
|
|
||||||
|
buckets (id, name, color, parent_id,
|
||||||
|
collab_uid, position)
|
||||||
|
|
||||||
|
settings (key, value)
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
### Indexes
|
||||||
|
- \`cards.bucket_id\` — bucket filter
|
||||||
|
- \`cards.parent_id\` — group lookup
|
||||||
|
- \`buckets.collab_uid UNIQUE\` — relay sync
|
||||||
|
|
||||||
|
SQLite WAL mode for concurrent reads.
|
||||||
|
|
||||||
|
#architecture #database`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Release notes v1.3',
|
||||||
|
color: COLORS.green,
|
||||||
|
body: `## What's new
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- **Tooltip system** — custom styled tooltips replace all native titles
|
||||||
|
- **Asset picker** — thumbnail grid in the editor toolbar
|
||||||
|
- **Super-bucket split** — click activates, caret opens dropdown
|
||||||
|
- **Watch plugin** — analog clock overlay with SVG watchface
|
||||||
|
- **Card peek** — hover preview with rendered markdown
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Shortcuts no longer fire when typing in inputs
|
||||||
|
- Gallery opens even if API fetch fails
|
||||||
|
- Relay poll suppressed during user actions
|
||||||
|
- Find/replace integrated into search overlay
|
||||||
|
|
||||||
|
### Breaking
|
||||||
|
- All \`title=""\` attributes migrated to \`data-tip=""\`
|
||||||
|
|
||||||
|
#release #changelog`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: '2026-04-12',
|
||||||
|
color: COLORS.slate,
|
||||||
|
body: `## Journal
|
||||||
|
|
||||||
|
Started the day reviewing PRs. Merged the tooltip system and the asset picker.
|
||||||
|
|
||||||
|
Spent the afternoon on the Electron build — static PHP binary works but the WAL/SHM files caused issues. Fixed by deleting stale lock files.
|
||||||
|
|
||||||
|
Had a good session on the watch plugin. The wobble animation on the second hand is a nice touch.
|
||||||
|
|
||||||
|
**Tomorrow:**
|
||||||
|
- [ ] Test relay collab-buckets with two instances
|
||||||
|
- [ ] Write release notes
|
||||||
|
- [ ] Screenshot for website
|
||||||
|
|
||||||
|
#journal`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Backup strategy',
|
||||||
|
color: COLORS.orange,
|
||||||
|
body: `### Current
|
||||||
|
|
||||||
|
Daily cron:
|
||||||
|
\`\`\`bash
|
||||||
|
#!/bin/bash
|
||||||
|
DATE=$(date +%Y-%m-%d)
|
||||||
|
cp data/hyprcrd.db "/backup/hyprcrd-$DATE.db"
|
||||||
|
tar czf "/backup/uploads-$DATE.tar.gz" public/uploads/
|
||||||
|
find /backup -mtime +30 -delete
|
||||||
|
\`\`\`
|
||||||
|
|
||||||
|
### Planned
|
||||||
|
- [ ] Automated export ZIP via API
|
||||||
|
- [ ] Offsite copy to S3-compatible storage
|
||||||
|
- [ ] Test restore monthly
|
||||||
|
- [ ] Document in runbook
|
||||||
|
|
||||||
|
> WAL checkpoint before copy:
|
||||||
|
> \`sqlite3 data/hyprcrd.db "PRAGMA wal_checkpoint(TRUNCATE);"\`
|
||||||
|
|
||||||
|
#ops #backup #infra`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Plugin ideas',
|
||||||
|
color: COLORS.pink,
|
||||||
|
body: `### Brainstorm
|
||||||
|
|
||||||
|
- **Kanban columns** — cards as swimlanes per bucket
|
||||||
|
- **Time tracking** — start/stop timer per card, weekly report
|
||||||
|
- **AI summary** — auto-generate card summaries with local LLM
|
||||||
|
- **RSS reader** — fetch feeds into cards
|
||||||
|
- **Webhook triggers** — POST on card create/update/delete
|
||||||
|
- **PDF export** — render card as styled PDF
|
||||||
|
- **Voice memo** — record audio, attach to card, transcribe
|
||||||
|
|
||||||
|
### Criteria for inclusion
|
||||||
|
1. Does it help *find* information?
|
||||||
|
2. Can it be a drop-in plugin (no core changes)?
|
||||||
|
3. Is it useful without an internet connection?
|
||||||
|
|
||||||
|
#idea #plugins #brainstorm`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'Monitoring setup',
|
||||||
|
color: COLORS.green,
|
||||||
|
body: `### Stack
|
||||||
|
|
||||||
|
- **Uptime:** UptimeRobot (free tier, 5min interval)
|
||||||
|
- **Errors:** Sentry self-hosted → \`sentry.internal\`
|
||||||
|
- **Metrics:** Grafana + Prometheus
|
||||||
|
- **Logs:** Loki + promtail on each node
|
||||||
|
|
||||||
|
### Alerts
|
||||||
|
| Metric | Threshold | Channel |
|
||||||
|
|--------|-----------|---------|
|
||||||
|
| HTTP 5xx rate | >1% for 5min | Slack #ops-alerts |
|
||||||
|
| Response time p95 | >2s for 10min | Slack #ops-alerts |
|
||||||
|
| Disk usage | >85% | Email + Slack |
|
||||||
|
| SSL expiry | <14 days | Email |
|
||||||
|
|
||||||
|
Dashboard: \`grafana.internal/d/hyprcrd\`
|
||||||
|
|
||||||
|
#ops #monitoring #infra`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
async function generate() {
|
||||||
|
const bucket = await api('api/buckets', { method: 'POST', body: { name: 'Project Alpha' } });
|
||||||
|
const bid = bucket?.id;
|
||||||
|
if (!bid) return false;
|
||||||
|
await api(`api/buckets/${bid}`, { method: 'PATCH', body: { color: COLORS.blue } });
|
||||||
|
|
||||||
|
for (const c of CARDS) {
|
||||||
|
await api('api/cards', {
|
||||||
|
method: 'POST',
|
||||||
|
body: { title: c.title, body: c.body, color: c.color, bucket_id: bid, due_date: c.due_date || null },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function init() {
|
||||||
|
const footer = document.getElementById('main-footer');
|
||||||
|
if (!footer) return;
|
||||||
|
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.className = 'flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors';
|
||||||
|
btn.innerHTML = '<i class="ph ph-flask text-sm"></i><span class="font-pixel text-[10px]">Demo</span>';
|
||||||
|
btn.dataset.tip = 'Create example bucket with demo cards';
|
||||||
|
|
||||||
|
btn.addEventListener('click', async () => {
|
||||||
|
btn.disabled = true;
|
||||||
|
btn.innerHTML = '<i class="ph ph-spinner text-sm"></i><span class="font-pixel text-[10px]">creating...</span>';
|
||||||
|
const ok = await generate();
|
||||||
|
if (ok) {
|
||||||
|
btn.innerHTML = '<i class="ph ph-check text-sm"></i><span class="font-pixel text-[10px]">Done</span>';
|
||||||
|
await window._reloadAll?.();
|
||||||
|
} else {
|
||||||
|
btn.innerHTML = '<i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Failed</span>';
|
||||||
|
}
|
||||||
|
setTimeout(() => {
|
||||||
|
btn.innerHTML = '<i class="ph ph-flask text-sm"></i><span class="font-pixel text-[10px]">Demo</span>';
|
||||||
|
btn.disabled = false;
|
||||||
|
}, 2000);
|
||||||
|
});
|
||||||
|
|
||||||
|
const firstChild = footer.querySelector('div');
|
||||||
|
if (firstChild) firstChild.appendChild(btn);
|
||||||
|
|
||||||
|
h?.registerPlugin({ name: 'example-content', version: '1.0.0' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', init);
|
||||||
|
} else {
|
||||||
|
init();
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"name": "example-content",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "One-click demo content for screenshots and first-time exploration.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["example-content.js"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,10 +27,16 @@ require_once __DIR__ . '/GiteaClient.php';
|
|||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
base_url TEXT NOT NULL,
|
base_url TEXT NOT NULL,
|
||||||
token TEXT NOT NULL,
|
token TEXT NOT NULL,
|
||||||
|
default_repo TEXT DEFAULT NULL,
|
||||||
position INTEGER NOT NULL DEFAULT 0,
|
position INTEGER NOT NULL DEFAULT 0,
|
||||||
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
|
created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
)
|
)
|
||||||
");
|
");
|
||||||
|
// Migration: add default_repo column if missing
|
||||||
|
$cols = $db->query("PRAGMA table_info(gitea_accounts)")->fetchAll(PDO::FETCH_COLUMN, 1);
|
||||||
|
if (!in_array('default_repo', $cols)) {
|
||||||
|
$db->exec("ALTER TABLE gitea_accounts ADD COLUMN default_repo TEXT DEFAULT NULL");
|
||||||
|
}
|
||||||
})();
|
})();
|
||||||
|
|
||||||
// ── Encryption helpers (mirrors email plugin / CalDavSync) ────────
|
// ── Encryption helpers (mirrors email plugin / CalDavSync) ────────
|
||||||
@@ -85,7 +91,7 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
|
|
||||||
if ($route === '/api/gitea/accounts' && $method === 'GET') {
|
if ($route === '/api/gitea/accounts' && $method === 'GET') {
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
$rows = $db->query('SELECT id, name, base_url, position, created_at FROM gitea_accounts ORDER BY position ASC, id ASC')->fetchAll();
|
$rows = $db->query('SELECT id, name, base_url, default_repo, position, created_at FROM gitea_accounts ORDER BY position ASC, id ASC')->fetchAll();
|
||||||
giteaJson($rows);
|
giteaJson($rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,6 +138,10 @@ PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
|||||||
if (!empty($input['token'])) {
|
if (!empty($input['token'])) {
|
||||||
$fields[] = 'token = :token'; $params['token'] = giteaEncrypt($input['token']);
|
$fields[] = 'token = :token'; $params['token'] = giteaEncrypt($input['token']);
|
||||||
}
|
}
|
||||||
|
if (array_key_exists('default_repo', $input)) {
|
||||||
|
$val = trim((string)($input['default_repo'] ?? ''));
|
||||||
|
$fields[] = 'default_repo = :default_repo'; $params['default_repo'] = $val ?: null;
|
||||||
|
}
|
||||||
if (!$fields) giteaJson(['ok' => true]);
|
if (!$fields) giteaJson(['ok' => true]);
|
||||||
$db = Database::connect();
|
$db = Database::connect();
|
||||||
$db->prepare('UPDATE gitea_accounts SET ' . implode(', ', $fields) . ' WHERE id = :id')->execute($params);
|
$db->prepare('UPDATE gitea_accounts SET ' . implode(', ', $fields) . ' WHERE id = :id')->execute($params);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!-- Gitea Plugin: full-screen issue browser overlay -->
|
<!-- Gitea Plugin: full-screen issue browser overlay -->
|
||||||
<div class="overlay fixed inset-0" id="gitea-overlay" style="z-index:75;">
|
<div class="overlay fixed inset-0" id="gitea-overlay" style="z-index:75;">
|
||||||
<div class="gitea-modal bg-t-bg border border-t-border shadow-2xl flex flex-col" style="position:absolute;inset:24px;border-radius:4px;">
|
<div class="gitea-modal bg-t-bg flex flex-col" style="position:absolute;inset:0;">
|
||||||
|
|
||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
<div class="flex items-center gap-3 px-4 py-2 border-b border-t-border shrink-0 bg-t-surface">
|
<div class="flex items-center gap-3 px-4 py-2 border-b border-t-border shrink-0 bg-t-surface">
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
<select id="gitea-account-select" class="bg-t-bg border border-t-border text-t-bright text-xs font-pixel px-2 py-1 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer min-w-32"></select>
|
<select id="gitea-account-select" class="bg-t-bg border border-t-border text-t-bright text-xs font-pixel px-2 py-1 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer min-w-32"></select>
|
||||||
<span id="gitea-status" class="text-[10px] text-t-dim font-pixel"></span>
|
<span id="gitea-status" class="text-[10px] text-t-dim font-pixel"></span>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<button id="gitea-show-settings" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" title="Manage accounts in settings"><i class="ph ph-gear text-sm"></i><span class="font-pixel text-[10px]">Accounts</span></button>
|
<button id="gitea-show-settings" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="Manage accounts in settings"><i class="ph ph-gear text-sm"></i><span class="font-pixel text-[10px]">Accounts</span></button>
|
||||||
<button id="gitea-close" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Close</span></button>
|
<button id="gitea-close" class="flex items-center gap-1.5 px-2 py-1 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger transition-colors"><i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Close</span></button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -40,25 +40,25 @@
|
|||||||
<div class="sticky top-0 z-20 bg-t-bg border-b border-t-border">
|
<div class="sticky top-0 z-20 bg-t-bg border-b border-t-border">
|
||||||
<!-- Filters bar -->
|
<!-- Filters bar -->
|
||||||
<div class="flex items-center gap-2 px-3 py-1.5">
|
<div class="flex items-center gap-2 px-3 py-1.5">
|
||||||
<select id="gitea-filter-state" class="bg-t-bg border border-t-border text-t-bright text-[10px] font-pixel px-1.5 py-0.5 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer" title="Issue state">
|
<select id="gitea-filter-state" class="bg-t-bg border border-t-border text-t-bright text-[10px] font-pixel px-1.5 py-0.5 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer" data-tip="Issue state">
|
||||||
<option value="open">open</option>
|
<option value="open">open</option>
|
||||||
<option value="closed">closed</option>
|
<option value="closed">closed</option>
|
||||||
<option value="all">all</option>
|
<option value="all">all</option>
|
||||||
</select>
|
</select>
|
||||||
<select id="gitea-filter-scope" class="bg-t-bg border border-t-border text-t-bright text-[10px] font-pixel px-1.5 py-0.5 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer" title="Filter by your involvement">
|
<select id="gitea-filter-scope" class="bg-t-bg border border-t-border text-t-bright text-[10px] font-pixel px-1.5 py-0.5 rounded-sm focus:border-t-accent focus:outline-none cursor-pointer" data-tip="Filter by your involvement">
|
||||||
<option value="all">everyone</option>
|
<option value="all">everyone</option>
|
||||||
<option value="assigned">assigned to me</option>
|
<option value="assigned">assigned to me</option>
|
||||||
<option value="created">created by me</option>
|
<option value="created">created by me</option>
|
||||||
<option value="mentioned">mentioning me</option>
|
<option value="mentioned">mentioning me</option>
|
||||||
</select>
|
</select>
|
||||||
<input id="gitea-filter-q" type="text" placeholder="search..." autocomplete="off" class="flex-1 min-w-0 bg-t-bg border border-t-border text-t-text px-2 py-0.5 text-[11px] focus:border-t-accent focus:outline-none font-mono">
|
<input id="gitea-filter-q" type="text" placeholder="search..." autocomplete="off" class="flex-1 min-w-0 bg-t-bg border border-t-border text-t-text px-2 py-0.5 text-[11px] focus:border-t-accent focus:outline-none font-mono">
|
||||||
<button id="gitea-new-issue" class="toolbar-btn" title="New issue"><i class="ph ph-plus-square text-sm text-t-accent"></i></button>
|
<button id="gitea-new-issue" class="toolbar-btn" data-tip="New issue"><i class="ph ph-plus-square text-sm text-t-accent"></i></button>
|
||||||
<button id="gitea-refresh" class="toolbar-btn" title="Refresh"><i class="ph ph-arrows-clockwise text-sm"></i></button>
|
<button id="gitea-refresh" class="toolbar-btn" data-tip="Refresh"><i class="ph ph-arrows-clockwise text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<!-- Pagination toolbar -->
|
<!-- Pagination toolbar -->
|
||||||
<div class="flex items-center gap-2 px-3 py-1 border-t border-t-border">
|
<div class="flex items-center gap-2 px-3 py-1 border-t border-t-border">
|
||||||
<button id="gitea-page-prev" class="toolbar-btn" title="Previous page"><i class="ph ph-caret-left text-sm"></i></button>
|
<button id="gitea-page-prev" class="toolbar-btn" data-tip="Previous page"><i class="ph ph-caret-left text-sm"></i></button>
|
||||||
<button id="gitea-page-next" class="toolbar-btn" title="Next page"><i class="ph ph-caret-right text-sm"></i></button>
|
<button id="gitea-page-next" class="toolbar-btn" data-tip="Next page"><i class="ph ph-caret-right text-sm"></i></button>
|
||||||
<span id="gitea-page-info" class="font-pixel text-[9px] text-t-dim">—</span>
|
<span id="gitea-page-info" class="font-pixel text-[9px] text-t-dim">—</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<div id="gitea-detail-empty" class="flex items-center justify-center flex-1 text-t-dim text-xs font-pixel">
|
<div id="gitea-detail-empty" class="flex items-center justify-center flex-1 text-t-dim text-xs font-pixel">
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<i class="ph ph-list-bullets text-3xl mb-2 block"></i>
|
<i class="ph ph-list-bullets text-3xl mb-2 block"></i>
|
||||||
select an issue
|
<span class="cursor-blink">select an issue</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- ── Create issue form ── -->
|
<!-- ── Create issue form ── -->
|
||||||
@@ -83,7 +83,7 @@
|
|||||||
<i class="ph ph-plus-square text-t-accent text-lg"></i>
|
<i class="ph ph-plus-square text-t-accent text-lg"></i>
|
||||||
<h3 class="text-t-bright text-base font-bold">new issue</h3>
|
<h3 class="text-t-bright text-base font-bold">new issue</h3>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<button id="gitea-create-cancel" class="toolbar-btn" title="Cancel"><i class="ph ph-x text-sm"></i></button>
|
<button id="gitea-create-cancel" class="toolbar-btn" data-tip="Cancel"><i class="ph ph-x text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<label class="block relative">
|
<label class="block relative">
|
||||||
@@ -140,12 +140,12 @@
|
|||||||
<div class="flex-1 min-w-0">
|
<div class="flex-1 min-w-0">
|
||||||
<div id="gitea-title-display" class="flex items-center gap-2">
|
<div id="gitea-title-display" class="flex items-center gap-2">
|
||||||
<h3 id="gitea-detail-title" class="text-t-bright text-base font-bold flex-1 break-words"></h3>
|
<h3 id="gitea-detail-title" class="text-t-bright text-base font-bold flex-1 break-words"></h3>
|
||||||
<button id="gitea-title-edit-btn" class="toolbar-btn shrink-0" title="Edit title"><i class="ph ph-pencil-simple text-sm"></i></button>
|
<button id="gitea-title-edit-btn" class="toolbar-btn shrink-0" data-tip="Edit title"><i class="ph ph-pencil-simple text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div id="gitea-title-edit" class="hidden flex items-center gap-2">
|
<div id="gitea-title-edit" class="hidden flex items-center gap-2">
|
||||||
<input id="gitea-title-input" type="text" class="flex-1 bg-t-bg border border-t-accent text-t-bright px-2 py-1 text-sm focus:outline-none font-mono">
|
<input id="gitea-title-input" type="text" class="flex-1 bg-t-bg border border-t-accent text-t-bright px-2 py-1 text-sm focus:outline-none font-mono">
|
||||||
<button id="gitea-title-save" class="toolbar-btn" title="Save"><i class="ph ph-check text-sm text-t-accent"></i></button>
|
<button id="gitea-title-save" class="toolbar-btn" data-tip="Save"><i class="ph ph-check text-sm text-t-accent"></i></button>
|
||||||
<button id="gitea-title-cancel" class="toolbar-btn" title="Cancel"><i class="ph ph-x text-sm text-t-danger"></i></button>
|
<button id="gitea-title-cancel" class="toolbar-btn" data-tip="Cancel"><i class="ph ph-x text-sm text-t-danger"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<span id="gitea-detail-number" class="font-pixel text-[10px] text-t-dim mt-1"></span>
|
<span id="gitea-detail-number" class="font-pixel text-[10px] text-t-dim mt-1"></span>
|
||||||
@@ -158,7 +158,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex items-start gap-2 mb-2">
|
<div class="flex items-start gap-2 mb-2">
|
||||||
<div id="gitea-detail-labels" class="flex flex-wrap gap-1 flex-1"></div>
|
<div id="gitea-detail-labels" class="flex flex-wrap gap-1 flex-1"></div>
|
||||||
<button id="gitea-labels-edit-btn" class="toolbar-btn shrink-0" title="Edit labels"><i class="ph ph-tag text-sm"></i></button>
|
<button id="gitea-labels-edit-btn" class="toolbar-btn shrink-0" data-tip="Edit labels"><i class="ph ph-tag text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div id="gitea-labels-editor" class="hidden border border-t-border bg-t-surface p-2 mb-2">
|
<div id="gitea-labels-editor" class="hidden border border-t-border bg-t-surface p-2 mb-2">
|
||||||
<div id="gitea-labels-warning" class="hidden mb-2 px-2 py-1 text-[10px] font-mono break-words border border-amber-500 text-amber-400 bg-t-bg"></div>
|
<div id="gitea-labels-warning" class="hidden mb-2 px-2 py-1 text-[10px] font-mono break-words border border-amber-500 text-amber-400 bg-t-bg"></div>
|
||||||
@@ -171,7 +171,7 @@
|
|||||||
<!-- Metadata row: assignees + milestone + due date with inline editor -->
|
<!-- Metadata row: assignees + milestone + due date with inline editor -->
|
||||||
<div class="flex items-center gap-2 mb-2">
|
<div class="flex items-center gap-2 mb-2">
|
||||||
<div id="gitea-detail-meta" class="flex flex-wrap gap-x-3 gap-y-1 flex-1 text-[10px] font-pixel text-t-dim"></div>
|
<div id="gitea-detail-meta" class="flex flex-wrap gap-x-3 gap-y-1 flex-1 text-[10px] font-pixel text-t-dim"></div>
|
||||||
<button id="gitea-meta-edit-btn" class="toolbar-btn shrink-0" title="Edit assignees, milestone, due date"><i class="ph ph-sliders-horizontal text-sm"></i></button>
|
<button id="gitea-meta-edit-btn" class="toolbar-btn shrink-0" data-tip="Edit assignees, milestone, due date"><i class="ph ph-sliders-horizontal text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div id="gitea-meta-editor" class="hidden border border-t-border bg-t-surface p-3 mb-2">
|
<div id="gitea-meta-editor" class="hidden border border-t-border bg-t-surface p-3 mb-2">
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
<span class="font-pixel text-[9px] text-t-dim uppercase block mb-1"><i class="ph ph-calendar text-xs"></i> due date</span>
|
<span class="font-pixel text-[9px] text-t-dim uppercase block mb-1"><i class="ph ph-calendar text-xs"></i> due date</span>
|
||||||
<div class="flex items-center gap-1">
|
<div class="flex items-center gap-1">
|
||||||
<input id="gitea-meta-due" type="date" class="flex-1 bg-t-bg border border-t-border text-t-bright px-2 py-1.5 text-xs focus:border-t-accent focus:outline-none font-mono">
|
<input id="gitea-meta-due" type="date" class="flex-1 bg-t-bg border border-t-border text-t-bright px-2 py-1.5 text-xs focus:border-t-accent focus:outline-none font-mono">
|
||||||
<button id="gitea-meta-due-clear" class="toolbar-btn" title="Clear due date"><i class="ph ph-x text-sm"></i></button>
|
<button id="gitea-meta-due-clear" class="toolbar-btn" data-tip="Clear due date"><i class="ph ph-x text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -213,7 +213,7 @@
|
|||||||
<div class="flex-1 min-h-0 overflow-y-auto px-5 py-4">
|
<div class="flex-1 min-h-0 overflow-y-auto px-5 py-4">
|
||||||
<div id="gitea-body-display" class="flex items-start gap-2">
|
<div id="gitea-body-display" class="flex items-start gap-2">
|
||||||
<div id="gitea-detail-body" class="prose text-sm text-t-text flex-1 min-w-0"></div>
|
<div id="gitea-detail-body" class="prose text-sm text-t-text flex-1 min-w-0"></div>
|
||||||
<button id="gitea-body-edit-btn" class="toolbar-btn shrink-0" title="Edit body"><i class="ph ph-pencil-simple text-sm"></i></button>
|
<button id="gitea-body-edit-btn" class="toolbar-btn shrink-0" data-tip="Edit body"><i class="ph ph-pencil-simple text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div id="gitea-body-edit" class="hidden">
|
<div id="gitea-body-edit" class="hidden">
|
||||||
<textarea id="gitea-body-input" class="w-full bg-t-bg border border-t-accent text-t-text px-3 py-2 text-xs focus:outline-none font-mono leading-relaxed" rows="10"></textarea>
|
<textarea id="gitea-body-input" class="w-full bg-t-bg border border-t-accent text-t-text px-3 py-2 text-xs focus:outline-none font-mono leading-relaxed" rows="10"></textarea>
|
||||||
|
|||||||
@@ -113,6 +113,10 @@ function buildSettingsPanel(panelEl) {
|
|||||||
<span class="font-pixel text-[9px] text-t-dim uppercase">access token <span id="gitea-tok-hint" class="text-t-muted normal-case text-[8px]"></span></span>
|
<span class="font-pixel text-[9px] text-t-dim uppercase">access token <span id="gitea-tok-hint" class="text-t-muted normal-case text-[8px]"></span></span>
|
||||||
<input id="gitea-acc-token" type="password" autocomplete="off" class="w-full bg-t-bg border border-t-border text-t-bright px-2 py-1.5 text-xs focus:border-t-accent focus:outline-none font-mono">
|
<input id="gitea-acc-token" type="password" autocomplete="off" class="w-full bg-t-bg border border-t-border text-t-bright px-2 py-1.5 text-xs focus:border-t-accent focus:outline-none font-mono">
|
||||||
</label>
|
</label>
|
||||||
|
<label class="block">
|
||||||
|
<span class="font-pixel text-[9px] text-t-dim uppercase">default repo <span class="text-t-muted normal-case text-[8px]">(owner/repo)</span></span>
|
||||||
|
<input id="gitea-acc-default-repo" type="text" placeholder="owner/repo" autocomplete="off" class="w-full bg-t-bg border border-t-border text-t-bright px-2 py-1.5 text-xs focus:border-t-accent focus:outline-none font-mono">
|
||||||
|
</label>
|
||||||
<div class="flex items-center gap-2 pt-1">
|
<div class="flex items-center gap-2 pt-1">
|
||||||
<button type="submit" id="gitea-acc-save" class="flex items-center gap-1.5 px-3 py-1.5 text-xs border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors"><i class="ph ph-floppy-disk text-sm"></i><span class="font-pixel text-[10px]">Save</span></button>
|
<button type="submit" id="gitea-acc-save" class="flex items-center gap-1.5 px-3 py-1.5 text-xs border border-t-accent text-t-accent hover:bg-t-accent/10 transition-colors"><i class="ph ph-floppy-disk text-sm"></i><span class="font-pixel text-[10px]">Save</span></button>
|
||||||
<button type="button" id="gitea-acc-test" class="flex items-center gap-1.5 px-3 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors"><i class="ph ph-plug text-sm"></i><span class="font-pixel text-[10px]">Test</span></button>
|
<button type="button" id="gitea-acc-test" class="flex items-center gap-1.5 px-3 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors"><i class="ph ph-plug text-sm"></i><span class="font-pixel text-[10px]">Test</span></button>
|
||||||
@@ -150,12 +154,12 @@ function renderAccountsList() {
|
|||||||
<i class="ph ph-git-pull-request text-t-accent text-base"></i>
|
<i class="ph ph-git-pull-request text-t-accent text-base"></i>
|
||||||
<div class="gitea-account-info">
|
<div class="gitea-account-info">
|
||||||
<div class="gitea-account-name">${escapeHtml(a.name)}</div>
|
<div class="gitea-account-name">${escapeHtml(a.name)}</div>
|
||||||
<div class="gitea-account-meta">${escapeHtml(a.base_url)}</div>
|
<div class="gitea-account-meta">${escapeHtml(a.base_url)}${a.default_repo ? ' · ' + escapeHtml(a.default_repo) : ''}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="gitea-account-actions">
|
<div class="gitea-account-actions">
|
||||||
<button class="toolbar-btn gitea-edit-btn" title="Edit"><i class="ph ph-pencil-simple text-sm"></i></button>
|
<button class="toolbar-btn gitea-edit-btn" data-tip="Edit"><i class="ph ph-pencil-simple text-sm"></i></button>
|
||||||
<button class="toolbar-btn gitea-test-btn" title="Test"><i class="ph ph-plug text-sm"></i></button>
|
<button class="toolbar-btn gitea-test-btn" data-tip="Test"><i class="ph ph-plug text-sm"></i></button>
|
||||||
<button class="toolbar-btn gitea-del-btn" title="Delete"><i class="ph ph-trash text-sm"></i></button>
|
<button class="toolbar-btn gitea-del-btn" data-tip="Delete"><i class="ph ph-trash text-sm"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
`).join('');
|
`).join('');
|
||||||
@@ -201,6 +205,7 @@ function resetAccountForm() {
|
|||||||
$('gitea-acc-name').value = '';
|
$('gitea-acc-name').value = '';
|
||||||
$('gitea-acc-baseurl').value = '';
|
$('gitea-acc-baseurl').value = '';
|
||||||
$('gitea-acc-token').value = '';
|
$('gitea-acc-token').value = '';
|
||||||
|
$('gitea-acc-default-repo').value = '';
|
||||||
setAccountStatus('');
|
setAccountStatus('');
|
||||||
$('gitea-tok-hint').textContent = '';
|
$('gitea-tok-hint').textContent = '';
|
||||||
}
|
}
|
||||||
@@ -214,6 +219,7 @@ function editAccount(id) {
|
|||||||
$('gitea-acc-name').value = acc.name;
|
$('gitea-acc-name').value = acc.name;
|
||||||
$('gitea-acc-baseurl').value = acc.base_url;
|
$('gitea-acc-baseurl').value = acc.base_url;
|
||||||
$('gitea-acc-token').value = '';
|
$('gitea-acc-token').value = '';
|
||||||
|
$('gitea-acc-default-repo').value = acc.default_repo || '';
|
||||||
$('gitea-tok-hint').textContent = '(leave blank to keep existing)';
|
$('gitea-tok-hint').textContent = '(leave blank to keep existing)';
|
||||||
setAccountStatus('');
|
setAccountStatus('');
|
||||||
$('gitea-acc-name').focus();
|
$('gitea-acc-name').focus();
|
||||||
@@ -240,6 +246,7 @@ async function saveAccount(e) {
|
|||||||
name: $('gitea-acc-name').value.trim(),
|
name: $('gitea-acc-name').value.trim(),
|
||||||
base_url: $('gitea-acc-baseurl').value.trim(),
|
base_url: $('gitea-acc-baseurl').value.trim(),
|
||||||
token: $('gitea-acc-token').value,
|
token: $('gitea-acc-token').value,
|
||||||
|
default_repo: $('gitea-acc-default-repo').value.trim(),
|
||||||
};
|
};
|
||||||
if (!payload.name || !payload.base_url || (!editingAccountId && !payload.token)) {
|
if (!payload.name || !payload.base_url || (!editingAccountId && !payload.token)) {
|
||||||
setAccountStatus('name, base url, and token are required', 'error');
|
setAccountStatus('name, base url, and token are required', 'error');
|
||||||
@@ -713,8 +720,9 @@ async function openCreateForm() {
|
|||||||
$('gitea-create-form').classList.remove('hidden');
|
$('gitea-create-form').classList.remove('hidden');
|
||||||
$('gitea-create-form').classList.add('flex');
|
$('gitea-create-form').classList.add('flex');
|
||||||
|
|
||||||
// Reset form
|
// Reset form — pre-fill default repo if configured
|
||||||
$('gitea-create-repo').value = '';
|
const currentAccount = accounts.find(a => a.id === currentAccountId);
|
||||||
|
$('gitea-create-repo').value = currentAccount?.default_repo || '';
|
||||||
$('gitea-create-title').value = '';
|
$('gitea-create-title').value = '';
|
||||||
$('gitea-create-body').value = '';
|
$('gitea-create-body').value = '';
|
||||||
setCreateStatus('');
|
setCreateStatus('');
|
||||||
@@ -766,6 +774,8 @@ async function openCreateForm() {
|
|||||||
errBox.classList.remove('hidden');
|
errBox.classList.remove('hidden');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currentAccount?.default_repo) loadCreateRepoLabels();
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateRepoHint() {
|
function updateRepoHint() {
|
||||||
@@ -1593,6 +1603,35 @@ if (document.readyState === 'loading') {
|
|||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the gitea overlay, switch to the create-issue form and pre-fill
|
||||||
|
* title + body from a hyprcrd card. Does NOT submit — the user reviews
|
||||||
|
* and clicks Submit themselves. Called from the card right-click menu's
|
||||||
|
* "Make ticket" action (see public/js/modules/context-menu.js).
|
||||||
|
*/
|
||||||
|
window._giteaMakeIssueFromCard = async function (card) {
|
||||||
|
if (!card) return;
|
||||||
|
// Body might not be loaded in state.cards (lazy field) — fetch it.
|
||||||
|
let body = card.body;
|
||||||
|
if (body == null) {
|
||||||
|
try {
|
||||||
|
const all = await fetch(`api/cards?ids=${card.id}`).then(r => r.json());
|
||||||
|
const fresh = all.find(c => c.id == card.id);
|
||||||
|
body = fresh?.body || '';
|
||||||
|
} catch { body = ''; }
|
||||||
|
}
|
||||||
|
await openGitea();
|
||||||
|
if (accounts.length === 0) return; // welcome view — user must configure first
|
||||||
|
await openCreateForm();
|
||||||
|
const titleInput = $('gitea-create-title');
|
||||||
|
const bodyInput = $('gitea-create-body');
|
||||||
|
if (titleInput) titleInput.value = card.title || '';
|
||||||
|
if (bodyInput) bodyInput.value = body || '';
|
||||||
|
// Cursor on the repo field so the user can pick the destination
|
||||||
|
// first. Title + body are already filled.
|
||||||
|
$('gitea-create-repo')?.focus();
|
||||||
|
};
|
||||||
|
|
||||||
hyprcrd.registerPlugin({
|
hyprcrd.registerPlugin({
|
||||||
name: 'gitea',
|
name: 'gitea',
|
||||||
version: '0.1.0',
|
version: '0.1.0',
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
# oumta-dashboard plugin
|
||||||
|
|
||||||
|
Fullscreen view for the Oumta cluster dashboard (Go backend in `oumta-dashboard/`).
|
||||||
|
|
||||||
|
## Open
|
||||||
|
|
||||||
|
- **Oumta** button in the hyprcrd top bar (next to *Tasks*)
|
||||||
|
- `window._oumtaToggle()` from the console / other plugins
|
||||||
|
|
||||||
|
Close with **ESC** or the × button.
|
||||||
|
|
||||||
|
## Views
|
||||||
|
|
||||||
|
- **Overview** — cluster state, workload counts, attention list
|
||||||
|
- **Workloads** — filterable table (name, state, replicas, cpu/mem, image, reason)
|
||||||
|
- **Timeline** — event stream; clicking a workload filters down to its own events
|
||||||
|
|
||||||
|
## Namespaces
|
||||||
|
|
||||||
|
Tab row at the top. Currently two mocks (`oumta-dev`, `oumta-beta`). Real list comes from the backend once `/api/namespaces` exists.
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
Hardwired at the top of `oumta-dashboard.js` in the `CONFIG` block:
|
||||||
|
|
||||||
|
- **baseUrl** — where the Oumta Go backend is reachable (default `http://localhost:8085`).
|
||||||
|
- **authToken** — optional, sent as `Authorization: Bearer …` when non-empty.
|
||||||
|
- **pollIntervalSec** — polling fallback cadence when SSE is unavailable. Default 15 s.
|
||||||
|
|
||||||
|
No UI settings panel: the dashboard only runs against one specific deployment, so exposing these as editable fields would be noise.
|
||||||
|
|
||||||
|
## State today
|
||||||
|
|
||||||
|
Everything is mocked. The live indicator in the top right shows `polling` once the overlay is open, but no real HTTP call fires yet. See [`TODO.md`](./TODO.md) for the integration plan.
|
||||||
|
|
||||||
|
## Disabling
|
||||||
|
|
||||||
|
Add `"oumta-dashboard"` to the `disabled` array in `data/plugins.json`.
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
# oumta-dashboard — TODO
|
||||||
|
|
||||||
|
Everything in this file is work the plugin still needs to do before it's more than a mockup. Organised by phase.
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
- **Phase 0 (current)**: UI shell + mock data. Everything renders but no backend call is real.
|
||||||
|
- **Phase 1**: connect to real Go backend (`oumta-dashboard` repo) as endpoints become available.
|
||||||
|
- **Phase 2**: Keycloak bearer auth, PHP proxy decision, persisted settings.
|
||||||
|
- **Phase 3**: nice-to-haves (card auto-creation on incident, etc.).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 1 — wire up the real API
|
||||||
|
|
||||||
|
All API calls live in `oumta-dashboard.js` → `api()`. Every case currently returns a `mock…` helper; swap them for `fetch` against the backend. The URL is constructed from `state.settings.baseUrl`.
|
||||||
|
|
||||||
|
### Endpoints to wire (listed in the order the UI consumes them)
|
||||||
|
|
||||||
|
| UI call | Backend endpoint (planned) | Status in backend | Notes |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `api('/api/namespaces')` | `GET /api/namespaces` | **not yet implemented** | returns the namespace tabs shown at the top. See "Open backend questions" below. |
|
||||||
|
| `api('/api/cluster/overview')` | `GET /api/cluster/overview?namespace=…` | **exists (stub)** | current stub returns zeros. Also need `namespace` query param. |
|
||||||
|
| `api('/api/workloads')` | `GET /api/workloads?namespace=…&state=…&since=…` | not yet | filters: `state`, `since` (ISO), also maybe `search`. |
|
||||||
|
| `api('/api/workloads/{ns}/{name}/timeline')` | `GET /api/workloads/{ns}/{name}/timeline` | not yet | workload-detail timeline |
|
||||||
|
| `api('/api/timeline')` | `GET /api/timeline?namespace=…` | not yet | global timeline |
|
||||||
|
|
||||||
|
### Real `fetch` implementation sketch
|
||||||
|
|
||||||
|
In `api()` replace the mock dispatch with:
|
||||||
|
|
||||||
|
```js
|
||||||
|
const url = new URL(path, state.settings.baseUrl);
|
||||||
|
if (!url.searchParams.has('namespace') && state.activeNamespace)
|
||||||
|
url.searchParams.set('namespace', state.activeNamespace.namespace);
|
||||||
|
const headers = state.settings.authToken
|
||||||
|
? { Authorization: 'Bearer ' + state.settings.authToken }
|
||||||
|
: {};
|
||||||
|
const res = await fetch(url, { ...opts, headers });
|
||||||
|
if (!res.ok) throw new Error(`${res.status}: ${await res.text()}`);
|
||||||
|
return res.json();
|
||||||
|
```
|
||||||
|
|
||||||
|
There's also a commented-out sketch inside `api()` itself — delete the mock branches once real endpoints work.
|
||||||
|
|
||||||
|
### Contract alignment — [REAL] vs [PROPOSED] fields
|
||||||
|
|
||||||
|
Mocks in `oumta-dashboard.js` are labelled inline:
|
||||||
|
|
||||||
|
- **[REAL]** — field matches the Go struct exactly (from `internal/httpapi/router.go`). Must stay byte-for-byte aligned when flipping to real.
|
||||||
|
- **[PROPOSED]** — our guess based on prose in backend `docs/README.md`. Backend author may pick different names; UI has one place per field to update, and there's a commented-out adapter slot in `api()` if several diverge.
|
||||||
|
|
||||||
|
**Overview** (`GET /api/cluster/overview`) — entirely [REAL]:
|
||||||
|
```
|
||||||
|
clusterState (string: healthy | degraded | down | unknown)
|
||||||
|
workloadsUp (int)
|
||||||
|
workloadsDown (int)
|
||||||
|
updatedAtUtc (string, RFC3339)
|
||||||
|
```
|
||||||
|
Extras shown on the Overview page (incidents count, attention list) are **derived client-side** from the workloads response — no contract addition needed from backend.
|
||||||
|
|
||||||
|
**Workloads** (`GET /api/workloads`) — [PROPOSED], derived from `docs/README.md §2`:
|
||||||
|
```
|
||||||
|
items: [{
|
||||||
|
workloadId // synthetic handle, format "deployment/{ns}/{name}"
|
||||||
|
name // ← from doc "Name"
|
||||||
|
namespace // ← "Namespace"
|
||||||
|
state // ← "Zustand" — vocab: healthy | degraded | unavailable
|
||||||
|
replicasReady // ← "Replikas (ready/…)"
|
||||||
|
replicasDesired // ← "Replikas (…/desired)"
|
||||||
|
cpu // ← "CPU-Auslastung"
|
||||||
|
memory // ← "Speicherverbrauch"
|
||||||
|
image // ← "Aktives Docker-Image"
|
||||||
|
lastReason // ← "Letzter bekannter Grund fuer Zustandswechsel"
|
||||||
|
lastTransitionAt // ← "inkl. letzter Statuswechsel-Zeit"
|
||||||
|
}]
|
||||||
|
```
|
||||||
|
|
||||||
|
**Timeline** (`GET /api/timeline`, `GET /api/workloads/{ns}/{name}/timeline`) — [PROPOSED], derived from `docs/README.md §3`:
|
||||||
|
```
|
||||||
|
items: [{
|
||||||
|
timestamp // RFC3339
|
||||||
|
severity // info | warning | error
|
||||||
|
workloadId // same handle as above
|
||||||
|
message // short human description
|
||||||
|
reason // cause code, e.g. CrashLoopBackOff, ImagePullBackOff
|
||||||
|
kind // deployment | incident | scale — optional UI hint, drop if absent
|
||||||
|
}]
|
||||||
|
```
|
||||||
|
|
||||||
|
**Namespaces** (`GET /api/namespaces`) — [PROPOSED], new endpoint:
|
||||||
|
```
|
||||||
|
items: [{ id, label, namespace }]
|
||||||
|
```
|
||||||
|
`id` could equal `namespace` if backend treats them as the same. `label` is optional display text.
|
||||||
|
|
||||||
|
If/when real shapes differ, the fix path in priority order:
|
||||||
|
1. Rename in `mockXxx()` + renderer (one place each).
|
||||||
|
2. If multiple fields diverge on one endpoint, add a mapping step inside `api()` before `return`.
|
||||||
|
3. If the shape differs fundamentally, split the renderer.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 2 — auth, persistence, proxy decision
|
||||||
|
|
||||||
|
### Keycloak bearer flow
|
||||||
|
|
||||||
|
- Decision pending (see user note): probably SSO-wrapped. The plugin already sends `Authorization: Bearer <state.settings.authToken>` if a token is configured; the open question is **how the token arrives**.
|
||||||
|
- Options:
|
||||||
|
- **A.** User pastes a token into the settings tab (good for POC, not for prod).
|
||||||
|
- **B.** hyprcrd itself becomes a Keycloak client, acquires a token, exposes it via `window.hyprcrd.authToken` — plugin reads that. Requires a hyprcrd-core change.
|
||||||
|
- **C.** PHP proxy (see below) attaches the token server-side; the browser never sees it.
|
||||||
|
- **Recommendation**: go with **C** once we decide on the proxy. Until then **A** is fine for dev.
|
||||||
|
|
||||||
|
### PHP proxy in hyprcrd
|
||||||
|
|
||||||
|
- Today the plugin calls the Go backend **directly from the browser**. That means:
|
||||||
|
- The Go backend must return permissive CORS (it does: `Access-Control-Allow-Origin` is wide-open in dev).
|
||||||
|
- The user's browser must reach the backend (issue if the backend lives inside a private network).
|
||||||
|
- If we add a PHP proxy (file: `public/plugins/oumta-dashboard/backend.php`), we'd:
|
||||||
|
- Route `/api/oumta/*` → forward to `baseUrl + *`.
|
||||||
|
- Store `baseUrl` + `authToken` in hyprcrd's `settings` table instead of `localStorage`.
|
||||||
|
- Get CORS for free because the request originates from hyprcrd's own origin.
|
||||||
|
- **Trigger for adding the proxy**: when we get the Keycloak spec, or when users report "dashboard only works when I'm VPN'd".
|
||||||
|
|
||||||
|
### Settings persistence
|
||||||
|
|
||||||
|
- Currently `localStorage['oumta-dashboard-settings']` — fine for a single user in one browser.
|
||||||
|
- If we want per-tenant server-side settings, add a hyprcrd `settings` key like `oumta.base_url` and expose via a small PHP endpoint.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 3 — realtime
|
||||||
|
|
||||||
|
- `startLive()` currently just starts polling (every `settings.pollIntervalSec`).
|
||||||
|
- SSE plan (see commented-out block in `startLive()`):
|
||||||
|
- Backend exposes `GET /api/events?namespace=…` as an `EventSource`-compatible stream.
|
||||||
|
- On `onopen` → `setLive('live')`, apply incoming events live (invalidate `state.data.overview` etc. or surgically patch).
|
||||||
|
- On `onerror` → fall back to polling, `setLive('polling')` with a hint.
|
||||||
|
- SSE event shape proposal (to negotiate with backend): `{ type: 'workload.state', workloadId, state, reason, timestamp }`, etc. Parking this until the backend is ready to talk.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phase 3+ — nice to haves (not in scope yet)
|
||||||
|
|
||||||
|
From the original questions catalog we parked:
|
||||||
|
- Timezone handling: UTC vs. local browser time (probably just use local + tooltip with UTC).
|
||||||
|
- Plugin settings in hyprcrd's settings-tab vs. per-user vs. shared across tenants.
|
||||||
|
- Auto-create a hyprcrd card when an incident is opened (tie the two systems together).
|
||||||
|
- Filter persistence in URL hash so links are shareable.
|
||||||
|
- Light/dark accent variants — currently inherits theme variables, should just work.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Open backend questions (to sync with the Go team)
|
||||||
|
|
||||||
|
1. **Namespace list endpoint** — UI needs an endpoint to populate the namespace tabs. The doc says "Namespace-Auswahl per Menü" and mentions env-var config on the backend. What's the endpoint? `GET /api/namespaces`? If not, how does the UI discover them?
|
||||||
|
2. **Response envelope** — the existing `overview` endpoint returns a flat object. Lists should probably be `{ items: [...] }` (consistent with our renderers) or `[]` (then we'll adapt). Pick one and stick with it across all list endpoints.
|
||||||
|
3. **Cluster state values** — our Overview card colour-codes on `healthy | degraded | down | unknown`. Backend currently returns `"unknown"` as a literal. Confirm the vocabulary.
|
||||||
|
4. **Workload state values** — we colour-code on `healthy | degraded | unavailable`. The doc uses these but the old .NET API also had `withRestarts` / `withWarnings` as summary counters. Only the three we use? Or more?
|
||||||
|
5. **Workload ID shape** — we use `deployment/{namespace}/{name}` as a synthetic id (so workloads can be linked from the timeline). Does the backend emit that exact form, or just `{namespace}/{name}`? We can adapt either way.
|
||||||
|
6. **Timeline pagination** — limit? cursor? since? The .NET version had all three; the Go doc mentions only filters. Enough for MVP?
|
||||||
|
7. **Realtime channel** — path + event format. We've got a plan above; needs the backend team's blessing.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Internal follow-ups
|
||||||
|
|
||||||
|
- `renderWorkloads` is called on every keystroke in the filter — fine up to ~1k rows, might need debouncing above that.
|
||||||
|
- `refresh()` tears down the scoped-workload timeline whenever it fires. For Phase 1 that's acceptable; once real data lands, consider NOT overwriting `state.data.timeline` when `state.data.scopeWorkload` is active.
|
||||||
|
- `bootstrap()` only runs on first show. If the user changes the API base URL in settings while the overlay is open, we re-start live mode but don't re-fetch namespaces. Add a "reset & reload" action if that matters.
|
||||||
|
- Namespace tab bar shows `namespace.label`; we currently fake it. Once real, consider showing the full k8s namespace if `label` and `namespace` differ.
|
||||||
@@ -0,0 +1,408 @@
|
|||||||
|
/* ── Namespace tabs ── */
|
||||||
|
.oumta-ns-tab {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
padding: 8px 14px;
|
||||||
|
background: transparent;
|
||||||
|
border: none;
|
||||||
|
border-bottom: 2px solid transparent;
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.15s, border-color 0.15s;
|
||||||
|
margin-right: 2px;
|
||||||
|
}
|
||||||
|
.oumta-ns-tab:hover { color: var(--t-bright); }
|
||||||
|
.oumta-ns-tab.active { color: var(--t-accent); border-bottom-color: var(--t-accent); }
|
||||||
|
|
||||||
|
/* ── View tabs ── */
|
||||||
|
.oumta-view-tab {
|
||||||
|
display: inline-flex; align-items: center; gap: 6px;
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
padding: 4px 8px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.oumta-view-tab:hover { color: var(--t-bright); }
|
||||||
|
.oumta-view-tab.active { color: var(--t-accent); border-color: var(--t-accent); }
|
||||||
|
|
||||||
|
.oumta-view.hidden { display: none; }
|
||||||
|
.oumta-view { padding: 20px 24px; }
|
||||||
|
|
||||||
|
/* ── Overview cards ── */
|
||||||
|
.oumta-overview-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
gap: 12px;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
}
|
||||||
|
.oumta-card {
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-card);
|
||||||
|
padding: 14px 16px;
|
||||||
|
display: flex; flex-direction: column; gap: 4px;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
transition: background-color 0.2s, border-color 0.2s, color 0.2s;
|
||||||
|
}
|
||||||
|
.oumta-card-wide { grid-column: span 4; }
|
||||||
|
.oumta-card-label {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.oumta-card-value {
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
font-size: 56px;
|
||||||
|
color: var(--t-bright);
|
||||||
|
font-weight: bold;
|
||||||
|
line-height: 1.05;
|
||||||
|
}
|
||||||
|
.oumta-card-value-sm { font-size: 18px; font-weight: normal; line-height: 1.3; }
|
||||||
|
.oumta-card-sub { font-size: 10px; color: var(--t-dim); }
|
||||||
|
.oumta-danger { color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* Fail state: whole card goes red; label, value, sub all flip to white
|
||||||
|
* so the box reads as a single alarm tile rather than a coloured number
|
||||||
|
* on dark chrome. Triggered from JS via the oumta-fail class. Uses the
|
||||||
|
* theme's --t-danger to stay consistent with the "unavailable" state
|
||||||
|
* labels and workload state colours elsewhere in the dashboard. */
|
||||||
|
.oumta-card.oumta-fail {
|
||||||
|
background: var(--t-danger);
|
||||||
|
border-color: var(--t-danger);
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
.oumta-card.oumta-fail .oumta-card-label,
|
||||||
|
.oumta-card.oumta-fail .oumta-card-value,
|
||||||
|
.oumta-card.oumta-fail .oumta-card-sub {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oumta-cluster-status[data-state="healthy"] .oumta-card-value { color: #4ade80; }
|
||||||
|
.oumta-cluster-status[data-state="degraded"] .oumta-card-value { color: #fb923c; }
|
||||||
|
.oumta-cluster-status[data-state="unknown"] .oumta-card-value { color: var(--t-dim); }
|
||||||
|
/* data-state="down" is handled by .oumta-fail (toggled from JS) so the
|
||||||
|
* cluster tile goes fully red + white like the other alarms. */
|
||||||
|
|
||||||
|
/* ── Attention list ── */
|
||||||
|
.oumta-section { margin-top: 8px; }
|
||||||
|
.oumta-section-title {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-accent);
|
||||||
|
margin-bottom: 10px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.oumta-attention-list { display: flex; flex-direction: column; gap: 6px; }
|
||||||
|
.oumta-attention-row {
|
||||||
|
display: flex; align-items: center; gap: 10px;
|
||||||
|
padding: 10px 14px;
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-card);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.15s;
|
||||||
|
}
|
||||||
|
.oumta-attention-row:hover { border-color: var(--t-accent); }
|
||||||
|
.oumta-attention-name { flex: 1; color: var(--t-bright); font-size: 13px; }
|
||||||
|
.oumta-attention-ns { color: var(--t-dim); font-size: 11px; font-family: var(--font-content, monospace); }
|
||||||
|
.oumta-attention-reason { color: var(--t-muted); font-size: 11px; font-style: italic; }
|
||||||
|
.oumta-attention-state {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
padding: 2px 6px;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
.oumta-attention-state[data-state="degraded"] { color: #fb923c; border-color: #fb923c; }
|
||||||
|
.oumta-attention-state[data-state="unavailable"] { color: var(--t-danger); border-color: var(--t-danger); }
|
||||||
|
|
||||||
|
.oumta-empty {
|
||||||
|
padding: 32px;
|
||||||
|
text-align: center;
|
||||||
|
color: var(--t-dim);
|
||||||
|
font-size: 12px;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Workload toolbar + table ── */
|
||||||
|
.oumta-toolbar {
|
||||||
|
display: flex; gap: 10px; margin-bottom: 14px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.oumta-input {
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-radius: var(--ui-radius-input);
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.oumta-input:focus { border-color: var(--t-accent); }
|
||||||
|
#oumta-wl-search { flex: 1; min-width: 200px; }
|
||||||
|
|
||||||
|
.oumta-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.oumta-table th {
|
||||||
|
text-align: left;
|
||||||
|
padding: 8px 10px;
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.oumta-table td {
|
||||||
|
padding: 8px 10px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
color: var(--t-text);
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
.oumta-table tbody tr { cursor: pointer; transition: background 0.15s; }
|
||||||
|
.oumta-table tbody tr:hover { background: var(--t-bg); }
|
||||||
|
.oumta-table .wl-state-healthy { color: #4ade80; }
|
||||||
|
.oumta-table .wl-state-degraded { color: #fb923c; }
|
||||||
|
.oumta-table .wl-state-unavailable{ color: var(--t-danger); }
|
||||||
|
|
||||||
|
/* ── Timeline ── */
|
||||||
|
.oumta-timeline-header {
|
||||||
|
display: flex; align-items: center; gap: 10px; margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
.oumta-btn-ghost {
|
||||||
|
display: inline-flex; align-items: center; gap: 4px;
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 10px;
|
||||||
|
padding: 4px 8px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
transition: all 0.15s;
|
||||||
|
}
|
||||||
|
.oumta-btn-ghost:hover { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
|
||||||
|
/* Workload filter pills: inline quick-pick. Horizontal-scrolls if the row
|
||||||
|
* runs out of space; an overflow dropdown is injected from JS when the
|
||||||
|
* pill count would blow out past the container. */
|
||||||
|
.oumta-tl-filters {
|
||||||
|
display: flex; gap: 6px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.oumta-tl-pill {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
padding: 4px 9px;
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--ui-radius-button);
|
||||||
|
transition: all 0.12s;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.oumta-tl-pill:hover { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
.oumta-tl-pill.active { background: var(--t-accent); border-color: var(--t-accent); color: var(--t-bg); }
|
||||||
|
|
||||||
|
.oumta-tl-more {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.oumta-tl-more-menu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 4px); left: 0;
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-card);
|
||||||
|
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
|
||||||
|
padding: 4px;
|
||||||
|
z-index: 10;
|
||||||
|
min-width: 200px;
|
||||||
|
max-height: 300px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
.oumta-tl-more-menu button {
|
||||||
|
display: block; width: 100%; text-align: left;
|
||||||
|
padding: 6px 10px;
|
||||||
|
background: transparent; border: none;
|
||||||
|
color: var(--t-text);
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
font-size: 11px;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: var(--ui-radius-input);
|
||||||
|
}
|
||||||
|
.oumta-tl-more-menu button:hover { background: var(--t-bg); color: var(--t-bright); }
|
||||||
|
.oumta-tl-more-menu button.active { color: var(--t-accent); }
|
||||||
|
|
||||||
|
/* Timeline body: two-column layout (left = date badge + time + dot, right
|
||||||
|
* = event list). Clusters of events that fired within the same tolerance
|
||||||
|
* window get a single row with all sub-events listed in the right column.
|
||||||
|
*
|
||||||
|
* The decorative connector line is drawn ONCE on the body, not per entry —
|
||||||
|
* that's the only way to guarantee it's truly continuous (per-entry
|
||||||
|
* pseudo-elements collapse into gaps the moment an entry has a shorter
|
||||||
|
* left column than right). */
|
||||||
|
.oumta-timeline-body {
|
||||||
|
display: flex; flex-direction: column;
|
||||||
|
gap: 20px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.oumta-timeline-body::before {
|
||||||
|
content: "";
|
||||||
|
position: absolute;
|
||||||
|
left: 79px; /* right edge of the 80px left column */
|
||||||
|
top: 24px; /* begin a bit below the first dot */
|
||||||
|
bottom: 24px; /* end a bit above the last dot */
|
||||||
|
width: 2px;
|
||||||
|
/* Soft fade at both ends so the line feels like it eases into the
|
||||||
|
* timeline rather than being clipped. The middle stays fully opaque. */
|
||||||
|
background: linear-gradient(
|
||||||
|
to bottom,
|
||||||
|
transparent 0,
|
||||||
|
var(--t-border) 28px,
|
||||||
|
var(--t-border) calc(100% - 28px),
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
z-index: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
.oumta-timeline-entry {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 80px 1fr;
|
||||||
|
grid-template-rows: auto auto; /* optional date row on top, dot-row + events below */
|
||||||
|
gap: 0 14px;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
.oumta-timeline-entry > * { position: relative; z-index: 1; }
|
||||||
|
/* Time + dot share a horizontal row so clusters without a date badge
|
||||||
|
* show the time label LEFT of the dot, not stacked underneath. The row
|
||||||
|
* lives in grid row 2 so events in the right column (also row 2) stay
|
||||||
|
* vertically aligned with it — regardless of whether a date badge
|
||||||
|
* occupies row 1 above. */
|
||||||
|
.oumta-tl-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
grid-column: 1;
|
||||||
|
grid-row: 2;
|
||||||
|
justify-self: end; /* hug the connector line on the right */
|
||||||
|
align-self: start; /* don't stretch to the events column's full height — stay at the top */
|
||||||
|
}
|
||||||
|
.oumta-tl-date {
|
||||||
|
display: flex; flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
line-height: 1;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: var(--ui-radius-card);
|
||||||
|
padding: 4px 0 5px;
|
||||||
|
width: 44px;
|
||||||
|
background: var(--t-bg); /* solid, so the connector line behind doesn't strike through the text */
|
||||||
|
grid-column: 1;
|
||||||
|
grid-row: 1;
|
||||||
|
justify-self: start; /* badge hugs the left edge of the column */
|
||||||
|
margin-bottom: 8px; /* spacing before the dot-row below */
|
||||||
|
}
|
||||||
|
.oumta-tl-date .day {
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
font-size: 18px; font-weight: 700;
|
||||||
|
color: var(--t-bright);
|
||||||
|
}
|
||||||
|
.oumta-tl-date .mon {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 8px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
margin-top: 1px;
|
||||||
|
}
|
||||||
|
.oumta-tl-time {
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
font-size: 10px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
margin-top: 2px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.oumta-tl-dot {
|
||||||
|
width: 10px; height: 10px;
|
||||||
|
border-radius: 50%;
|
||||||
|
/* Dot sits at the right end of the time+dot row, which align-items:
|
||||||
|
* flex-end of the left column pushes to the right edge (x=80).
|
||||||
|
* Translate by half the dot width so its centre lines up exactly with
|
||||||
|
* the connector line (also at x=80). */
|
||||||
|
transform: translateX(5px);
|
||||||
|
flex-shrink: 0;
|
||||||
|
box-shadow: 0 0 0 3px color-mix(in srgb, var(--oumta-dot-color) 22%, transparent);
|
||||||
|
background: var(--oumta-dot-color);
|
||||||
|
}
|
||||||
|
.oumta-tl-dot[data-sev="info"] { --oumta-dot-color: var(--t-accent); }
|
||||||
|
.oumta-tl-dot[data-sev="warning"] { --oumta-dot-color: #fb923c; }
|
||||||
|
.oumta-tl-dot[data-sev="error"] { --oumta-dot-color: var(--t-danger); }
|
||||||
|
.oumta-tl-dot[data-sev="recovered"] { --oumta-dot-color: #4ade80; }
|
||||||
|
.oumta-tl-dot[data-sev="image"] { --oumta-dot-color: #60a5fa; }
|
||||||
|
|
||||||
|
.oumta-tl-right {
|
||||||
|
display: flex; flex-direction: column;
|
||||||
|
gap: 23px;
|
||||||
|
min-width: 0;
|
||||||
|
grid-column: 2;
|
||||||
|
grid-row: 2; /* pinned to the same row as .oumta-tl-row so events line up with the dot */
|
||||||
|
}
|
||||||
|
.oumta-tl-event {
|
||||||
|
display: flex; flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
.oumta-tl-event-head {
|
||||||
|
display: flex; align-items: baseline; gap: 8px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
.oumta-tl-severity {
|
||||||
|
font-family: var(--font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.oumta-tl-severity[data-sev="info"] { color: var(--t-accent); }
|
||||||
|
.oumta-tl-severity[data-sev="warning"] { color: #fb923c; }
|
||||||
|
.oumta-tl-severity[data-sev="error"] { color: var(--t-danger); }
|
||||||
|
.oumta-tl-severity[data-sev="recovered"] { color: #4ade80; }
|
||||||
|
.oumta-tl-severity[data-sev="image"] { color: #60a5fa; }
|
||||||
|
.oumta-tl-workload {
|
||||||
|
font-family: var(--font-content, monospace);
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.1s;
|
||||||
|
}
|
||||||
|
.oumta-tl-workload:hover { color: var(--t-accent); }
|
||||||
|
.oumta-tl-reason { font-size: 10px; color: var(--t-dim); }
|
||||||
|
.oumta-tl-message { font-size: 12px; color: var(--t-bright); line-height: 1.4; word-break: break-word; }
|
||||||
|
|
||||||
|
/* ── Live indicator ── */
|
||||||
|
.oumta-dot {
|
||||||
|
width: 6px; height: 6px; border-radius: 50%;
|
||||||
|
background: var(--t-dim);
|
||||||
|
display: inline-block;
|
||||||
|
transition: background 0.2s;
|
||||||
|
}
|
||||||
|
#oumta-live-indicator[data-state="live"] .oumta-dot { background: #4ade80; box-shadow: 0 0 6px #4ade80; }
|
||||||
|
#oumta-live-indicator[data-state="polling"] .oumta-dot { background: #4ade80; box-shadow: 0 0 6px #4ade80; }
|
||||||
|
#oumta-live-indicator[data-state="error"] .oumta-dot { background: var(--t-danger); }
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
<div class="overlay fixed inset-0 z-[75]" style="background:var(--t-overlay)" id="oumta-overlay">
|
||||||
|
<div class="bg-t-surface flex flex-col absolute" style="inset:0;">
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="flex items-center gap-3 px-5 py-3 border-b border-t-border shrink-0">
|
||||||
|
<i class="ph ph-gauge text-t-accent text-base"></i>
|
||||||
|
<h2 class="font-pixel text-xs text-t-accent">oumta_dashboard</h2>
|
||||||
|
<span id="oumta-generated-at" class="font-pixel text-[9px] text-t-dim"></span>
|
||||||
|
<div class="flex-1"></div>
|
||||||
|
<button id="oumta-refresh" class="flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors" data-tip="Refresh now">
|
||||||
|
<i class="ph ph-arrows-clockwise text-sm"></i><span class="font-pixel text-[10px]">Refresh</span>
|
||||||
|
</button>
|
||||||
|
<button id="oumta-close" class="flex items-center gap-1.5 px-2.5 py-1 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger transition-colors">
|
||||||
|
<i class="ph ph-x text-sm"></i><span class="font-pixel text-[10px]">Close</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Namespace tabs -->
|
||||||
|
<div id="oumta-ns-tabs" class="flex items-center gap-0 border-b border-t-border shrink-0 px-5"></div>
|
||||||
|
|
||||||
|
<!-- View tabs (Overview / Workloads / Timeline) -->
|
||||||
|
<div class="flex items-center gap-4 border-b border-t-border shrink-0 px-5 py-2 bg-t-bg">
|
||||||
|
<button class="oumta-view-tab active" data-view="overview"><i class="ph ph-squares-four text-sm"></i> Overview</button>
|
||||||
|
<button class="oumta-view-tab" data-view="workloads"><i class="ph ph-list text-sm"></i> Workloads</button>
|
||||||
|
<button class="oumta-view-tab" data-view="timeline"><i class="ph ph-clock-counter-clockwise text-sm"></i> Timeline</button>
|
||||||
|
<div class="flex-1"></div>
|
||||||
|
<span id="oumta-live-indicator" class="flex items-center gap-1 font-pixel text-[9px] text-t-dim" data-tip="Realtime status">
|
||||||
|
<span class="oumta-dot"></span><span id="oumta-live-label">connecting…</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Body -->
|
||||||
|
<div class="flex-1 overflow-auto" id="oumta-body">
|
||||||
|
|
||||||
|
<!-- Overview -->
|
||||||
|
<section class="oumta-view" data-view="overview">
|
||||||
|
<div class="oumta-overview-grid">
|
||||||
|
<div class="oumta-card oumta-cluster-status" id="oumta-cluster-card">
|
||||||
|
<div class="oumta-card-label">Cluster state</div>
|
||||||
|
<div class="oumta-card-value" id="oumta-cluster-state">—</div>
|
||||||
|
<div class="oumta-card-sub" id="oumta-cluster-updated">no data</div>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-card">
|
||||||
|
<div class="oumta-card-label">Workloads healthy</div>
|
||||||
|
<div class="oumta-card-value" id="oumta-workloads-up">—</div>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-card">
|
||||||
|
<div class="oumta-card-label">Workloads down</div>
|
||||||
|
<div class="oumta-card-value" id="oumta-workloads-down">—</div>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-card">
|
||||||
|
<div class="oumta-card-label">Open incidents</div>
|
||||||
|
<div class="oumta-card-value" id="oumta-incidents">—</div>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-card oumta-card-wide">
|
||||||
|
<div class="oumta-card-label">Last successful import</div>
|
||||||
|
<div class="oumta-card-value oumta-card-value-sm" id="oumta-last-import">—</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-section">
|
||||||
|
<div class="oumta-section-title">Workloads needing attention</div>
|
||||||
|
<div id="oumta-attention-list" class="oumta-attention-list">
|
||||||
|
<div class="oumta-empty">Nothing currently flagged.</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<!-- Workloads -->
|
||||||
|
<section class="oumta-view hidden" data-view="workloads">
|
||||||
|
<div class="oumta-toolbar">
|
||||||
|
<input id="oumta-wl-search" type="text" placeholder="Filter by name…" class="oumta-input">
|
||||||
|
<select id="oumta-wl-status" class="oumta-input">
|
||||||
|
<option value="">All states</option>
|
||||||
|
<option value="healthy">healthy</option>
|
||||||
|
<option value="degraded">degraded</option>
|
||||||
|
<option value="unavailable">unavailable</option>
|
||||||
|
</select>
|
||||||
|
<select id="oumta-wl-timerange" class="oumta-input">
|
||||||
|
<option value="1h">last 1h</option>
|
||||||
|
<option value="24h" selected>last 24h</option>
|
||||||
|
<option value="7d">last 7d</option>
|
||||||
|
<option value="">all</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<table class="oumta-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Name</th>
|
||||||
|
<th>Namespace</th>
|
||||||
|
<th>State</th>
|
||||||
|
<th>Replicas</th>
|
||||||
|
<th>CPU</th>
|
||||||
|
<th>Memory</th>
|
||||||
|
<th>Image</th>
|
||||||
|
<th>Last reason</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="oumta-wl-body">
|
||||||
|
<tr><td colspan="8" class="oumta-empty">No workloads.</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<!-- Timeline (workload-detail opens here as well) -->
|
||||||
|
<section class="oumta-view hidden" data-view="timeline">
|
||||||
|
<div class="oumta-timeline-header">
|
||||||
|
<button id="oumta-timeline-back" class="hidden oumta-btn-ghost"><i class="ph ph-caret-left text-sm"></i> back to all</button>
|
||||||
|
<span id="oumta-timeline-scope" class="font-pixel text-xs text-t-accent">all events</span>
|
||||||
|
</div>
|
||||||
|
<!-- Workload filter: quick-pick pills by default, a dropdown
|
||||||
|
trigger appears only when the pills don't fit. -->
|
||||||
|
<div id="oumta-timeline-filters" class="oumta-tl-filters"></div>
|
||||||
|
<div id="oumta-timeline-body" class="oumta-timeline-body">
|
||||||
|
<div class="oumta-empty">No events.</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,591 @@
|
|||||||
|
// ── Oumta Dashboard plugin ──
|
||||||
|
//
|
||||||
|
// Fullscreen view that consumes the Oumta Go backend (`oumta-dashboard`).
|
||||||
|
// The browser talks to /api/dashboard/* same-origin; the hyprcrd PHP
|
||||||
|
// backend forwards to the real upstream (see OUMTA_DASHBOARD_URL in
|
||||||
|
// config.php). Keeps CORS out of the browser and lets the dashboard
|
||||||
|
// live on a private network reachable only by the hyprcrd container.
|
||||||
|
|
||||||
|
const h = window.hyprcrd;
|
||||||
|
const $ = id => document.getElementById(id);
|
||||||
|
|
||||||
|
const CONFIG = {
|
||||||
|
proxyPrefix: '/api/dashboard',
|
||||||
|
pollIntervalSec: 15,
|
||||||
|
};
|
||||||
|
|
||||||
|
const state = {
|
||||||
|
namespaces: [], // [{ id, label, namespace }]
|
||||||
|
activeNamespace: null,
|
||||||
|
activeView: 'overview',
|
||||||
|
liveMode: 'polling', // 'live' | 'polling' | 'error' | 'off'
|
||||||
|
pollHandle: null,
|
||||||
|
sseHandle: null,
|
||||||
|
data: { overview: null, workloads: [], timeline: [], scopeWorkload: null },
|
||||||
|
timelineFilter: new Set(), // empty = all events; else any-of workloadIds (multi-select pills)
|
||||||
|
};
|
||||||
|
|
||||||
|
// ── Central API surface ─────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Every backend call routes through `api()` against the same-origin
|
||||||
|
// proxy prefix; the active namespace (if any) is attached as a
|
||||||
|
// `namespace` query parameter. Auth / bearer tokens live server-side
|
||||||
|
// in config.php, so nothing sensitive ships to the browser. Response
|
||||||
|
// shapes are defined by the Go backend in
|
||||||
|
// `internal/httpapi/contracts.go`.
|
||||||
|
|
||||||
|
async function api(path, opts = {}) {
|
||||||
|
const url = new URL(CONFIG.proxyPrefix + path, window.location.origin);
|
||||||
|
if (!url.searchParams.has('namespace') && state.activeNamespace) {
|
||||||
|
url.searchParams.set('namespace', state.activeNamespace.namespace);
|
||||||
|
}
|
||||||
|
const res = await fetch(url, opts);
|
||||||
|
if (!res.ok) throw new Error(`${res.status}: ${await res.text()}`);
|
||||||
|
return res.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Fullscreen overlay show/hide ─────────────────────────────────
|
||||||
|
|
||||||
|
const overlay = $('oumta-overlay');
|
||||||
|
|
||||||
|
function isOpen() {
|
||||||
|
return overlay?.classList.contains('open');
|
||||||
|
}
|
||||||
|
function show() {
|
||||||
|
if (!overlay) return;
|
||||||
|
overlay.classList.add('open');
|
||||||
|
// Always kick off polling — refresh() self-heals: it loads namespaces
|
||||||
|
// if they aren't there yet, and the interval keeps retrying even if
|
||||||
|
// the initial poll fails. Previously an initial bootstrap failure
|
||||||
|
// stopped the loop entirely and required a page reload to recover.
|
||||||
|
refresh();
|
||||||
|
startLive();
|
||||||
|
}
|
||||||
|
function hide() {
|
||||||
|
if (!overlay) return;
|
||||||
|
overlay.classList.remove('open');
|
||||||
|
stopLive();
|
||||||
|
}
|
||||||
|
function toggle() {
|
||||||
|
isOpen() ? hide() : show();
|
||||||
|
}
|
||||||
|
window._oumtaToggle = toggle;
|
||||||
|
|
||||||
|
function renderNamespaceTabs() {
|
||||||
|
const host = $('oumta-ns-tabs');
|
||||||
|
if (!host) return;
|
||||||
|
host.innerHTML = state.namespaces.map(n => `
|
||||||
|
<button class="oumta-ns-tab ${state.activeNamespace?.id === n.id ? 'active' : ''}" data-ns="${n.id}">
|
||||||
|
${n.label}
|
||||||
|
</button>
|
||||||
|
`).join('');
|
||||||
|
host.querySelectorAll('.oumta-ns-tab').forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
const ns = state.namespaces.find(x => x.id === btn.dataset.ns);
|
||||||
|
if (ns && ns.id !== state.activeNamespace?.id) {
|
||||||
|
state.activeNamespace = ns;
|
||||||
|
renderNamespaceTabs();
|
||||||
|
refresh();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── View switching ────────────────────────────────────────────
|
||||||
|
|
||||||
|
document.addEventListener('click', e => {
|
||||||
|
const tab = e.target.closest('.oumta-view-tab');
|
||||||
|
if (!tab || !overlay.contains(tab)) return;
|
||||||
|
switchView(tab.dataset.view);
|
||||||
|
});
|
||||||
|
|
||||||
|
function switchView(view) {
|
||||||
|
state.activeView = view;
|
||||||
|
document.querySelectorAll('.oumta-view-tab').forEach(b =>
|
||||||
|
b.classList.toggle('active', b.dataset.view === view));
|
||||||
|
document.querySelectorAll('.oumta-view').forEach(s =>
|
||||||
|
s.classList.toggle('hidden', s.dataset.view !== view));
|
||||||
|
// Reset workload-scoped timeline when leaving timeline view
|
||||||
|
if (view !== 'timeline') state.data.scopeWorkload = null;
|
||||||
|
renderTimeline();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Refresh all data for the active namespace ──────────────────
|
||||||
|
//
|
||||||
|
// Self-healing: if namespaces aren't loaded yet (e.g. initial poll
|
||||||
|
// failed), fetch them first; if upstream is down, leave state as
|
||||||
|
// 'error' and let the next interval tick try again. On any successful
|
||||||
|
// poll we flip back to 'polling' so the indicator recovers without a
|
||||||
|
// page reload.
|
||||||
|
|
||||||
|
async function refresh() {
|
||||||
|
try {
|
||||||
|
if (!state.activeNamespace) {
|
||||||
|
const res = await api('/api/namespaces');
|
||||||
|
state.namespaces = res.items || [];
|
||||||
|
state.activeNamespace = state.namespaces[0] || null;
|
||||||
|
renderNamespaceTabs();
|
||||||
|
}
|
||||||
|
if (!state.activeNamespace) {
|
||||||
|
// Namespaces endpoint returned empty — nothing to poll yet.
|
||||||
|
// Stay in 'polling' so we keep retrying on the interval.
|
||||||
|
setLive('polling');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [ov, wl, tl] = await Promise.all([
|
||||||
|
api('/api/cluster/overview'),
|
||||||
|
api('/api/workloads'),
|
||||||
|
api('/api/timeline'),
|
||||||
|
]);
|
||||||
|
state.data.overview = ov;
|
||||||
|
state.data.workloads = wl.items || [];
|
||||||
|
state.data.timeline = tl.items || [];
|
||||||
|
renderAll();
|
||||||
|
setLive('polling');
|
||||||
|
} catch (e) {
|
||||||
|
setLive('error', e.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Renderers ─────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function renderAll() {
|
||||||
|
renderOverview();
|
||||||
|
renderWorkloads();
|
||||||
|
renderTimeline();
|
||||||
|
const genAt = state.data.overview?.updatedAtUtc;
|
||||||
|
const el = $('oumta-generated-at');
|
||||||
|
if (el && genAt) el.textContent = 'last import: ' + formatTime(genAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderOverview() {
|
||||||
|
const o = state.data.overview;
|
||||||
|
const wl = state.data.workloads || [];
|
||||||
|
if (!o) return;
|
||||||
|
|
||||||
|
// Values that come directly from the Go overview endpoint [REAL].
|
||||||
|
const clusterCard = $('oumta-cluster-card');
|
||||||
|
const clusterState = o.clusterState || 'unknown';
|
||||||
|
clusterCard.dataset.state = clusterState;
|
||||||
|
clusterCard.classList.toggle('oumta-fail', clusterState === 'down');
|
||||||
|
$('oumta-cluster-state').textContent = clusterState;
|
||||||
|
$('oumta-cluster-updated').textContent = o.updatedAtUtc ? 'as of ' + formatTime(o.updatedAtUtc) : 'no data';
|
||||||
|
$('oumta-workloads-up').textContent = o.workloadsUp ?? '—';
|
||||||
|
$('oumta-workloads-down').textContent = o.workloadsDown ?? '—';
|
||||||
|
$('oumta-last-import').textContent = o.updatedAtUtc ? formatTime(o.updatedAtUtc) : '—';
|
||||||
|
|
||||||
|
// Any workload down → the "workloads down" tile becomes an alarm tile.
|
||||||
|
const downCard = $('oumta-workloads-down').closest('.oumta-card');
|
||||||
|
if (downCard) downCard.classList.toggle('oumta-fail', (o.workloadsDown ?? 0) > 0);
|
||||||
|
|
||||||
|
// Values derived client-side from the workloads list — the overview
|
||||||
|
// endpoint doesn't carry these today. If the backend later adds
|
||||||
|
// `incidents` / `attention` fields, prefer those over the derivation.
|
||||||
|
const attention = wl.filter(w => w.state !== 'healthy')
|
||||||
|
.sort((a, b) => rankState(a.state) - rankState(b.state));
|
||||||
|
$('oumta-incidents').textContent = attention.length || '—';
|
||||||
|
const incCard = $('oumta-incidents').closest('.oumta-card');
|
||||||
|
if (incCard) incCard.classList.toggle('oumta-fail', attention.length > 0);
|
||||||
|
|
||||||
|
const list = $('oumta-attention-list');
|
||||||
|
if (!attention.length) {
|
||||||
|
list.innerHTML = '<div class="oumta-empty">Nothing currently flagged.</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
list.innerHTML = attention.map(a => `
|
||||||
|
<div class="oumta-attention-row" data-wlid="${escapeAttr(a.workloadId)}">
|
||||||
|
<span class="oumta-attention-state" data-state="${a.state}">${a.state}</span>
|
||||||
|
<span class="oumta-attention-name">${escapeHtml(a.name)}</span>
|
||||||
|
<span class="oumta-attention-ns">${escapeHtml(a.namespace)}</span>
|
||||||
|
<span class="oumta-attention-reason">${escapeHtml(a.lastReason || '')}</span>
|
||||||
|
</div>
|
||||||
|
`).join('');
|
||||||
|
list.querySelectorAll('.oumta-attention-row').forEach(row => {
|
||||||
|
row.addEventListener('click', () => openWorkload(row.dataset.wlid));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Severity order for the attention list: worst first.
|
||||||
|
function rankState(s) {
|
||||||
|
return { unavailable: 0, degraded: 1, healthy: 2 }[s] ?? 9;
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderWorkloads() {
|
||||||
|
const search = ($('oumta-wl-search').value || '').toLowerCase();
|
||||||
|
const filterState = $('oumta-wl-status').value;
|
||||||
|
const body = $('oumta-wl-body');
|
||||||
|
const rows = (state.data.workloads || []).filter(w => {
|
||||||
|
if (search && !w.name.toLowerCase().includes(search)) return false;
|
||||||
|
if (filterState && w.state !== filterState) return false;
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
if (!rows.length) {
|
||||||
|
body.innerHTML = '<tr><td colspan="8" class="oumta-empty">No workloads match.</td></tr>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
body.innerHTML = rows.map(w => `
|
||||||
|
<tr data-wlid="${escapeAttr(w.workloadId)}">
|
||||||
|
<td>${escapeHtml(w.name)}</td>
|
||||||
|
<td>${escapeHtml(w.namespace)}</td>
|
||||||
|
<td class="wl-state-${w.state}">${w.state}</td>
|
||||||
|
<td>${w.replicasReady}/${w.replicasDesired}</td>
|
||||||
|
<td>${escapeHtml(w.cpu)}</td>
|
||||||
|
<td>${escapeHtml(w.memory)}</td>
|
||||||
|
<td>${escapeHtml(w.image)}</td>
|
||||||
|
<td>${escapeHtml(w.lastReason)}</td>
|
||||||
|
</tr>
|
||||||
|
`).join('');
|
||||||
|
body.querySelectorAll('tr').forEach(tr => {
|
||||||
|
tr.addEventListener('click', () => openWorkload(tr.dataset.wlid));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Timeline helpers ──────────────────────────────────────────
|
||||||
|
|
||||||
|
const TL_CLUSTER_WINDOW_MS = 60_000; // events within 60s collapse into one entry
|
||||||
|
const TL_SEV_RANK = { error: 5, warning: 4, recovered: 3, image: 2, info: 1 };
|
||||||
|
const TL_MONTHS = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC'];
|
||||||
|
|
||||||
|
/** Normalise an event's severity. Two post-hoc classifications matter:
|
||||||
|
* "-> healthy" transitions are recoveries, and ImageRolled reasons are
|
||||||
|
* real image pushes (vs. plain revision bumps which are just info). */
|
||||||
|
function eventSev(e) {
|
||||||
|
const isRecovery = typeof e.message === 'string' && e.message.endsWith('-> healthy');
|
||||||
|
const isImageRoll = e.reason === 'ImageRolled';
|
||||||
|
if (isRecovery) return 'recovered';
|
||||||
|
if (isImageRoll) return 'image';
|
||||||
|
return e.severity || 'info';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Workload short-name for the filter pill (strip namespace prefix). */
|
||||||
|
function workloadShort(id) {
|
||||||
|
if (!id) return '?';
|
||||||
|
const parts = id.split('/');
|
||||||
|
return parts[parts.length - 1] || id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Greedy clustering: walk events (assumed newest-first) and start a new
|
||||||
|
* cluster whenever the gap exceeds the tolerance window. */
|
||||||
|
function clusterEvents(events) {
|
||||||
|
const clusters = [];
|
||||||
|
let current = null;
|
||||||
|
for (const e of events) {
|
||||||
|
const ts = Date.parse(e.timestamp);
|
||||||
|
if (!current || isNaN(ts) || Math.abs(current.anchorTs - ts) > TL_CLUSTER_WINDOW_MS) {
|
||||||
|
current = { anchorTs: ts, ts: e.timestamp, events: [e] };
|
||||||
|
clusters.push(current);
|
||||||
|
} else {
|
||||||
|
current.events.push(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return clusters;
|
||||||
|
}
|
||||||
|
|
||||||
|
function dominantSev(events) {
|
||||||
|
let best = null;
|
||||||
|
for (const e of events) {
|
||||||
|
const sev = eventSev(e);
|
||||||
|
if (!best || TL_SEV_RANK[sev] > TL_SEV_RANK[best]) best = sev;
|
||||||
|
}
|
||||||
|
return best || 'info';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Scan the cluster (events are newest-first) for the most recent state
|
||||||
|
* transition and map it to a dot severity. This reflects how the
|
||||||
|
* workload ended up after the cluster, not the worst thing that
|
||||||
|
* happened inside it — so a cluster that ends in "-> healthy" shows a
|
||||||
|
* green dot even if it contains degraded/warning events along the way.
|
||||||
|
* A cluster without any state transition (rollouts or image changes
|
||||||
|
* that didn't flip state) counts as "uneventful" → also green, since
|
||||||
|
* the absence of a transition means the workload stayed in whatever
|
||||||
|
* state it was in. */
|
||||||
|
function clusterOutcomeSev(events) {
|
||||||
|
for (const e of events) {
|
||||||
|
const m = /->\s*(\w+)\s*$/.exec(e.message || '');
|
||||||
|
if (!m) continue;
|
||||||
|
switch (m[1]) {
|
||||||
|
case 'healthy': return 'recovered';
|
||||||
|
case 'degraded': return 'warning';
|
||||||
|
case 'unavailable': return 'error';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 'recovered';
|
||||||
|
}
|
||||||
|
|
||||||
|
function sameDay(a, b) {
|
||||||
|
const da = new Date(a), db = new Date(b);
|
||||||
|
return da.getFullYear() === db.getFullYear()
|
||||||
|
&& da.getMonth() === db.getMonth()
|
||||||
|
&& da.getDate() === db.getDate();
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatTimeShort(iso) {
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (isNaN(d.getTime())) return iso;
|
||||||
|
const now = new Date();
|
||||||
|
if (Math.abs(now - d) < 60_000) return 'just now';
|
||||||
|
const hh = String(d.getHours()).padStart(2, '0');
|
||||||
|
const mm = String(d.getMinutes()).padStart(2, '0');
|
||||||
|
return `${hh}:${mm}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderTimeline() {
|
||||||
|
const scope = state.data.scopeWorkload;
|
||||||
|
const scopeEl = $('oumta-timeline-scope');
|
||||||
|
const backEl = $('oumta-timeline-back');
|
||||||
|
if (scope) {
|
||||||
|
scopeEl.textContent = 'events for ' + scope;
|
||||||
|
backEl.classList.remove('hidden');
|
||||||
|
} else {
|
||||||
|
const n = state.timelineFilter.size;
|
||||||
|
scopeEl.textContent = n === 0 ? 'all events' : `filtered · ${n}`;
|
||||||
|
backEl.classList.add('hidden');
|
||||||
|
}
|
||||||
|
const filter = state.timelineFilter;
|
||||||
|
const events = state.data.timeline.filter(e => {
|
||||||
|
if (scope) return e.workloadId === scope;
|
||||||
|
if (filter.size === 0) return true;
|
||||||
|
return filter.has(e.workloadId);
|
||||||
|
});
|
||||||
|
renderTimelineFilters();
|
||||||
|
|
||||||
|
const body = $('oumta-timeline-body');
|
||||||
|
if (!events.length) {
|
||||||
|
body.innerHTML = '<div class="oumta-empty">No events.</div>';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const clusters = clusterEvents(events);
|
||||||
|
|
||||||
|
let lastDate = null;
|
||||||
|
body.innerHTML = clusters.map(cluster => {
|
||||||
|
const sev = clusterOutcomeSev(cluster.events) || dominantSev(cluster.events);
|
||||||
|
const showDate = !lastDate || !sameDay(lastDate, cluster.ts);
|
||||||
|
lastDate = cluster.ts;
|
||||||
|
const d = new Date(cluster.ts);
|
||||||
|
const badge = showDate
|
||||||
|
? `<div class="oumta-tl-date" title="${escapeAttr(d.toDateString())}">
|
||||||
|
<span class="day">${d.getDate()}</span>
|
||||||
|
<span class="mon">${TL_MONTHS[d.getMonth()]}</span>
|
||||||
|
</div>`
|
||||||
|
: '';
|
||||||
|
const left = `
|
||||||
|
${badge}
|
||||||
|
<div class="oumta-tl-row">
|
||||||
|
<span class="oumta-tl-time">${escapeHtml(formatTimeShort(cluster.ts))}</span>
|
||||||
|
<span class="oumta-tl-dot" data-sev="${sev}"></span>
|
||||||
|
</div>`;
|
||||||
|
const right = `
|
||||||
|
<div class="oumta-tl-right">
|
||||||
|
${cluster.events.map(e => {
|
||||||
|
const esev = eventSev(e);
|
||||||
|
const wid = e.workloadId || '';
|
||||||
|
return `
|
||||||
|
<div class="oumta-tl-event">
|
||||||
|
<div class="oumta-tl-event-head">
|
||||||
|
<span class="oumta-tl-severity" data-sev="${esev}">${esev}</span>
|
||||||
|
<span class="oumta-tl-workload" data-wlid="${escapeAttr(wid)}" title="filter by this workload">${escapeHtml(workloadShort(wid))}</span>
|
||||||
|
<span class="oumta-tl-reason">${escapeHtml(e.reason || '')}</span>
|
||||||
|
</div>
|
||||||
|
<div class="oumta-tl-message">${escapeHtml(e.message || '')}</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}).join('')}
|
||||||
|
</div>`;
|
||||||
|
return `<div class="oumta-timeline-entry">${left}${right}</div>`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
// Tapping a workload name inside an event toggles it in the filter set.
|
||||||
|
body.querySelectorAll('.oumta-tl-workload').forEach(el => {
|
||||||
|
el.addEventListener('click', () => toggleTimelineFilter(el.dataset.wlid));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Toggle a workload in the multi-select filter set. Passing an empty
|
||||||
|
* value clears the set (the "all" pill). */
|
||||||
|
function toggleTimelineFilter(workloadId) {
|
||||||
|
const set = state.timelineFilter;
|
||||||
|
if (!workloadId) { set.clear(); }
|
||||||
|
else if (set.has(workloadId)) { set.delete(workloadId); }
|
||||||
|
else { set.add(workloadId); }
|
||||||
|
renderTimeline();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Render the workload quick-pick bar. "all" + distinct workloads seen in
|
||||||
|
* the current timeline, capped at N inline pills — overflow collapses
|
||||||
|
* into a dropdown. Deduplicated by workloadId, ranked by most recent
|
||||||
|
* event so the pills you care about stay visible. */
|
||||||
|
function renderTimelineFilters() {
|
||||||
|
const host = $('oumta-timeline-filters');
|
||||||
|
if (!host) return;
|
||||||
|
// In workload-detail scope (opened via a card click) the filter bar is
|
||||||
|
// redundant — we're already showing one workload's events.
|
||||||
|
if (state.data.scopeWorkload) { host.innerHTML = ''; return; }
|
||||||
|
|
||||||
|
const seen = new Map(); // workloadId -> earliest-seen index (= recency)
|
||||||
|
state.data.timeline.forEach((e, i) => {
|
||||||
|
if (e.workloadId && !seen.has(e.workloadId)) seen.set(e.workloadId, i);
|
||||||
|
});
|
||||||
|
const workloads = [...seen.keys()];
|
||||||
|
if (!workloads.length) { host.innerHTML = ''; return; }
|
||||||
|
|
||||||
|
const INLINE_LIMIT = 6;
|
||||||
|
const inline = workloads.slice(0, INLINE_LIMIT);
|
||||||
|
const overflow = workloads.slice(INLINE_LIMIT);
|
||||||
|
const active = state.timelineFilter; // Set<workloadId>
|
||||||
|
|
||||||
|
const pill = (id, label, isActive) =>
|
||||||
|
`<button class="oumta-tl-pill${isActive ? ' active' : ''}" data-wlid="${escapeAttr(id)}">${escapeHtml(label)}</button>`;
|
||||||
|
|
||||||
|
// "all" is active whenever the filter set is empty; picking it clears
|
||||||
|
// the set. The individual pills toggle their workload in the set so
|
||||||
|
// multiple filters can stack (any-of match).
|
||||||
|
const overflowActiveCount = overflow.reduce((n, id) => n + (active.has(id) ? 1 : 0), 0);
|
||||||
|
host.innerHTML = [
|
||||||
|
pill('', 'all', active.size === 0),
|
||||||
|
...inline.map(id => pill(id, workloadShort(id), active.has(id))),
|
||||||
|
overflow.length ? `
|
||||||
|
<div class="oumta-tl-more">
|
||||||
|
<button class="oumta-tl-pill${overflowActiveCount ? ' active' : ''}" data-tl-more="1">+${overflow.length} more${overflowActiveCount ? ` (${overflowActiveCount})` : ''}<i class="ph ph-caret-down" style="font-size:10px;margin-left:4px;"></i></button>
|
||||||
|
<div class="oumta-tl-more-menu hidden">
|
||||||
|
${overflow.map(id => `<button class="${active.has(id) ? 'active' : ''}" data-wlid="${escapeAttr(id)}">${escapeHtml(workloadShort(id))}</button>`).join('')}
|
||||||
|
</div>
|
||||||
|
</div>` : '',
|
||||||
|
].filter(Boolean).join('');
|
||||||
|
|
||||||
|
host.querySelectorAll('.oumta-tl-pill[data-wlid]').forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => toggleTimelineFilter(btn.dataset.wlid || ''));
|
||||||
|
});
|
||||||
|
const moreBtn = host.querySelector('[data-tl-more]');
|
||||||
|
const moreMenu = host.querySelector('.oumta-tl-more-menu');
|
||||||
|
if (moreBtn && moreMenu) {
|
||||||
|
moreBtn.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
moreMenu.classList.toggle('hidden');
|
||||||
|
});
|
||||||
|
// Overflow picks don't close the menu — multi-select UX relies on
|
||||||
|
// being able to tick several without the menu collapsing every time.
|
||||||
|
moreMenu.querySelectorAll('button[data-wlid]').forEach(btn => {
|
||||||
|
btn.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
toggleTimelineFilter(btn.dataset.wlid || '');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
document.addEventListener('click', (e) => {
|
||||||
|
if (!moreMenu.contains(e.target) && e.target !== moreBtn) moreMenu.classList.add('hidden');
|
||||||
|
}, { once: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Workload → detail-as-timeline navigation ──────────────────
|
||||||
|
|
||||||
|
async function openWorkload(workloadId) {
|
||||||
|
state.data.scopeWorkload = workloadId;
|
||||||
|
const [nsSlug, name] = workloadId.replace('deployment/', '').split('/');
|
||||||
|
// Pull workload-scoped timeline — this REPLACES the generic one for rendering.
|
||||||
|
try {
|
||||||
|
const res = await api(`/api/workloads/${nsSlug}/${name}/timeline`);
|
||||||
|
state.data.timeline = res.items || [];
|
||||||
|
} catch (e) { setLive('error', e.message); }
|
||||||
|
switchView('timeline');
|
||||||
|
}
|
||||||
|
|
||||||
|
$('oumta-timeline-back')?.addEventListener('click', () => {
|
||||||
|
state.data.scopeWorkload = null;
|
||||||
|
// Restore the global timeline
|
||||||
|
api('/api/timeline').then(r => {
|
||||||
|
state.data.timeline = r.items || [];
|
||||||
|
renderTimeline();
|
||||||
|
}).catch(e => setLive('error', e.message));
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Polling loop ──────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// SSE intentionally unsupported: the PHP proxy buffers whole responses,
|
||||||
|
// so streaming through it would pin an Apache worker per client. If we
|
||||||
|
// ever want live events, bypass the proxy and talk to the Go backend's
|
||||||
|
// WebSocket / SSE endpoint directly — browsers don't enforce CORS on
|
||||||
|
// WS, and SSE would need a short-lived signed URL from the proxy.
|
||||||
|
|
||||||
|
function startLive() {
|
||||||
|
stopLive();
|
||||||
|
startPolling();
|
||||||
|
}
|
||||||
|
function stopLive() {
|
||||||
|
if (state.pollHandle) { clearInterval(state.pollHandle); state.pollHandle = null; }
|
||||||
|
if (state.sseHandle) { state.sseHandle.close(); state.sseHandle = null; }
|
||||||
|
setLive('off');
|
||||||
|
}
|
||||||
|
function startPolling() {
|
||||||
|
const ms = (CONFIG.pollIntervalSec || 15) * 1000;
|
||||||
|
state.pollHandle = setInterval(refresh, ms);
|
||||||
|
setLive('polling');
|
||||||
|
}
|
||||||
|
|
||||||
|
function setLive(mode, detail = '') {
|
||||||
|
state.liveMode = mode;
|
||||||
|
const el = $('oumta-live-indicator');
|
||||||
|
const lbl = $('oumta-live-label');
|
||||||
|
if (el) el.dataset.state = mode;
|
||||||
|
if (lbl) {
|
||||||
|
lbl.textContent = ({
|
||||||
|
live: 'live',
|
||||||
|
polling: 'polling',
|
||||||
|
error: 'error' + (detail ? ' — ' + detail : ''),
|
||||||
|
off: 'off',
|
||||||
|
})[mode] || mode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Header buttons ───────────────────────────────────────────
|
||||||
|
|
||||||
|
$('oumta-close')?.addEventListener('click', hide);
|
||||||
|
$('oumta-refresh')?.addEventListener('click', refresh);
|
||||||
|
$('oumta-wl-search')?.addEventListener('input', renderWorkloads);
|
||||||
|
$('oumta-wl-status')?.addEventListener('change', renderWorkloads);
|
||||||
|
$('oumta-wl-timerange')?.addEventListener('change', () => {
|
||||||
|
// TODO(api): forward to /api/workloads?since=<ISO> once the backend accepts it.
|
||||||
|
renderWorkloads();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ESC to close
|
||||||
|
window.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Escape' && isOpen()) {
|
||||||
|
e.preventDefault(); e.stopPropagation();
|
||||||
|
hide();
|
||||||
|
}
|
||||||
|
}, { capture: true });
|
||||||
|
|
||||||
|
// ── Inject header button into hyprcrd top bar ────────────────
|
||||||
|
|
||||||
|
function injectHeaderButton() {
|
||||||
|
const tasksBtn = document.getElementById('tasks-btn');
|
||||||
|
if (!tasksBtn || document.getElementById('oumta-btn')) return;
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.id = 'oumta-btn';
|
||||||
|
btn.className = 'flex items-center gap-2 px-2.5 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors';
|
||||||
|
btn.innerHTML = '<i class="ph ph-gauge text-sm"></i><span class="font-pixel text-[10px]">Oumta</span>';
|
||||||
|
btn.addEventListener('click', toggle);
|
||||||
|
tasksBtn.parentNode.insertBefore(btn, tasksBtn);
|
||||||
|
}
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', injectHeaderButton);
|
||||||
|
} else {
|
||||||
|
injectHeaderButton();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Helpers ─────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function escapeHtml(s) {
|
||||||
|
return String(s ?? '').replace(/[&<>"']/g, c => ({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]));
|
||||||
|
}
|
||||||
|
function escapeAttr(s) { return escapeHtml(s); }
|
||||||
|
function formatTime(iso) {
|
||||||
|
try {
|
||||||
|
const d = new Date(iso);
|
||||||
|
return d.toLocaleString();
|
||||||
|
} catch { return iso; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Boot ────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
h?.registerPlugin?.({ name: 'oumta-dashboard', version: '0.1.0' });
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"name": "oumta-dashboard",
|
||||||
|
"version": "0.1.0",
|
||||||
|
"description": "Oumta cluster dashboard — overview, workloads, timeline.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["oumta-dashboard.js"],
|
||||||
|
"css": ["oumta-dashboard.css"],
|
||||||
|
"html": ["oumta-dashboard.html"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shopping Plugin: backend.
|
||||||
|
*
|
||||||
|
* Thin forwarder from the client to the relay's /api/shopping*
|
||||||
|
* endpoints. The phone-side view is part of the relay UI; this
|
||||||
|
* plugin just pipes hyprcrd's push/pull through the configured
|
||||||
|
* relay credentials.
|
||||||
|
*
|
||||||
|
* Routes:
|
||||||
|
* GET /api/shopping — pull active list state from relay
|
||||||
|
* POST /api/shopping — push active card {uid,title,body}
|
||||||
|
* POST /api/shopping/check — (mostly phone-only; proxied for
|
||||||
|
* completeness/tests — relay will
|
||||||
|
* 401 for client-auth callers)
|
||||||
|
*/
|
||||||
|
|
||||||
|
function shoppingJson($data, int $code = 200): void {
|
||||||
|
http_response_code($code);
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo json_encode($data);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
function shoppingRelay(): array {
|
||||||
|
$db = Database::connect();
|
||||||
|
return [
|
||||||
|
'url' => $db->query("SELECT value FROM settings WHERE key = 'relay_url'")->fetchColumn() ?: '',
|
||||||
|
'user' => $db->query("SELECT value FROM settings WHERE key = 'relay_username'")->fetchColumn() ?: '',
|
||||||
|
'key' => $db->query("SELECT value FROM settings WHERE key = 'relay_key'")->fetchColumn() ?: '',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
||||||
|
if ($route !== '/api/shopping' && $route !== '/api/shopping/check') return;
|
||||||
|
if (!in_array($method, ['GET', 'POST', 'DELETE'], true)) return;
|
||||||
|
|
||||||
|
$r = shoppingRelay();
|
||||||
|
if (!$r['url'] || !$r['user'] || !$r['key']) {
|
||||||
|
shoppingJson(['ok' => false, 'error' => 'relay not configured']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$ch = curl_init(rtrim($r['url'], '/') . $route);
|
||||||
|
$opts = [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_HTTPHEADER => [
|
||||||
|
'Content-Type: application/json',
|
||||||
|
'X-Relay-User: ' . $r['user'],
|
||||||
|
'X-Relay-Key: ' . $r['key'],
|
||||||
|
],
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
];
|
||||||
|
if ($method === 'POST') {
|
||||||
|
$opts[CURLOPT_POST] = true;
|
||||||
|
$opts[CURLOPT_POSTFIELDS] = file_get_contents('php://input') ?: '{}';
|
||||||
|
} elseif ($method === 'DELETE') {
|
||||||
|
$opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
|
||||||
|
$opts[CURLOPT_POSTFIELDS] = file_get_contents('php://input') ?: '{}';
|
||||||
|
}
|
||||||
|
curl_setopt_array($ch, $opts);
|
||||||
|
$response = curl_exec($ch);
|
||||||
|
$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
|
||||||
|
http_response_code($status ?: 502);
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo is_string($response) ? $response : json_encode(['ok' => false, 'error' => 'relay unreachable']);
|
||||||
|
exit;
|
||||||
|
});
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"name": "shopping",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "Ship one shopping card at a time to the relay so it's checkable from your phone. hyprcrd stays the edit surface; phone only toggles.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["shopping.js"],
|
||||||
|
"css": ["shopping.css"]
|
||||||
|
},
|
||||||
|
"backend": "backend.php"
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
/* Shopping plugin styles. Most of the picker dialog leans on
|
||||||
|
existing Tailwind tokens (text-t-accent, border-t-border, etc.)
|
||||||
|
so there's little needed here — only things that can't be
|
||||||
|
expressed inline on dynamically-created nodes. */
|
||||||
|
|
||||||
|
.shopping-picker-overlay { font-family: var(--t-font-mono, inherit); }
|
||||||
@@ -0,0 +1,343 @@
|
|||||||
|
// ── Shopping-list plugin (hyprcrd side) ──
|
||||||
|
//
|
||||||
|
// Tag a card with #einkauf or #shopping to make it eligible. Pick
|
||||||
|
// any number as "active" via the Shopping header button; each active
|
||||||
|
// card's body is pushed to the relay on every sync.tick and on every
|
||||||
|
// cards.reloaded so edits land on the phone within seconds. Pulls
|
||||||
|
// phone-side toggles back and PATCHes the local cards.
|
||||||
|
//
|
||||||
|
// No timestamp cursors — we diff the (uid, title, body) triple we
|
||||||
|
// last saw in sync with the relay, which is timezone-agnostic.
|
||||||
|
|
||||||
|
const hyprcrd = window.hyprcrd;
|
||||||
|
if (!hyprcrd) throw new Error('[shopping plugin] window.hyprcrd missing');
|
||||||
|
|
||||||
|
const $ = (id) => document.getElementById(id);
|
||||||
|
|
||||||
|
const ACTIVE_KEY = 'hyprcrd-shopping-active-ids';
|
||||||
|
const SYNCED_KEY = 'hyprcrd-shopping-synced';
|
||||||
|
const ORDER_KEY = 'hyprcrd-shopping-order';
|
||||||
|
|
||||||
|
function esc(s) {
|
||||||
|
return String(s ?? '')
|
||||||
|
.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
||||||
|
.replace(/"/g, '"').replace(/'/g, ''');
|
||||||
|
}
|
||||||
|
|
||||||
|
function hasEinkaufTag(card) {
|
||||||
|
const tags = (card.tags || '').split(',').map(s => s.trim());
|
||||||
|
return tags.includes('einkauf') || tags.includes('shopping');
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Active IDs (multi-select) ────────────────────────────────
|
||||||
|
|
||||||
|
function getActiveIds() {
|
||||||
|
try { return JSON.parse(localStorage.getItem(ACTIVE_KEY) || '[]'); } catch { return []; }
|
||||||
|
}
|
||||||
|
function setActiveIds(ids) {
|
||||||
|
localStorage.setItem(ACTIVE_KEY, JSON.stringify(ids.map(String)));
|
||||||
|
}
|
||||||
|
function isActive(id) {
|
||||||
|
return getActiveIds().includes(String(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
function getActiveCards() {
|
||||||
|
const ids = getActiveIds();
|
||||||
|
if (!ids.length) return [];
|
||||||
|
const cards = window.state?.cards || [];
|
||||||
|
return ids.map(id => cards.find(c => String(c.id) === id)).filter(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getStoredOrder() {
|
||||||
|
try { return JSON.parse(localStorage.getItem(ORDER_KEY) || '[]'); } catch { return []; }
|
||||||
|
}
|
||||||
|
function setStoredOrder(ids) {
|
||||||
|
localStorage.setItem(ORDER_KEY, JSON.stringify(ids.map(String)));
|
||||||
|
}
|
||||||
|
function sortByOrder(cards) {
|
||||||
|
const order = getStoredOrder();
|
||||||
|
const idx = new Map(order.map((id, i) => [id, i]));
|
||||||
|
return [...cards].sort((a, b) => {
|
||||||
|
const ai = idx.has(String(a.id)) ? idx.get(String(a.id)) : 9999;
|
||||||
|
const bi = idx.has(String(b.id)) ? idx.get(String(b.id)) : 9999;
|
||||||
|
return ai - bi;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Synced state (per card_uid) ──────────────────────────────
|
||||||
|
|
||||||
|
function getSyncedMap() {
|
||||||
|
try { return JSON.parse(localStorage.getItem(SYNCED_KEY) || '{}'); } catch { return {}; }
|
||||||
|
}
|
||||||
|
function setSyncedFor(uid, title, body, pos) {
|
||||||
|
const m = getSyncedMap();
|
||||||
|
m[String(uid)] = { title: title || '', body: body || '', pos: pos ?? -1 };
|
||||||
|
localStorage.setItem(SYNCED_KEY, JSON.stringify(m));
|
||||||
|
}
|
||||||
|
function removeSyncedFor(uid) {
|
||||||
|
const m = getSyncedMap();
|
||||||
|
delete m[String(uid)];
|
||||||
|
localStorage.setItem(SYNCED_KEY, JSON.stringify(m));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Header button injection ──────────────────────────────────
|
||||||
|
|
||||||
|
function injectHeaderButton() {
|
||||||
|
if ($('shopping-btn')) return;
|
||||||
|
const header = document.querySelector('header#main-header');
|
||||||
|
if (!header) return;
|
||||||
|
const rows = header.querySelectorAll('.flex.items-center.gap-3');
|
||||||
|
const group = rows[rows.length - 1];
|
||||||
|
if (!group) return;
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.id = 'shopping-btn';
|
||||||
|
btn.className = 'flex items-center gap-2 px-2.5 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors';
|
||||||
|
btn.innerHTML = '<i class="ph ph-shopping-cart text-sm"></i><span class="font-pixel text-[10px]">Shopping</span>';
|
||||||
|
btn.addEventListener('click', openDialog);
|
||||||
|
group.insertBefore(btn, group.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Picker dialog ────────────────────────────────────────────
|
||||||
|
|
||||||
|
function openDialog() {
|
||||||
|
document.querySelector('.shopping-picker-overlay')?.remove();
|
||||||
|
|
||||||
|
const overlay = document.createElement('div');
|
||||||
|
overlay.className = 'shopping-picker-overlay';
|
||||||
|
overlay.style.cssText = 'position:fixed;inset:0;background:var(--t-overlay,rgba(0,0,0,0.6));z-index:200;display:flex;align-items:center;justify-content:center;padding:24px;';
|
||||||
|
|
||||||
|
const panel = document.createElement('div');
|
||||||
|
panel.style.cssText = 'background:var(--t-surface);border:1px solid var(--t-border);box-shadow:0 8px 32px rgba(0,0,0,0.6);width:100%;max-width:520px;max-height:80vh;display:flex;flex-direction:column;';
|
||||||
|
panel.innerHTML = `
|
||||||
|
<div class="flex items-center gap-3 px-5 py-3 border-b border-t-border">
|
||||||
|
<i class="ph ph-shopping-cart text-t-accent text-base"></i>
|
||||||
|
<h2 class="font-pixel text-sm text-t-accent flex-1">Shopping lists</h2>
|
||||||
|
<button class="shopping-picker-close text-t-muted hover:text-t-danger"><i class="ph ph-x text-sm"></i></button>
|
||||||
|
</div>
|
||||||
|
<div class="px-5 py-3 text-[11px] text-t-muted leading-relaxed">
|
||||||
|
Cards tagged with <span class="text-t-accent">#einkauf</span> or
|
||||||
|
<span class="text-t-accent">#shopping</span> can be activated for the phone.
|
||||||
|
Check any number of lists; their items appear stacked under the
|
||||||
|
<span class="text-t-accent">shopping</span> tab in the relay UI.
|
||||||
|
</div>
|
||||||
|
<div class="flex-1 overflow-y-auto px-2 py-2" id="shopping-picker-list"></div>
|
||||||
|
<div class="flex items-center gap-2 px-5 py-3 border-t border-t-border">
|
||||||
|
<span id="shopping-picker-status" class="font-pixel text-[10px] text-t-dim flex-1"></span>
|
||||||
|
<button class="shopping-picker-cancel px-3 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-danger hover:text-t-danger"><span class="font-pixel text-[10px]">Close</span></button>
|
||||||
|
<button class="shopping-picker-save px-3 py-1.5 text-xs border border-t-accent text-t-accent hover:bg-t-accent/10"><span class="font-pixel text-[10px]">Save</span></button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
overlay.appendChild(panel);
|
||||||
|
document.body.appendChild(overlay);
|
||||||
|
|
||||||
|
const list = panel.querySelector('#shopping-picker-list');
|
||||||
|
const status = panel.querySelector('#shopping-picker-status');
|
||||||
|
const close = () => overlay.remove();
|
||||||
|
panel.querySelector('.shopping-picker-close').addEventListener('click', close);
|
||||||
|
panel.querySelector('.shopping-picker-cancel').addEventListener('click', close);
|
||||||
|
overlay.addEventListener('click', (e) => { if (e.target === overlay) close(); });
|
||||||
|
document.addEventListener('keydown', function escClose(e) {
|
||||||
|
if (e.key === 'Escape') { close(); document.removeEventListener('keydown', escClose); }
|
||||||
|
});
|
||||||
|
|
||||||
|
const cards = window.state?.cards || [];
|
||||||
|
const candidates = sortByOrder(cards.filter(hasEinkaufTag));
|
||||||
|
const currentIds = new Set(getActiveIds());
|
||||||
|
const selected = new Set(currentIds);
|
||||||
|
|
||||||
|
if (!candidates.length) {
|
||||||
|
list.innerHTML = `<div class="px-4 py-6 text-center text-[11px] text-t-dim">
|
||||||
|
No cards tagged <span class="text-t-accent">#einkauf</span> or
|
||||||
|
<span class="text-t-accent">#shopping</span> yet. Create a card with checkbox items
|
||||||
|
and add one of those tags — it'll show up here.
|
||||||
|
</div>`;
|
||||||
|
} else {
|
||||||
|
list.innerHTML = candidates.map(c => {
|
||||||
|
const id = String(c.id);
|
||||||
|
const checked = selected.has(id) ? 'checked' : '';
|
||||||
|
const items = (c.body || '').split('\n').filter(l => /^\s*-\s*\[[ xX]\]/.test(l));
|
||||||
|
const open = items.filter(l => /^\s*-\s*\[\s\]/.test(l)).length;
|
||||||
|
return `<div class="shopping-picker-row flex items-start gap-3 px-3 py-2 hover:bg-t-raised" draggable="true" data-card-id="${id}">
|
||||||
|
<i class="ph ph-dots-six-vertical text-t-dim" style="margin-top:4px;cursor:grab;flex-shrink:0;"></i>
|
||||||
|
<label class="flex items-start gap-3 flex-1 min-w-0 cursor-pointer">
|
||||||
|
<input type="checkbox" data-card-id="${id}" ${checked} style="margin-top:3px;">
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<div class="text-xs text-t-bright font-pixel">${esc(c.title || '(untitled)')}</div>
|
||||||
|
<div class="text-[10px] text-t-dim font-pixel mt-0.5">${open} open · ${items.length} total</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
<button class="shopping-goto text-t-dim hover:text-t-accent transition-colors" data-card-id="${id}" data-bucket="${c.bucket_id || ''}" title="go to card" style="padding:4px;margin-top:1px;"><i class="ph ph-arrow-square-out text-sm"></i></button>
|
||||||
|
</div>`;
|
||||||
|
}).join('');
|
||||||
|
list.querySelectorAll('input[type="checkbox"]').forEach(cb => {
|
||||||
|
cb.addEventListener('change', () => {
|
||||||
|
if (cb.checked) selected.add(cb.dataset.cardId);
|
||||||
|
else selected.delete(cb.dataset.cardId);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
// Drag-and-drop reordering of picker rows.
|
||||||
|
let dragRow = null;
|
||||||
|
list.querySelectorAll('.shopping-picker-row').forEach(row => {
|
||||||
|
row.addEventListener('dragstart', (e) => {
|
||||||
|
dragRow = row;
|
||||||
|
e.dataTransfer.effectAllowed = 'move';
|
||||||
|
row.style.opacity = '0.4';
|
||||||
|
});
|
||||||
|
row.addEventListener('dragend', () => {
|
||||||
|
row.style.opacity = '';
|
||||||
|
dragRow = null;
|
||||||
|
list.querySelectorAll('.shopping-picker-row').forEach(r => r.style.borderTop = '');
|
||||||
|
});
|
||||||
|
row.addEventListener('dragover', (e) => {
|
||||||
|
if (!dragRow || dragRow === row) return;
|
||||||
|
e.preventDefault();
|
||||||
|
e.dataTransfer.dropEffect = 'move';
|
||||||
|
list.querySelectorAll('.shopping-picker-row').forEach(r => r.style.borderTop = '');
|
||||||
|
const rect = row.getBoundingClientRect();
|
||||||
|
const mid = rect.top + rect.height / 2;
|
||||||
|
if (e.clientY < mid) {
|
||||||
|
row.style.borderTop = '2px solid var(--t-accent)';
|
||||||
|
} else {
|
||||||
|
const next = row.nextElementSibling;
|
||||||
|
if (next) next.style.borderTop = '2px solid var(--t-accent)';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
row.addEventListener('drop', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!dragRow || dragRow === row) return;
|
||||||
|
const rect = row.getBoundingClientRect();
|
||||||
|
const mid = rect.top + rect.height / 2;
|
||||||
|
if (e.clientY < mid) {
|
||||||
|
list.insertBefore(dragRow, row);
|
||||||
|
} else {
|
||||||
|
list.insertBefore(dragRow, row.nextSibling);
|
||||||
|
}
|
||||||
|
// Persist new order from DOM.
|
||||||
|
const newOrder = [...list.querySelectorAll('.shopping-picker-row')].map(r => r.dataset.cardId);
|
||||||
|
setStoredOrder(newOrder);
|
||||||
|
list.querySelectorAll('.shopping-picker-row').forEach(r => r.style.borderTop = '');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
list.querySelectorAll('.shopping-goto').forEach(btn => {
|
||||||
|
btn.addEventListener('click', (e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
const cardId = btn.dataset.cardId;
|
||||||
|
const bucketId = btn.dataset.bucket;
|
||||||
|
close();
|
||||||
|
// Switch bucket if needed so the card is visible.
|
||||||
|
if (bucketId && window.state?.activeBucket !== bucketId
|
||||||
|
&& window.state?.activeBucket !== 'all') {
|
||||||
|
window.state.activeBucket = bucketId;
|
||||||
|
localStorage.setItem('hyprcrd-active-bucket', bucketId);
|
||||||
|
window._renderBoard?.();
|
||||||
|
}
|
||||||
|
setTimeout(() => window._openDetail?.(parseInt(cardId)), 100);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
panel.querySelector('.shopping-picker-save').addEventListener('click', async () => {
|
||||||
|
const prev = getActiveIds();
|
||||||
|
const next = [...selected];
|
||||||
|
setActiveIds(next);
|
||||||
|
status.innerHTML = '<i class="ph ph-spinner card-spinner" style="font-size:14px;vertical-align:middle;margin-right:4px;"></i> saving — please wait!';
|
||||||
|
try {
|
||||||
|
// Remove deactivated lists from relay.
|
||||||
|
for (const id of prev) {
|
||||||
|
if (!selected.has(id)) {
|
||||||
|
removeSyncedFor(id);
|
||||||
|
await hyprcrd.api('api/shopping', { method: 'DELETE', body: { card_uid: id } }).catch(() => {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Push all active lists.
|
||||||
|
await tick();
|
||||||
|
status.textContent = 'saved';
|
||||||
|
setTimeout(close, 400);
|
||||||
|
} catch (e) {
|
||||||
|
status.textContent = 'error: ' + (e?.message || e);
|
||||||
|
status.style.color = 'var(--t-danger)';
|
||||||
|
setActiveIds(prev);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Sync ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function pushOne(card) {
|
||||||
|
const uid = String(card.id);
|
||||||
|
const title = card.title || '';
|
||||||
|
const body = card.body || '';
|
||||||
|
const order = getStoredOrder();
|
||||||
|
const pos = order.indexOf(uid);
|
||||||
|
const synced = getSyncedMap()[uid];
|
||||||
|
if (synced && synced.title === title && synced.body === body && synced.pos === pos) return;
|
||||||
|
const res = await hyprcrd.api('api/shopping', {
|
||||||
|
method: 'POST',
|
||||||
|
body: { card_uid: uid, title, body, position: pos >= 0 ? pos : 999, updated_at: new Date().toISOString().replace('T', ' ').slice(0, 19) },
|
||||||
|
});
|
||||||
|
if (res?.ok && res.stored !== false) setSyncedFor(uid, title, body, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function pullOne(card, relayState) {
|
||||||
|
const uid = String(card.id);
|
||||||
|
const { body, title } = relayState;
|
||||||
|
const synced = getSyncedMap()[uid];
|
||||||
|
// Preserve the position we last pushed so a pull doesn't reset it
|
||||||
|
// and cause an unnecessary re-push on the next tick.
|
||||||
|
const curPos = synced?.pos ?? -1;
|
||||||
|
if (synced && synced.body === (body || '') && synced.title === (title || '')) return;
|
||||||
|
if ((card.body || '') === (body || '') && (card.title || '') === (title || '')) {
|
||||||
|
setSyncedFor(card.id, card.title || '', card.body || '', curPos);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await hyprcrd.api(`api/cards/${card.id}`, { method: 'PATCH', body: { body } });
|
||||||
|
setSyncedFor(card.id, card.title || '', body || '', curPos);
|
||||||
|
await window._reloadAll?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function tick() {
|
||||||
|
const activeCards = getActiveCards();
|
||||||
|
const activeUids = activeCards.map(c => String(c.id));
|
||||||
|
// Push all active cards first.
|
||||||
|
for (const card of activeCards) {
|
||||||
|
try { await pushOne(card); } catch {}
|
||||||
|
}
|
||||||
|
// Tell the relay to drop any rows that aren't in our active set.
|
||||||
|
// This cleans up stale entries from previous activations that
|
||||||
|
// were never explicitly deleted (old single-list era, failed
|
||||||
|
// DELETEs, migration leftovers).
|
||||||
|
try {
|
||||||
|
await hyprcrd.api('api/shopping', { method: 'DELETE', body: { keep: activeUids } });
|
||||||
|
} catch {}
|
||||||
|
// Pull: fetch all lists from relay, match by card_uid.
|
||||||
|
try {
|
||||||
|
const res = await hyprcrd.api('api/shopping', { method: 'GET' });
|
||||||
|
if (!res?.ok || !Array.isArray(res.lists)) return;
|
||||||
|
const byUid = new Map(res.lists.map(l => [l.card_uid, l]));
|
||||||
|
for (const card of activeCards) {
|
||||||
|
const relay = byUid.get(String(card.id));
|
||||||
|
if (relay) await pullOne(card, relay);
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Init ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function init() {
|
||||||
|
injectHeaderButton();
|
||||||
|
hyprcrd.hooks?.on?.('sync.tick', () => { tick().catch(() => {}); });
|
||||||
|
hyprcrd.hooks?.on?.('cards.reloaded', () => { tick().catch(() => {}); });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', init);
|
||||||
|
} else {
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
|
hyprcrd.registerPlugin?.({
|
||||||
|
name: 'shopping',
|
||||||
|
version: '1.1.0',
|
||||||
|
description: 'Sync shopping cards to the relay so they\'re checkable from a phone.',
|
||||||
|
});
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
<span class="font-pixel text-[10px]">image:</span>
|
<span class="font-pixel text-[10px]">image:</span>
|
||||||
<input id="slideshow-ed-src" type="text" placeholder="/uploads/foo.png" class="bg-t-bg border border-t-border text-t-text text-xs font-mono" style="width:300px;padding:2px 8px;border-radius:3px;">
|
<input id="slideshow-ed-src" type="text" placeholder="/uploads/foo.png" class="bg-t-bg border border-t-border text-t-text text-xs font-mono" style="width:300px;padding:2px 8px;border-radius:3px;">
|
||||||
</label>
|
</label>
|
||||||
<button id="slideshow-ed-gallery" class="toolbar-btn text-xs" title="Pick from gallery"><i class="ph ph-images text-sm"></i></button>
|
<button id="slideshow-ed-gallery" class="toolbar-btn text-xs" data-tip="pick from gallery"><i class="ph ph-images text-sm"></i></button>
|
||||||
<button id="slideshow-ed-pick" class="toolbar-btn text-xs" title="Upload new image"><i class="ph ph-upload-simple text-sm"></i></button>
|
<button id="slideshow-ed-pick" class="toolbar-btn text-xs" data-tip="upload new image"><i class="ph ph-upload-simple text-sm"></i></button>
|
||||||
<input type="file" id="slideshow-ed-file" accept="image/*" class="hidden">
|
<input type="file" id="slideshow-ed-file" accept="image/*" class="hidden">
|
||||||
<div class="w-px h-4 bg-t-border mx-1"></div>
|
<div class="w-px h-4 bg-t-border mx-1"></div>
|
||||||
<button id="slideshow-ed-delete" class="toolbar-btn text-xs" title="Delete selected hotspot" disabled><i class="ph ph-trash text-sm"></i></button>
|
<button id="slideshow-ed-delete" class="toolbar-btn text-xs" data-tip="delete selected hotspot" disabled><i class="ph ph-trash text-sm"></i></button>
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
<span id="slideshow-ed-hint" class="font-pixel text-[9px] text-t-dim">drag on image to draw · click rect to select</span>
|
<span id="slideshow-ed-hint" class="font-pixel text-[9px] text-t-dim">drag on image to draw · click rect to select</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ function renderImageSlide(slide) {
|
|||||||
const rects = slide.hotspots.map((h, i) => {
|
const rects = slide.hotspots.map((h, i) => {
|
||||||
const style = `left:${h.x}%;top:${h.y}%;width:${h.w}%;height:${h.h}%`;
|
const style = `left:${h.x}%;top:${h.y}%;width:${h.w}%;height:${h.h}%`;
|
||||||
const label = resolveTargetLabel(h.target) || h.target || '';
|
const label = resolveTargetLabel(h.target) || h.target || '';
|
||||||
return `<div class="slide-hotspot-live" data-hs="${i}" style="${style}" title="${escHtml(label)}"></div>`;
|
return `<div class="slide-hotspot-live" data-hs="${i}" style="${style}" data-tip="${escHtml(label)}"></div>`;
|
||||||
}).join('');
|
}).join('');
|
||||||
viewerSlide.innerHTML = `
|
viewerSlide.innerHTML = `
|
||||||
<div class="slide-image-wrap">
|
<div class="slide-image-wrap">
|
||||||
@@ -640,7 +640,7 @@ async function refreshGalleryPicker() {
|
|||||||
if (!images.length) {
|
if (!images.length) {
|
||||||
gp.grid.innerHTML = `<div class="col-span-full text-center py-16" style="grid-column:1/-1;">
|
gp.grid.innerHTML = `<div class="col-span-full text-center py-16" style="grid-column:1/-1;">
|
||||||
<i class="ph ph-image text-4xl text-t-dim mb-2 block"></i>
|
<i class="ph ph-image text-4xl text-t-dim mb-2 block"></i>
|
||||||
<p class="font-pixel text-[10px] text-t-dim">no images yet — upload above</p>
|
<p class="font-pixel text-[10px] text-t-dim cursor-blink">no images yet — upload above</p>
|
||||||
</div>`;
|
</div>`;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -705,7 +705,7 @@ function renderPickerList(query) {
|
|||||||
picker.list.innerHTML = filtered.map(c => {
|
picker.list.innerHTML = filtered.map(c => {
|
||||||
const col = c.color ? `background:${c.color};` : '';
|
const col = c.color ? `background:${c.color};` : '';
|
||||||
return `<button class="slideshow-pick-row" data-pick-target="card:${escHtml(c.id)}"><span style="display:inline-block;width:8px;height:8px;${col}"></span><span style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${escHtml(c.title || '(untitled)')}</span></button>`;
|
return `<button class="slideshow-pick-row" data-pick-target="card:${escHtml(c.id)}"><span style="display:inline-block;width:8px;height:8px;${col}"></span><span style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">${escHtml(c.title || '(untitled)')}</span></button>`;
|
||||||
}).join('') || `<div class="font-pixel text-[10px] text-t-dim px-2 py-2">no matches</div>`;
|
}).join('') || `<div class="font-pixel text-[10px] text-t-dim px-2 py-2 cursor-blink">no matches</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
picker.search?.addEventListener('input', () => renderPickerList(picker.search.value));
|
picker.search?.addEventListener('input', () => renderPickerList(picker.search.value));
|
||||||
|
|||||||
@@ -0,0 +1,404 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Support Plugin: backend (hyprcrd side).
|
||||||
|
*
|
||||||
|
* Talks to a standalone support-relay via HTTP. Tickets live on the
|
||||||
|
* relay; this plugin keeps a local cache + links each ticket to a
|
||||||
|
* hyprcrd card so the user can answer from the card detail view.
|
||||||
|
* KB fragments stay purely in hyprcrd (cards in a configured bucket).
|
||||||
|
*
|
||||||
|
* Routes (auth-protected, registered via the plugin dispatch):
|
||||||
|
* GET /api/support/tickets list from local cache
|
||||||
|
* GET /api/support/tickets/{id} single ticket w/ replies
|
||||||
|
* POST /api/support/tickets/{id}/reply forward reply to the relay
|
||||||
|
* PATCH /api/support/tickets/{id}/status forward status change
|
||||||
|
* POST /api/support/poll pull tickets from the relay
|
||||||
|
* GET /api/support/kb?q=... search KB fragments (local cards)
|
||||||
|
* POST /api/support/kb save a new KB fragment
|
||||||
|
* GET /api/support/settings read plugin config (no secret)
|
||||||
|
* POST /api/support/settings write plugin config
|
||||||
|
* POST /api/support/settings/test ping the configured relay
|
||||||
|
*/
|
||||||
|
|
||||||
|
// ── Schema ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
(function () {
|
||||||
|
$db = Database::connect();
|
||||||
|
// Local cache of tickets that live on the relay. We map relay_id
|
||||||
|
// (authoritative) to hyprcrd card_id so the card detail view can
|
||||||
|
// surface the ticket + its reply history.
|
||||||
|
$db->exec('
|
||||||
|
CREATE TABLE IF NOT EXISTS support_tickets (
|
||||||
|
relay_id INTEGER PRIMARY KEY,
|
||||||
|
card_id INTEGER,
|
||||||
|
issue_id TEXT NOT NULL,
|
||||||
|
email TEXT NOT NULL,
|
||||||
|
subject TEXT NOT NULL DEFAULT "",
|
||||||
|
status TEXT NOT NULL DEFAULT "open",
|
||||||
|
message_id TEXT,
|
||||||
|
created_at TEXT NOT NULL,
|
||||||
|
updated_at TEXT NOT NULL,
|
||||||
|
last_reply_at TEXT,
|
||||||
|
polled_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
');
|
||||||
|
$db->exec('CREATE INDEX IF NOT EXISTS idx_support_tickets_status ON support_tickets(status, updated_at DESC)');
|
||||||
|
$db->exec('CREATE INDEX IF NOT EXISTS idx_support_tickets_card ON support_tickets(card_id)');
|
||||||
|
|
||||||
|
$db->exec('
|
||||||
|
CREATE TABLE IF NOT EXISTS support_replies (
|
||||||
|
relay_id INTEGER PRIMARY KEY,
|
||||||
|
ticket_id INTEGER NOT NULL,
|
||||||
|
direction TEXT NOT NULL,
|
||||||
|
body TEXT NOT NULL,
|
||||||
|
sent_at TEXT,
|
||||||
|
created_at TEXT NOT NULL,
|
||||||
|
FOREIGN KEY (ticket_id) REFERENCES support_tickets(relay_id) ON DELETE CASCADE
|
||||||
|
)
|
||||||
|
');
|
||||||
|
$db->exec('CREATE INDEX IF NOT EXISTS idx_support_replies_ticket ON support_replies(ticket_id, created_at)');
|
||||||
|
})();
|
||||||
|
|
||||||
|
// ── Encryption (API key at rest) ──────────────────────────────────
|
||||||
|
|
||||||
|
function supportEncKey(): string {
|
||||||
|
$db = Database::connect();
|
||||||
|
$vk = $db->query("SELECT value FROM settings WHERE key = 'vault_key'")->fetchColumn();
|
||||||
|
if ($vk) return substr(hash('sha256', $vk), 0, 32);
|
||||||
|
$hash = $db->query("SELECT value FROM settings WHERE key = 'password_hash'")->fetchColumn();
|
||||||
|
return substr(hash('sha256', $hash ?: 'hyprcrd-default-key'), 0, 32);
|
||||||
|
}
|
||||||
|
function supportEncrypt(string $plain): string {
|
||||||
|
$iv = random_bytes(16);
|
||||||
|
$cipher = openssl_encrypt($plain, 'aes-256-cbc', supportEncKey(), OPENSSL_RAW_DATA, $iv);
|
||||||
|
return base64_encode($iv . $cipher);
|
||||||
|
}
|
||||||
|
function supportDecrypt(string $encoded): string {
|
||||||
|
$raw = base64_decode($encoded);
|
||||||
|
if (!$raw || strlen($raw) < 17) return '';
|
||||||
|
return openssl_decrypt(substr($raw, 16), 'aes-256-cbc', supportEncKey(), OPENSSL_RAW_DATA, substr($raw, 0, 16)) ?: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function supportSetting(string $key, ?string $default = null): ?string {
|
||||||
|
$db = Database::connect();
|
||||||
|
$stmt = $db->prepare('SELECT value FROM settings WHERE key = :k');
|
||||||
|
$stmt->execute(['k' => 'support_' . $key]);
|
||||||
|
$v = $stmt->fetchColumn();
|
||||||
|
return $v === false ? $default : $v;
|
||||||
|
}
|
||||||
|
function supportSetSetting(string $key, ?string $value): void {
|
||||||
|
$db = Database::connect();
|
||||||
|
if ($value === null) {
|
||||||
|
$db->prepare('DELETE FROM settings WHERE key = :k')->execute(['k' => 'support_' . $key]);
|
||||||
|
} else {
|
||||||
|
$db->prepare('INSERT OR REPLACE INTO settings (key, value) VALUES (:k, :v)')
|
||||||
|
->execute(['k' => 'support_' . $key, 'v' => $value]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function supportRelayUrl(): string {
|
||||||
|
return rtrim((string)supportSetting('relay_url', ''), '/');
|
||||||
|
}
|
||||||
|
function supportRelayKey(): string {
|
||||||
|
$enc = supportSetting('relay_key_enc', '');
|
||||||
|
return $enc ? supportDecrypt($enc) : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function supportJson($data, int $code = 200): void {
|
||||||
|
http_response_code($code);
|
||||||
|
header('Content-Type: application/json');
|
||||||
|
echo json_encode($data);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** cURL helper for the support-relay. Short timeouts — this runs inline
|
||||||
|
* from user-triggered flows. Responses are returned as the decoded body
|
||||||
|
* plus the HTTP status so callers can surface errors. */
|
||||||
|
function supportCurl(string $path, string $method = 'GET', ?array $body = null): array {
|
||||||
|
$url = supportRelayUrl() . $path;
|
||||||
|
$key = supportRelayKey();
|
||||||
|
if ($url === '' || $key === '') return ['status' => 0, 'error' => 'support relay not configured', 'body' => null];
|
||||||
|
|
||||||
|
$ch = curl_init($url);
|
||||||
|
$headers = ['X-Support-Key: ' . $key, 'Accept: application/json'];
|
||||||
|
$opts = [
|
||||||
|
CURLOPT_RETURNTRANSFER => true,
|
||||||
|
CURLOPT_HTTPHEADER => $headers,
|
||||||
|
CURLOPT_CONNECTTIMEOUT => 3,
|
||||||
|
CURLOPT_TIMEOUT => 10,
|
||||||
|
CURLOPT_CUSTOMREQUEST => $method,
|
||||||
|
];
|
||||||
|
if ($body !== null) {
|
||||||
|
$opts[CURLOPT_POSTFIELDS] = json_encode($body);
|
||||||
|
$opts[CURLOPT_HTTPHEADER][] = 'Content-Type: application/json';
|
||||||
|
}
|
||||||
|
curl_setopt_array($ch, $opts);
|
||||||
|
if (function_exists('hyprcrdApplySafeCurlOpts')) hyprcrdApplySafeCurlOpts($ch);
|
||||||
|
$resp = curl_exec($ch);
|
||||||
|
$status = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
$err = curl_error($ch);
|
||||||
|
curl_close($ch);
|
||||||
|
if ($resp === false) return ['status' => 0, 'error' => $err ?: 'request failed', 'body' => null];
|
||||||
|
$decoded = json_decode($resp, true);
|
||||||
|
return ['status' => $status, 'body' => $decoded, 'raw' => $resp, 'error' => null];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Apply a relay-side ticket (+ replies) into the local cache, creating
|
||||||
|
* or updating the linked hyprcrd card. */
|
||||||
|
function supportApplyTicket(array $t): void {
|
||||||
|
$db = Database::connect();
|
||||||
|
$relayId = (int)$t['id'];
|
||||||
|
$issueId = (string)($t['issue_id'] ?? '');
|
||||||
|
$email = strtolower((string)($t['email'] ?? ''));
|
||||||
|
$subject = (string)($t['subject'] ?? '');
|
||||||
|
$status = (string)($t['status'] ?? 'open');
|
||||||
|
$body = (string)($t['body'] ?? '');
|
||||||
|
|
||||||
|
// Look up existing mapping
|
||||||
|
$ex = $db->prepare('SELECT card_id FROM support_tickets WHERE relay_id = :r');
|
||||||
|
$ex->execute(['r' => $relayId]);
|
||||||
|
$cardId = (int)($ex->fetchColumn() ?: 0);
|
||||||
|
|
||||||
|
// Compose the card body from the ticket + reply log (relay is
|
||||||
|
// authoritative on replies too).
|
||||||
|
$replies = $t['replies'] ?? [];
|
||||||
|
$rendered = "**From:** " . $email . "\n"
|
||||||
|
. "**Issue:** " . $issueId . "\n"
|
||||||
|
. "**Status:** " . $status . "\n\n---\n\n"
|
||||||
|
. $body;
|
||||||
|
foreach ($replies as $r) {
|
||||||
|
if (($r['direction'] ?? '') === 'in' && ($r['body'] ?? '') === $body) continue; // skip initial dupe
|
||||||
|
$label = ($r['direction'] ?? '') === 'out' ? 'Reply sent' : 'User reply';
|
||||||
|
$when = (string)($r['created_at'] ?? '');
|
||||||
|
$rendered .= "\n\n---\n\n**{$label} — {$when}:**\n\n" . ($r['body'] ?? '');
|
||||||
|
}
|
||||||
|
|
||||||
|
$title = $subject !== '' ? $subject : '(no subject)';
|
||||||
|
$tagSet = 'support,' . $status;
|
||||||
|
$buckets = ['inbox' => (int)(supportSetting('bucket_inbox', '0') ?: 0)];
|
||||||
|
$bucketId = $buckets['inbox'] ?: null;
|
||||||
|
|
||||||
|
if ($cardId) {
|
||||||
|
$db->prepare('UPDATE cards SET title = :t, body = :b, tags = :tg, updated_at = datetime("now") WHERE id = :id')
|
||||||
|
->execute(['t' => $title, 'b' => $rendered, 'tg' => $tagSet, 'id' => $cardId]);
|
||||||
|
} else {
|
||||||
|
$db->prepare('INSERT INTO cards (title, body, color, bucket_id, position, tags) VALUES (:t, :b, :c, :bi, -1, :tg)')
|
||||||
|
->execute(['t' => $title, 'b' => $rendered, 'c' => '#38bdf8', 'bi' => $bucketId, 'tg' => $tagSet]);
|
||||||
|
$cardId = (int)$db->lastInsertId();
|
||||||
|
}
|
||||||
|
|
||||||
|
$db->prepare('
|
||||||
|
INSERT INTO support_tickets (relay_id, card_id, issue_id, email, subject, status, message_id, created_at, updated_at, last_reply_at, polled_at)
|
||||||
|
VALUES (:r, :c, :ii, :e, :s, :st, :mid, :ca, :ua, :lr, datetime("now"))
|
||||||
|
ON CONFLICT(relay_id) DO UPDATE SET
|
||||||
|
card_id = excluded.card_id,
|
||||||
|
issue_id = excluded.issue_id,
|
||||||
|
email = excluded.email,
|
||||||
|
subject = excluded.subject,
|
||||||
|
status = excluded.status,
|
||||||
|
message_id = excluded.message_id,
|
||||||
|
updated_at = excluded.updated_at,
|
||||||
|
last_reply_at = excluded.last_reply_at,
|
||||||
|
polled_at = datetime("now")
|
||||||
|
')->execute([
|
||||||
|
'r' => $relayId,
|
||||||
|
'c' => $cardId,
|
||||||
|
'ii' => $issueId,
|
||||||
|
'e' => $email,
|
||||||
|
's' => $subject,
|
||||||
|
'st' => $status,
|
||||||
|
'mid' => $t['message_id'] ?? null,
|
||||||
|
'ca' => (string)($t['created_at'] ?? date('Y-m-d H:i:s')),
|
||||||
|
'ua' => (string)($t['updated_at'] ?? date('Y-m-d H:i:s')),
|
||||||
|
'lr' => $t['last_reply_at'] ?? null,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Replies: straight upsert by relay reply id. Lets the local card
|
||||||
|
// body stay in sync no matter which side added the reply.
|
||||||
|
$db->prepare('DELETE FROM support_replies WHERE ticket_id = :t')->execute(['t' => $relayId]);
|
||||||
|
$ins = $db->prepare('INSERT INTO support_replies (relay_id, ticket_id, direction, body, sent_at, created_at) VALUES (:r, :t, :d, :b, :sa, :ca)');
|
||||||
|
foreach ($replies as $r) {
|
||||||
|
$ins->execute([
|
||||||
|
'r' => (int)($r['id'] ?? 0) ?: null,
|
||||||
|
't' => $relayId,
|
||||||
|
'd' => (string)($r['direction'] ?? 'in'),
|
||||||
|
'b' => (string)($r['body'] ?? ''),
|
||||||
|
'sa' => $r['sent_at'] ?? null,
|
||||||
|
'ca' => (string)($r['created_at'] ?? date('Y-m-d H:i:s')),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Routes ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
||||||
|
$db = Database::connect();
|
||||||
|
|
||||||
|
if ($route === '/api/support/tickets' && $method === 'GET') {
|
||||||
|
$status = trim((string)($_GET['status'] ?? ''));
|
||||||
|
$sql = 'SELECT t.*, c.title AS card_title FROM support_tickets t LEFT JOIN cards c ON c.id = t.card_id';
|
||||||
|
$params = [];
|
||||||
|
if ($status !== '') { $sql .= ' WHERE t.status = :s'; $params['s'] = $status; }
|
||||||
|
$sql .= ' ORDER BY COALESCE(t.last_reply_at, t.updated_at) DESC LIMIT 500';
|
||||||
|
$stmt = $db->prepare($sql);
|
||||||
|
$stmt->execute($params);
|
||||||
|
supportJson(['tickets' => $stmt->fetchAll()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^/api/support/tickets/(\d+)$#', $route, $m) && $method === 'GET') {
|
||||||
|
$relayId = (int)$m[1];
|
||||||
|
$stmt = $db->prepare('SELECT t.*, c.title AS card_title, c.body AS card_body FROM support_tickets t LEFT JOIN cards c ON c.id = t.card_id WHERE t.relay_id = :r');
|
||||||
|
$stmt->execute(['r' => $relayId]);
|
||||||
|
$t = $stmt->fetch();
|
||||||
|
if (!$t) supportJson(['error' => 'not found'], 404);
|
||||||
|
$reps = $db->prepare('SELECT direction, body, sent_at, created_at FROM support_replies WHERE ticket_id = :t ORDER BY created_at ASC');
|
||||||
|
$reps->execute(['t' => $relayId]);
|
||||||
|
$t['replies'] = $reps->fetchAll();
|
||||||
|
supportJson(['ticket' => $t]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^/api/support/tickets/(\d+)/reply$#', $route, $m) && $method === 'POST') {
|
||||||
|
$relayId = (int)$m[1];
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$body = trim((string)($input['body'] ?? ''));
|
||||||
|
if ($body === '') supportJson(['error' => 'body required'], 400);
|
||||||
|
$res = supportCurl('/api/hyprcrd/tickets/' . $relayId . '/reply', 'POST', ['body' => $body]);
|
||||||
|
if ($res['status'] !== 200) {
|
||||||
|
supportJson(['error' => ($res['body']['error'] ?? $res['error'] ?? 'relay error') . ' (HTTP ' . $res['status'] . ')'], 502);
|
||||||
|
}
|
||||||
|
// Re-fetch the updated ticket so the local cache immediately reflects
|
||||||
|
// the new reply + answered status.
|
||||||
|
$fresh = supportCurl('/api/hyprcrd/tickets?since=', 'GET');
|
||||||
|
if ($fresh['status'] === 200 && is_array($fresh['body']['tickets'] ?? null)) {
|
||||||
|
foreach ($fresh['body']['tickets'] as $t) {
|
||||||
|
if ((int)$t['id'] === $relayId) { supportApplyTicket($t); break; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
supportJson(['ok' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('#^/api/support/tickets/(\d+)/status$#', $route, $m) && $method === 'PATCH') {
|
||||||
|
$relayId = (int)$m[1];
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$status = trim((string)($input['status'] ?? ''));
|
||||||
|
if (!in_array($status, ['open', 'answered', 'closed'], true)) supportJson(['error' => 'invalid status'], 400);
|
||||||
|
$res = supportCurl('/api/hyprcrd/tickets/' . $relayId . '/status', 'PATCH', ['status' => $status]);
|
||||||
|
if ($res['status'] !== 200) supportJson(['error' => 'relay error ' . $res['status']], 502);
|
||||||
|
$db->prepare('UPDATE support_tickets SET status = :s WHERE relay_id = :r')->execute(['s' => $status, 'r' => $relayId]);
|
||||||
|
// Sync the card's support tag set
|
||||||
|
$db->prepare("
|
||||||
|
UPDATE cards SET tags = (
|
||||||
|
SELECT 'support,' || :s FROM support_tickets WHERE card_id = cards.id
|
||||||
|
) WHERE id = (SELECT card_id FROM support_tickets WHERE relay_id = :r)
|
||||||
|
")->execute(['s' => $status, 'r' => $relayId]);
|
||||||
|
supportJson(['ok' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/support/poll' && $method === 'POST') {
|
||||||
|
// Mirrors /api/relay/poll: an unconfigured support relay is a normal
|
||||||
|
// resting state, not an error. Returning 502 here floods the network
|
||||||
|
// tab on every background poll for users who don't use the plugin.
|
||||||
|
if (supportRelayUrl() === '' || supportRelayKey() === '') {
|
||||||
|
supportJson(['ok' => true, 'pulled' => 0]);
|
||||||
|
}
|
||||||
|
$last = supportSetting('last_polled_at', '') ?: '';
|
||||||
|
$qs = $last !== '' ? '?since=' . urlencode($last) : '';
|
||||||
|
$res = supportCurl('/api/hyprcrd/tickets' . $qs, 'GET');
|
||||||
|
if ($res['status'] !== 200) supportJson(['error' => ($res['body']['error'] ?? $res['error'] ?? 'relay error'), 'status' => $res['status']], 502);
|
||||||
|
$tickets = $res['body']['tickets'] ?? [];
|
||||||
|
$maxUpd = $last;
|
||||||
|
foreach ($tickets as $t) {
|
||||||
|
supportApplyTicket($t);
|
||||||
|
if (!empty($t['updated_at']) && $t['updated_at'] > $maxUpd) $maxUpd = $t['updated_at'];
|
||||||
|
}
|
||||||
|
if ($maxUpd !== $last) supportSetSetting('last_polled_at', $maxUpd);
|
||||||
|
supportJson(['ok' => true, 'pulled' => count($tickets)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// KB search (local cards in the configured KB bucket)
|
||||||
|
if ($route === '/api/support/kb' && $method === 'GET') {
|
||||||
|
$q = trim((string)($_GET['q'] ?? ''));
|
||||||
|
$bucket = (int)(supportSetting('bucket_kb', '0') ?: 0);
|
||||||
|
if (!$bucket) supportJson(['fragments' => []]);
|
||||||
|
$sql = 'SELECT id, title, body, tags, updated_at FROM cards WHERE bucket_id = :b';
|
||||||
|
$params = ['b' => $bucket];
|
||||||
|
if ($q !== '') {
|
||||||
|
$sql .= ' AND (title LIKE :q OR body LIKE :q2 OR tags LIKE :q3)';
|
||||||
|
$like = '%' . $q . '%';
|
||||||
|
$params['q'] = $like; $params['q2'] = $like; $params['q3'] = $like;
|
||||||
|
}
|
||||||
|
$sql .= ' ORDER BY updated_at DESC LIMIT 50';
|
||||||
|
$stmt = $db->prepare($sql);
|
||||||
|
$stmt->execute($params);
|
||||||
|
supportJson(['fragments' => $stmt->fetchAll()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/support/kb' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$title = trim((string)($input['title'] ?? ''));
|
||||||
|
$body = trim((string)($input['body'] ?? ''));
|
||||||
|
$tags = trim((string)($input['tags'] ?? 'faq'));
|
||||||
|
if ($body === '') supportJson(['error' => 'body required'], 400);
|
||||||
|
if ($title === '') $title = mb_substr(str_replace("\n", ' ', $body), 0, 50);
|
||||||
|
$bucket = (int)(supportSetting('bucket_kb', '0') ?: 0);
|
||||||
|
if (!$bucket) supportJson(['error' => 'KB bucket not configured'], 400);
|
||||||
|
$db->prepare('INSERT INTO cards (title, body, color, bucket_id, position, tags) VALUES (:t, :b, :c, :bi, -1, :tg)')
|
||||||
|
->execute(['t' => $title, 'b' => $body, 'c' => '#4ade80', 'bi' => $bucket, 'tg' => $tags]);
|
||||||
|
supportJson(['ok' => true, 'id' => (int)$db->lastInsertId()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/support/settings' && $method === 'GET') {
|
||||||
|
supportJson([
|
||||||
|
'relay_url' => supportRelayUrl(),
|
||||||
|
'has_key' => supportRelayKey() !== '',
|
||||||
|
'bucket_inbox' => (int)(supportSetting('bucket_inbox', '0') ?: 0),
|
||||||
|
'bucket_kb' => (int)(supportSetting('bucket_kb', '0') ?: 0),
|
||||||
|
'last_polled_at' => supportSetting('last_polled_at', ''),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/support/settings' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
if (array_key_exists('relay_url', $input)) supportSetSetting('relay_url', rtrim((string)$input['relay_url'], '/'));
|
||||||
|
if (array_key_exists('relay_key', $input)) {
|
||||||
|
$k = (string)$input['relay_key'];
|
||||||
|
if ($k === '') supportSetSetting('relay_key_enc', null);
|
||||||
|
else supportSetSetting('relay_key_enc', supportEncrypt($k));
|
||||||
|
}
|
||||||
|
if (array_key_exists('bucket_inbox', $input)) supportSetSetting('bucket_inbox', (int)$input['bucket_inbox'] ?: null);
|
||||||
|
if (array_key_exists('bucket_kb', $input)) supportSetSetting('bucket_kb', (int)$input['bucket_kb'] ?: null);
|
||||||
|
supportJson(['ok' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($route === '/api/support/settings/test' && $method === 'POST') {
|
||||||
|
$res = supportCurl('/api/hyprcrd/ping', 'GET');
|
||||||
|
if ($res['status'] !== 200) supportJson(['error' => ($res['body']['error'] ?? $res['error'] ?? 'ping failed'), 'status' => $res['status']], 502);
|
||||||
|
supportJson(['ok' => true, 'brand' => $res['body']['brand'] ?? '']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Proxy to the relay's editable-settings endpoint. The plugin UI
|
||||||
|
// uses this to let the admin tweak the mail footer / public URL /
|
||||||
|
// brand post-setup without touching the relay's data directly.
|
||||||
|
if ($route === '/api/support/relay-settings' && $method === 'GET') {
|
||||||
|
$res = supportCurl('/api/hyprcrd/settings', 'GET');
|
||||||
|
if ($res['status'] !== 200) supportJson(['error' => ($res['body']['error'] ?? $res['error'] ?? 'relay unreachable'), 'status' => $res['status']], 502);
|
||||||
|
supportJson($res['body']);
|
||||||
|
}
|
||||||
|
if ($route === '/api/support/relay-settings' && $method === 'POST') {
|
||||||
|
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||||
|
$res = supportCurl('/api/hyprcrd/settings', 'POST', $input);
|
||||||
|
if ($res['status'] !== 200) supportJson(['error' => ($res['body']['error'] ?? $res['error'] ?? 'relay update failed'), 'status' => $res['status']], 502);
|
||||||
|
supportJson(['ok' => true]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Hook into the central sync.tick so support polls happen alongside the
|
||||||
|
// CalDAV + relay-mail cycle. Runs server-side triggered from the client
|
||||||
|
// — no separate cron needed. If the relay isn't configured the call
|
||||||
|
// silently no-ops.
|
||||||
|
PluginManager::instance()->onApiRoute(function (string $route, string $method) {
|
||||||
|
// Tie the poll to the main relay poll: when hyprcrd fires /api/relay/poll
|
||||||
|
// the client also fires /api/support/poll. No server-side hook runs
|
||||||
|
// here, we just expose the endpoint. See support.js.
|
||||||
|
});
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"name": "support",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "Central support channel: public form for incoming tickets (OUMTA-nnn issue IDs, email-matched replies), plugin inbox with a reply composer, KB-fragment library. Outbound replies via configured SMTP.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["support.js"],
|
||||||
|
"css": ["support.css"],
|
||||||
|
"html": ["support.html"]
|
||||||
|
},
|
||||||
|
"backend": "backend.php"
|
||||||
|
}
|
||||||
@@ -0,0 +1,289 @@
|
|||||||
|
/* Support overlay. Full-screen like chat / email / canvas. Dark chrome,
|
||||||
|
* two-column layout on desktop, stacked on narrow. Inbox left, ticket
|
||||||
|
* detail + reply composer + KB picker on the right. */
|
||||||
|
|
||||||
|
.support-overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 90;
|
||||||
|
background: var(--t-bg);
|
||||||
|
display: none;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.support-overlay.open { display: flex; }
|
||||||
|
|
||||||
|
.support-header {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 14px;
|
||||||
|
padding: 10px 16px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
background: var(--t-surface);
|
||||||
|
}
|
||||||
|
.support-header-left, .support-header-right { display: flex; align-items: center; gap: 10px; }
|
||||||
|
.support-header i { font-size: 16px; color: var(--t-accent); }
|
||||||
|
|
||||||
|
.support-btn {
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 3px;
|
||||||
|
padding: 6px 10px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
transition: all 0.12s;
|
||||||
|
}
|
||||||
|
.support-btn:hover { border-color: var(--t-accent); color: var(--t-accent); }
|
||||||
|
.support-btn-primary {
|
||||||
|
background: var(--t-accent);
|
||||||
|
color: var(--t-bg);
|
||||||
|
border-color: var(--t-accent);
|
||||||
|
}
|
||||||
|
.support-btn-primary:hover { filter: brightness(1.08); color: var(--t-bg); }
|
||||||
|
.support-btn-danger:hover { border-color: var(--t-danger); color: var(--t-danger); }
|
||||||
|
.support-btn-ghost {
|
||||||
|
width: 30px; height: 30px; padding: 0;
|
||||||
|
display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.support-filter { display: flex; gap: 4px; }
|
||||||
|
.support-pill {
|
||||||
|
background: transparent;
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-muted);
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
padding: 4px 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 3px;
|
||||||
|
transition: all 0.12s;
|
||||||
|
}
|
||||||
|
.support-pill:hover { color: var(--t-bright); }
|
||||||
|
.support-pill.active { background: var(--t-accent); border-color: var(--t-accent); color: var(--t-bg); }
|
||||||
|
|
||||||
|
.support-body {
|
||||||
|
flex: 1;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 320px 1fr;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
@media (max-width: 800px) {
|
||||||
|
.support-body { grid-template-columns: 1fr; }
|
||||||
|
.support-list { max-height: 40vh; }
|
||||||
|
.support-list.hidden-mobile { display: none; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.support-list {
|
||||||
|
border-right: 1px solid var(--t-border);
|
||||||
|
overflow-y: auto;
|
||||||
|
background: var(--t-bg);
|
||||||
|
}
|
||||||
|
.support-ticket {
|
||||||
|
padding: 12px 14px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.1s;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
.support-ticket:hover { background: var(--t-surface); }
|
||||||
|
.support-ticket.active { background: color-mix(in srgb, var(--t-accent) 12%, transparent); border-left: 3px solid var(--t-accent); padding-left: 11px; }
|
||||||
|
.support-ticket-row { display: flex; justify-content: space-between; align-items: baseline; gap: 8px; }
|
||||||
|
.support-ticket-issue {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-accent);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.support-ticket-status {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 8px;
|
||||||
|
padding: 1px 5px;
|
||||||
|
border-radius: 2px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.support-ticket-status[data-status="open"] { background: rgba(251, 146, 60, 0.2); color: #fb923c; }
|
||||||
|
.support-ticket-status[data-status="answered"] { background: rgba(74, 222, 128, 0.15); color: #4ade80; }
|
||||||
|
.support-ticket-status[data-status="closed"] { background: rgba(100, 116, 139, 0.2); color: var(--t-dim); }
|
||||||
|
.support-ticket-title { color: var(--t-bright); font-size: 13px; line-height: 1.3; }
|
||||||
|
.support-ticket-meta { color: var(--t-dim); font-size: 11px; display: flex; gap: 8px; }
|
||||||
|
|
||||||
|
.support-detail {
|
||||||
|
overflow-y: auto;
|
||||||
|
padding: 20px 24px 40px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 18px;
|
||||||
|
}
|
||||||
|
.support-empty {
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-align: center;
|
||||||
|
padding: 40px 20px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
/* Hero empty-state ("pick a ticket on the left") matches the board's
|
||||||
|
* "no cards found" placeholder: centred in the available column, pixel
|
||||||
|
* font with blink cursor, 4xl dim icon above. flex:1 consumes the
|
||||||
|
* detail column so the axis centring actually has a box to work in. */
|
||||||
|
.support-empty-hero {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
text-align: center;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
.support-empty-hero i {
|
||||||
|
display: block;
|
||||||
|
font-size: 2.25rem; /* matches text-4xl */
|
||||||
|
color: var(--t-dim);
|
||||||
|
margin-bottom: 1rem; /* matches mb-4 */
|
||||||
|
}
|
||||||
|
.support-empty-hero p {
|
||||||
|
margin: 0;
|
||||||
|
font-family: var(--t-font-ui, var(--t-font-pixel, 'Silkscreen', cursive));
|
||||||
|
font-size: 0.875rem; /* text-sm */
|
||||||
|
color: var(--t-dim);
|
||||||
|
}
|
||||||
|
|
||||||
|
.support-ticket-header h2 { font-family: var(--t-font-pixel); color: var(--t-bright); font-size: 14px; margin: 0 0 4px; }
|
||||||
|
.support-ticket-header .meta { color: var(--t-dim); font-size: 11px; display: flex; gap: 12px; flex-wrap: wrap; }
|
||||||
|
.support-ticket-header .email { color: var(--t-text); }
|
||||||
|
|
||||||
|
.support-thread { display: flex; flex-direction: column; gap: 10px; }
|
||||||
|
.support-msg {
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 12px 14px;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
.support-msg[data-dir="out"] {
|
||||||
|
border-left: 3px solid var(--t-accent);
|
||||||
|
padding-left: 11px;
|
||||||
|
}
|
||||||
|
.support-msg[data-dir="in"] {
|
||||||
|
border-left: 3px solid #fb923c;
|
||||||
|
padding-left: 11px;
|
||||||
|
}
|
||||||
|
.support-msg-label {
|
||||||
|
font-family: var(--t-font-pixel);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.support-msg-label .tag { color: var(--t-accent); }
|
||||||
|
.support-msg-label[data-dir="in"] .tag { color: #fb923c; }
|
||||||
|
|
||||||
|
/* Composer */
|
||||||
|
.support-composer {
|
||||||
|
background: var(--t-surface);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 12px 14px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
.support-composer-head {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.support-composer-head .font-pixel { font-family: var(--t-font-pixel); font-size: 10px; color: var(--t-accent); text-transform: uppercase; letter-spacing: 0.5px; }
|
||||||
|
.support-kb-search {
|
||||||
|
flex: 1;
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-family: var(--t-font-content, monospace);
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.support-kb-search:focus { border-color: var(--t-accent); }
|
||||||
|
|
||||||
|
.support-kb-results {
|
||||||
|
display: none;
|
||||||
|
max-height: 200px;
|
||||||
|
overflow-y: auto;
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.support-kb-results.open { display: block; }
|
||||||
|
.support-kb-result {
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-bottom: 1px solid var(--t-border);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.1s;
|
||||||
|
}
|
||||||
|
.support-kb-result:hover { background: var(--t-surface); }
|
||||||
|
.support-kb-result:last-child { border-bottom: none; }
|
||||||
|
.support-kb-result-title { color: var(--t-bright); font-size: 12px; font-weight: 600; }
|
||||||
|
.support-kb-result-preview { color: var(--t-dim); font-size: 11px; margin-top: 2px; line-height: 1.4; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; }
|
||||||
|
|
||||||
|
.support-composer textarea {
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-family: var(--t-font-content, ui-monospace, monospace);
|
||||||
|
font-size: 13px;
|
||||||
|
min-height: 140px;
|
||||||
|
resize: vertical;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.support-composer textarea:focus { border-color: var(--t-accent); }
|
||||||
|
|
||||||
|
.support-composer-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
justify-content: flex-end;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
.support-composer-actions .spacer { flex: 1; }
|
||||||
|
.support-composer-status { font-size: 11px; color: var(--t-dim); align-self: center; margin-right: auto; }
|
||||||
|
.support-composer-status.err { color: var(--t-danger); }
|
||||||
|
.support-composer-status.ok { color: #4ade80; }
|
||||||
|
|
||||||
|
/* Settings tab (injected into the main settings overlay) */
|
||||||
|
.support-settings-field { display: flex; flex-direction: column; gap: 6px; margin-bottom: 14px; }
|
||||||
|
.support-settings-field label {
|
||||||
|
font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 9px;
|
||||||
|
color: var(--t-dim);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
.support-settings-field input, .support-settings-field select {
|
||||||
|
background: var(--t-bg);
|
||||||
|
border: 1px solid var(--t-border);
|
||||||
|
color: var(--t-bright);
|
||||||
|
padding: 8px 10px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-family: var(--t-font-content, monospace);
|
||||||
|
font-size: 12px;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
.support-settings-field input:focus { border-color: var(--t-accent); }
|
||||||
|
.support-settings-help { font-size: 10px; color: var(--t-dim); line-height: 1.5; }
|
||||||
|
.support-settings-row { display: flex; gap: 8px; align-items: center; margin-top: 12px; }
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<!-- Support plugin overlay: ticket inbox + reply composer + KB panel.
|
||||||
|
Rendered into the document root; shown/hidden via the .open class. -->
|
||||||
|
<div id="support-overlay" class="support-overlay">
|
||||||
|
<header class="support-header">
|
||||||
|
<div class="support-header-left">
|
||||||
|
<i class="ph ph-lifebuoy"></i>
|
||||||
|
<span class="font-pixel text-xs text-t-bright">Support inbox</span>
|
||||||
|
<button id="support-poll" class="support-btn support-btn-ghost" title="Poll the relay for new tickets"><i class="ph ph-arrow-clockwise"></i></button>
|
||||||
|
</div>
|
||||||
|
<div class="support-header-right">
|
||||||
|
<div class="support-filter">
|
||||||
|
<button class="support-pill active" data-filter="">all</button>
|
||||||
|
<button class="support-pill" data-filter="open">open</button>
|
||||||
|
<button class="support-pill" data-filter="answered">answered</button>
|
||||||
|
<button class="support-pill" data-filter="closed">closed</button>
|
||||||
|
</div>
|
||||||
|
<button id="support-close" class="support-btn support-btn-ghost" title="Close (Esc)"><i class="ph ph-x"></i></button>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="support-body">
|
||||||
|
<!-- Left: ticket list -->
|
||||||
|
<aside id="support-list" class="support-list">
|
||||||
|
<div class="support-empty">Loading…</div>
|
||||||
|
</aside>
|
||||||
|
|
||||||
|
<!-- Right: active ticket detail + reply composer -->
|
||||||
|
<section id="support-detail" class="support-detail">
|
||||||
|
<div class="support-empty-hero">
|
||||||
|
<i class="ph ph-envelope-open"></i>
|
||||||
|
<p class="cursor-blink">select a ticket</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,498 @@
|
|||||||
|
// ── Support plugin ──
|
||||||
|
//
|
||||||
|
// Talks to a self-hosted support-relay (see support-relay/ in the repo).
|
||||||
|
// Renders a full-screen overlay with the ticket inbox, the active
|
||||||
|
// ticket's thread, a reply composer with KB-fragment search + insert,
|
||||||
|
// and a "save as fragment" button. KB fragments are plain hyprcrd cards
|
||||||
|
// in the configured KB bucket, searched via the plugin backend.
|
||||||
|
|
||||||
|
const h = window.hyprcrd;
|
||||||
|
const $ = id => document.getElementById(id);
|
||||||
|
|
||||||
|
// ── State ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const state = {
|
||||||
|
tickets: [],
|
||||||
|
filter: '', // '', 'open', 'answered', 'closed'
|
||||||
|
activeId: null, // relay_id of the selected ticket
|
||||||
|
kbResults: [],
|
||||||
|
composerDirty: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
// ── Overlay lifecycle ───────────────────────────────────────────
|
||||||
|
|
||||||
|
const overlay = document.getElementById('support-overlay');
|
||||||
|
function isOpen() { return overlay?.classList.contains('open'); }
|
||||||
|
function show() {
|
||||||
|
if (!overlay) return;
|
||||||
|
overlay.classList.add('open');
|
||||||
|
refreshTickets();
|
||||||
|
// Hopefully poll right away so the user sees fresh data
|
||||||
|
poll();
|
||||||
|
}
|
||||||
|
function hide() {
|
||||||
|
overlay?.classList.remove('open');
|
||||||
|
state.composerDirty = false;
|
||||||
|
}
|
||||||
|
window._supportToggle = () => (isOpen() ? hide() : show());
|
||||||
|
|
||||||
|
$('support-close')?.addEventListener('click', hide);
|
||||||
|
$('support-poll')?.addEventListener('click', () => poll({ manual: true }));
|
||||||
|
|
||||||
|
// Close with Escape (respects any open child dialogs)
|
||||||
|
document.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Escape' && isOpen()) {
|
||||||
|
e.preventDefault();
|
||||||
|
hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Filter pills
|
||||||
|
overlay?.querySelectorAll('.support-pill').forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
overlay.querySelectorAll('.support-pill').forEach(b => b.classList.toggle('active', b === btn));
|
||||||
|
state.filter = btn.dataset.filter || '';
|
||||||
|
renderList();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── API wrappers ────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function api(path, opts = {}) {
|
||||||
|
const res = await fetch(path, {
|
||||||
|
method: opts.method || 'GET',
|
||||||
|
headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': h?.util?.csrf?.() || '' },
|
||||||
|
body: opts.body ? JSON.stringify(opts.body) : undefined,
|
||||||
|
});
|
||||||
|
const data = await res.json().catch(() => ({ error: 'bad response' }));
|
||||||
|
if (!res.ok) throw new Error(data.error || ('HTTP ' + res.status));
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function poll({ manual = false } = {}) {
|
||||||
|
try {
|
||||||
|
const res = await api('api/support/poll', { method: 'POST' });
|
||||||
|
if (manual) toast(`Pulled ${res.pulled || 0} update(s)`);
|
||||||
|
await refreshTickets();
|
||||||
|
if (state.activeId) await refreshActive();
|
||||||
|
} catch (e) {
|
||||||
|
if (manual) toast('Poll failed: ' + e.message, 'err');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshTickets() {
|
||||||
|
try {
|
||||||
|
const res = await api('api/support/tickets');
|
||||||
|
state.tickets = res.tickets || [];
|
||||||
|
renderList();
|
||||||
|
} catch (e) {
|
||||||
|
$('support-list').innerHTML = `<div class="support-empty" style="color:var(--t-danger);">Couldn't load: ${escapeHtml(e.message)}</div>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function refreshActive() {
|
||||||
|
if (!state.activeId) return;
|
||||||
|
try {
|
||||||
|
const res = await api('api/support/tickets/' + encodeURIComponent(state.activeId));
|
||||||
|
renderDetail(res.ticket);
|
||||||
|
} catch (e) {
|
||||||
|
$('support-detail').innerHTML = `<div class="support-empty" style="color:var(--t-danger);">${escapeHtml(e.message)}</div>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Rendering ───────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function renderList() {
|
||||||
|
const host = $('support-list');
|
||||||
|
if (!host) return;
|
||||||
|
const shown = state.filter ? state.tickets.filter(t => t.status === state.filter) : state.tickets;
|
||||||
|
if (!shown.length) {
|
||||||
|
host.innerHTML = `<div class="support-empty">No tickets${state.filter ? ' with status ' + state.filter : ''}.</div>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
host.innerHTML = shown.map(t => `
|
||||||
|
<div class="support-ticket ${t.relay_id == state.activeId ? 'active' : ''}" data-id="${t.relay_id}">
|
||||||
|
<div class="support-ticket-row">
|
||||||
|
<span class="support-ticket-issue">${escapeHtml(t.issue_id)}</span>
|
||||||
|
<span class="support-ticket-status" data-status="${escapeHtml(t.status)}">${escapeHtml(t.status)}</span>
|
||||||
|
</div>
|
||||||
|
<div class="support-ticket-title">${escapeHtml(t.subject || '(no subject)')}</div>
|
||||||
|
<div class="support-ticket-meta">
|
||||||
|
<span>${escapeHtml(t.email)}</span>
|
||||||
|
<span>${escapeHtml(formatRel(t.last_reply_at || t.updated_at))}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`).join('');
|
||||||
|
host.querySelectorAll('.support-ticket').forEach(el => {
|
||||||
|
el.addEventListener('click', () => openTicket(parseInt(el.dataset.id)));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderDetail(t) {
|
||||||
|
const host = $('support-detail');
|
||||||
|
if (!host) return;
|
||||||
|
if (!t) {
|
||||||
|
host.innerHTML = `<div class="support-empty-hero"><i class="ph ph-envelope-open"></i><p class="cursor-blink">select a ticket</p></div>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const replies = (t.replies || []).map(r => `
|
||||||
|
<div class="support-msg" data-dir="${escapeHtml(r.direction)}">
|
||||||
|
<div class="support-msg-label" data-dir="${escapeHtml(r.direction)}">
|
||||||
|
<span class="tag">${r.direction === 'out' ? 'sent' : 'received'}</span>
|
||||||
|
<span>${escapeHtml(r.created_at)}</span>
|
||||||
|
</div>${escapeHtml(r.body)}
|
||||||
|
</div>
|
||||||
|
`).join('');
|
||||||
|
host.innerHTML = `
|
||||||
|
<div class="support-ticket-header">
|
||||||
|
<h2>${escapeHtml(t.subject || '(no subject)')}</h2>
|
||||||
|
<div class="meta">
|
||||||
|
<span class="support-ticket-issue">${escapeHtml(t.issue_id)}</span>
|
||||||
|
<span class="support-ticket-status" data-status="${escapeHtml(t.status)}">${escapeHtml(t.status)}</span>
|
||||||
|
<span class="email">${escapeHtml(t.email)}</span>
|
||||||
|
<span>opened ${escapeHtml(formatRel(t.created_at))}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="support-thread">
|
||||||
|
${replies || '<div class="support-empty" style="padding:12px;">No messages yet.</div>'}
|
||||||
|
</div>
|
||||||
|
<div class="support-composer">
|
||||||
|
<div class="support-composer-head">
|
||||||
|
<span class="font-pixel">Reply</span>
|
||||||
|
<input class="support-kb-search" placeholder="Search fragments…" id="support-kb-input">
|
||||||
|
<button class="support-btn support-btn-ghost" id="support-kb-toggle" title="Toggle fragment list"><i class="ph ph-books"></i></button>
|
||||||
|
</div>
|
||||||
|
<div id="support-kb-results" class="support-kb-results"></div>
|
||||||
|
<textarea id="support-reply-body" placeholder="Type your reply. Click a fragment to insert it at the cursor."></textarea>
|
||||||
|
<div class="support-composer-actions">
|
||||||
|
<span id="support-composer-status" class="support-composer-status"></span>
|
||||||
|
<button class="support-btn" id="support-save-fragment"><i class="ph ph-plus-circle"></i> Save as fragment</button>
|
||||||
|
<span class="spacer"></span>
|
||||||
|
<button class="support-btn" id="support-status-closed" title="Close without replying"><i class="ph ph-archive"></i> Close ticket</button>
|
||||||
|
<button class="support-btn support-btn-primary" id="support-send-btn"><i class="ph ph-paper-plane-tilt"></i> Send reply</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
bindComposer(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bindComposer(t) {
|
||||||
|
const kbInput = $('support-kb-input');
|
||||||
|
const kbResults = $('support-kb-results');
|
||||||
|
const kbToggle = $('support-kb-toggle');
|
||||||
|
const body = $('support-reply-body');
|
||||||
|
const sendBtn = $('support-send-btn');
|
||||||
|
const saveFrag = $('support-save-fragment');
|
||||||
|
const closeBtn = $('support-status-closed');
|
||||||
|
const statusEl = $('support-composer-status');
|
||||||
|
|
||||||
|
// KB search: debounced
|
||||||
|
let kbTimer = null;
|
||||||
|
async function runKb(q) {
|
||||||
|
try {
|
||||||
|
const res = await api('api/support/kb?q=' + encodeURIComponent(q || ''));
|
||||||
|
state.kbResults = res.fragments || [];
|
||||||
|
kbResults.classList.toggle('open', !!state.kbResults.length);
|
||||||
|
kbResults.innerHTML = state.kbResults.map((f, i) => `
|
||||||
|
<div class="support-kb-result" data-idx="${i}">
|
||||||
|
<div class="support-kb-result-title">${escapeHtml(f.title)}</div>
|
||||||
|
<div class="support-kb-result-preview">${escapeHtml(stripMd(f.body).slice(0, 140))}</div>
|
||||||
|
</div>
|
||||||
|
`).join('') || `<div class="support-empty" style="padding:12px;">No fragments yet.</div>`;
|
||||||
|
kbResults.querySelectorAll('.support-kb-result').forEach(el => {
|
||||||
|
el.addEventListener('click', () => {
|
||||||
|
const frag = state.kbResults[parseInt(el.dataset.idx)];
|
||||||
|
insertAtCursor(body, frag.body);
|
||||||
|
kbResults.classList.remove('open');
|
||||||
|
kbInput.value = '';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
kbResults.innerHTML = `<div class="support-empty" style="padding:12px;color:var(--t-danger);">${escapeHtml(e.message)}</div>`;
|
||||||
|
kbResults.classList.add('open');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
kbInput.addEventListener('input', () => {
|
||||||
|
clearTimeout(kbTimer);
|
||||||
|
kbTimer = setTimeout(() => runKb(kbInput.value.trim()), 120);
|
||||||
|
});
|
||||||
|
kbInput.addEventListener('focus', () => runKb(kbInput.value.trim()));
|
||||||
|
kbToggle.addEventListener('click', () => {
|
||||||
|
if (kbResults.classList.contains('open')) kbResults.classList.remove('open');
|
||||||
|
else runKb(kbInput.value.trim());
|
||||||
|
});
|
||||||
|
// Close KB results when clicking outside
|
||||||
|
document.addEventListener('click', e => {
|
||||||
|
if (!overlay.contains(e.target)) return;
|
||||||
|
if (kbResults.contains(e.target) || e.target === kbInput || e.target === kbToggle || kbToggle.contains(e.target)) return;
|
||||||
|
kbResults.classList.remove('open');
|
||||||
|
});
|
||||||
|
|
||||||
|
sendBtn.addEventListener('click', async () => {
|
||||||
|
const text = body.value.trim();
|
||||||
|
if (!text) { setStatus('Nothing to send.', 'err'); return; }
|
||||||
|
sendBtn.disabled = true; setStatus('Sending…');
|
||||||
|
try {
|
||||||
|
await api('api/support/tickets/' + t.relay_id + '/reply', { method: 'POST', body: { body: text } });
|
||||||
|
body.value = '';
|
||||||
|
setStatus('Sent.', 'ok');
|
||||||
|
await refreshTickets();
|
||||||
|
await refreshActive();
|
||||||
|
} catch (e) {
|
||||||
|
setStatus('Failed: ' + e.message, 'err');
|
||||||
|
} finally {
|
||||||
|
sendBtn.disabled = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
saveFrag.addEventListener('click', async () => {
|
||||||
|
const text = body.value.trim();
|
||||||
|
if (!text) { setStatus('Type something first.', 'err'); return; }
|
||||||
|
const title = prompt('Fragment title?', text.split('\n')[0].slice(0, 60));
|
||||||
|
if (title === null) return;
|
||||||
|
try {
|
||||||
|
await api('api/support/kb', { method: 'POST', body: { title: title || '', body: text } });
|
||||||
|
setStatus('Saved to fragment library.', 'ok');
|
||||||
|
// Refresh KB list if open
|
||||||
|
if (kbResults.classList.contains('open')) runKb(kbInput.value.trim());
|
||||||
|
} catch (e) {
|
||||||
|
setStatus('Save failed: ' + e.message, 'err');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
closeBtn.addEventListener('click', async () => {
|
||||||
|
try {
|
||||||
|
await api('api/support/tickets/' + t.relay_id + '/status', { method: 'PATCH', body: { status: 'closed' } });
|
||||||
|
await refreshTickets();
|
||||||
|
await refreshActive();
|
||||||
|
} catch (e) {
|
||||||
|
setStatus('Close failed: ' + e.message, 'err');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
function setStatus(msg, kind = '') {
|
||||||
|
statusEl.textContent = msg;
|
||||||
|
statusEl.className = 'support-composer-status' + (kind ? ' ' + kind : '');
|
||||||
|
if (kind === 'ok') setTimeout(() => { statusEl.textContent = ''; statusEl.className = 'support-composer-status'; }, 3500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openTicket(id) {
|
||||||
|
state.activeId = id;
|
||||||
|
renderList();
|
||||||
|
await refreshActive();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Helpers ─────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function escapeHtml(s) {
|
||||||
|
return String(s ?? '').replace(/[&<>"']/g, c => ({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Strip Markdown markers for preview purposes (headings, emphasis). */
|
||||||
|
function stripMd(s) {
|
||||||
|
return String(s || '')
|
||||||
|
.replace(/^#+\s+/gm, '')
|
||||||
|
.replace(/[*_`]/g, '')
|
||||||
|
.replace(/\[([^\]]+)\]\([^)]+\)/g, '$1')
|
||||||
|
.replace(/\s+/g, ' ')
|
||||||
|
.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Human-friendly timestamp: "just now", "14m ago", "2h ago", "Tue 14:02". */
|
||||||
|
function formatRel(iso) {
|
||||||
|
if (!iso) return '';
|
||||||
|
const d = new Date(iso.replace(' ', 'T') + (iso.includes('T') || iso.endsWith('Z') ? '' : 'Z'));
|
||||||
|
if (isNaN(d.getTime())) return iso;
|
||||||
|
const now = new Date();
|
||||||
|
const diff = (now - d) / 1000;
|
||||||
|
if (diff < 60) return 'just now';
|
||||||
|
if (diff < 3600) return Math.floor(diff / 60) + 'm ago';
|
||||||
|
if (diff < 86400) return Math.floor(diff / 3600) + 'h ago';
|
||||||
|
if (diff < 86400 * 7) return d.toLocaleDateString(undefined, { weekday: 'short' }) + ' ' + d.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' });
|
||||||
|
return d.toLocaleDateString();
|
||||||
|
}
|
||||||
|
|
||||||
|
function insertAtCursor(textarea, text) {
|
||||||
|
const start = textarea.selectionStart, end = textarea.selectionEnd;
|
||||||
|
const before = textarea.value.slice(0, start);
|
||||||
|
const after = textarea.value.slice(end);
|
||||||
|
const prefix = (before && !before.endsWith('\n')) ? '\n' : '';
|
||||||
|
textarea.value = before + prefix + text + after;
|
||||||
|
const caret = (before + prefix + text).length;
|
||||||
|
textarea.focus();
|
||||||
|
textarea.setSelectionRange(caret, caret);
|
||||||
|
}
|
||||||
|
|
||||||
|
function toast(msg, kind = 'info') {
|
||||||
|
// Piggy-back on the simple notification system from relay sync
|
||||||
|
const el = document.createElement('div');
|
||||||
|
el.style.cssText = 'position:fixed;bottom:60px;right:16px;z-index:200;background:var(--t-surface);border:1px solid ' + (kind === 'err' ? 'var(--t-danger)' : 'var(--t-accent)') + ';border-radius:4px;padding:10px 14px;box-shadow:0 4px 20px rgba(0,0,0,0.4);max-width:300px;font-family:var(--t-font-pixel);font-size:10px;color:' + (kind === 'err' ? 'var(--t-danger)' : 'var(--t-accent)') + ';';
|
||||||
|
el.textContent = msg;
|
||||||
|
document.body.appendChild(el);
|
||||||
|
setTimeout(() => { el.style.transition = 'opacity 0.3s'; el.style.opacity = '0'; setTimeout(() => el.remove(), 350); }, 3500);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Header button ───────────────────────────────────────────────
|
||||||
|
|
||||||
|
function injectHeaderButton() {
|
||||||
|
const tasksBtn = document.getElementById('tasks-btn');
|
||||||
|
if (!tasksBtn || document.getElementById('support-btn')) return;
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.id = 'support-btn';
|
||||||
|
btn.className = 'flex items-center gap-2 px-2.5 py-1.5 text-xs border border-t-border text-t-muted hover:border-t-accent hover:text-t-accent transition-colors';
|
||||||
|
btn.innerHTML = '<i class="ph ph-lifebuoy text-sm"></i><span class="font-pixel text-[10px]">Support</span>';
|
||||||
|
btn.addEventListener('click', () => window._supportToggle?.());
|
||||||
|
tasksBtn.parentNode.insertBefore(btn, tasksBtn);
|
||||||
|
}
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', injectHeaderButton);
|
||||||
|
} else {
|
||||||
|
injectHeaderButton();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Settings tab in the main settings overlay ───────────────────
|
||||||
|
|
||||||
|
function renderSettingsPanel(panelEl) {
|
||||||
|
panelEl.innerHTML = `
|
||||||
|
<p class="support-settings-help" style="margin-bottom:14px;">
|
||||||
|
Connect hyprcrd to your support relay. The relay hosts the public form and
|
||||||
|
sends outgoing replies via SMTP; hyprcrd mirrors tickets and lets you reply
|
||||||
|
from any card.
|
||||||
|
</p>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-set-url">Relay URL</label>
|
||||||
|
<input id="support-set-url" type="url" placeholder="https://support.example.com">
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-set-key">API key</label>
|
||||||
|
<input id="support-set-key" type="password" placeholder="paste the key shown by the relay setup" autocomplete="off">
|
||||||
|
<div class="support-settings-help">Leave empty to keep the currently stored key.</div>
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-set-inbox">Inbox bucket</label>
|
||||||
|
<select id="support-set-inbox"><option value="0">(none — keep cards unsorted)</option></select>
|
||||||
|
<div class="support-settings-help">Where newly-pulled ticket cards will land.</div>
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-set-kb">KB bucket</label>
|
||||||
|
<select id="support-set-kb"><option value="0">(none — disable fragment library)</option></select>
|
||||||
|
<div class="support-settings-help">Cards in this bucket become reusable reply fragments.</div>
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-row">
|
||||||
|
<button id="support-set-save" class="support-btn"><i class="ph ph-floppy-disk"></i> Save</button>
|
||||||
|
<button id="support-set-test" class="support-btn"><i class="ph ph-pulse"></i> Test connection</button>
|
||||||
|
<span id="support-set-status" class="support-settings-help"></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2 style="margin-top:20px;font-family:var(--t-font-pixel);font-size:12px;color:var(--t-accent);text-transform:uppercase;letter-spacing:0.5px;">Relay config</h2>
|
||||||
|
<p class="support-settings-help" style="margin-bottom:14px;">
|
||||||
|
Editable post-setup values on the connected relay. Mail footer supports
|
||||||
|
<code>{brand}</code>, <code>{issue_id}</code>, <code>{public_url}</code>
|
||||||
|
placeholders — lines containing an empty placeholder are dropped.
|
||||||
|
</p>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-rs-brand">Brand</label>
|
||||||
|
<input id="support-rs-brand" type="text">
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-rs-public">Public form URL</label>
|
||||||
|
<input id="support-rs-public" type="url" placeholder="https://support.oumta.de">
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-field">
|
||||||
|
<label for="support-rs-footer">Mail footer template</label>
|
||||||
|
<textarea id="support-rs-footer" rows="4" style="background:var(--t-bg);border:1px solid var(--t-border);color:var(--t-bright);padding:8px 10px;border-radius:3px;font-family:var(--t-font-content,monospace);font-size:12px;outline:none;resize:vertical;"></textarea>
|
||||||
|
<div class="support-settings-help" id="support-rs-footer-default"></div>
|
||||||
|
</div>
|
||||||
|
<div class="support-settings-row">
|
||||||
|
<button id="support-rs-save" class="support-btn"><i class="ph ph-floppy-disk"></i> Save relay config</button>
|
||||||
|
<span id="support-rs-status" class="support-settings-help"></span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
// Populate bucket selects from state.buckets
|
||||||
|
const opts = (window.state?.buckets || []).map(b => `<option value="${b.id}">${escapeHtml(b.name)}</option>`).join('');
|
||||||
|
panelEl.querySelector('#support-set-inbox').innerHTML += opts;
|
||||||
|
panelEl.querySelector('#support-set-kb').innerHTML += opts;
|
||||||
|
|
||||||
|
api('api/support/settings').then(cur => {
|
||||||
|
panelEl.querySelector('#support-set-url').value = cur.relay_url || '';
|
||||||
|
panelEl.querySelector('#support-set-key').placeholder = cur.has_key ? '•••••••• (saved — leave empty to keep)' : 'paste the key shown by the relay setup';
|
||||||
|
if (cur.bucket_inbox) panelEl.querySelector('#support-set-inbox').value = cur.bucket_inbox;
|
||||||
|
if (cur.bucket_kb) panelEl.querySelector('#support-set-kb').value = cur.bucket_kb;
|
||||||
|
}).catch(() => {});
|
||||||
|
|
||||||
|
const statusEl = panelEl.querySelector('#support-set-status');
|
||||||
|
function setStatus(msg, kind = '') {
|
||||||
|
statusEl.textContent = msg;
|
||||||
|
statusEl.style.color = kind === 'err' ? 'var(--t-danger)' : kind === 'ok' ? '#4ade80' : 'var(--t-dim)';
|
||||||
|
}
|
||||||
|
|
||||||
|
panelEl.querySelector('#support-set-save').addEventListener('click', async () => {
|
||||||
|
const payload = {
|
||||||
|
relay_url: panelEl.querySelector('#support-set-url').value.trim(),
|
||||||
|
bucket_inbox: parseInt(panelEl.querySelector('#support-set-inbox').value) || 0,
|
||||||
|
bucket_kb: parseInt(panelEl.querySelector('#support-set-kb').value) || 0,
|
||||||
|
};
|
||||||
|
const key = panelEl.querySelector('#support-set-key').value;
|
||||||
|
if (key) payload.relay_key = key;
|
||||||
|
try {
|
||||||
|
await api('api/support/settings', { method: 'POST', body: payload });
|
||||||
|
setStatus('Saved.', 'ok');
|
||||||
|
} catch (e) { setStatus(e.message, 'err'); }
|
||||||
|
});
|
||||||
|
|
||||||
|
panelEl.querySelector('#support-set-test').addEventListener('click', async () => {
|
||||||
|
setStatus('Testing…');
|
||||||
|
try {
|
||||||
|
const r = await api('api/support/settings/test', { method: 'POST' });
|
||||||
|
setStatus('OK — relay says "' + (r.brand || 'support') + '"', 'ok');
|
||||||
|
} catch (e) { setStatus(e.message, 'err'); }
|
||||||
|
});
|
||||||
|
|
||||||
|
// Relay config (brand / public url / footer). Loaded after a tick so
|
||||||
|
// the local-settings render happens first — keeps this lazy, and
|
||||||
|
// silently hides if the relay isn't reachable.
|
||||||
|
const rsStatus = panelEl.querySelector('#support-rs-status');
|
||||||
|
function setRsStatus(msg, kind = '') {
|
||||||
|
rsStatus.textContent = msg;
|
||||||
|
rsStatus.style.color = kind === 'err' ? 'var(--t-danger)' : kind === 'ok' ? '#4ade80' : 'var(--t-dim)';
|
||||||
|
}
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const rs = await api('api/support/relay-settings');
|
||||||
|
panelEl.querySelector('#support-rs-brand').value = rs.brand || '';
|
||||||
|
panelEl.querySelector('#support-rs-public').value = rs.public_url || '';
|
||||||
|
panelEl.querySelector('#support-rs-footer').value = rs.mail_footer || '';
|
||||||
|
const def = panelEl.querySelector('#support-rs-footer-default');
|
||||||
|
if (def && rs.default_footer) def.textContent = 'Default if left empty: ' + rs.default_footer.replace(/\n/g, ' ⏎ ');
|
||||||
|
} catch (e) {
|
||||||
|
setRsStatus('(relay unreachable — configure above first)', 'err');
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
panelEl.querySelector('#support-rs-save').addEventListener('click', async () => {
|
||||||
|
setRsStatus('Saving…');
|
||||||
|
try {
|
||||||
|
await api('api/support/relay-settings', { method: 'POST', body: {
|
||||||
|
brand: panelEl.querySelector('#support-rs-brand').value.trim(),
|
||||||
|
public_url: panelEl.querySelector('#support-rs-public').value.trim(),
|
||||||
|
mail_footer: panelEl.querySelector('#support-rs-footer').value,
|
||||||
|
}});
|
||||||
|
setRsStatus('Saved.', 'ok');
|
||||||
|
} catch (e) {
|
||||||
|
setRsStatus(e.message, 'err');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
h?.settings?.registerTab?.({
|
||||||
|
id: 'support',
|
||||||
|
label: 'support',
|
||||||
|
icon: 'ph-lifebuoy',
|
||||||
|
onShow: renderSettingsPanel,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Hook the sync tick so each user-triggered sync also pulls support.
|
||||||
|
h?.hooks?.on?.('sync.tick', () => { poll().catch(() => {}); });
|
||||||
|
|
||||||
|
h?.registerPlugin?.({ name: 'support', version: '1.0.0' });
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
# terminal plugin
|
||||||
|
|
||||||
|
In-app command line for controlling hyprcrd with text commands.
|
||||||
|
|
||||||
|
## Toggle
|
||||||
|
|
||||||
|
**Shift+T** opens/closes the terminal. **ESC** closes it from inside.
|
||||||
|
|
||||||
|
## Commands
|
||||||
|
|
||||||
|
| Command | Description |
|
||||||
|
|---------|-------------|
|
||||||
|
| `help` | list all commands |
|
||||||
|
| `clear` | clear terminal output |
|
||||||
|
| `go <bucket>` | switch bucket (name or: all, current, favorites, journal, unsorted) |
|
||||||
|
| `open <card>` | open card preview (fuzzy title match) |
|
||||||
|
| `edit <card>` | open card in editor |
|
||||||
|
| `new <title>` | create card in active bucket |
|
||||||
|
| `delete <card>` | delete a card |
|
||||||
|
| `tag <card> <tag>` | append tag to card body |
|
||||||
|
| `untag <card> <tag>` | remove tag from card body |
|
||||||
|
| `color <card> <hex>` | change card color |
|
||||||
|
| `move <card> <bucket>` | move card to another bucket |
|
||||||
|
| `search <query>` | open search overlay with query |
|
||||||
|
| `find <text>` | list matching cards inline |
|
||||||
|
| `calendar` | open calendar |
|
||||||
|
| `assets` | open assets gallery |
|
||||||
|
| `export` | download export ZIP |
|
||||||
|
| `sort <mode>` | change sort (manual/newest/oldest/alpha/tag) |
|
||||||
|
| `split` | toggle split preview |
|
||||||
|
| `zen` | toggle zen mode |
|
||||||
|
| `count` | show card and bucket counts |
|
||||||
|
| `tags` | list all tags |
|
||||||
|
| `buckets` | list all buckets |
|
||||||
|
| `version` | show app version |
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- **Tab completion** on command names
|
||||||
|
- **History** with arrow up/down
|
||||||
|
- **Fuzzy matching** on card and bucket names
|
||||||
|
- Colored output: accent for success, red for errors, grey for info
|
||||||
|
- Slides up from the bottom, max 45% viewport height
|
||||||
|
- Scrollable output buffer
|
||||||
|
|
||||||
|
## Disabling
|
||||||
|
|
||||||
|
Add `"terminal"` to the `disabled` array in `data/plugins.json`.
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"name": "terminal",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "In-app terminal for controlling hyprcrd with text commands. Toggle with Shift+T.",
|
||||||
|
"frontend": {
|
||||||
|
"js": ["terminal.js"],
|
||||||
|
"css": ["terminal.css"],
|
||||||
|
"html": ["terminal.html"]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
.hterm {
|
||||||
|
position: fixed; bottom: 0; left: 0; right: 0; z-index: 500;
|
||||||
|
background: var(--t-bg); border-top: 1px solid var(--t-border);
|
||||||
|
max-height: 45vh; display: flex; flex-direction: column;
|
||||||
|
box-shadow: 0 -8px 32px rgba(0,0,0,0.4);
|
||||||
|
transform: translateY(0);
|
||||||
|
transition: transform 0.2s ease, opacity 0.2s ease;
|
||||||
|
}
|
||||||
|
.hterm.hidden { transform: translateY(100%); opacity: 0; pointer-events: none; }
|
||||||
|
|
||||||
|
#hterm-output {
|
||||||
|
flex: 1; overflow-y: auto; padding: 12px 16px;
|
||||||
|
font-family: var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
font-size: 12px; line-height: 1.7;
|
||||||
|
scrollbar-width: thin;
|
||||||
|
}
|
||||||
|
.hterm-line { color: var(--t-text); white-space: pre-wrap; word-break: break-word; }
|
||||||
|
.hterm-line.cmd { color: var(--t-bright); }
|
||||||
|
.hterm-line.cmd::before { content: '> '; color: var(--t-accent); }
|
||||||
|
.hterm-line.ok { color: var(--t-accent); }
|
||||||
|
.hterm-line.err { color: var(--t-danger); }
|
||||||
|
.hterm-line.dim { color: var(--t-dim); }
|
||||||
|
.hterm-line.heading { color: var(--t-accent); font-family: var(--t-font-pixel, 'Silkscreen', cursive); font-size: 10px; margin-top: 8px; }
|
||||||
|
|
||||||
|
.hterm-input-row {
|
||||||
|
display: flex; align-items: center; gap: 8px;
|
||||||
|
padding: 8px 16px; border-top: 1px solid var(--t-border);
|
||||||
|
background: var(--t-surface);
|
||||||
|
}
|
||||||
|
.hterm-prompt {
|
||||||
|
color: var(--t-accent); font-family: var(--t-font-pixel, 'Silkscreen', cursive);
|
||||||
|
font-size: 11px; flex-shrink: 0;
|
||||||
|
}
|
||||||
|
#hterm-input {
|
||||||
|
flex: 1; background: transparent; border: none; color: var(--t-bright);
|
||||||
|
font-family: var(--t-font-content, 'JetBrains Mono', monospace);
|
||||||
|
font-size: 12px; outline: none;
|
||||||
|
}
|
||||||
|
#hterm-input::placeholder { color: var(--t-dim); }
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<div id="hterm" class="hterm hidden">
|
||||||
|
<div id="hterm-output"></div>
|
||||||
|
<div class="hterm-input-row">
|
||||||
|
<span class="hterm-prompt">></span>
|
||||||
|
<input type="text" id="hterm-input" autocomplete="off" spellcheck="false" placeholder="type a command...">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,376 @@
|
|||||||
|
// ── Terminal plugin — in-app command line ──
|
||||||
|
|
||||||
|
const h = window.hyprcrd;
|
||||||
|
const $ = id => document.getElementById(id);
|
||||||
|
|
||||||
|
const panel = $('hterm');
|
||||||
|
const output = $('hterm-output');
|
||||||
|
const input = $('hterm-input');
|
||||||
|
|
||||||
|
let visible = false;
|
||||||
|
let history = [];
|
||||||
|
let historyIdx = -1;
|
||||||
|
|
||||||
|
function toggle() {
|
||||||
|
visible = !visible;
|
||||||
|
panel.classList.toggle('hidden', !visible);
|
||||||
|
if (visible) { input.focus(); scrollBottom(); }
|
||||||
|
else { document.activeElement?.blur(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
function scrollBottom() {
|
||||||
|
output.scrollTop = output.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
function print(text, cls = '') {
|
||||||
|
const line = document.createElement('div');
|
||||||
|
line.className = 'hterm-line' + (cls ? ' ' + cls : '');
|
||||||
|
line.textContent = text;
|
||||||
|
output.appendChild(line);
|
||||||
|
scrollBottom();
|
||||||
|
}
|
||||||
|
|
||||||
|
function printHtml(html, cls = '') {
|
||||||
|
const line = document.createElement('div');
|
||||||
|
line.className = 'hterm-line' + (cls ? ' ' + cls : '');
|
||||||
|
line.innerHTML = html;
|
||||||
|
output.appendChild(line);
|
||||||
|
scrollBottom();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── API helpers ──
|
||||||
|
|
||||||
|
async function api(path, opts = {}) {
|
||||||
|
return h?.api?.(path, opts) || fetch(path, {
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
...opts,
|
||||||
|
body: opts.body ? JSON.stringify(opts.body) : undefined,
|
||||||
|
}).then(r => r.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
function fuzzy(needle, haystack) {
|
||||||
|
const n = needle.toLowerCase();
|
||||||
|
return haystack.filter(s => s.toLowerCase().includes(n));
|
||||||
|
}
|
||||||
|
|
||||||
|
function findCard(query) {
|
||||||
|
const q = query.toLowerCase();
|
||||||
|
return window.state?.cards?.find(c => c.title.toLowerCase() === q)
|
||||||
|
|| window.state?.cards?.find(c => c.title.toLowerCase().includes(q));
|
||||||
|
}
|
||||||
|
|
||||||
|
function findBucket(query) {
|
||||||
|
const q = query.toLowerCase();
|
||||||
|
return window.state?.buckets?.find(b => b.name.toLowerCase() === q)
|
||||||
|
|| window.state?.buckets?.find(b => b.name.toLowerCase().includes(q));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Commands ──
|
||||||
|
|
||||||
|
const COMMANDS = {};
|
||||||
|
|
||||||
|
function register(name, desc, fn) {
|
||||||
|
COMMANDS[name] = { desc, fn };
|
||||||
|
}
|
||||||
|
|
||||||
|
register('help', 'show available commands', () => {
|
||||||
|
print('COMMANDS', 'heading');
|
||||||
|
const maxLen = Math.max(...Object.keys(COMMANDS).map(k => k.length));
|
||||||
|
for (const [name, cmd] of Object.entries(COMMANDS)) {
|
||||||
|
print(` ${name.padEnd(maxLen + 2)} ${cmd.desc}`, 'dim');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
register('clear', 'clear terminal output', () => {
|
||||||
|
output.innerHTML = '';
|
||||||
|
});
|
||||||
|
|
||||||
|
register('go', 'go <bucket> — switch to bucket', (args) => {
|
||||||
|
const name = args.join(' ');
|
||||||
|
if (!name) { print('usage: go <bucket name>', 'err'); return; }
|
||||||
|
const specials = { all: 'all', current: 'current', favorites: 'favorites', journal: 'journal', unsorted: 'none' };
|
||||||
|
if (specials[name.toLowerCase()]) {
|
||||||
|
window.state.activeBucket = specials[name.toLowerCase()];
|
||||||
|
window._renderBoard?.();
|
||||||
|
print(`switched to ${name}`, 'ok');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const b = findBucket(name);
|
||||||
|
if (!b) { print(`bucket not found: ${name}`, 'err'); return; }
|
||||||
|
window.state.activeBucket = b.id;
|
||||||
|
window._renderBoard?.();
|
||||||
|
print(`switched to ${b.name}`, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('open', 'open <card> — open card preview', async (args) => {
|
||||||
|
const q = args.join(' ');
|
||||||
|
if (!q) { print('usage: open <card title>', 'err'); return; }
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
window._openDetail?.(c.id);
|
||||||
|
print(`opened: ${c.title}`, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('edit', 'edit <card> — open card in editor', async (args) => {
|
||||||
|
const q = args.join(' ');
|
||||||
|
if (!q) { print('usage: edit <card title>', 'err'); return; }
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
window._openModal?.(c);
|
||||||
|
print(`editing: ${c.title}`, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('new', 'new <title> — create card in active bucket', async (args) => {
|
||||||
|
const title = args.join(' ');
|
||||||
|
if (!title) { print('usage: new <title>', 'err'); return; }
|
||||||
|
const bucketId = window.state?.activeBucket;
|
||||||
|
const numBucket = Number.isFinite(Number(bucketId)) ? Number(bucketId) : null;
|
||||||
|
const res = await api('api/cards', { method: 'POST', body: { title, body: '', color: '#38bdf8', bucket_id: numBucket } });
|
||||||
|
if (res?.id) {
|
||||||
|
print(`created: ${title} (id: ${res.id})`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
} else {
|
||||||
|
print(res?.error || 'failed', 'err');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
register('delete', 'delete <card> — delete a card', async (args) => {
|
||||||
|
const q = args.join(' ');
|
||||||
|
if (!q) { print('usage: delete <card title>', 'err'); return; }
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'DELETE' });
|
||||||
|
print(`deleted: ${c.title}`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
register('tag', 'tag <card> <tag> — add tag to card', async (args) => {
|
||||||
|
if (args.length < 2) { print('usage: tag <card title> <tag>', 'err'); return; }
|
||||||
|
const tag = args.pop();
|
||||||
|
const q = args.join(' ');
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
const body = (c.body || '') + `\n#${tag}`;
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'PATCH', body: { body } });
|
||||||
|
print(`tagged ${c.title} with #${tag}`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
register('untag', 'untag <card> <tag> — remove tag from card', async (args) => {
|
||||||
|
if (args.length < 2) { print('usage: untag <card title> <tag>', 'err'); return; }
|
||||||
|
const tag = args.pop();
|
||||||
|
const q = args.join(' ');
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
const body = (c.body || '').replace(new RegExp(`\\s*#${tag}\\b`, 'g'), '');
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'PATCH', body: { body } });
|
||||||
|
print(`removed #${tag} from ${c.title}`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
register('color', 'color <card> <hex> — change card color', async (args) => {
|
||||||
|
if (args.length < 2) { print('usage: color <card title> <#hex>', 'err'); return; }
|
||||||
|
const hex = args.pop();
|
||||||
|
const q = args.join(' ');
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'PATCH', body: { color: hex } });
|
||||||
|
print(`${c.title} → ${hex}`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
register('move', 'move <card> <bucket> — move card to bucket', async (args) => {
|
||||||
|
if (args.length < 2) { print('usage: move <card title> <bucket name>', 'err'); return; }
|
||||||
|
const bucketName = args.pop();
|
||||||
|
const q = args.join(' ');
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
const b = findBucket(bucketName);
|
||||||
|
if (!b) { print(`bucket not found: ${bucketName}`, 'err'); return; }
|
||||||
|
await api(`api/cards/${c.id}`, { method: 'PATCH', body: { bucket_id: b.id } });
|
||||||
|
print(`moved ${c.title} → ${b.name}`, 'ok');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
});
|
||||||
|
|
||||||
|
register('search', 'search <query> — open search with query', (args) => {
|
||||||
|
const q = args.join(' ');
|
||||||
|
window._closeSearch?.();
|
||||||
|
const searchInput = document.getElementById('search-input');
|
||||||
|
const overlay = document.getElementById('search');
|
||||||
|
if (overlay) overlay.classList.add('open');
|
||||||
|
if (searchInput) { searchInput.value = q; searchInput.dispatchEvent(new Event('input')); searchInput.focus(); }
|
||||||
|
print(`searching: ${q}`, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('calendar', 'open calendar', () => { window._openCalendar?.(); print('calendar opened', 'ok'); });
|
||||||
|
register('tim', 'open time calculator', () => {
|
||||||
|
if (window._timToggle) { window._timToggle(); print('tim opened', 'ok'); }
|
||||||
|
else print('tim plugin not loaded', 'err');
|
||||||
|
});
|
||||||
|
register('assets', 'open assets gallery', () => { window._openGallery?.(); print('assets opened', 'ok'); });
|
||||||
|
|
||||||
|
register('export', 'download export ZIP', () => {
|
||||||
|
document.getElementById('export-btn')?.click();
|
||||||
|
print('export started', 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('sort', 'sort <mode> — manual/newest/oldest/alpha/tag', (args) => {
|
||||||
|
const mode = args[0];
|
||||||
|
if (!mode) { print('usage: sort <manual|newest|oldest|alpha|tag>', 'err'); return; }
|
||||||
|
const sortBtn = document.getElementById('sort-toggle');
|
||||||
|
if (sortBtn) {
|
||||||
|
const label = document.getElementById('sort-label');
|
||||||
|
if (label) label.textContent = mode;
|
||||||
|
window.state.sortMode = mode;
|
||||||
|
window._renderBoard?.();
|
||||||
|
print(`sort: ${mode}`, 'ok');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
register('split', 'toggle split preview', () => {
|
||||||
|
document.getElementById('board-split-toggle')?.click();
|
||||||
|
print('split toggled', 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('zen', 'toggle zen mode on current detail', () => {
|
||||||
|
document.getElementById('detail-zen')?.click();
|
||||||
|
print('zen toggled', 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('count', 'show card and bucket counts', () => {
|
||||||
|
const cards = window.state?.cards?.length || 0;
|
||||||
|
const buckets = window.state?.buckets?.length || 0;
|
||||||
|
print(`${cards} cards · ${buckets} buckets`, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('tags', 'list all tags', () => {
|
||||||
|
const tagSet = new Set();
|
||||||
|
for (const c of window.state?.cards || []) {
|
||||||
|
for (const t of (c.tags || '').split(',').filter(Boolean)) tagSet.add(t);
|
||||||
|
}
|
||||||
|
if (!tagSet.size) { print('no tags', 'dim'); return; }
|
||||||
|
const sorted = [...tagSet].sort();
|
||||||
|
print(`${sorted.length} tags:`, 'heading');
|
||||||
|
print(sorted.map(t => '#' + t).join(' '));
|
||||||
|
});
|
||||||
|
|
||||||
|
register('buckets', 'list all buckets', () => {
|
||||||
|
const bs = window.state?.buckets || [];
|
||||||
|
if (!bs.length) { print('no buckets', 'dim'); return; }
|
||||||
|
print(`${bs.length} buckets:`, 'heading');
|
||||||
|
for (const b of bs) print(` ${b.name} (${b.id})${b.parent_id ? ` → child of ${b.parent_id}` : ''}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
register('history', 'history <card> — show edit history', async (args) => {
|
||||||
|
const q = args.join(' ');
|
||||||
|
if (!q) { print('usage: history <card title>', 'err'); return; }
|
||||||
|
const c = findCard(q);
|
||||||
|
if (!c) { print(`card not found: ${q}`, 'err'); return; }
|
||||||
|
let entries;
|
||||||
|
try {
|
||||||
|
const res = await fetch(`api/cards/${c.id}/history`);
|
||||||
|
entries = await res.json();
|
||||||
|
} catch (e) { print('failed to fetch history', 'err'); return; }
|
||||||
|
if (!entries || !entries.length) { print(`${c.title}: no edit history`, 'dim'); return; }
|
||||||
|
print(`${c.title} — ${entries.length} changes:`, 'heading');
|
||||||
|
for (const e of entries) {
|
||||||
|
const old = (e.old_value || '(empty)').replace(/\n/g, '↵').substring(0, 60);
|
||||||
|
const nw = (e.new_value || '(empty)').replace(/\n/g, '↵').substring(0, 60);
|
||||||
|
const time = e.changed_at?.substring(0, 16) || '?';
|
||||||
|
print(` ${time} ${e.field}: ${old} → ${nw}`, 'dim');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
register('find', 'find <text> — list matching cards', (args) => {
|
||||||
|
const q = args.join(' ').toLowerCase();
|
||||||
|
if (!q) { print('usage: find <text>', 'err'); return; }
|
||||||
|
const hits = (window.state?.cards || []).filter(c =>
|
||||||
|
c.title.toLowerCase().includes(q) || (c.body || '').toLowerCase().includes(q) || (c.tags || '').toLowerCase().includes(q)
|
||||||
|
);
|
||||||
|
if (!hits.length) { print('no matches', 'dim'); return; }
|
||||||
|
print(`${hits.length} matches:`, 'heading');
|
||||||
|
for (const c of hits.slice(0, 20)) {
|
||||||
|
print(` ${c.title}${c.tags ? ' ' + (c.tags || '').split(',').map(t => '#' + t).join(' ') : ''}`, 'dim');
|
||||||
|
}
|
||||||
|
if (hits.length > 20) print(` ... and ${hits.length - 20} more`, 'dim');
|
||||||
|
});
|
||||||
|
|
||||||
|
register('version', 'show app version', () => {
|
||||||
|
const v = document.querySelector('[data-app-version]')?.textContent || '?';
|
||||||
|
print(v, 'ok');
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── Tab completion ──
|
||||||
|
|
||||||
|
function tabComplete() {
|
||||||
|
const val = input.value;
|
||||||
|
const parts = val.split(/\s+/);
|
||||||
|
if (parts.length <= 1) {
|
||||||
|
const matches = fuzzy(parts[0] || '', Object.keys(COMMANDS));
|
||||||
|
if (matches.length === 1) { input.value = matches[0] + ' '; }
|
||||||
|
else if (matches.length > 1) { print(matches.join(' '), 'dim'); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Execute ──
|
||||||
|
|
||||||
|
async function exec(line) {
|
||||||
|
const trimmed = line.trim();
|
||||||
|
if (!trimmed) return;
|
||||||
|
|
||||||
|
history.push(trimmed);
|
||||||
|
historyIdx = history.length;
|
||||||
|
print(trimmed, 'cmd');
|
||||||
|
|
||||||
|
const parts = trimmed.split(/\s+/);
|
||||||
|
const cmd = parts.shift().toLowerCase();
|
||||||
|
const command = COMMANDS[cmd];
|
||||||
|
|
||||||
|
if (!command) {
|
||||||
|
print(`unknown command: ${cmd}. Type "help" for a list.`, 'err');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await command.fn(parts);
|
||||||
|
} catch (e) {
|
||||||
|
print(`error: ${e.message}`, 'err');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Event handlers ──
|
||||||
|
|
||||||
|
input?.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
const val = input.value;
|
||||||
|
input.value = '';
|
||||||
|
exec(val);
|
||||||
|
} else if (e.key === 'Tab') {
|
||||||
|
e.preventDefault();
|
||||||
|
tabComplete();
|
||||||
|
} else if (e.key === 'ArrowUp') {
|
||||||
|
e.preventDefault();
|
||||||
|
if (historyIdx > 0) { historyIdx--; input.value = history[historyIdx]; }
|
||||||
|
} else if (e.key === 'ArrowDown') {
|
||||||
|
e.preventDefault();
|
||||||
|
if (historyIdx < history.length - 1) { historyIdx++; input.value = history[historyIdx]; }
|
||||||
|
else { historyIdx = history.length; input.value = ''; }
|
||||||
|
} else if (e.key === 'Escape') {
|
||||||
|
e.preventDefault(); e.stopPropagation();
|
||||||
|
toggle();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Shift+T toggle (capture, before shortcuts)
|
||||||
|
window.addEventListener('keydown', e => {
|
||||||
|
if (e.key === 'T' && e.shiftKey && !e.ctrlKey && !e.altKey && !e.metaKey) {
|
||||||
|
const tag = document.activeElement?.tagName;
|
||||||
|
if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT' || document.activeElement?.isContentEditable) return;
|
||||||
|
e.preventDefault(); e.stopPropagation(); e.stopImmediatePropagation();
|
||||||
|
toggle();
|
||||||
|
}
|
||||||
|
}, { capture: true });
|
||||||
|
|
||||||
|
print('hyprcrd terminal — type "help" for commands, Shift+T to toggle', 'dim');
|
||||||
|
|
||||||
|
h?.registerPlugin({ name: 'terminal', version: '1.0.0' });
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, expect, csrf } from './runner.js';
|
import { describe, it, expect, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
describe('API: Edge Cases', () => {
|
describe('API: Edge Cases', () => {
|
||||||
it('create card with special characters in title', async () => {
|
it('create card with special characters in title', async () => {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, expect, csrf } from './runner.js';
|
import { describe, it, expect, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
describe('API: Cards CRUD', () => {
|
describe('API: Cards CRUD', () => {
|
||||||
it('GET /api/cards returns array', async () => {
|
it('GET /api/cards returns array', async () => {
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll } from './runner.js?v=4';
|
||||||
|
|
||||||
|
async function openEditor() {
|
||||||
|
const card = document.querySelector('#board [data-id]');
|
||||||
|
if (!card) return false;
|
||||||
|
card.dispatchEvent(new MouseEvent('dblclick', { bubbles: true }));
|
||||||
|
for (let i = 0; i < 20; i++) {
|
||||||
|
if ($('#modal')?.classList.contains('open')) return true;
|
||||||
|
await sleep(100);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openPicker() {
|
||||||
|
click('#md-asset-picker');
|
||||||
|
for (let i = 0; i < 30; i++) {
|
||||||
|
if (document.getElementById('asset-picker-flyout')) return true;
|
||||||
|
await sleep(100);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Asset Picker', () => {
|
||||||
|
afterEach(async () => {
|
||||||
|
document.getElementById('asset-picker-flyout')?.remove();
|
||||||
|
await closeAll();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toolbar button exists', () => {
|
||||||
|
expect($('#md-asset-picker')).toExist();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens flyout with search and grid, toggles closed on second click', async () => {
|
||||||
|
if (!await openEditor()) return;
|
||||||
|
if (!await openPicker()) return;
|
||||||
|
|
||||||
|
expect(document.getElementById('asset-picker-flyout')).toExist();
|
||||||
|
expect(document.getElementById('asset-picker-search')).toExist();
|
||||||
|
expect(document.getElementById('asset-picker-grid')).toExist();
|
||||||
|
|
||||||
|
// Second click closes
|
||||||
|
click('#md-asset-picker');
|
||||||
|
for (let i = 0; i < 20; i++) {
|
||||||
|
if (!document.getElementById('asset-picker-flyout')) break;
|
||||||
|
await sleep(50);
|
||||||
|
}
|
||||||
|
expect(document.getElementById('asset-picker-flyout')).toBe(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('search input filters tiles', async () => {
|
||||||
|
if (!await openEditor()) return;
|
||||||
|
if (!await openPicker()) return;
|
||||||
|
|
||||||
|
const search = document.getElementById('asset-picker-search');
|
||||||
|
if (!search) return;
|
||||||
|
|
||||||
|
search.value = 'zzz_nonexistent_zzz';
|
||||||
|
search.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
await sleep(50);
|
||||||
|
const grid = document.getElementById('asset-picker-grid');
|
||||||
|
expect(grid.querySelectorAll('.asset-pick-tile').length).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
import { describe, it, afterEach, expect, $, $$, click, sleep, waitFor, closeAll, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
|
async function makeCard(title, body) {
|
||||||
|
return fetch('api/cards', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json', 'X-CSRF-Token': csrf() },
|
||||||
|
body: JSON.stringify({ title, body, color: '#38bdf8' }),
|
||||||
|
}).then(r => r.json());
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getCard(id) {
|
||||||
|
const all = await fetch(`api/cards?ids=${id}`).then(r => r.json());
|
||||||
|
return all.find(c => c.id == id);
|
||||||
|
}
|
||||||
|
|
||||||
|
function openSearchReplace() {
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', {
|
||||||
|
key: 'H', ctrlKey: true, shiftKey: true, bubbles: true,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Search: Find/Replace', () => {
|
||||||
|
afterEach(async () => {
|
||||||
|
await closeAll();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Ctrl+Shift+H opens search with replace row visible', async () => {
|
||||||
|
openSearchReplace();
|
||||||
|
await sleep(200);
|
||||||
|
const overlay = document.getElementById('search');
|
||||||
|
expect(overlay?.classList.contains('open')).toBe(true);
|
||||||
|
expect(document.getElementById('search-replace-row')).toBeVisible();
|
||||||
|
expect(document.getElementById('search-replace-input')).toExist();
|
||||||
|
expect(document.getElementById('search-replace-all')).toExist();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replace toggle shows/hides replace row', async () => {
|
||||||
|
openSearchReplace();
|
||||||
|
await sleep(200);
|
||||||
|
expect(document.getElementById('search-replace-row')).toBeVisible();
|
||||||
|
click('#search-replace-toggle');
|
||||||
|
await sleep(50);
|
||||||
|
expect(document.getElementById('search-replace-row')?.classList.contains('hidden')).toBe(true);
|
||||||
|
click('#search-replace-toggle');
|
||||||
|
await sleep(50);
|
||||||
|
expect(document.getElementById('search-replace-row')).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replace all updates card bodies after confirmation', async () => {
|
||||||
|
const c1 = await makeCard('__bfr_repl_a__', 'hello world hello');
|
||||||
|
const c2 = await makeCard('__bfr_repl_b__', 'hello there');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
openSearchReplace();
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
const searchInput = document.getElementById('search-input');
|
||||||
|
const replInput = document.getElementById('search-replace-input');
|
||||||
|
if (!searchInput || !replInput) return;
|
||||||
|
|
||||||
|
searchInput.value = 'hello';
|
||||||
|
searchInput.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
replInput.value = 'goodbye';
|
||||||
|
replInput.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
await sleep(50);
|
||||||
|
|
||||||
|
const applyBtn = document.getElementById('search-replace-all');
|
||||||
|
expect(applyBtn.disabled).toBe(false);
|
||||||
|
click(applyBtn);
|
||||||
|
|
||||||
|
// The replace-all button opens a confirm dialog — wait for it
|
||||||
|
// to appear rather than relying on a fixed sleep, since the
|
||||||
|
// dialog creation is async and can lag on slow runs.
|
||||||
|
await waitFor(() => document.getElementById('dialog')?.classList.contains('open'), 2000);
|
||||||
|
const okBtn = document.getElementById('dialog-ok');
|
||||||
|
if (okBtn) click(okBtn);
|
||||||
|
|
||||||
|
// Poll until both replaces have persisted. Budget is generous
|
||||||
|
// (~10s) because a cold PHP run plus two sequential PATCH calls
|
||||||
|
// can easily blow past the original 4-second window — the retry
|
||||||
|
// always passes because opcache + SQLite WAL are warm by then.
|
||||||
|
let updated1, updated2;
|
||||||
|
for (let i = 0; i < 100; i++) {
|
||||||
|
await sleep(100);
|
||||||
|
updated1 = await getCard(c1.id);
|
||||||
|
updated2 = await getCard(c2.id);
|
||||||
|
if (updated1?.body === 'goodbye world goodbye' && updated2?.body === 'goodbye there') break;
|
||||||
|
}
|
||||||
|
expect(updated1.body).toBe('goodbye world goodbye');
|
||||||
|
expect(updated2.body).toBe('goodbye there');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('replace all button disabled without replace text', async () => {
|
||||||
|
await makeCard('__bfr_dis__', 'some text');
|
||||||
|
await window._reloadAll?.();
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
openSearchReplace();
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
const searchInput = document.getElementById('search-input');
|
||||||
|
if (!searchInput) return;
|
||||||
|
searchInput.value = 'some';
|
||||||
|
searchInput.dispatchEvent(new Event('input', { bubbles: true }));
|
||||||
|
await sleep(100);
|
||||||
|
|
||||||
|
const applyBtn = document.getElementById('search-replace-all');
|
||||||
|
expect(applyBtn.disabled).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js';
|
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
describe('Board Rendering', () => {
|
describe('Board Rendering', () => {
|
||||||
it('renders card elements', () => {
|
it('renders card elements', () => {
|
||||||
@@ -124,3 +124,110 @@ describe('Board: Card Create & Delete', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('Board: Focus restoration after overlay close', () => {
|
||||||
|
afterEach(() => closeAll());
|
||||||
|
|
||||||
|
it('closing the editor returns focus to body', async () => {
|
||||||
|
click('#add-btn');
|
||||||
|
await sleep(200);
|
||||||
|
// Editor is open — focus should be inside the modal (title input)
|
||||||
|
expect(document.activeElement !== document.body).toBe(true);
|
||||||
|
click('#modal-cancel');
|
||||||
|
await sleep(200);
|
||||||
|
expect(document.activeElement).toBe(document.body);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('closing the detail view returns focus to body', async () => {
|
||||||
|
const card = $('#board [data-id]');
|
||||||
|
if (!card) return;
|
||||||
|
click(card);
|
||||||
|
await sleep(300);
|
||||||
|
if (!$('#detail')?.classList.contains('open')) return;
|
||||||
|
click('#detail-close');
|
||||||
|
await sleep(200);
|
||||||
|
expect(document.activeElement).toBe(document.body);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('closing search returns focus to body', async () => {
|
||||||
|
click('#search-btn');
|
||||||
|
await sleep(200);
|
||||||
|
if (!$('#search')?.classList.contains('open')) return;
|
||||||
|
expect(document.activeElement?.id).toBe('search-input');
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
|
||||||
|
await sleep(200);
|
||||||
|
expect(document.activeElement).toBe(document.body);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('arrow keys work after editor round-trip (enter → enter → escape)', async () => {
|
||||||
|
const card = $('#board [data-id]');
|
||||||
|
if (!card) return;
|
||||||
|
// Focus a card
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }));
|
||||||
|
await sleep(100);
|
||||||
|
if (!document.querySelector('#board .card-focused')) return;
|
||||||
|
// Enter → detail
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
|
||||||
|
await sleep(300);
|
||||||
|
if (!$('#detail')?.classList.contains('open')) return;
|
||||||
|
// Enter → close detail, open editor
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true }));
|
||||||
|
await sleep(300);
|
||||||
|
if (!$('#modal')?.classList.contains('open')) return;
|
||||||
|
// Escape → close editor
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
|
||||||
|
await sleep(200);
|
||||||
|
expect(document.activeElement).toBe(document.body);
|
||||||
|
// Arrows should work again
|
||||||
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }));
|
||||||
|
await sleep(100);
|
||||||
|
expect(document.querySelector('#board .card-focused')).toExist();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Board: new-card pulse', () => {
|
||||||
|
// Journal entries shouldn't get the 1× card-pulse-local flash —
|
||||||
|
// they're daily-log jottings, not "new thing" moments. We use
|
||||||
|
// title "9999-12-31" for the journal probe to ensure we can't
|
||||||
|
// collide with a real user entry; a control card with a
|
||||||
|
// __prefixed__ title verifies the pulse still fires for normal
|
||||||
|
// local creations.
|
||||||
|
|
||||||
|
it('locally-created journal-format cards skip the pulse', async () => {
|
||||||
|
const token = csrf();
|
||||||
|
const hJson = { 'Content-Type': 'application/json', 'X-CSRF-Token': token };
|
||||||
|
const hCsrf = { 'X-CSRF-Token': token };
|
||||||
|
let journal, control;
|
||||||
|
try {
|
||||||
|
journal = await fetch('api/cards', { method: 'POST', headers: hJson, body: JSON.stringify({ title: '9999-12-31', body: '' }) }).then(r => r.json());
|
||||||
|
control = await fetch('api/cards', { method: 'POST', headers: hJson, body: JSON.stringify({ title: '__test_pulse_ctrl__', body: '' }) }).then(r => r.json());
|
||||||
|
expect(journal?.id).toExist();
|
||||||
|
expect(control?.id).toExist();
|
||||||
|
|
||||||
|
// Flag both as "just created locally" so renderBoard routes
|
||||||
|
// them through the local-pulse branch. The journal
|
||||||
|
// exemption then has to filter out the journal one.
|
||||||
|
window.state.recentlyCreatedIds.add(String(journal.id));
|
||||||
|
window.state.recentlyCreatedIds.add(String(control.id));
|
||||||
|
await window._reloadAll();
|
||||||
|
// Wait past the rAF tick so pulse classes have been
|
||||||
|
// applied, but well within the 900ms lifetime so we
|
||||||
|
// can still observe them.
|
||||||
|
await sleep(150);
|
||||||
|
|
||||||
|
const journalEl = document.querySelector(`.board-card[data-id="${journal.id}"]`);
|
||||||
|
const controlEl = document.querySelector(`.board-card[data-id="${control.id}"]`);
|
||||||
|
expect(journalEl).toExist();
|
||||||
|
expect(controlEl).toExist();
|
||||||
|
expect(journalEl.classList.contains('card-pulse-local')).toBe(false);
|
||||||
|
expect(controlEl.classList.contains('card-pulse-local')).toBe(true);
|
||||||
|
} finally {
|
||||||
|
// Clean up even on failure. Backup/restore would catch it
|
||||||
|
// eventually, but between tests we don't want a stray
|
||||||
|
// 9999-12-31 card floating around upsetting other suites.
|
||||||
|
if (journal?.id) await fetch(`api/cards/${journal.id}`, { method: 'DELETE', headers: hCsrf });
|
||||||
|
if (control?.id) await fetch(`api/cards/${control.id}`, { method: 'DELETE', headers: hCsrf });
|
||||||
|
await window._reloadAll?.();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
import { describe, it, expect, $, click, sleep, waitFor, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
|
// Bookmarks plugin tests. The plugin injects a header button, decorates
|
||||||
|
// #bookmarks-tagged board cards, and opens a column-based overlay.
|
||||||
|
// Tests create throwaway cards and clean up in finally blocks.
|
||||||
|
|
||||||
|
const token = () => csrf();
|
||||||
|
const hJson = () => ({ 'Content-Type': 'application/json', 'X-CSRF-Token': token() });
|
||||||
|
const hDel = () => ({ 'X-CSRF-Token': token() });
|
||||||
|
|
||||||
|
function emptyBody() {
|
||||||
|
return JSON.stringify({ type: 'bookmarks', columns: [{ name: 'General', items: [] }], columnWidth: 220 }) + '\n\n#bookmarks';
|
||||||
|
}
|
||||||
|
|
||||||
|
function bodyWith(columns, columnWidth = 220) {
|
||||||
|
return JSON.stringify({ type: 'bookmarks', columns, columnWidth }) + '\n\n#bookmarks';
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Bookmarks: plugin registration', () => {
|
||||||
|
it('registers itself in window.hyprcrd.plugins', () => {
|
||||||
|
const entry = (window.hyprcrd?.plugins || []).find(p => p?.name === 'bookmarks');
|
||||||
|
expect(entry).toExist();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: header button', () => {
|
||||||
|
it('injects a Bookmarks button into the header', () => {
|
||||||
|
const btn = $('#bookmarks-btn');
|
||||||
|
expect(btn).toExist();
|
||||||
|
expect(btn.closest('#main-header')).toExist();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: board card rendering', () => {
|
||||||
|
it('decorates #bookmarks cards with bm-card class', async () => {
|
||||||
|
let card;
|
||||||
|
try {
|
||||||
|
card = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_deco__', body: emptyBody(), color: '#fb923c' }) }).then(r => r.json());
|
||||||
|
expect(card?.id).toExist();
|
||||||
|
await window._reloadAll();
|
||||||
|
await sleep(200);
|
||||||
|
const el = document.querySelector(`.board-card[data-id="${card.id}"]`);
|
||||||
|
expect(el).toExist();
|
||||||
|
expect(el.classList.contains('bm-card')).toBe(true);
|
||||||
|
expect(el.querySelector('.bm-card-icon')).toExist();
|
||||||
|
expect(el.querySelector('.bm-card-title').textContent).toContain('__test_bm_deco__');
|
||||||
|
} finally {
|
||||||
|
if (card?.id) await fetch(`api/cards/${card.id}`, { method: 'DELETE', headers: hDel() });
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: overlay', () => {
|
||||||
|
it('opens on click and shows columns from the card body', async () => {
|
||||||
|
const cols = [
|
||||||
|
{ name: 'TestCol', items: [{ url: 'https://example.com', title: 'Example', favicon: '' }] }
|
||||||
|
];
|
||||||
|
let card;
|
||||||
|
try {
|
||||||
|
card = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_overlay__', body: bodyWith(cols) }) }).then(r => r.json());
|
||||||
|
await window._reloadAll();
|
||||||
|
await sleep(200);
|
||||||
|
const el = document.querySelector(`.board-card[data-id="${card.id}"]`);
|
||||||
|
expect(el).toExist();
|
||||||
|
click(el);
|
||||||
|
await sleep(150);
|
||||||
|
const overlay = $('#bookmarks-overlay');
|
||||||
|
expect(overlay.classList.contains('open')).toBe(true);
|
||||||
|
expect($('bookmarks-title').textContent).toContain('__test_bm_overlay__');
|
||||||
|
// Column rendered
|
||||||
|
const colName = document.querySelector('.bm-col-name');
|
||||||
|
expect(colName).toExist();
|
||||||
|
expect(colName.textContent).toBe('TestCol');
|
||||||
|
// Item rendered
|
||||||
|
const item = document.querySelector('.bm-item');
|
||||||
|
expect(item).toExist();
|
||||||
|
expect(item.textContent).toContain('Example');
|
||||||
|
// Close
|
||||||
|
click($('bookmarks-close'));
|
||||||
|
await sleep(100);
|
||||||
|
expect(overlay.classList.contains('open')).toBe(false);
|
||||||
|
} finally {
|
||||||
|
if (card?.id) await fetch(`api/cards/${card.id}`, { method: 'DELETE', headers: hDel() });
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: fetch-meta API', () => {
|
||||||
|
it('returns JSON with ok field for a valid URL', async () => {
|
||||||
|
const r = await fetch('api/bookmarks/fetch-meta?url=' + encodeURIComponent('https://example.com')).then(x => x.json());
|
||||||
|
expect(r.ok).toBe(true);
|
||||||
|
expect(typeof r.title).toBe('string');
|
||||||
|
// favicon is either a data: URI or empty string
|
||||||
|
expect(typeof r.favicon).toBe('string');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns 400 for missing URL', async () => {
|
||||||
|
const r = await fetch('api/bookmarks/fetch-meta');
|
||||||
|
expect(r.status).toBe(400);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: card links', () => {
|
||||||
|
it('renders card:ID items with a card icon', async () => {
|
||||||
|
let target, bm;
|
||||||
|
try {
|
||||||
|
target = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_target__', body: 'hello' }) }).then(r => r.json());
|
||||||
|
const cols = [{ name: 'Links', items: [{ url: `card:${target.id}`, title: '__test_bm_target__', favicon: '' }] }];
|
||||||
|
bm = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_cardlink__', body: bodyWith(cols) }) }).then(r => r.json());
|
||||||
|
await window._reloadAll();
|
||||||
|
await sleep(200);
|
||||||
|
const el = document.querySelector(`.board-card[data-id="${bm.id}"]`);
|
||||||
|
click(el);
|
||||||
|
await sleep(150);
|
||||||
|
const item = document.querySelector('.bm-item');
|
||||||
|
expect(item).toExist();
|
||||||
|
// Card links get a ph-card icon, not ph-globe
|
||||||
|
const cardIcon = item.querySelector('.ph-card');
|
||||||
|
expect(cardIcon).toExist();
|
||||||
|
click($('bookmarks-close'));
|
||||||
|
await sleep(80);
|
||||||
|
} finally {
|
||||||
|
for (const c of [target, bm]) {
|
||||||
|
if (c?.id) await fetch(`api/cards/${c.id}`, { method: 'DELETE', headers: hDel() });
|
||||||
|
}
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: column persistence', () => {
|
||||||
|
it('new columns survive close + reopen', async () => {
|
||||||
|
let card;
|
||||||
|
try {
|
||||||
|
card = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_colsave__', body: emptyBody() }) }).then(r => r.json());
|
||||||
|
await window._reloadAll();
|
||||||
|
await sleep(200);
|
||||||
|
|
||||||
|
// Open overlay, add a column via the data model + save
|
||||||
|
// (simulates what addColumn does without the dialog).
|
||||||
|
const el = document.querySelector(`.board-card[data-id="${card.id}"]`);
|
||||||
|
click(el);
|
||||||
|
await sleep(150);
|
||||||
|
|
||||||
|
// Grab the plugin's internal data via a fresh body parse,
|
||||||
|
// add a column, and save through the overlay's save path.
|
||||||
|
const full = await fetch(`api/cards?ids=${card.id}`).then(r => r.json());
|
||||||
|
const body = (full[0]?.body || '').trim();
|
||||||
|
const jsonEnd = body.lastIndexOf('}');
|
||||||
|
const parsed = JSON.parse(body.substring(0, jsonEnd + 1));
|
||||||
|
parsed.columns.push({ name: 'Added', items: [] });
|
||||||
|
const newBody = JSON.stringify(parsed) + '\n\n#bookmarks';
|
||||||
|
await fetch(`api/cards/${card.id}`, {
|
||||||
|
method: 'PATCH', headers: hJson(),
|
||||||
|
body: JSON.stringify({ body: newBody }),
|
||||||
|
});
|
||||||
|
// Update local state like save() does.
|
||||||
|
const local = (window.state?.cards || []).find(c => c.id == card.id);
|
||||||
|
if (local) local.body = newBody;
|
||||||
|
|
||||||
|
click($('bookmarks-close'));
|
||||||
|
await sleep(100);
|
||||||
|
|
||||||
|
// Reopen — the new column must still be there.
|
||||||
|
const el2 = document.querySelector(`.board-card[data-id="${card.id}"]`);
|
||||||
|
click(el2);
|
||||||
|
await sleep(150);
|
||||||
|
const names = [...document.querySelectorAll('.bm-col-name')].map(n => n.textContent);
|
||||||
|
expect(names).toContain('General');
|
||||||
|
expect(names).toContain('Added');
|
||||||
|
click($('bookmarks-close'));
|
||||||
|
await sleep(80);
|
||||||
|
} finally {
|
||||||
|
if (card?.id) await fetch(`api/cards/${card.id}`, { method: 'DELETE', headers: hDel() });
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Bookmarks: column width persistence', () => {
|
||||||
|
it('saves and restores columnWidth from card body', async () => {
|
||||||
|
const cols = [{ name: 'W', items: [] }];
|
||||||
|
let card;
|
||||||
|
try {
|
||||||
|
card = await fetch('api/cards', { method: 'POST', headers: hJson(), body: JSON.stringify({ title: '__test_bm_width__', body: bodyWith(cols, 300) }) }).then(r => r.json());
|
||||||
|
await window._reloadAll();
|
||||||
|
await sleep(200);
|
||||||
|
const el = document.querySelector(`.board-card[data-id="${card.id}"]`);
|
||||||
|
click(el);
|
||||||
|
await sleep(150);
|
||||||
|
const slider = $('#bookmarks-col-width');
|
||||||
|
expect(slider).toExist();
|
||||||
|
expect(parseInt(slider.value)).toBe(300);
|
||||||
|
click($('bookmarks-close'));
|
||||||
|
await sleep(80);
|
||||||
|
} finally {
|
||||||
|
if (card?.id) await fetch(`api/cards/${card.id}`, { method: 'DELETE', headers: hDel() });
|
||||||
|
await window._reloadAll();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js';
|
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js?v=4';
|
||||||
|
|
||||||
describe('Bucket Context Menu', () => {
|
describe('Bucket Context Menu', () => {
|
||||||
afterEach(async () => {
|
afterEach(async () => {
|
||||||
@@ -100,7 +100,11 @@ describe('Bucket Context Menu', () => {
|
|||||||
it('move-left disabled on first bucket', async () => {
|
it('move-left disabled on first bucket', async () => {
|
||||||
await window._reloadAll?.();
|
await window._reloadAll?.();
|
||||||
await sleep(200);
|
await sleep(200);
|
||||||
const tabs = $$('#bucket-bar [data-bucket]').filter(t => !['all', 'current', 'favorites', 'journal', 'none'].includes(t.dataset.bucket));
|
// data-bucket-drag is present on BOTH regular and super-bucket
|
||||||
|
// tiles but not on the fixed filters (all/current/favorites/…).
|
||||||
|
// Using it instead of [data-bucket] avoids missing super-bucket
|
||||||
|
// tiles which carry data-bucket-super instead.
|
||||||
|
const tabs = $$('#bucket-bar [data-bucket-drag]');
|
||||||
if (!tabs.length) return;
|
if (!tabs.length) return;
|
||||||
tabs[0].dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, clientX: 100, clientY: 50 }));
|
tabs[0].dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, clientX: 100, clientY: 50 }));
|
||||||
await sleep(150);
|
await sleep(150);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js';
|
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll, csrf } from './runner.js?v=4';
|
||||||
import { state } from '../../js/modules/state.js';
|
import { state } from '../../js/modules/state.js';
|
||||||
|
|
||||||
describe('Bucket Bar', () => {
|
describe('Bucket Bar', () => {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll } from './runner.js';
|
import { describe, it, afterEach, expect, $, $$, click, sleep, closeAll } from './runner.js?v=4';
|
||||||
|
|
||||||
describe('Calendar: Day Click', () => {
|
describe('Calendar: Day Click', () => {
|
||||||
afterEach(() => closeAll());
|
afterEach(() => closeAll());
|
||||||
|
|||||||
Loaded 100 of 210 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user