Compare commits

..

1 Commits

Author SHA1 Message Date
Dex 368d070174 CUB-134: Build printers list page
Dev Build / build-test (pull_request) Failing after 11m16s
2026-05-26 14:15:25 +00:00
5 changed files with 313 additions and 324 deletions
+13 -34
View File
@@ -1,8 +1,8 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { BrowserRouter, Routes, Route, NavLink } from 'react-router-dom'
import { Package, Settings } from 'lucide-react'
import { BrowserRouter, Routes, Route } from 'react-router-dom'
import Dashboard from './pages/Dashboard'
import InventoryPage from './pages/InventoryPage'
import SettingsPage from './pages/SettingsPage'
import PrintersPage from './pages/PrintersPage'
const queryClient = new QueryClient()
@@ -12,42 +12,21 @@ export default function App() {
<BrowserRouter>
<div className="min-h-screen bg-slate-900 text-slate-50">
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-4 sticky top-0 z-20">
<div className="flex items-center gap-3 mr-4">
<a href="/" className="flex items-center gap-3 no-underline">
<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>
</div>
<nav className="flex items-center gap-1">
<NavLink
to="/"
end
className={({ isActive }) =>
`inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-sm font-medium transition-colors ${
isActive
? 'bg-emerald-600/20 text-emerald-400'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-700'
}`
}
>
<Package size={15} /> Inventory
</NavLink>
<NavLink
to="/settings"
className={({ isActive }) =>
`inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-sm font-medium transition-colors ${
isActive
? 'bg-emerald-600/20 text-emerald-400'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-700'
}`
}
>
<Settings size={15} /> Settings
</NavLink>
<h1 className="text-lg font-semibold text-slate-50">Extrudex</h1>
</a>
<nav className="flex items-center gap-1 ml-2">
<a href="/" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Dashboard</a>
<a href="/inventory" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Inventory</a>
<a href="/printers" className="px-3 py-1.5 rounded-md text-sm text-slate-300 hover:text-slate-100 hover:bg-slate-700 transition-colors">Printers</a>
</nav>
</header>
<main className="p-4">
<Routes>
<Route path="/" element={<InventoryPage />} />
<Route path="/settings" element={<SettingsPage />} />
<Route path="/" element={<Dashboard />} />
<Route path="/inventory" element={<InventoryPage />} />
<Route path="/printers" element={<PrintersPage />} />
</Routes>
</main>
</div>
+262
View File
@@ -0,0 +1,262 @@
import { useQuery } from '@tanstack/react-query'
import { Printer, Wifi, WifiOff, HelpCircle, Plus, Globe, Radio } from 'lucide-react'
import { fetchPrinters } from '../services/printerService'
import LoadingSpinner from '../components/LoadingSpinner'
import type { Printer as PrinterType, ConnectionStatus } from '../types/printer'
function getConnectionStatus(printer: PrinterType): ConnectionStatus {
if (!printer.is_active) return 'offline'
if (printer.moonraker_url || printer.mqtt_broker_host) return 'online'
return 'unknown'
}
const statusConfig: Record<ConnectionStatus, { icon: typeof Wifi; label: string; className: string }> = {
online: {
icon: Wifi,
label: 'Online',
className: 'bg-emerald-900/30 border-emerald-700 text-emerald-300',
},
offline: {
icon: WifiOff,
label: 'Offline',
className: 'bg-red-900/30 border-red-700 text-red-300',
},
unknown: {
icon: HelpCircle,
label: 'Unknown',
className: 'bg-slate-700/50 border-slate-600 text-slate-400',
},
}
export default function PrintersPage() {
const { data: printers, isLoading, error, refetch } = useQuery({
queryKey: ['printers'],
queryFn: fetchPrinters,
})
const count = printers?.length ?? 0
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">{count} printer(s) in fleet</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>
{/* Loading */}
{isLoading && (
<div className="flex items-center justify-center py-16">
<LoadingSpinner />
</div>
)}
{/* Error */}
{error && (
<div className="rounded-lg border border-red-700 bg-red-900/20 p-6 text-center">
<p className="text-red-400 mb-2">Failed to load printers.</p>
<button
onClick={() => refetch()}
className="text-sm text-red-300 underline hover:text-red-200"
>
Retry
</button>
</div>
)}
{/* Empty */}
{!isLoading && !error && printers?.length === 0 && (
<div className="rounded-lg border border-slate-700 bg-slate-800 p-12 text-center">
<Printer size={40} className="mx-auto mb-3 text-slate-500" />
<p className="text-slate-400">No printers found.</p>
<p className="text-sm text-slate-500 mt-1">
Add a printer to start monitoring your fleet.
</p>
</div>
)}
{/* Desktop Table */}
{!isLoading && !error && (printers?.length ?? 0) > 0 && (
<>
<div className="hidden lg: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">Name</th>
<th className="px-4 py-3 text-left font-semibold">Type</th>
<th className="px-4 py-3 text-left font-semibold">Manufacturer</th>
<th className="px-4 py-3 text-left font-semibold">Model</th>
<th className="px-4 py-3 text-center font-semibold">Status</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>
</tr>
</thead>
<tbody className="divide-y divide-slate-700">
{printers!.map((printer) => {
const status = getConnectionStatus(printer)
const StatusIcon = statusConfig[status].icon
return (
<tr
key={printer.id}
className="bg-slate-800/50 hover:bg-slate-700/50 transition-colors"
>
<td className="px-4 py-3 font-medium text-slate-100">
{printer.name}
</td>
<td className="px-4 py-3 text-slate-300">
{printer.printer_type?.name ?? '—'}
</td>
<td className="px-4 py-3 text-slate-300">
{printer.manufacturer || '—'}
</td>
<td className="px-4 py-3 text-slate-300">
{printer.model || '—'}
</td>
<td className="px-4 py-3 text-center">
<span
className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-0.5 text-xs font-medium ${statusConfig[status].className}`}
>
<StatusIcon size={12} />
{statusConfig[status].label}
</span>
</td>
<td className="px-4 py-3">
{printer.moonraker_url ? (
<a
href={printer.moonraker_url}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1.5 text-sky-400 hover:text-sky-300 text-xs truncate max-w-[180px]"
title={printer.moonraker_url}
>
<Globe size={12} className="shrink-0" />
{printer.moonraker_url}
</a>
) : (
<span className="text-slate-500 text-xs"></span>
)}
</td>
<td className="px-4 py-3">
{printer.mqtt_broker_host ? (
<div className="space-y-0.5">
<div className="inline-flex items-center gap-1.5 text-xs text-slate-300">
<Radio size={12} className="shrink-0 text-amber-400" />
<span className="truncate max-w-[140px]" title={printer.mqtt_broker_host}>
{printer.mqtt_broker_host}
</span>
</div>
{printer.mqtt_topic_prefix && (
<div className="text-xs text-slate-500 ml-[20px] truncate max-w-[140px]" title={printer.mqtt_topic_prefix}>
topic: {printer.mqtt_topic_prefix}
</div>
)}
<div className="text-xs text-slate-500 ml-[20px]">
TLS: {printer.mqtt_tls_enabled ? 'on' : 'off'}
</div>
</div>
) : (
<span className="text-slate-500 text-xs"></span>
)}
</td>
</tr>
)
})}
</tbody>
</table>
</div>
{/* Mobile / Tablet Cards */}
<div className="lg:hidden space-y-3">
{printers!.map((printer) => {
const status = getConnectionStatus(printer)
const StatusIcon = statusConfig[status].icon
return (
<div
key={printer.id}
className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3"
>
{/* Top row: name + status */}
<div className="flex items-start justify-between gap-3">
<div className="min-w-0">
<div className="font-semibold text-slate-100 truncate">
{printer.name}
</div>
<div className="text-xs text-slate-400 mt-0.5">
{[
printer.printer_type?.name,
printer.manufacturer,
printer.model,
]
.filter(Boolean)
.join(' · ') || 'No details'}
</div>
</div>
<span
className={`inline-flex items-center gap-1.5 rounded-full border px-2.5 py-0.5 text-xs font-medium shrink-0 ${statusConfig[status].className}`}
>
<StatusIcon size={12} />
{statusConfig[status].label}
</span>
</div>
{/* Connection details */}
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
{/* Moonraker */}
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
<Globe size={12} />
Moonraker
</div>
{printer.moonraker_url ? (
<a
href={printer.moonraker_url}
target="_blank"
rel="noopener noreferrer"
className="text-xs text-sky-400 hover:text-sky-300 break-all"
>
{printer.moonraker_url}
</a>
) : (
<span className="text-xs text-slate-500">Not configured</span>
)}
</div>
{/* MQTT */}
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
<Radio size={12} />
MQTT
</div>
{printer.mqtt_broker_host ? (
<div className="space-y-0.5 text-xs text-slate-300">
<div className="truncate" title={printer.mqtt_broker_host}>
{printer.mqtt_broker_host}
</div>
{printer.mqtt_topic_prefix && (
<div className="text-slate-500 truncate" title={printer.mqtt_topic_prefix}>
topic: {printer.mqtt_topic_prefix}
</div>
)}
<div className="text-slate-500">
TLS: {printer.mqtt_tls_enabled ? 'on' : 'off'}
</div>
</div>
) : (
<span className="text-xs text-slate-500">Not configured</span>
)}
</div>
</div>
</div>
)
})}
</div>
</>
)}
</div>
)
}
-290
View File
@@ -1,290 +0,0 @@
import { useState } from 'react'
import { Save, Wifi, WifiOff, Sun, Moon, AlertCircle, CheckCircle2 } from 'lucide-react'
// TODO: Replace with API calls to GET/PUT /api/settings once Dex implements the endpoint
const DEFAULT_SETTINGS = {
lowStockThresholdGrams: 100,
filamentCrossSectionMm2: 2.405, // π × (0.875mm)² — standard 1.75mm filament
currency: 'USD',
theme: 'dark' as 'dark' | 'light' | 'system',
}
const CURRENCIES = ['USD', 'EUR', 'GBP', 'CAD', 'AUD', 'JPY']
type ConnectionStatus = 'idle' | 'testing' | 'ok' | 'error'
interface PrinterConfig {
name: string
type: 'bambu' | 'moonraker'
host: string
}
// TODO: Load from GET /api/printers once Dex implements the endpoint
const MOCK_PRINTERS: PrinterConfig[] = [
{ name: 'Bambu X1C #1', type: 'bambu', host: '192.168.1.100' },
{ name: 'Bambu X1C #2', type: 'bambu', host: '192.168.1.101' },
{ name: 'Voron 2.4 (Klipper)', type: 'moonraker', host: '192.168.1.200' },
]
function SettingRow({ label, hint, children }: { label: string; hint?: string; children: React.ReactNode }) {
return (
<div className="flex flex-col sm:flex-row sm:items-center gap-2 sm:gap-4 py-4 border-b border-slate-700 last:border-0">
<div className="sm:w-64 shrink-0">
<div className="text-sm font-medium text-slate-200">{label}</div>
{hint && <div className="text-xs text-slate-500 mt-0.5">{hint}</div>}
</div>
<div className="flex-1">{children}</div>
</div>
)
}
function SectionHeader({ title, description }: { title: string; description?: string }) {
return (
<div className="mb-2">
<h3 className="text-base font-semibold text-slate-100">{title}</h3>
{description && <p className="text-sm text-slate-400 mt-0.5">{description}</p>}
</div>
)
}
export default function SettingsPage() {
const [lowStockThreshold, setLowStockThreshold] = useState(DEFAULT_SETTINGS.lowStockThresholdGrams)
const [crossSection, setCrossSection] = useState(DEFAULT_SETTINGS.filamentCrossSectionMm2)
const [currency, setCurrency] = useState(DEFAULT_SETTINGS.currency)
const [theme, setTheme] = useState(DEFAULT_SETTINGS.theme)
const [saved, setSaved] = useState(false)
const [saveError, setSaveError] = useState(false)
const [printerStatus, setPrinterStatus] = useState<Record<string, ConnectionStatus>>({})
const [thresholdError, setThresholdError] = useState('')
const [crossSectionError, setCrossSectionError] = useState('')
const validate = () => {
let valid = true
if (!lowStockThreshold || lowStockThreshold < 0 || lowStockThreshold > 10000) {
setThresholdError('Must be between 0 and 10,000 g')
valid = false
} else {
setThresholdError('')
}
if (!crossSection || crossSection <= 0 || crossSection > 100) {
setCrossSectionError('Must be a positive number (typical: 2.405 for 1.75mm)')
valid = false
} else {
setCrossSectionError('')
}
return valid
}
const handleSave = async () => {
if (!validate()) return
try {
// TODO: PUT /api/settings with { low_stock_threshold_grams, filament_cross_section_mm2, currency, theme }
setSaved(true)
setSaveError(false)
setTimeout(() => setSaved(false), 3000)
} catch {
setSaveError(true)
setSaved(false)
}
}
const testPrinterConnection = async (printer: PrinterConfig) => {
setPrinterStatus(s => ({ ...s, [printer.host]: 'testing' }))
// TODO: POST /api/printers/test with { host, type } — Dex to implement
await new Promise(r => setTimeout(r, 1500))
// Mock: hosts ending in .100 or .200 pass, others fail
const ok = printer.host.endsWith('.100') || printer.host.endsWith('.200')
setPrinterStatus(s => ({ ...s, [printer.host]: ok ? 'ok' : 'error' }))
}
return (
<div className="space-y-6 max-w-2xl">
{/* 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">Settings</h2>
<p className="text-sm text-slate-400">App configuration for Extrudex</p>
</div>
<div className="flex items-center gap-3">
{saved && (
<span className="inline-flex items-center gap-1.5 text-sm text-emerald-400">
<CheckCircle2 size={16} /> Saved
</span>
)}
{saveError && (
<span className="inline-flex items-center gap-1.5 text-sm text-red-400">
<AlertCircle size={16} /> Save failed
</span>
)}
<button
onClick={handleSave}
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"
>
<Save size={16} /> Save Settings
</button>
</div>
</div>
{/* Inventory Settings */}
<div className="rounded-lg border border-slate-700 bg-slate-800/50 px-4 pt-4 pb-2">
<SectionHeader
title="Inventory"
description="Controls how spools are tracked and displayed"
/>
<SettingRow
label="Low stock threshold"
hint="Spools below this weight are flagged as low stock"
>
<div>
<div className="flex items-center gap-2">
<input
type="number"
min={0}
max={10000}
step={10}
value={lowStockThreshold}
onChange={e => setLowStockThreshold(Number(e.target.value))}
className={`w-32 rounded-lg bg-slate-800 border ${thresholdError ? 'border-red-500' : 'border-slate-700'} px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500`}
/>
<span className="text-sm text-slate-400">grams</span>
</div>
{thresholdError && <p className="mt-1 text-xs text-red-400">{thresholdError}</p>}
</div>
</SettingRow>
<SettingRow
label="Filament cross-section area"
hint="Used to convert mm extruded → grams (π × r²)"
>
<div>
<div className="flex items-center gap-2">
<input
type="number"
min={0.01}
max={100}
step={0.001}
value={crossSection}
onChange={e => setCrossSection(Number(e.target.value))}
className={`w-36 rounded-lg bg-slate-800 border ${crossSectionError ? 'border-red-500' : 'border-slate-700'} px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500`}
/>
<span className="text-sm text-slate-400">mm²</span>
</div>
{crossSectionError && <p className="mt-1 text-xs text-red-400">{crossSectionError}</p>}
<p className="mt-1 text-xs text-slate-500">1.75mm filament = 2.405 mm² · 2.85mm filament = 6.379 mm²</p>
</div>
</SettingRow>
<SettingRow label="Currency" hint="Used for cost display throughout the app">
<select
value={currency}
onChange={e => setCurrency(e.target.value)}
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"
>
{CURRENCIES.map(c => (
<option key={c} value={c}>{c}</option>
))}
</select>
</SettingRow>
</div>
{/* Appearance */}
<div className="rounded-lg border border-slate-700 bg-slate-800/50 px-4 pt-4 pb-2">
<SectionHeader title="Appearance" />
<SettingRow label="Theme" hint="Override system default color scheme">
<div className="flex items-center gap-2">
{(['system', 'dark', 'light'] as const).map(t => (
<button
key={t}
onClick={() => setTheme(t)}
className={`inline-flex items-center gap-1.5 rounded-lg px-3 py-2 text-sm font-medium border transition-colors ${
theme === t
? 'bg-emerald-600 border-emerald-500 text-white'
: 'bg-slate-800 border-slate-700 text-slate-300 hover:bg-slate-700'
}`}
>
{t === 'dark' && <Moon size={14} />}
{t === 'light' && <Sun size={14} />}
{t === 'system' && <span className="text-xs">Auto</span>}
{t !== 'system' && <span className="capitalize">{t}</span>}
{t === 'system' && <span>System</span>}
</button>
))}
</div>
</SettingRow>
</div>
{/* Printer Connections */}
<div className="rounded-lg border border-slate-700 bg-slate-800/50 px-4 pt-4 pb-2">
<SectionHeader
title="Printer Connections"
description="Test connectivity to configured printers"
/>
{/* TODO: Load printer list from GET /api/printers */}
{MOCK_PRINTERS.map(printer => {
const status = printerStatus[printer.host] ?? 'idle'
return (
<SettingRow
key={printer.host}
label={printer.name}
hint={`${printer.type === 'bambu' ? 'Bambu MQTT' : 'Moonraker'} · ${printer.host}`}
>
<div className="flex items-center gap-3">
<StatusBadge status={status} />
<button
onClick={() => testPrinterConnection(printer)}
disabled={status === 'testing'}
className="inline-flex items-center gap-1.5 rounded-lg bg-slate-700 border border-slate-600 px-3 py-1.5 text-xs font-medium text-slate-200 hover:bg-slate-600 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
>
{status === 'testing' ? (
<>
<span className="animate-spin inline-block w-3 h-3 border border-slate-400 border-t-transparent rounded-full" />
Testing
</>
) : (
<>
<Wifi size={12} /> Test Connection
</>
)}
</button>
</div>
</SettingRow>
)
})}
</div>
{/* Save footer (mobile convenience) */}
<div className="flex justify-end pb-4">
<button
onClick={handleSave}
className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-5 py-2.5 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors"
>
<Save size={16} /> Save Settings
</button>
</div>
</div>
)
}
function StatusBadge({ status }: { status: ConnectionStatus }) {
if (status === 'idle') return null
if (status === 'testing') {
return (
<span className="inline-flex items-center gap-1 rounded-full bg-slate-700 border border-slate-600 px-2 py-0.5 text-xs text-slate-300">
Testing
</span>
)
}
if (status === 'ok') {
return (
<span className="inline-flex items-center gap-1 rounded-full bg-emerald-900/30 border border-emerald-700 px-2 py-0.5 text-xs text-emerald-300">
<CheckCircle2 size={11} /> Connected
</span>
)
}
return (
<span className="inline-flex items-center gap-1 rounded-full bg-red-900/30 border border-red-700 px-2 py-0.5 text-xs text-red-300">
<WifiOff size={11} /> Unreachable
</span>
)
}
+9
View File
@@ -0,0 +1,9 @@
import axios from 'axios'
import type { Printer, PrinterResponse } from '../types/printer'
const API_BASE = '/api'
export async function fetchPrinters(): Promise<Printer[]> {
const res = await axios.get<PrinterResponse>(`${API_BASE}/printers`)
return res.data.data
}
+29
View File
@@ -0,0 +1,29 @@
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
created_at: string
updated_at: string
}
export type ConnectionStatus = 'online' | 'offline' | 'unknown'
export interface PrinterResponse {
data: Printer[]
}