3 Commits

Author SHA1 Message Date
allen 14de77926f Merge pull request 'Prep v1.1.0 release: version string, gitignore secrets, docs' (#8) from release/v1.1.0 into main 2026-06-09 23:41:25 -07:00
root 3cbf36e0ad Prep v1.1.0 release: version string, gitignore secrets, docs
- Add VERSION = "1.1.0" to server.py; print at startup, expose via public
  GET /api/config, and show it in the admin header (so deployed == released
  is verifiable at a glance).
- Ignore config.json in .gitignore — it holds the admin password hash and
  session secret; fresh installs use config.json.example.
- README/CLAUDE.md: document the in-app pixel editor (now with shape tools,
  select/move, reference overlay, custom/recent palettes), the receiver health
  dashboard, 9 sprite types, and the asset cache-busting convention.
- Bump admin asset cache-bust to ?v=20260609d.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-09 23:41:00 -07:00
allen 8204d8d41e Merge pull request 'Pixel editor: shape tools, select/move, reference overlay, color tools' (#7) from feature/pixel-editor-enhancements into main 2026-06-09 15:53:05 -07:00
7 changed files with 43 additions and 12 deletions
+3 -2
View File
@@ -23,5 +23,6 @@ __pycache__/
.DS_Store .DS_Store
Thumbs.db Thumbs.db
# Local config (uncomment if you want to ignore local changes) # Local config — contains the admin password hash and session secret.
# config.json # Fresh installs start from config.json.example (see CONFIG.md).
config.json
+7 -3
View File
@@ -48,11 +48,15 @@ Access at http://localhost:{web_port} (configured in config.json)
- **admin/** - Admin panel (login + tabbed settings UI) - **admin/** - Admin panel (login + tabbed settings UI)
- Theme management: rename display names, upload per-direction background PNGs, create new themes - Theme management: rename display names, upload per-direction background PNGs, create new themes
- Display names stored in `config.json` `theme_names` map (folder name -> display name) - Display names stored in `config.json` `theme_names` map (folder name -> display name)
- Receivers tab: live per-receiver health (via `GET /api/admin/receiver-status` and `POST /api/admin/test-receivers`), a select → SAVE & APPLY → auto-test flow, selectable scan results, and a per-interface scan selector
- Version (from `server.py` `VERSION`) is surfaced via public `GET /api/config` and shown in the admin header
- **pixel-editor.js** - In-app Canvas2D pixel editor (Sprites tab "EDIT" button) - **pixel-editor.js** - In-app Canvas2D pixel editor (Sprites tab "EDIT" button)
- Edits sprites at native 500x333; tools: pencil, eraser, color picker, fill bucket, pan - Edits sprites at native 500x333; tools: pencil, eraser, color picker, fill bucket, pan, line, rectangle, ellipse (outline/filled), rectangular select
- Zoom/pan, undo/redo (snapshot-per-stroke), grid overlay, retro palette + native color input - Select & move: marquee + floating layer, drag/arrow-nudge, Ctrl+C/X/V clipboard, Delete, Enter/Esc commit
- Zoom/pan, undo/redo (snapshot-per-stroke), grid overlay, brush size & opacity, retro + custom (localStorage) + recent palettes, adjustable reference-image overlay
- Exports a 500x333 PNG via `srcCanvas.toBlob` and POSTs to the existing `/api/admin/sprites/{type}` upload endpoint (no new server route) - Exports a 500x333 PNG via `srcCanvas.toBlob` and POSTs to the existing `/api/admin/sprites/{type}` upload endpoint (no new server route)
- Keyboard: B/E/I/F tools, Space=pan, +/-/0 zoom, Ctrl+Z/Y undo/redo, G grid, Esc close - Keyboard: B/E/I/F/L/R/O/M tools, Space=pan, +/-/0 zoom, Ctrl+Z/Y undo/redo, Ctrl+C/X/V, arrows nudge, G grid, Esc close
- **Asset cache-busting:** `admin.html` references `admin.css`/`admin.js`/`pixel-editor.js` with a `?v=YYYYMMDD[x]` query — bump it whenever those files change so browsers reload them
- **setup/** - First-run setup wizard (multi-step configuration) - **setup/** - First-run setup wizard (multi-step configuration)
+4 -2
View File
@@ -7,14 +7,16 @@ A retro SNES-style side-view flight tracker that displays ADS-B aircraft data wi
## Features ## Features
- Real-time aircraft tracking via ADS-B receivers - Real-time aircraft tracking via ADS-B receivers
- Custom pixel art sprites for 6 aircraft types (small prop, regional jet, narrow body, wide body, heavy, helicopter) - Custom pixel art sprites for 9 aircraft types (small prop, regional jet, narrow body, wide body, heavy, helicopter, balloon, glider, UAV)
- Animated sun and moon with accurate astronomical positions - Animated sun and moon with accurate astronomical positions
- Dynamic sky colors based on time of day - Dynamic sky colors based on time of day
- Weather visualization with cloud sprites - Weather visualization with cloud sprites
- Directional view (N/E/S/W) with themed backgrounds - Directional view (N/E/S/W) with themed backgrounds
- Auto-discovery of ADS-B receivers on your network - Auto-discovery of ADS-B receivers on your network, with per-interface scanning
- Canvas-based 10 FPS retro rendering - Canvas-based 10 FPS retro rendering
- Admin panel with password authentication - Admin panel with password authentication
- **In-app pixel editor** — draw and edit sprites in the browser (pencil, shapes, fill, select & move, reference overlay, custom palettes)
- **Receiver health dashboard** — live per-receiver status (receiving / no data / unreachable), connection testing, and select → save → apply flow
- First-run setup wizard - First-run setup wizard
## Quick Start ## Quick Start
+9
View File
@@ -169,6 +169,15 @@ textarea {
margin: 0; margin: 0;
} }
.admin-version {
font-family: 'Courier New', monospace;
font-size: 11px;
color: #54fc54;
text-shadow: none;
margin-left: 6px;
vertical-align: middle;
}
.header-actions { .header-actions {
display: flex; display: flex;
gap: 8px; gap: 8px;
+4 -4
View File
@@ -7,7 +7,7 @@
<link rel="preconnect" href="https://fonts.googleapis.com"> <link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Press+Start+2P&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/admin/admin.css?v=20260609c"> <link rel="stylesheet" href="/admin/admin.css?v=20260609d">
</head> </head>
<body> <body>
<!-- Login Screen --> <!-- Login Screen -->
@@ -27,7 +27,7 @@
<!-- Admin Panel --> <!-- Admin Panel -->
<div id="admin-panel" class="hidden"> <div id="admin-panel" class="hidden">
<header class="admin-header"> <header class="admin-header">
<h1 class="retro-title">ADS-Bit Admin</h1> <h1 class="retro-title">ADS-Bit Admin <span id="admin-version" class="admin-version"></span></h1>
<div class="header-actions"> <div class="header-actions">
<a href="/" class="btn btn-small">VIEWER</a> <a href="/" class="btn btn-small">VIEWER</a>
<button id="logout-btn" class="btn btn-small btn-danger">LOGOUT</button> <button id="logout-btn" class="btn btn-small btn-danger">LOGOUT</button>
@@ -297,7 +297,7 @@
<div id="toast" class="toast hidden"></div> <div id="toast" class="toast hidden"></div>
</div> </div>
<script src="/admin/pixel-editor.js?v=20260609c"></script> <script src="/admin/pixel-editor.js?v=20260609d"></script>
<script src="/admin/admin.js?v=20260609c"></script> <script src="/admin/admin.js?v=20260609d"></script>
</body> </body>
</html> </html>
+12
View File
@@ -28,10 +28,22 @@
loadConfig(); loadConfig();
loadThemes(); loadThemes();
loadNetworkInfo(); loadNetworkInfo();
loadVersion();
refreshStatus(); refreshStatus();
statusInterval = setInterval(refreshStatus, 5000); statusInterval = setInterval(refreshStatus, 5000);
} }
async function loadVersion() {
try {
const res = await fetch('/api/config');
if (!res.ok) return;
const data = await res.json();
if (data.version) {
document.getElementById('admin-version').textContent = 'v' + data.version;
}
} catch (e) { /* ignore */ }
}
document.getElementById('login-form').addEventListener('submit', async (e) => { document.getElementById('login-form').addEventListener('submit', async (e) => {
e.preventDefault(); e.preventDefault();
const pw = document.getElementById('login-password').value; const pw = document.getElementById('login-password').value;
+4 -1
View File
@@ -17,6 +17,8 @@ from aiohttp import web, ClientSession, ClientTimeout
import netifaces import netifaces
import bcrypt import bcrypt
VERSION = "1.1.0"
WEB_DIR = Path(__file__).parent WEB_DIR = Path(__file__).parent
CONFIG_FILE = WEB_DIR / "config.json" CONFIG_FILE = WEB_DIR / "config.json"
@@ -549,6 +551,7 @@ async def handle_receiver_location(request):
async def handle_config(request): async def handle_config(request):
"""Return client-relevant configuration (public, no secrets).""" """Return client-relevant configuration (public, no secrets)."""
return web.json_response({ return web.json_response({
"version": VERSION,
"theme": config.get("theme", "desert"), "theme": config.get("theme", "desert"),
"location": config["location"], "location": config["location"],
"receivers": receivers, "receivers": receivers,
@@ -1231,7 +1234,7 @@ async def main():
"""Main entry point""" """Main entry point"""
global receivers, receiver_tasks global receivers, receiver_tasks
print("ADS-Bit Server Starting...") print(f"ADS-Bit Server v{VERSION} Starting...")
load_config() load_config()