Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 368d070174 |
+12
-31
@@ -1,50 +1,31 @@
|
|||||||
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'
|
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}>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<div className="min-h-screen bg-slate-900 text-slate-50">
|
<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-3 sticky top-0 z-20">
|
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-4 sticky top-0 z-20">
|
||||||
|
<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>
|
<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 text-slate-50">Extrudex</h1>
|
||||||
<nav className="ml-4 hidden sm:flex items-center gap-1">
|
</a>
|
||||||
<NavItem to="/" icon={Box} label="Inventory" />
|
<nav className="flex items-center gap-1 ml-2">
|
||||||
<NavItem to="/printers" icon={Printer} label="Printers" />
|
<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>
|
</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="/inventory" element={<InventoryPage />} />
|
||||||
<Route path="/printers" element={<PrintersPage />} />
|
<Route path="/printers" element={<PrintersPage />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
+166
-372
@@ -1,153 +1,40 @@
|
|||||||
import { useState, useMemo } from 'react'
|
|
||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery } from '@tanstack/react-query'
|
||||||
import {
|
import { Printer, Wifi, WifiOff, HelpCircle, Plus, Globe, Radio } from 'lucide-react'
|
||||||
Search,
|
|
||||||
Wifi,
|
|
||||||
WifiOff,
|
|
||||||
HelpCircle,
|
|
||||||
Pencil,
|
|
||||||
Plus,
|
|
||||||
Trash2,
|
|
||||||
AlertTriangle,
|
|
||||||
ChevronLeft,
|
|
||||||
ChevronRight,
|
|
||||||
Server,
|
|
||||||
Radio,
|
|
||||||
ShieldCheck,
|
|
||||||
} from 'lucide-react'
|
|
||||||
import { fetchPrinters } from '../services/printerService'
|
import { fetchPrinters } from '../services/printerService'
|
||||||
import type { Printer } from '../types/printer'
|
import LoadingSpinner from '../components/LoadingSpinner'
|
||||||
|
import type { Printer as PrinterType, ConnectionStatus } from '../types/printer'
|
||||||
|
|
||||||
const PAGE_SIZE = 20
|
function getConnectionStatus(printer: PrinterType): ConnectionStatus {
|
||||||
|
if (!printer.is_active) return 'offline'
|
||||||
|
if (printer.moonraker_url || printer.mqtt_broker_host) return 'online'
|
||||||
|
return 'unknown'
|
||||||
|
}
|
||||||
|
|
||||||
type SortField = 'name' | 'printer_type' | 'manufacturer' | 'model'
|
const statusConfig: Record<ConnectionStatus, { icon: typeof Wifi; label: string; className: string }> = {
|
||||||
type SortDir = 'asc' | 'desc'
|
online: {
|
||||||
|
icon: Wifi,
|
||||||
type ConnStatus = 'online' | 'offline' | 'unknown'
|
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() {
|
export default function PrintersPage() {
|
||||||
const [search, setSearch] = useState('')
|
const { data: printers, isLoading, error, refetch } = useQuery({
|
||||||
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'],
|
queryKey: ['printers'],
|
||||||
queryFn: fetchPrinters,
|
queryFn: fetchPrinters,
|
||||||
})
|
})
|
||||||
|
|
||||||
// Derive connection status from backend is_active for now
|
const count = printers?.length ?? 0
|
||||||
// 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 (
|
return (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
@@ -155,314 +42,221 @@ export default function PrintersPage() {
|
|||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-xl font-bold text-slate-100">Printers</h2>
|
<h2 className="text-xl font-bold text-slate-100">Printers</h2>
|
||||||
<p className="text-sm text-slate-400">{total} printer(s)</p>
|
<p className="text-sm text-slate-400">{count} printer(s) in fleet</p>
|
||||||
</div>
|
</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">
|
<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
|
<Plus size={16} /> Add Printer
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Filters */}
|
{/* Loading */}
|
||||||
<div className="flex flex-col lg:flex-row gap-3">
|
{isLoading && (
|
||||||
{/* Search */}
|
<div className="flex items-center justify-center py-16">
|
||||||
<div className="relative flex-1">
|
<LoadingSpinner />
|
||||||
<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>
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Status filter */}
|
{/* Error */}
|
||||||
<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 && (
|
{error && (
|
||||||
<div className="text-center py-12 text-red-400">
|
<div className="rounded-lg border border-red-700 bg-red-900/20 p-6 text-center">
|
||||||
Failed to load printers.
|
<p className="text-red-400 mb-2">Failed to load printers.</p>
|
||||||
<button onClick={() => refetch()} className="ml-2 underline hover:text-red-300">
|
<button
|
||||||
|
onClick={() => refetch()}
|
||||||
|
className="text-sm text-red-300 underline hover:text-red-200"
|
||||||
|
>
|
||||||
Retry
|
Retry
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</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 */}
|
{/* Desktop Table */}
|
||||||
{!isLoading && !error && (
|
{!isLoading && !error && (printers?.length ?? 0) > 0 && (
|
||||||
<>
|
<>
|
||||||
<div className="hidden md:block overflow-x-auto rounded-lg border border-slate-700">
|
<div className="hidden lg:block overflow-x-auto rounded-lg border border-slate-700">
|
||||||
<table className="w-full text-sm">
|
<table className="w-full text-sm">
|
||||||
<thead className="bg-slate-800 text-slate-300">
|
<thead className="bg-slate-800 text-slate-300">
|
||||||
<tr>
|
<tr>
|
||||||
<th
|
<th className="px-4 py-3 text-left font-semibold">Name</th>
|
||||||
className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100"
|
<th className="px-4 py-3 text-left font-semibold">Type</th>
|
||||||
onClick={() => handleSort('name')}
|
<th className="px-4 py-3 text-left font-semibold">Manufacturer</th>
|
||||||
>
|
<th className="px-4 py-3 text-left font-semibold">Model</th>
|
||||||
Name <SortIndicator field="name" />
|
<th className="px-4 py-3 text-center font-semibold">Status</th>
|
||||||
</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">Moonraker</th>
|
||||||
<th className="px-4 py-3 text-left font-semibold">MQTT</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>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody className="divide-y divide-slate-700">
|
<tbody className="divide-y divide-slate-700">
|
||||||
{pageItems.length === 0 && (
|
{printers!.map((printer) => {
|
||||||
<tr>
|
const status = getConnectionStatus(printer)
|
||||||
<td colSpan={8} className="px-4 py-8 text-center text-slate-500">
|
const StatusIcon = statusConfig[status].icon
|
||||||
No printers found.
|
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>
|
||||||
</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">
|
<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">
|
{printer.printer_type?.name ?? '—'}
|
||||||
{p.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>
|
</span>
|
||||||
</td>
|
</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">
|
<td className="px-4 py-3">
|
||||||
<StatusBadge status={p.connection_status} />
|
{printer.moonraker_url ? (
|
||||||
</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
|
<a
|
||||||
href={p.moonraker_url}
|
href={printer.moonraker_url}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="hover:underline truncate max-w-[160px] inline-block"
|
className="inline-flex items-center gap-1.5 text-sky-400 hover:text-sky-300 text-xs truncate max-w-[180px]"
|
||||||
title={p.moonraker_url}
|
title={printer.moonraker_url}
|
||||||
>
|
>
|
||||||
{p.moonraker_url}
|
<Globe size={12} className="shrink-0" />
|
||||||
|
{printer.moonraker_url}
|
||||||
</a>
|
</a>
|
||||||
</span>
|
|
||||||
) : (
|
) : (
|
||||||
<span className="text-slate-500 text-xs">—</span>
|
<span className="text-slate-500 text-xs">—</span>
|
||||||
)}
|
)}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-4 py-3">
|
<td className="px-4 py-3">
|
||||||
{p.mqtt_broker_host ? (
|
{printer.mqtt_broker_host ? (
|
||||||
<span className="inline-flex items-center gap-1 text-xs text-slate-300">
|
<div className="space-y-0.5">
|
||||||
<Radio size={12} className="text-emerald-400" />
|
<div className="inline-flex items-center gap-1.5 text-xs text-slate-300">
|
||||||
{p.mqtt_topic_prefix ? `${p.mqtt_topic_prefix} @ ` : ''}
|
<Radio size={12} className="shrink-0 text-amber-400" />
|
||||||
{p.mqtt_broker_host}
|
<span className="truncate max-w-[140px]" title={printer.mqtt_broker_host}>
|
||||||
{p.mqtt_tls_enabled && (
|
{printer.mqtt_broker_host}
|
||||||
<span title="TLS enabled">
|
|
||||||
<ShieldCheck size={12} className="text-emerald-400" />
|
|
||||||
</span>
|
</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>
|
||||||
)}
|
)}
|
||||||
</span>
|
<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>
|
<span className="text-slate-500 text-xs">—</span>
|
||||||
)}
|
)}
|
||||||
</td>
|
</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>
|
</tr>
|
||||||
))}
|
)
|
||||||
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Mobile Cards */}
|
{/* Mobile / Tablet Cards */}
|
||||||
<div className="md:hidden space-y-3">
|
<div className="lg:hidden space-y-3">
|
||||||
{pageItems.length === 0 && (
|
{printers!.map((printer) => {
|
||||||
<div className="text-center py-12 text-slate-500">No printers found.</div>
|
const status = getConnectionStatus(printer)
|
||||||
)}
|
const StatusIcon = statusConfig[status].icon
|
||||||
{pageItems.map((p: Printer & { connection_status: ConnStatus }) => (
|
return (
|
||||||
<div
|
<div
|
||||||
key={p.id}
|
key={printer.id}
|
||||||
className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3"
|
className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3"
|
||||||
>
|
>
|
||||||
<div className="flex items-start justify-between">
|
{/* Top row: name + status */}
|
||||||
<div>
|
<div className="flex items-start justify-between gap-3">
|
||||||
<div className="font-semibold text-slate-100">{p.name}</div>
|
<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">
|
<div className="text-xs text-slate-400 mt-0.5">
|
||||||
{p.printer_type?.name ?? '—'} · {p.manufacturer ?? '—'} {p.model ?? ''}
|
{[
|
||||||
|
printer.printer_type?.name,
|
||||||
|
printer.manufacturer,
|
||||||
|
printer.model,
|
||||||
|
]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(' · ') || 'No details'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<StatusBadge status={p.connection_status} />
|
<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>
|
</div>
|
||||||
|
|
||||||
|
{/* Connection details */}
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
|
||||||
{/* Moonraker */}
|
{/* Moonraker */}
|
||||||
{p.moonraker_url && (
|
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
|
||||||
<div className="flex items-center gap-2 text-sm text-slate-300">
|
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
|
||||||
<Server size={14} className="text-blue-400 shrink-0" />
|
<Globe size={12} />
|
||||||
|
Moonraker
|
||||||
|
</div>
|
||||||
|
{printer.moonraker_url ? (
|
||||||
<a
|
<a
|
||||||
href={p.moonraker_url}
|
href={printer.moonraker_url}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="text-blue-300 hover:underline truncate"
|
className="text-xs text-sky-400 hover:text-sky-300 break-all"
|
||||||
>
|
>
|
||||||
{p.moonraker_url}
|
{printer.moonraker_url}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
) : (
|
||||||
|
<span className="text-xs text-slate-500">Not configured</span>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* MQTT */}
|
{/* MQTT */}
|
||||||
{p.mqtt_broker_host && (
|
<div className="rounded-md bg-slate-900/50 p-3 min-w-0">
|
||||||
<div className="flex items-center gap-2 text-sm text-slate-300">
|
<div className="flex items-center gap-1.5 text-xs text-slate-400 mb-1">
|
||||||
<Radio size={14} className="text-emerald-400 shrink-0" />
|
<Radio size={12} />
|
||||||
<span className="truncate">
|
MQTT
|
||||||
{p.mqtt_topic_prefix ? `${p.mqtt_topic_prefix} @ ` : ''}
|
</div>
|
||||||
{p.mqtt_broker_host}
|
{printer.mqtt_broker_host ? (
|
||||||
{p.mqtt_tls_enabled && (
|
<div className="space-y-0.5 text-xs text-slate-300">
|
||||||
<span title="TLS enabled">
|
<div className="truncate" title={printer.mqtt_broker_host}>
|
||||||
<ShieldCheck size={14} className="text-emerald-400 inline ml-1" />
|
{printer.mqtt_broker_host}
|
||||||
</span>
|
</div>
|
||||||
)}
|
{printer.mqtt_topic_prefix && (
|
||||||
</span>
|
<div className="text-slate-500 truncate" title={printer.mqtt_topic_prefix}>
|
||||||
|
topic: {printer.mqtt_topic_prefix}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
<div className="text-slate-500">
|
||||||
{/* Actions */}
|
TLS: {printer.mqtt_tls_enabled ? 'on' : 'off'}
|
||||||
<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>
|
</div>
|
||||||
))}
|
) : (
|
||||||
|
<span className="text-xs text-slate-500">Not configured</span>
|
||||||
|
)}
|
||||||
</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>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import type { Printer } from '../types/printer'
|
import type { Printer, PrinterResponse } from '../types/printer'
|
||||||
|
|
||||||
const API_BASE = '/api'
|
const API_BASE = '/api'
|
||||||
|
|
||||||
export async function fetchPrinters(): Promise<Printer[]> {
|
export async function fetchPrinters(): Promise<Printer[]> {
|
||||||
const res = await axios.get<{ data: Printer[] }>(`${API_BASE}/printers`)
|
const res = await axios.get<PrinterResponse>(`${API_BASE}/printers`)
|
||||||
return res.data.data
|
return res.data.data
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function deletePrinter(id: number): Promise<void> {
|
|
||||||
await axios.delete(`${API_BASE}/printers/${id}`)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
// Extrudex printer domain types
|
|
||||||
|
|
||||||
export interface PrinterType {
|
export interface PrinterType {
|
||||||
id: number
|
id: number
|
||||||
name: string
|
name: string
|
||||||
@@ -20,14 +18,12 @@ export interface Printer {
|
|||||||
mqtt_topic_prefix?: string
|
mqtt_topic_prefix?: string
|
||||||
mqtt_tls_enabled: boolean
|
mqtt_tls_enabled: boolean
|
||||||
is_active: boolean
|
is_active: boolean
|
||||||
connection_status?: 'online' | 'offline' | 'unknown'
|
|
||||||
created_at: string
|
created_at: string
|
||||||
updated_at: string
|
updated_at: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ListResponse<T> {
|
export type ConnectionStatus = 'online' | 'offline' | 'unknown'
|
||||||
data: T[]
|
|
||||||
total: number
|
export interface PrinterResponse {
|
||||||
limit: number
|
data: Printer[]
|
||||||
offset: number
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user