Compare commits
5 Commits
32798fbf14
...
agent/pip/
| Author | SHA1 | Date | |
|---|---|---|---|
| a1d47f2536 | |||
| 10c9340e74 | |||
| ffff4213b6 | |||
| f1614029b5 | |||
| 1109d1dd2f |
19
deploy.sh
19
deploy.sh
@@ -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
|
||||||
|
|
||||||
|
|||||||
168
docs/PI-KIOSK-SETUP.md
Normal file
168
docs/PI-KIOSK-SETUP.md
Normal file
@@ -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 │
|
||||||
|
│ └──────────┘ │
|
||||||
|
└──────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
@@ -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';
|
||||||
|
|||||||
@@ -1,14 +1,27 @@
|
|||||||
import { Routes, Route } from 'react-router-dom'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
|
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
||||||
import Dashboard from './pages/Dashboard'
|
import Dashboard from './pages/Dashboard'
|
||||||
|
import InventoryPage from './pages/InventoryPage'
|
||||||
|
|
||||||
function App() {
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen bg-slate-900">
|
<QueryClientProvider client={queryClient}>
|
||||||
<Routes>
|
<BrowserRouter>
|
||||||
<Route path="/" element={<Dashboard />} />
|
<div className="min-h-screen bg-slate-900 text-slate-50">
|
||||||
</Routes>
|
<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>
|
<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>
|
||||||
|
</header>
|
||||||
|
<main className="p-4">
|
||||||
|
<Routes>
|
||||||
|
<Route path="/" element={<Dashboard />} />
|
||||||
|
<Route path="/inventory" element={<InventoryPage />} />
|
||||||
|
</Routes>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</BrowserRouter>
|
||||||
|
</QueryClientProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default App
|
|
||||||
|
|||||||
18
frontend/src/components/ColorSwatch.tsx
Normal file
18
frontend/src/components/ColorSwatch.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
interface ColorSwatchProps {
|
||||||
|
colorHex: string
|
||||||
|
size?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ColorSwatch({ colorHex, size = 24 }: ColorSwatchProps) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="rounded-full border border-slate-600 shadow-sm inline-block"
|
||||||
|
style={{
|
||||||
|
backgroundColor: colorHex.startsWith('#') ? colorHex : `#${colorHex}`,
|
||||||
|
width: size,
|
||||||
|
height: size,
|
||||||
|
}}
|
||||||
|
title={colorHex}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
339
frontend/src/pages/InventoryPage.tsx
Normal file
339
frontend/src/pages/InventoryPage.tsx
Normal file
@@ -0,0 +1,339 @@
|
|||||||
|
import { useState, useMemo } from 'react'
|
||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { Search, Filter, ChevronLeft, ChevronRight, Trash2, Pencil, Plus, AlertTriangle } from 'lucide-react'
|
||||||
|
import ColorSwatch from '../components/ColorSwatch'
|
||||||
|
import { fetchFilaments, deleteFilament } from '../services/filamentService'
|
||||||
|
import type { FilamentSpool, FilamentFilter } from '../types/filament'
|
||||||
|
|
||||||
|
const PAGE_SIZE = 20
|
||||||
|
|
||||||
|
type SortField = 'name' | 'remaining_grams' | 'cost_usd'
|
||||||
|
type SortDir = 'asc' | 'desc'
|
||||||
|
|
||||||
|
export default function InventoryPage() {
|
||||||
|
const [search, setSearch] = useState('')
|
||||||
|
const [material, setMaterial] = useState('')
|
||||||
|
const [finish, setFinish] = useState('')
|
||||||
|
const [lowStockOnly, setLowStockOnly] = useState(false)
|
||||||
|
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 filter: FilamentFilter = useMemo(() => ({
|
||||||
|
material: material || undefined,
|
||||||
|
finish: finish || undefined,
|
||||||
|
low_stock: lowStockOnly,
|
||||||
|
sort_by: sortBy,
|
||||||
|
sort_dir: sortDir,
|
||||||
|
limit: PAGE_SIZE,
|
||||||
|
offset: page * PAGE_SIZE,
|
||||||
|
}), [material, finish, lowStockOnly, sortBy, sortDir, page])
|
||||||
|
|
||||||
|
const { data, isLoading, error, refetch } = useQuery({
|
||||||
|
queryKey: ['filaments', filter],
|
||||||
|
queryFn: () => fetchFilaments(filter),
|
||||||
|
})
|
||||||
|
|
||||||
|
const filaments = data?.data ?? []
|
||||||
|
const total = data?.total ?? 0
|
||||||
|
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
||||||
|
|
||||||
|
// Client-side search filter (name/barcode) since backend may not support it yet.
|
||||||
|
const filtered = useMemo(() => {
|
||||||
|
if (!search.trim()) return filaments
|
||||||
|
const q = search.toLowerCase()
|
||||||
|
return filaments.filter(
|
||||||
|
(f: FilamentSpool) =>
|
||||||
|
f.name.toLowerCase().includes(q) ||
|
||||||
|
(f.barcode && f.barcode.toLowerCase().includes(q))
|
||||||
|
)
|
||||||
|
}, [filaments, search])
|
||||||
|
|
||||||
|
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 deleteFilament(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>
|
||||||
|
}
|
||||||
|
|
||||||
|
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">Filament Inventory</h2>
|
||||||
|
<p className="text-sm text-slate-400">{total} spool(s) total</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 Spool
|
||||||
|
</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 or barcode…"
|
||||||
|
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>
|
||||||
|
|
||||||
|
{/* Material filter */}
|
||||||
|
<select
|
||||||
|
value={material}
|
||||||
|
onChange={e => { setMaterial(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 Materials</option>
|
||||||
|
<option value="PLA">PLA</option>
|
||||||
|
<option value="PETG">PETG</option>
|
||||||
|
<option value="ABS">ABS</option>
|
||||||
|
<option value="TPU">TPU</option>
|
||||||
|
<option value="ASA">ASA</option>
|
||||||
|
<option value="Nylon">Nylon</option>
|
||||||
|
<option value="PC">PC</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
{/* Finish filter */}
|
||||||
|
<select
|
||||||
|
value={finish}
|
||||||
|
onChange={e => { setFinish(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 Finishes</option>
|
||||||
|
<option value="Basic">Basic</option>
|
||||||
|
<option value="Silk">Silk</option>
|
||||||
|
<option value="Matte">Matte</option>
|
||||||
|
<option value="Glossy">Glossy</option>
|
||||||
|
<option value="Wood">Wood</option>
|
||||||
|
<option value="Marble">Marble</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
{/* Low stock toggle */}
|
||||||
|
<label className="inline-flex items-center gap-2 rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 cursor-pointer select-none hover:bg-slate-750">
|
||||||
|
<Filter size={14} className="text-amber-400" />
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={lowStockOnly}
|
||||||
|
onChange={e => { setLowStockOnly(e.target.checked); setPage(0) }}
|
||||||
|
className="accent-amber-500"
|
||||||
|
/>
|
||||||
|
Low Stock Only
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Loading / Error */}
|
||||||
|
{isLoading && (
|
||||||
|
<div className="text-center py-12 text-slate-400">Loading spools…</div>
|
||||||
|
)}
|
||||||
|
{error && (
|
||||||
|
<div className="text-center py-12 text-red-400">
|
||||||
|
Failed to load inventory.
|
||||||
|
<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">Material</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Finish</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Color</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('remaining_grams')}>
|
||||||
|
Remaining <SortIndicator field="remaining_grams" />
|
||||||
|
</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('cost_usd')}>
|
||||||
|
Cost <SortIndicator field="cost_usd" />
|
||||||
|
</th>
|
||||||
|
<th className="px-4 py-3 text-center font-semibold">Status</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold">Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-slate-700">
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<tr>
|
||||||
|
<td colSpan={8} className="px-4 py-8 text-center text-slate-500">No spools found.</td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
|
{filtered.map((spool: FilamentSpool) => {
|
||||||
|
const isLow = spool.remaining_grams <= spool.low_stock_threshold_grams
|
||||||
|
return (
|
||||||
|
<tr key={spool.id} className={`${isLow ? 'bg-red-900/20' : 'bg-slate-800/50'} hover:bg-slate-700/50 transition-colors`}>
|
||||||
|
<td className="px-4 py-3 font-medium text-slate-100">{spool.name}</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">{spool.material_base?.name ?? '—'}</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">{spool.material_finish?.name ?? '—'}</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ColorSwatch colorHex={spool.color_hex} size={20} />
|
||||||
|
<span className="text-xs text-slate-400 uppercase">{spool.color_hex}</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-right tabular-nums text-slate-200">{spool.remaining_grams.toLocaleString()} g</td>
|
||||||
|
<td className="px-4 py-3 text-right tabular-nums text-slate-300">{spool.cost_usd != null ? `$${spool.cost_usd.toFixed(2)}` : '—'}</td>
|
||||||
|
<td className="px-4 py-3 text-center">
|
||||||
|
{isLow ? (
|
||||||
|
<span className="inline-flex items-center gap-1 rounded-full bg-red-900/50 border border-red-700 px-2 py-0.5 text-xs font-medium text-red-300">
|
||||||
|
<AlertTriangle size={12} /> Low
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center rounded-full bg-emerald-900/30 border border-emerald-700 px-2 py-0.5 text-xs font-medium text-emerald-300">OK</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(spool.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">
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<div className="text-center py-12 text-slate-500">No spools found.</div>
|
||||||
|
)}
|
||||||
|
{filtered.map((spool: FilamentSpool) => {
|
||||||
|
const isLow = spool.remaining_grams <= spool.low_stock_threshold_grams
|
||||||
|
return (
|
||||||
|
<div key={spool.id} className={`rounded-lg border ${isLow ? 'border-red-700 bg-red-900/10' : 'border-slate-700 bg-slate-800'} p-4 space-y-2`}>
|
||||||
|
<div className="flex items-start justify-between">
|
||||||
|
<div>
|
||||||
|
<div className="font-semibold text-slate-100">{spool.name}</div>
|
||||||
|
<div className="text-xs text-slate-400 mt-0.5">{spool.material_base?.name ?? '—'} · {spool.material_finish?.name ?? '—'}</div>
|
||||||
|
</div>
|
||||||
|
{isLow ? (
|
||||||
|
<span className="inline-flex items-center gap-1 rounded-full bg-red-900/50 border border-red-700 px-2 py-0.5 text-xs font-medium text-red-300">
|
||||||
|
<AlertTriangle size={12} /> Low
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center rounded-full bg-emerald-900/30 border border-emerald-700 px-2 py-0.5 text-xs font-medium text-emerald-300">OK</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-3 text-sm">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ColorSwatch colorHex={spool.color_hex} size={20} />
|
||||||
|
<span className="text-slate-400 uppercase text-xs">{spool.color_hex}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center justify-between text-sm">
|
||||||
|
<span className="text-slate-400">Remaining: <span className="text-slate-200 font-medium tabular-nums">{spool.remaining_grams.toLocaleString()} g</span></span>
|
||||||
|
<span className="text-slate-400">{spool.cost_usd != null ? `$${spool.cost_usd.toFixed(2)}` : '—'}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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(spool.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 Spool?</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>
|
||||||
|
)
|
||||||
|
}
|
||||||
24
frontend/src/services/filamentService.ts
Normal file
24
frontend/src/services/filamentService.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { FilamentSpool, ListResponse, FilamentFilter } from '../types/filament'
|
||||||
|
|
||||||
|
const API_BASE = '/api'
|
||||||
|
|
||||||
|
export async function fetchFilaments(filter: FilamentFilter): Promise<ListResponse<FilamentSpool>> {
|
||||||
|
const params = new URLSearchParams()
|
||||||
|
if (filter.material) params.set('material', filter.material)
|
||||||
|
if (filter.finish) params.set('finish', filter.finish)
|
||||||
|
if (filter.color) params.set('color', filter.color)
|
||||||
|
if (filter.low_stock) params.set('low_stock', 'true')
|
||||||
|
if (filter.search) params.set('search', filter.search)
|
||||||
|
if (filter.sort_by) params.set('sort_by', filter.sort_by)
|
||||||
|
if (filter.sort_dir) params.set('sort_dir', filter.sort_dir)
|
||||||
|
if (filter.limit !== undefined) params.set('limit', String(filter.limit))
|
||||||
|
if (filter.offset !== undefined) params.set('offset', String(filter.offset))
|
||||||
|
|
||||||
|
const res = await axios.get<ListResponse<FilamentSpool>>(`${API_BASE}/filaments?${params.toString()}`)
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteFilament(id: number): Promise<void> {
|
||||||
|
await axios.delete(`${API_BASE}/filaments/${id}`)
|
||||||
|
}
|
||||||
72
frontend/src/types/filament.ts
Normal file
72
frontend/src/types/filament.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
// Extrudex domain types
|
||||||
|
|
||||||
|
export interface MaterialBase {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
density_g_cm3: number
|
||||||
|
extrusion_temp_min?: number
|
||||||
|
extrusion_temp_max?: number
|
||||||
|
bed_temp_min?: number
|
||||||
|
bed_temp_max?: number
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MaterialFinish {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
description?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MaterialModifier {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
description?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FilamentSpool {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
material_base_id: number
|
||||||
|
material_base?: MaterialBase
|
||||||
|
material_finish_id: number
|
||||||
|
material_finish?: MaterialFinish
|
||||||
|
material_modifier_id?: number
|
||||||
|
material_modifier?: MaterialModifier
|
||||||
|
color_hex: string
|
||||||
|
brand?: string
|
||||||
|
diameter_mm: number
|
||||||
|
initial_grams: number
|
||||||
|
remaining_grams: number
|
||||||
|
spool_weight_grams?: number
|
||||||
|
cost_usd?: number
|
||||||
|
low_stock_threshold_grams: number
|
||||||
|
notes?: string
|
||||||
|
barcode?: string
|
||||||
|
deleted_at?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ListResponse<T> {
|
||||||
|
data: T[]
|
||||||
|
total: number
|
||||||
|
limit: number
|
||||||
|
offset: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FilamentFilter {
|
||||||
|
material?: string
|
||||||
|
finish?: string
|
||||||
|
color?: string
|
||||||
|
low_stock?: boolean
|
||||||
|
search?: string
|
||||||
|
sort_by?: string
|
||||||
|
sort_dir?: 'asc' | 'desc'
|
||||||
|
limit?: number
|
||||||
|
offset?: number
|
||||||
|
}
|
||||||
36
systemd/extrudex-kiosk.service
Normal file
36
systemd/extrudex-kiosk.service
Normal file
@@ -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
|
||||||
12
systemd/extrudex-kiosk@.service
Normal file
12
systemd/extrudex-kiosk@.service
Normal file
@@ -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
|
||||||
16
systemd/extrudex.service
Normal file
16
systemd/extrudex.service
Normal file
@@ -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