Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a1d47f2536 |
@@ -1,34 +1,37 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
echo "🔧 Deploying Extrudex Docker runtime..."
|
echo "🔧 Deploying Extrudex (Go + React) on Raspberry Pi..."
|
||||||
|
|
||||||
# Check if Docker Compose is available
|
# Check if Docker Compose is available
|
||||||
if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
|
if ! docker compose version &>/dev/null && ! command -v docker-compose &>/dev/null; then
|
||||||
echo "❌ Docker Compose is not installed"
|
echo "❌ Docker Compose is not installed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
COMPOSE_CMD="docker compose"
|
COMPOSE_CMD="docker compose"
|
||||||
if command -v docker-compose &> /dev/null; then
|
if command -v docker-compose &>/dev/null; then
|
||||||
COMPOSE_CMD="docker-compose"
|
COMPOSE_CMD="docker-compose"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "📦 Building and starting services..."
|
echo "📦 Building and starting Go backend + React frontend + PostgreSQL..."
|
||||||
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
||||||
|
|
||||||
echo "⏳ Waiting for services to become healthy..."
|
echo "⏳ Waiting for services to become healthy..."
|
||||||
sleep 15
|
sleep 10
|
||||||
|
|
||||||
echo "✅ Deployment complete!"
|
echo "✅ Deployment complete!"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Services running:"
|
echo "Services running:"
|
||||||
echo " • PostgreSQL: localhost:5433"
|
echo " • PostgreSQL: localhost:5433"
|
||||||
echo " • Extrudex API: http://localhost:5080"
|
echo " • Extrudex API (Go): http://localhost:5080"
|
||||||
echo " • Extrudex Web: http://localhost:5081"
|
echo " • Extrudex Web (React): http://localhost:5081"
|
||||||
|
echo ""
|
||||||
|
echo "Barcode scanner: HID keyboard input — focus any text field to start scanning."
|
||||||
|
echo "Kiosk mode: Chromium auto-starts on boot via systemd (extrudex-kiosk.service)."
|
||||||
echo ""
|
echo ""
|
||||||
echo "To view logs:"
|
echo "To view logs:"
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
||||||
echo ""
|
echo ""
|
||||||
echo "To stop:"
|
echo "To stop:"
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml down"
|
echo " $COMPOSE_CMD -f docker-compose.dev.yml down"
|
||||||
|
|||||||
@@ -28,13 +28,10 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "5080:8080"
|
- "5080:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Development
|
- DATABASE_URL=postgres://extrudex:changeme@extrudex-db:5432/extrudex?sslmode=disable
|
||||||
- ASPNETCORE_URLS=http://+:8080
|
- PORT=8080
|
||||||
- EXTRUDEX_DB_HOST=extrudex-db
|
- CORS_ORIGIN=*
|
||||||
- EXTRUDEX_DB_PORT=5432
|
- LOG_LEVEL=info
|
||||||
- EXTRUDEX_DB_NAME=extrudex
|
|
||||||
- EXTRUDEX_DB_USER=extrudex
|
|
||||||
- EXTRUDEX_DB_PASSWORD=changeme
|
|
||||||
depends_on:
|
depends_on:
|
||||||
extrudex-db:
|
extrudex-db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -44,7 +41,7 @@ services:
|
|||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 40s
|
start_period: 15s
|
||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
|
|||||||
-214
@@ -1,214 +0,0 @@
|
|||||||
# Extrudex — Project Context
|
|
||||||
|
|
||||||
> **Last updated:** 2026-05-21
|
|
||||||
> **Repo:** `CubeCraft-Creations/Extrudex` | **Host:** `code.cubecraftcreations.com`
|
|
||||||
> **Local clone:** `/mnt/ai-storage/projects/Extrudex` | **Default branch:** `dev`
|
|
||||||
> **Discord:** `DISCORD_DEV_EXTRUDEX_CHANNEL_ID`
|
|
||||||
> **Linear Epic:** [CUB-110](https://linear.app/cubecraft-creations/issue/CUB-110)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
Custom filament inventory and print tracking system for CubeCraft Creations. Tracks spool consumption, material costs, and per-print COGS across a fleet of 6 FDM printers (5 Bambu Lab + 1 Elegoo Centauri Carbon) + resin printers. Kiosk interface on Raspberry Pi 5 with USB barcode scanner.
|
|
||||||
|
|
||||||
**Active refactor in progress:** .NET → Go + React (CUB-110 epic).
|
|
||||||
|
|
||||||
## Tech Stack
|
|
||||||
|
|
||||||
| Layer | Technology | Notes |
|
|
||||||
|-------|-----------|-------|
|
|
||||||
| Backend (legacy) | ASP.NET Core 9 + EF Core | Being replaced by Go |
|
|
||||||
| Backend (new) | Go 1.24+ | Chi router, pgx (PostgreSQL), gorilla/websocket, paho.mqtt.golang |
|
|
||||||
| Frontend (legacy) | Angular 17+ | Being replaced by React |
|
|
||||||
| Frontend (new) | React 18 + TypeScript + Tailwind CSS | Vite |
|
|
||||||
| Database | PostgreSQL 16+ | snake_case naming |
|
|
||||||
| Real-time | SSE (Server-Sent Events) | Replaces SignalR |
|
|
||||||
| Printer integrations | Moonraker REST + WebSocket, MQTT TLS | Elegoo/Klipper + Bambu Lab |
|
|
||||||
| CI/CD | Gitea Actions | `.gitea/workflows/dev.yml` |
|
|
||||||
| Deployment | Docker/Compose, Pi 5 kiosk | |
|
|
||||||
|
|
||||||
## Key Design Decisions
|
|
||||||
|
|
||||||
1. **Custom system over Spoolman** — Full control over data model and integrations
|
|
||||||
2. **MaterialFinish required** on every spool; default is "Basic"
|
|
||||||
3. **MaterialModifier is optional**
|
|
||||||
4. **Grams derived from:** `mm_extruded × filament_cross_section_area × material_density`
|
|
||||||
5. **Push over poll** — SSE + MQTT preferred; Moonraker polling is fallback
|
|
||||||
6. **Snake_case** for all PostgreSQL identifiers
|
|
||||||
|
|
||||||
## Project Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
Extrudex/
|
|
||||||
├── backend/ # Original .NET backend (being replaced)
|
|
||||||
│ ├── API/Controllers/ # Filaments, Spools, PrintJobs, Printers, Materials, QR, UsageLogs, Cost
|
|
||||||
│ ├── API/DTOs/ # DTOs per domain
|
|
||||||
│ ├── API/Validators/ # FluentValidation rules
|
|
||||||
│ ├── API/Hubs/ # SignalR PrinterHub
|
|
||||||
│ ├── API/Jobs/ # Background sync jobs
|
|
||||||
│ ├── Domain/Entities/ # EF Core entities (Printer, Spool, PrintJob, MaterialBase, etc.)
|
|
||||||
│ ├── Domain/Enums/ # ConnectionType, DataSource, JobStatus, PrinterStatus, QrResourceType
|
|
||||||
│ ├── Domain/Interfaces/ # Service interfaces
|
|
||||||
│ ├── Infrastructure/Data/ # EF DbContext, Configurations, Migrations, SeedData
|
|
||||||
│ ├── Infrastructure/Services/ # MoonrakerClient, CostPerPrint, UsageLog, FilamentUsage, QR
|
|
||||||
│ └── Program.cs # ASP.NET entry point
|
|
||||||
├── cmd/server/main.go # Go entrypoint (new), worker discovery, graceful shutdown
|
|
||||||
├── internal/ # Go backend (new)
|
|
||||||
│ ├── config/config.go # Env vars
|
|
||||||
│ ├── db/db.go # PostgreSQL connection pool (pgx)
|
|
||||||
│ ├── models/models.go # Go domain structs
|
|
||||||
│ ├── router/router.go # Chi HTTP routes
|
|
||||||
│ ├── sse/broadcaster.go # SSE broadcaster
|
|
||||||
│ ├── sse/events.go # SSE event types
|
|
||||||
│ ├── sse/handler.go # SSE HTTP handler
|
|
||||||
│ ├── handlers/ # API handlers (filament, health, material, print_job, printer, usage_log)
|
|
||||||
│ ├── repositories/ # DB access layer
|
|
||||||
│ └── services/ # Business logic + validation
|
|
||||||
├── migrations/ # Go-migrate SQL migrations
|
|
||||||
│ ├── 000001_initial_schema.up.sql
|
|
||||||
│ ├── 000001_initial_schema.down.sql
|
|
||||||
│ ├── 000002_seed_data.up.sql
|
|
||||||
│ └── 000002_seed_data.down.sql
|
|
||||||
├── frontend/ # React frontend (new)
|
|
||||||
│ ├── src/
|
|
||||||
│ │ ├── App.tsx
|
|
||||||
│ │ ├── main.tsx
|
|
||||||
│ │ ├── components/ # ColorSwatch, LoadingSpinner, RecentPrints, SummaryCard
|
|
||||||
│ │ ├── pages/
|
|
||||||
│ │ │ ├── Dashboard.tsx # Main dashboard with summary cards + recent prints
|
|
||||||
│ │ │ └── InventoryPage.tsx # Filament inventory list (table + filters)
|
|
||||||
│ │ ├── services/
|
|
||||||
│ │ │ ├── api.ts # Axios client
|
|
||||||
│ │ │ └── filamentService.ts
|
|
||||||
│ │ ├── stores/ # State stores (WIP)
|
|
||||||
│ │ ├── types/
|
|
||||||
│ │ │ ├── filament.ts
|
|
||||||
│ │ │ └── index.ts
|
|
||||||
│ │ └── hooks/
|
|
||||||
│ ├── Dockerfile + nginx.conf
|
|
||||||
│ └── vite.config.ts, tailwind.config.js
|
|
||||||
├── design/ # UX/design specs + mockup images
|
|
||||||
│ ├── homepage-spec.md
|
|
||||||
│ ├── 01-filament-inventory-list.md
|
|
||||||
│ ├── 02-spool-detail-view.md
|
|
||||||
│ ├── 03-smart-intake-workflow.md
|
|
||||||
│ ├── smart-intake-identify-spec.md
|
|
||||||
│ └── *.jpg / *.png # Mockup images (kiosk + mobile)
|
|
||||||
├── docker-compose.dev.yml
|
|
||||||
└── deploy.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
## Database Schema (PostgreSQL — .NET EF Core Migrations)
|
|
||||||
|
|
||||||
Core entities managed by EF Core with full configurations:
|
|
||||||
- **Printers** — id, name, type (BambuLab/Moonraker), connection_type, status, ip_address, mac_address, ams_count
|
|
||||||
- **AmsUnit / AmsSlot** — Bambu Lab AMS tray tracking
|
|
||||||
- **Spools** — filament inventory with material, color, weight, location, QR support
|
|
||||||
- **MaterialBase / MaterialFinish / MaterialModifier** — material taxonomy
|
|
||||||
- **PrintJobs** — job tracking with status, cost, filament consumption
|
|
||||||
- **UsageLogs** — per-printer filament consumption records
|
|
||||||
- **FilamentUsage** — aggregated per-spool consumption tracking
|
|
||||||
- **FilamentUsageSyncJob** — background Moonraker polling
|
|
||||||
- **MoonrakerPrinterSyncJob** — background printer status sync
|
|
||||||
|
|
||||||
## API Endpoints (.NET)
|
|
||||||
|
|
||||||
| Method | Endpoint | Description |
|
|
||||||
|--------|----------|-------------|
|
|
||||||
| GET | /api/filaments | List filaments (paginated, filterable) |
|
|
||||||
| POST | /api/filaments | Create filament |
|
|
||||||
| GET | /api/filaments/{id} | Get filament detail |
|
|
||||||
| PUT | /api/filaments/{id} | Update filament |
|
|
||||||
| DELETE | /api/filaments/{id} | Delete filament |
|
|
||||||
| GET | /api/spools | List spools |
|
|
||||||
| POST | /api/spools | Create spool |
|
|
||||||
| GET | /api/spools/{id} | Get spool detail |
|
|
||||||
| PUT | /api/spools/{id} | Update spool |
|
|
||||||
| DELETE | /api/spools/{id} | Delete spool |
|
|
||||||
| GET | /api/print-jobs | List print jobs |
|
|
||||||
| POST | /api/print-jobs | Create print job |
|
|
||||||
| GET | /api/print-jobs/{id} | Get print job detail |
|
|
||||||
| GET | /api/printers | List printers |
|
|
||||||
| POST | /api/printers | Register printer |
|
|
||||||
| GET | /api/printers/{id} | Get printer detail |
|
|
||||||
| GET | /api/printers/{id}/costs | Per-print cost summary |
|
|
||||||
| GET | /api/printers/{id}/usage | Filament usage history |
|
|
||||||
| GET | /api/materials/bases | List material bases |
|
|
||||||
| POST | /api/materials/bases | Create material base |
|
|
||||||
| GET | /api/materials/finishes | List material finishes |
|
|
||||||
| POST | /api/materials/finishes | Create material finish |
|
|
||||||
| GET | /api/materials/modifiers | List material modifiers |
|
|
||||||
| POST | /api/materials/modifiers | Create modifier |
|
|
||||||
| GET | /api/materials/lookups | Unified material lookup |
|
|
||||||
| GET | /api/qr/resolve/{code} | QR code resolve |
|
|
||||||
| GET | /api/usage-logs | List usage logs |
|
|
||||||
| POST | /api/usage-logs | Create usage log |
|
|
||||||
|
|
||||||
## CUB-110 Epic Progress (Go + React Rewrite)
|
|
||||||
|
|
||||||
| Sub-task | Title | Status | Agent |
|
|
||||||
|----------|-------|--------|-------|
|
|
||||||
| CUB-111 | Design PostgreSQL schema | Done | Hex |
|
|
||||||
| CUB-112 | Scaffold Go backend | Done | Dex |
|
|
||||||
| CUB-113 | Core CRUD API endpoints | Done | Dex |
|
|
||||||
| CUB-116 | Scaffold React frontend | In Review | Rex |
|
|
||||||
| CUB-117 | Moonraker + MQTT integrations | In Progress | Dex |
|
|
||||||
| CUB-118 | (deprecated → CUB-135 + CUB-136) | — | — |
|
|
||||||
| CUB-130 | Add/Edit Filament form | In Review | Rex |
|
|
||||||
| CUB-131 | Filament Detail page | In Review | Rex |
|
|
||||||
| CUB-132 | Filament Inventory list | Done | Rex |
|
|
||||||
| CUB-133 | Dashboard summary cards | In Review | Rex |
|
|
||||||
| CUB-134 | Printers list page | Todo | Rex |
|
|
||||||
| CUB-135 | Subscribe to SSE in React | In Review | Rex |
|
|
||||||
| CUB-136 | Add SSE endpoint in Go | In Review | Dex |
|
|
||||||
| CUB-128 | Settings page | Todo | — |
|
|
||||||
| CUB-129 | Print Jobs list page | Todo | — |
|
|
||||||
| CUB-114 | Pi 5 kiosk deployment | Todo | — |
|
|
||||||
|
|
||||||
## Active Branches
|
|
||||||
|
|
||||||
| Branch | Agent | Issue | Status |
|
|
||||||
|--------|-------|-------|--------|
|
|
||||||
| `agent/dex/CUB-117-moonraker-mqtt-go` | Dex | CUB-117 | Local commit ready |
|
|
||||||
| `agent/dex/CUB-136-sse-endpoint` | Dex | CUB-136 | PR open |
|
|
||||||
| `agent/rex/CUB-130-filament-form` | Rex | CUB-130 | PR open |
|
|
||||||
| `agent/rex/CUB-131-filament-detail` | Rex | CUB-131 | PR open |
|
|
||||||
| `agent/rex/CUB-133-dashboard-cards` | Rex | CUB-133 | PR open |
|
|
||||||
| `agent/rex/CUB-135-sse-subscribe` | Rex | CUB-135 | PR open |
|
|
||||||
|
|
||||||
## Known Limitations
|
|
||||||
|
|
||||||
- Go rewrite is in progress — backend `internal/` is new Go code, but legacy .NET code still serves endpoints
|
|
||||||
- Kiosk deployment not finalized (CUB-114)
|
|
||||||
- Smart intake workflow is designed but not implemented
|
|
||||||
- MQTT Bambu Lab integration is partially complete (CUB-117)
|
|
||||||
|
|
||||||
## Default Agent Assignments
|
|
||||||
|
|
||||||
| Area | Agent | Notes |
|
|
||||||
|------|-------|-------|
|
|
||||||
| Backend (Go API, Moonraker, MQTT) | Dex | gitea-dex MCP |
|
|
||||||
| Database (PostgreSQL schema, migrations) | Hex | gitea-hex MCP |
|
|
||||||
| Frontend (React, Tailwind) | Rex | gitea-rex MCP |
|
|
||||||
| Design (wireframes, UX) | Sketch | |
|
|
||||||
|
|
||||||
## Getting Started
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd /mnt/ai-storage/projects/Extrudex
|
|
||||||
git checkout dev
|
|
||||||
git pull origin dev
|
|
||||||
|
|
||||||
# Legacy .NET backend
|
|
||||||
cd backend && dotnet run
|
|
||||||
|
|
||||||
# New Go backend
|
|
||||||
go run cmd/server/main.go
|
|
||||||
|
|
||||||
# React frontend
|
|
||||||
cd frontend && npm install && npm run dev
|
|
||||||
|
|
||||||
# Docker
|
|
||||||
docker compose -f docker-compose.dev.yml up --build
|
|
||||||
```
|
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
# Pi 5 Kiosk Setup — Extrudex (Go + React)
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- Raspberry Pi 5 (4 GB or 8 GB)
|
||||||
|
- MicroSD card (32 GB minimum, Class 10+)
|
||||||
|
- HDMI touchscreen display
|
||||||
|
- USB barcode scanner (HID keyboard mode)
|
||||||
|
- Power supply (27W USB-C recommended)
|
||||||
|
|
||||||
|
## One-Line Setup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Install Raspberry Pi OS (64-bit, Desktop)
|
||||||
|
# 2. Enable SSH and VNC
|
||||||
|
# 3. Run the automated bootstrap
|
||||||
|
curl -sSL https://raw.githubusercontent.com/CubeCraft-Creations/Extrudex/dev/scripts/pi-bootstrap.sh | bash
|
||||||
|
```
|
||||||
|
|
||||||
|
Or follow the manual steps below.
|
||||||
|
|
||||||
|
## Manual Setup
|
||||||
|
|
||||||
|
### 1. Install Docker
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -fsSL https://get.docker.com | sh
|
||||||
|
sudo usermod -aG docker pi
|
||||||
|
```
|
||||||
|
|
||||||
|
Log out and back in for group changes to take effect.
|
||||||
|
|
||||||
|
### 2. Clone and deploy
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/pi
|
||||||
|
git clone https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex.git
|
||||||
|
cd Extrudex
|
||||||
|
git checkout dev
|
||||||
|
|
||||||
|
# Run the deploy script
|
||||||
|
chmod +x deploy.sh
|
||||||
|
./deploy.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Verify services
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.dev.yml ps
|
||||||
|
# All three services should be "Up"
|
||||||
|
```
|
||||||
|
|
||||||
|
Check the health endpoint:
|
||||||
|
```bash
|
||||||
|
curl http://localhost:5080/health
|
||||||
|
# Expected: {"status":"ok","db_connected":true,"timestamp":"..."}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Configure kiosk auto-start
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Enable the Docker stack service (starts on boot)
|
||||||
|
sudo cp systemd/extrudex.service /etc/systemd/system/
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable extrudex.service
|
||||||
|
|
||||||
|
# Enable the kiosk service (starts Chromium after Docker stack)
|
||||||
|
sudo cp systemd/extrudex-kiosk.service /etc/systemd/system/
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable extrudex-kiosk.service
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Configure display server
|
||||||
|
|
||||||
|
For Pi 5, Raspberry Pi OS uses Wayland by default. If you encounter
|
||||||
|
X11-specific issues, switch to X11 in raspi-config (Advanced Options →
|
||||||
|
Resolution → X11).
|
||||||
|
|
||||||
|
The kiosk service supports both Wayland and X11 display servers.
|
||||||
|
|
||||||
|
### 6. Touchscreen calibration (if needed)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install calibration tools
|
||||||
|
sudo apt install -y xinput-calibrator
|
||||||
|
|
||||||
|
# Run calibration, note the device ID and parameters
|
||||||
|
xinput_calibrator
|
||||||
|
```
|
||||||
|
|
||||||
|
Add the calibration to `~/.config/labwc/labwc.conf` or `/etc/X11/xorg.conf.d/`
|
||||||
|
as appropriate for your display server.
|
||||||
|
|
||||||
|
## USB Barcode Scanner
|
||||||
|
|
||||||
|
The USB barcode scanner works as a HID keyboard device — it types scanned
|
||||||
|
codes followed by an Enter keypress. No driver configuration is needed.
|
||||||
|
|
||||||
|
On the React frontend, the search input auto-focuses on page load and
|
||||||
|
will capture barcode input immediately. After a touch on another element,
|
||||||
|
tap the search field again to re-focus.
|
||||||
|
|
||||||
|
## Auto-Refresh on Wake
|
||||||
|
|
||||||
|
The React app polls the SSE endpoint every 30 seconds for real-time
|
||||||
|
updates. When the Pi wakes from sleep, the next poll will immediately
|
||||||
|
sync the UI.
|
||||||
|
|
||||||
|
The kiosk service has `Restart=always` and `RestartSec=10`, so Chromium
|
||||||
|
will restart within 10 seconds of any crash or power cycle.
|
||||||
|
|
||||||
|
## Touch Gestures
|
||||||
|
|
||||||
|
Chromium is launched with `--touch-events=enabled` and `--enable-pinch`
|
||||||
|
for native touch gesture support:
|
||||||
|
- **Tap** — click/submit
|
||||||
|
- **Two-finger scroll** — page scrolling
|
||||||
|
- **Pinch** — zoom (disabled in kiosk mode by default; enable if needed)
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Services not starting
|
||||||
|
```bash
|
||||||
|
sudo systemctl status extrudex
|
||||||
|
sudo systemctl status extrudex-kiosk
|
||||||
|
docker compose -f docker-compose.dev.yml logs
|
||||||
|
```
|
||||||
|
|
||||||
|
### Kiosk shows blank page
|
||||||
|
- Ensure Docker stack is running: `docker compose ps`
|
||||||
|
- Check nginx is serving the React build: `curl http://localhost:5081`
|
||||||
|
- Check Chromium logs: `journalctl -u extrudex-kiosk -n 50`
|
||||||
|
|
||||||
|
### Barcode not working
|
||||||
|
- Verify scanner is in HID keyboard mode (most USB scanners default to this)
|
||||||
|
- Open a text field and scan — you should see digits appear
|
||||||
|
- Check with `dmesg | grep -i usb` for device enumeration
|
||||||
|
|
||||||
|
### PostgreSQL connection refused
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.dev.yml restart extrudex-db
|
||||||
|
# Wait 15 seconds, then check health
|
||||||
|
curl http://localhost:5080/health
|
||||||
|
```
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────────────────────────────────────────┐
|
||||||
|
│ Pi 5 (Raspberry Pi OS 64-bit) │
|
||||||
|
│ │
|
||||||
|
│ ┌─────────────┐ ┌──────────┐ ┌─────────┐ │
|
||||||
|
│ │ Chromium │ │ Nginx │ │ Go │ │
|
||||||
|
│ │ Kiosk │→│ (React) │→│ API │ │
|
||||||
|
│ │ :5081 │ │ :5080 │ │ :8080 │ │
|
||||||
|
│ └─────────────┘ └──────────┘ └────┬────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌────────▼────┐ │
|
||||||
|
│ │ PostgreSQL │ │
|
||||||
|
│ │ :5432 │ │
|
||||||
|
│ └─────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────┐ │
|
||||||
|
│ │ USB │ │
|
||||||
|
│ │ Scanner │ → HID keyboard → Browser │
|
||||||
|
│ └──────────┘ │
|
||||||
|
└──────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
+1
-1
@@ -10,7 +10,7 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location /api/ {
|
location /api/ {
|
||||||
proxy_pass http://backend:8080/api/;
|
proxy_pass http://extrudex-api:8080/api/;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection 'upgrade';
|
proxy_set_header Connection 'upgrade';
|
||||||
|
|||||||
+4
-32
@@ -1,29 +1,10 @@
|
|||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
import { BrowserRouter, Routes, Route, NavLink } from 'react-router-dom'
|
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
||||||
import { Box, Printer } from 'lucide-react'
|
import Dashboard from './pages/Dashboard'
|
||||||
import InventoryPage from './pages/InventoryPage'
|
import InventoryPage from './pages/InventoryPage'
|
||||||
import PrintersPage from './pages/PrintersPage'
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
function NavItem({ to, icon: Icon, label }: { to: string; icon: React.ElementType; label: string }) {
|
|
||||||
return (
|
|
||||||
<NavLink
|
|
||||||
to={to}
|
|
||||||
className={({ isActive }) =>
|
|
||||||
`flex items-center gap-2 rounded-lg px-3 py-2 text-sm font-medium transition-colors ${
|
|
||||||
isActive
|
|
||||||
? 'bg-emerald-600/20 text-emerald-300'
|
|
||||||
: 'text-slate-300 hover:bg-slate-700/50 hover:text-slate-100'
|
|
||||||
}`
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<Icon size={16} />
|
|
||||||
<span>{label}</span>
|
|
||||||
</NavLink>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
@@ -32,20 +13,11 @@ export default function App() {
|
|||||||
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20">
|
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20">
|
||||||
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
||||||
<h1 className="text-lg font-semibold">Extrudex</h1>
|
<h1 className="text-lg font-semibold">Extrudex</h1>
|
||||||
<nav className="ml-4 hidden sm:flex items-center gap-1">
|
|
||||||
<NavItem to="/" icon={Box} label="Inventory" />
|
|
||||||
<NavItem to="/printers" icon={Printer} label="Printers" />
|
|
||||||
</nav>
|
|
||||||
</header>
|
</header>
|
||||||
{/* Mobile nav */}
|
|
||||||
<nav className="sm:hidden bg-slate-800 border-b border-slate-700 px-4 py-2 flex items-center gap-1">
|
|
||||||
<NavItem to="/" icon={Box} label="Inventory" />
|
|
||||||
<NavItem to="/printers" icon={Printer} label="Printers" />
|
|
||||||
</nav>
|
|
||||||
<main className="p-4">
|
<main className="p-4">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<InventoryPage />} />
|
<Route path="/" element={<Dashboard />} />
|
||||||
<Route path="/printers" element={<PrintersPage />} />
|
<Route path="/inventory" element={<InventoryPage />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,468 +0,0 @@
|
|||||||
import { useState, useMemo } from 'react'
|
|
||||||
import { useQuery } from '@tanstack/react-query'
|
|
||||||
import {
|
|
||||||
Search,
|
|
||||||
Wifi,
|
|
||||||
WifiOff,
|
|
||||||
HelpCircle,
|
|
||||||
Pencil,
|
|
||||||
Plus,
|
|
||||||
Trash2,
|
|
||||||
AlertTriangle,
|
|
||||||
ChevronLeft,
|
|
||||||
ChevronRight,
|
|
||||||
Server,
|
|
||||||
Radio,
|
|
||||||
ShieldCheck,
|
|
||||||
} from 'lucide-react'
|
|
||||||
import { fetchPrinters } from '../services/printerService'
|
|
||||||
import type { Printer } from '../types/printer'
|
|
||||||
|
|
||||||
const PAGE_SIZE = 20
|
|
||||||
|
|
||||||
type SortField = 'name' | 'printer_type' | 'manufacturer' | 'model'
|
|
||||||
type SortDir = 'asc' | 'desc'
|
|
||||||
|
|
||||||
type ConnStatus = 'online' | 'offline' | 'unknown'
|
|
||||||
|
|
||||||
export default function PrintersPage() {
|
|
||||||
const [search, setSearch] = useState('')
|
|
||||||
const [statusFilter, setStatusFilter] = useState<ConnStatus | ''>('')
|
|
||||||
const [typeFilter, setTypeFilter] = useState('')
|
|
||||||
const [sortBy, setSortBy] = useState<SortField>('name')
|
|
||||||
const [sortDir, setSortDir] = useState<SortDir>('asc')
|
|
||||||
const [page, setPage] = useState(0)
|
|
||||||
const [deleteId, setDeleteId] = useState<number | null>(null)
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: printers,
|
|
||||||
isLoading,
|
|
||||||
error,
|
|
||||||
refetch,
|
|
||||||
} = useQuery({
|
|
||||||
queryKey: ['printers'],
|
|
||||||
queryFn: fetchPrinters,
|
|
||||||
})
|
|
||||||
|
|
||||||
// Derive connection status from backend is_active for now
|
|
||||||
// TODO: replace with real status endpoint / SSE when available
|
|
||||||
const printersWithStatus = useMemo(() => {
|
|
||||||
return (printers ?? []).map((p) => {
|
|
||||||
const status: ConnStatus = p.is_active ? 'online' : 'offline'
|
|
||||||
return { ...p, connection_status: status }
|
|
||||||
})
|
|
||||||
}, [printers])
|
|
||||||
|
|
||||||
// Client-side filter + sort
|
|
||||||
const filtered = useMemo(() => {
|
|
||||||
let list = [...printersWithStatus]
|
|
||||||
|
|
||||||
if (search.trim()) {
|
|
||||||
const q = search.toLowerCase()
|
|
||||||
list = list.filter(
|
|
||||||
(p) =>
|
|
||||||
p.name.toLowerCase().includes(q) ||
|
|
||||||
(p.manufacturer?.toLowerCase().includes(q) ?? false) ||
|
|
||||||
(p.model?.toLowerCase().includes(q) ?? false)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (statusFilter) {
|
|
||||||
list = list.filter((p) => p.connection_status === statusFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeFilter) {
|
|
||||||
list = list.filter((p) => p.printer_type?.name === typeFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
list.sort((a, b) => {
|
|
||||||
const dir = sortDir === 'asc' ? 1 : -1
|
|
||||||
switch (sortBy) {
|
|
||||||
case 'name':
|
|
||||||
return a.name.localeCompare(b.name) * dir
|
|
||||||
case 'printer_type':
|
|
||||||
return (a.printer_type?.name ?? '').localeCompare(b.printer_type?.name ?? '') * dir
|
|
||||||
case 'manufacturer':
|
|
||||||
return (a.manufacturer ?? '').localeCompare(b.manufacturer ?? '') * dir
|
|
||||||
case 'model':
|
|
||||||
return (a.model ?? '').localeCompare(b.model ?? '') * dir
|
|
||||||
default:
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return list
|
|
||||||
}, [printersWithStatus, search, statusFilter, typeFilter, sortBy, sortDir])
|
|
||||||
|
|
||||||
const total = filtered.length
|
|
||||||
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
|
||||||
const pageItems = filtered.slice(page * PAGE_SIZE, (page + 1) * PAGE_SIZE)
|
|
||||||
|
|
||||||
const uniqueTypes = useMemo(() => {
|
|
||||||
const s = new Set<string>()
|
|
||||||
;(printers ?? []).forEach((p) => {
|
|
||||||
if (p.printer_type?.name) s.add(p.printer_type.name)
|
|
||||||
})
|
|
||||||
return Array.from(s).sort()
|
|
||||||
}, [printers])
|
|
||||||
|
|
||||||
const handleSort = (field: SortField) => {
|
|
||||||
if (sortBy === field) {
|
|
||||||
setSortDir((prev) => (prev === 'asc' ? 'desc' : 'asc'))
|
|
||||||
} else {
|
|
||||||
setSortBy(field)
|
|
||||||
setSortDir('asc')
|
|
||||||
}
|
|
||||||
setPage(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleDelete = async (_id: number) => {
|
|
||||||
// await deletePrinter(id)
|
|
||||||
setDeleteId(null)
|
|
||||||
refetch()
|
|
||||||
}
|
|
||||||
|
|
||||||
const SortIndicator = ({ field }: { field: SortField }) => {
|
|
||||||
if (sortBy !== field) return <span className="text-slate-600 ml-1">↕</span>
|
|
||||||
return <span className="text-emerald-400 ml-1">{sortDir === 'asc' ? '↑' : '↓'}</span>
|
|
||||||
}
|
|
||||||
|
|
||||||
const StatusBadge = ({ status }: { status: ConnStatus }) => {
|
|
||||||
if (status === 'online') {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-emerald-900/30 border border-emerald-700 px-2.5 py-1 text-xs font-medium text-emerald-300">
|
|
||||||
<Wifi size={12} /> Online
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (status === 'offline') {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-red-900/30 border border-red-700 px-2.5 py-1 text-xs font-medium text-red-300">
|
|
||||||
<WifiOff size={12} /> Offline
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-slate-700/50 border border-slate-600 px-2.5 py-1 text-xs font-medium text-slate-400">
|
|
||||||
<HelpCircle size={12} /> Unknown
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="space-y-4">
|
|
||||||
{/* Header */}
|
|
||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
|
||||||
<div>
|
|
||||||
<h2 className="text-xl font-bold text-slate-100">Printers</h2>
|
|
||||||
<p className="text-sm text-slate-400">{total} printer(s)</p>
|
|
||||||
</div>
|
|
||||||
<button className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors">
|
|
||||||
<Plus size={16} /> Add Printer
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Filters */}
|
|
||||||
<div className="flex flex-col lg:flex-row gap-3">
|
|
||||||
{/* Search */}
|
|
||||||
<div className="relative flex-1">
|
|
||||||
<Search size={16} className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-400" />
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
placeholder="Search by name, manufacturer, or model…"
|
|
||||||
value={search}
|
|
||||||
onChange={(e) => {
|
|
||||||
setSearch(e.target.value)
|
|
||||||
setPage(0)
|
|
||||||
}}
|
|
||||||
className="w-full rounded-lg bg-slate-800 border border-slate-700 pl-9 pr-3 py-2 text-sm text-slate-100 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Status filter */}
|
|
||||||
<select
|
|
||||||
value={statusFilter}
|
|
||||||
onChange={(e) => {
|
|
||||||
setStatusFilter(e.target.value as ConnStatus | '')
|
|
||||||
setPage(0)
|
|
||||||
}}
|
|
||||||
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
|
|
||||||
>
|
|
||||||
<option value="">All Status</option>
|
|
||||||
<option value="online">Online</option>
|
|
||||||
<option value="offline">Offline</option>
|
|
||||||
<option value="unknown">Unknown</option>
|
|
||||||
</select>
|
|
||||||
|
|
||||||
{/* Type filter */}
|
|
||||||
<select
|
|
||||||
value={typeFilter}
|
|
||||||
onChange={(e) => {
|
|
||||||
setTypeFilter(e.target.value)
|
|
||||||
setPage(0)
|
|
||||||
}}
|
|
||||||
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
|
|
||||||
>
|
|
||||||
<option value="">All Types</option>
|
|
||||||
{uniqueTypes.map((t) => (
|
|
||||||
<option key={t} value={t}>
|
|
||||||
{t}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Loading / Error */}
|
|
||||||
{isLoading && <div className="text-center py-12 text-slate-400">Loading printers…</div>}
|
|
||||||
{error && (
|
|
||||||
<div className="text-center py-12 text-red-400">
|
|
||||||
Failed to load printers.
|
|
||||||
<button onClick={() => refetch()} className="ml-2 underline hover:text-red-300">
|
|
||||||
Retry
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Desktop Table */}
|
|
||||||
{!isLoading && !error && (
|
|
||||||
<>
|
|
||||||
<div className="hidden md:block overflow-x-auto rounded-lg border border-slate-700">
|
|
||||||
<table className="w-full text-sm">
|
|
||||||
<thead className="bg-slate-800 text-slate-300">
|
|
||||||
<tr>
|
|
||||||
<th
|
|
||||||
className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100"
|
|
||||||
onClick={() => handleSort('name')}
|
|
||||||
>
|
|
||||||
Name <SortIndicator field="name" />
|
|
||||||
</th>
|
|
||||||
<th
|
|
||||||
className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100"
|
|
||||||
onClick={() => handleSort('printer_type')}
|
|
||||||
>
|
|
||||||
Type <SortIndicator field="printer_type" />
|
|
||||||
</th>
|
|
||||||
<th
|
|
||||||
className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100"
|
|
||||||
onClick={() => handleSort('manufacturer')}
|
|
||||||
>
|
|
||||||
Manufacturer <SortIndicator field="manufacturer" />
|
|
||||||
</th>
|
|
||||||
<th
|
|
||||||
className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100"
|
|
||||||
onClick={() => handleSort('model')}
|
|
||||||
>
|
|
||||||
Model <SortIndicator field="model" />
|
|
||||||
</th>
|
|
||||||
<th className="px-4 py-3 text-left font-semibold">Connection</th>
|
|
||||||
<th className="px-4 py-3 text-left font-semibold">Moonraker</th>
|
|
||||||
<th className="px-4 py-3 text-left font-semibold">MQTT</th>
|
|
||||||
<th className="px-4 py-3 text-right font-semibold">Actions</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody className="divide-y divide-slate-700">
|
|
||||||
{pageItems.length === 0 && (
|
|
||||||
<tr>
|
|
||||||
<td colSpan={8} className="px-4 py-8 text-center text-slate-500">
|
|
||||||
No printers found.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
)}
|
|
||||||
{pageItems.map((p: Printer & { connection_status: ConnStatus }) => (
|
|
||||||
<tr key={p.id} className="bg-slate-800/50 hover:bg-slate-700/50 transition-colors">
|
|
||||||
<td className="px-4 py-3 font-medium text-slate-100">{p.name}</td>
|
|
||||||
<td className="px-4 py-3 text-slate-300">
|
|
||||||
<span className="inline-flex items-center gap-1.5 rounded-md bg-slate-700/50 px-2 py-0.5 text-xs">
|
|
||||||
{p.printer_type?.name ?? '—'}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-300">{p.manufacturer ?? '—'}</td>
|
|
||||||
<td className="px-4 py-3 text-slate-300">{p.model ?? '—'}</td>
|
|
||||||
<td className="px-4 py-3">
|
|
||||||
<StatusBadge status={p.connection_status} />
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-slate-300">
|
|
||||||
{p.moonraker_url ? (
|
|
||||||
<span className="inline-flex items-center gap-1.5 text-xs text-blue-300">
|
|
||||||
<Server size={12} />
|
|
||||||
<a
|
|
||||||
href={p.moonraker_url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="hover:underline truncate max-w-[160px] inline-block"
|
|
||||||
title={p.moonraker_url}
|
|
||||||
>
|
|
||||||
{p.moonraker_url}
|
|
||||||
</a>
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span className="text-slate-500 text-xs">—</span>
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3">
|
|
||||||
{p.mqtt_broker_host ? (
|
|
||||||
<span className="inline-flex items-center gap-1 text-xs text-slate-300">
|
|
||||||
<Radio size={12} className="text-emerald-400" />
|
|
||||||
{p.mqtt_topic_prefix ? `${p.mqtt_topic_prefix} @ ` : ''}
|
|
||||||
{p.mqtt_broker_host}
|
|
||||||
{p.mqtt_tls_enabled && (
|
|
||||||
<span title="TLS enabled">
|
|
||||||
<ShieldCheck size={12} className="text-emerald-400" />
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span className="text-slate-500 text-xs">—</span>
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
<td className="px-4 py-3 text-right">
|
|
||||||
<div className="flex items-center justify-end gap-2">
|
|
||||||
<button
|
|
||||||
className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-blue-400 transition-colors"
|
|
||||||
title="Edit"
|
|
||||||
>
|
|
||||||
<Pencil size={14} />
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setDeleteId(p.id)}
|
|
||||||
className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-red-400 transition-colors"
|
|
||||||
title="Delete"
|
|
||||||
>
|
|
||||||
<Trash2 size={14} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Mobile Cards */}
|
|
||||||
<div className="md:hidden space-y-3">
|
|
||||||
{pageItems.length === 0 && (
|
|
||||||
<div className="text-center py-12 text-slate-500">No printers found.</div>
|
|
||||||
)}
|
|
||||||
{pageItems.map((p: Printer & { connection_status: ConnStatus }) => (
|
|
||||||
<div
|
|
||||||
key={p.id}
|
|
||||||
className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3"
|
|
||||||
>
|
|
||||||
<div className="flex items-start justify-between">
|
|
||||||
<div>
|
|
||||||
<div className="font-semibold text-slate-100">{p.name}</div>
|
|
||||||
<div className="text-xs text-slate-400 mt-0.5">
|
|
||||||
{p.printer_type?.name ?? '—'} · {p.manufacturer ?? '—'} {p.model ?? ''}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<StatusBadge status={p.connection_status} />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Moonraker */}
|
|
||||||
{p.moonraker_url && (
|
|
||||||
<div className="flex items-center gap-2 text-sm text-slate-300">
|
|
||||||
<Server size={14} className="text-blue-400 shrink-0" />
|
|
||||||
<a
|
|
||||||
href={p.moonraker_url}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="text-blue-300 hover:underline truncate"
|
|
||||||
>
|
|
||||||
{p.moonraker_url}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* MQTT */}
|
|
||||||
{p.mqtt_broker_host && (
|
|
||||||
<div className="flex items-center gap-2 text-sm text-slate-300">
|
|
||||||
<Radio size={14} className="text-emerald-400 shrink-0" />
|
|
||||||
<span className="truncate">
|
|
||||||
{p.mqtt_topic_prefix ? `${p.mqtt_topic_prefix} @ ` : ''}
|
|
||||||
{p.mqtt_broker_host}
|
|
||||||
{p.mqtt_tls_enabled && (
|
|
||||||
<span title="TLS enabled">
|
|
||||||
<ShieldCheck size={14} className="text-emerald-400 inline ml-1" />
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Actions */}
|
|
||||||
<div className="flex items-center justify-end gap-2 pt-1">
|
|
||||||
<button className="flex items-center gap-1 rounded-md bg-slate-700 px-3 py-1.5 text-xs font-medium text-slate-200 hover:bg-slate-600">
|
|
||||||
<Pencil size={12} /> Edit
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => setDeleteId(p.id)}
|
|
||||||
className="flex items-center gap-1 rounded-md bg-red-900/30 border border-red-700 px-3 py-1.5 text-xs font-medium text-red-300 hover:bg-red-900/50"
|
|
||||||
>
|
|
||||||
<Trash2 size={12} /> Delete
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Pagination */}
|
|
||||||
<div className="flex items-center justify-between pt-2">
|
|
||||||
<span className="text-sm text-slate-400">
|
|
||||||
Showing {page * PAGE_SIZE + 1}–{Math.min((page + 1) * PAGE_SIZE, total)} of {total}
|
|
||||||
</span>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<button
|
|
||||||
onClick={() => setPage((p) => Math.max(0, p - 1))}
|
|
||||||
disabled={page === 0}
|
|
||||||
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
<ChevronLeft size={16} />
|
|
||||||
</button>
|
|
||||||
<span className="text-sm text-slate-300 tabular-nums">
|
|
||||||
{page + 1} / {totalPages}
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
onClick={() => setPage((p) => Math.min(totalPages - 1, p + 1))}
|
|
||||||
disabled={page >= totalPages - 1}
|
|
||||||
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
|
|
||||||
>
|
|
||||||
<ChevronRight size={16} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Delete confirmation modal */}
|
|
||||||
{deleteId !== null && (
|
|
||||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
|
|
||||||
<div className="w-full max-w-sm rounded-xl bg-slate-800 border border-slate-700 p-6 shadow-2xl space-y-4">
|
|
||||||
<div className="flex items-center gap-3">
|
|
||||||
<div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-900/30">
|
|
||||||
<AlertTriangle size={20} className="text-red-400" />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3 className="text-lg font-semibold text-slate-100">Delete Printer?</h3>
|
|
||||||
<p className="text-sm text-slate-400">This action cannot be undone.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex justify-end gap-3">
|
|
||||||
<button
|
|
||||||
onClick={() => setDeleteId(null)}
|
|
||||||
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
onClick={() => handleDelete(deleteId)}
|
|
||||||
className="rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-500 transition-colors"
|
|
||||||
>
|
|
||||||
Delete
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import axios from 'axios'
|
|
||||||
import type { Printer } from '../types/printer'
|
|
||||||
|
|
||||||
const API_BASE = '/api'
|
|
||||||
|
|
||||||
export async function fetchPrinters(): Promise<Printer[]> {
|
|
||||||
const res = await axios.get<{ data: Printer[] }>(`${API_BASE}/printers`)
|
|
||||||
return res.data.data
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function deletePrinter(id: number): Promise<void> {
|
|
||||||
await axios.delete(`${API_BASE}/printers/${id}`)
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
// Extrudex printer domain types
|
|
||||||
|
|
||||||
export interface PrinterType {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
created_at: string
|
|
||||||
updated_at: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Printer {
|
|
||||||
id: number
|
|
||||||
name: string
|
|
||||||
printer_type_id: number
|
|
||||||
printer_type?: PrinterType
|
|
||||||
manufacturer?: string
|
|
||||||
model?: string
|
|
||||||
moonraker_url?: string
|
|
||||||
moonraker_api_key?: string
|
|
||||||
mqtt_broker_host?: string
|
|
||||||
mqtt_topic_prefix?: string
|
|
||||||
mqtt_tls_enabled: boolean
|
|
||||||
is_active: boolean
|
|
||||||
connection_status?: 'online' | 'offline' | 'unknown'
|
|
||||||
created_at: string
|
|
||||||
updated_at: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ListResponse<T> {
|
|
||||||
data: T[]
|
|
||||||
total: number
|
|
||||||
limit: number
|
|
||||||
offset: number
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Kiosk (Chromium, Go + React frontend)
|
||||||
|
After=network-online.target extrudex.service
|
||||||
|
Requires=extrudex.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=pi
|
||||||
|
Group=pi
|
||||||
|
Environment=DISPLAY=:0
|
||||||
|
Environment=XAUTHORITY=/home/pi/.Xauthority
|
||||||
|
WorkingDirectory=/home/pi
|
||||||
|
|
||||||
|
ExecStart=/usr/bin/chromium-browser \
|
||||||
|
--no-first-run \
|
||||||
|
--no-default-browser-check \
|
||||||
|
--autoplay-policy=no-user-gesture-required \
|
||||||
|
--disable-infobars \
|
||||||
|
--disable-window-activation \
|
||||||
|
--disable-full-screen-modal \
|
||||||
|
--kiosk http://localhost:5081 \
|
||||||
|
--disable-features=TranslateUI \
|
||||||
|
--touch-events=enabled \
|
||||||
|
--enable-pinch
|
||||||
|
|
||||||
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
|
||||||
|
# Touchscreen / kiosk
|
||||||
|
Environment=QT_QPA_PLATFORM=wayland
|
||||||
|
Environment=QT_WAYLAND_SHELL_INTEGRATION=wayland
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Kiosk Session (user-level, seat %i)
|
||||||
|
After=graphical-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
Environment=DISPLAY=:0
|
||||||
|
ExecStart=/bin/true
|
||||||
|
Restart=on-failure
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=graphical-session.target
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Docker Compose Stack (Go + React)
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Requires=docker.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
WorkingDirectory=/home/pi/extrudex
|
||||||
|
ExecStart=/usr/bin/docker compose -f docker-compose.dev.yml up -d
|
||||||
|
ExecStop=/usr/bin/docker compose -f docker-compose.dev.yml down
|
||||||
|
TimeoutStartSec=120
|
||||||
|
TimeoutStopSec=120
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Reference in New Issue
Block a user