Compare commits
2 Commits
agent/Rex/
...
ffff4213b6
| Author | SHA1 | Date | |
|---|---|---|---|
| ffff4213b6 | |||
| 32798fbf14 |
@@ -1,8 +1,7 @@
|
|||||||
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 { Package, Settings } from 'lucide-react'
|
import Dashboard from './pages/Dashboard'
|
||||||
import InventoryPage from './pages/InventoryPage'
|
import InventoryPage from './pages/InventoryPage'
|
||||||
import SettingsPage from './pages/SettingsPage'
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
@@ -11,43 +10,14 @@ export default function App() {
|
|||||||
<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-4 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="flex items-center gap-3 mr-4">
|
|
||||||
<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>
|
||||||
</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>
|
|
||||||
</nav>
|
|
||||||
</header>
|
</header>
|
||||||
<main className="p-4">
|
<main className="p-4">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<InventoryPage />} />
|
<Route path="/" element={<Dashboard />} />
|
||||||
<Route path="/settings" element={<SettingsPage />} />
|
<Route path="/inventory" element={<InventoryPage />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
8
frontend/src/components/LoadingSpinner.tsx
Normal file
8
frontend/src/components/LoadingSpinner.tsx
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
export default function LoadingSpinner() {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center gap-3">
|
||||||
|
<div className="w-10 h-10 border-4 border-emerald-500/30 border-t-emerald-400 rounded-full animate-spin" />
|
||||||
|
<p className="text-slate-400 text-sm">Loading dashboard…</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
76
frontend/src/components/RecentPrints.tsx
Normal file
76
frontend/src/components/RecentPrints.tsx
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
import type { PrintJob } from '../types'
|
||||||
|
import { Clock, FileText } from 'lucide-react'
|
||||||
|
|
||||||
|
interface RecentPrintsProps {
|
||||||
|
jobs: PrintJob[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function RecentPrints({ jobs }: RecentPrintsProps) {
|
||||||
|
if (jobs.length === 0) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 p-6 text-center text-slate-400">
|
||||||
|
<FileText size={32} className="mx-auto mb-3 text-slate-500" />
|
||||||
|
<p>No recent print jobs</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusColor = (status: string) => {
|
||||||
|
switch (status.toLowerCase()) {
|
||||||
|
case 'completed': return 'text-emerald-400 bg-emerald-500/10'
|
||||||
|
case 'in_progress': return 'text-sky-400 bg-sky-500/10'
|
||||||
|
case 'failed': return 'text-red-400 bg-red-500/10'
|
||||||
|
default: return 'text-slate-400 bg-slate-500/10'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full text-left">
|
||||||
|
<thead>
|
||||||
|
<tr className="border-b border-slate-700">
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Name</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Status</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Duration</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Filament</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Cost</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{jobs.map((job) => (
|
||||||
|
<tr key={job.id} className="border-b border-slate-700/50 last:border-0 hover:bg-slate-700/30 transition-colors">
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-100 font-medium">{job.name}</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
<span className={`inline-flex items-center gap-1 px-2 py-1 rounded-full text-xs font-medium ${statusColor(job.status)}`}>
|
||||||
|
{job.status}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<Clock size={14} />
|
||||||
|
{formatDuration(job.duration_seconds)}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
{job.filament_used_grams?.toFixed(1) ?? '-'} g
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
${job.cost_usd?.toFixed(2) ?? '-'}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDuration(seconds: number): string {
|
||||||
|
if (!seconds) return '-'
|
||||||
|
const hrs = Math.floor(seconds / 3600)
|
||||||
|
const mins = Math.floor((seconds % 3600) / 60)
|
||||||
|
if (hrs > 0) return `${hrs}h ${mins}m`
|
||||||
|
return `${mins}m`
|
||||||
|
}
|
||||||
31
frontend/src/components/SummaryCard.tsx
Normal file
31
frontend/src/components/SummaryCard.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import type { LucideIcon } from 'lucide-react'
|
||||||
|
|
||||||
|
interface SummaryCardProps {
|
||||||
|
title: string
|
||||||
|
value: string | number
|
||||||
|
icon: LucideIcon
|
||||||
|
color: 'emerald' | 'amber' | 'sky' | 'violet'
|
||||||
|
}
|
||||||
|
|
||||||
|
const colorMap = {
|
||||||
|
emerald: { bg: 'bg-emerald-500/10', border: 'border-emerald-500/20', text: 'text-emerald-400', icon: 'text-emerald-400' },
|
||||||
|
amber: { bg: 'bg-amber-500/10', border: 'border-amber-500/20', text: 'text-amber-400', icon: 'text-amber-400' },
|
||||||
|
sky: { bg: 'bg-sky-500/10', border: 'border-sky-500/20', text: 'text-sky-400', icon: 'text-sky-400' },
|
||||||
|
violet: { bg: 'bg-violet-500/10', border: 'border-violet-500/20', text: 'text-violet-400', icon: 'text-violet-400' },
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SummaryCard({ title, value, icon: Icon, color }: SummaryCardProps) {
|
||||||
|
const c = colorMap[color]
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`rounded-xl border ${c.border} ${c.bg} p-5 flex items-start justify-between`}>
|
||||||
|
<div>
|
||||||
|
<p className="text-sm font-medium text-slate-400 mb-1">{title}</p>
|
||||||
|
<p className={`text-3xl font-bold ${c.text}`}>{value}</p>
|
||||||
|
</div>
|
||||||
|
<div className={`p-2 rounded-lg ${c.bg}`}>
|
||||||
|
<Icon size={24} className={c.icon} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,10 +1,25 @@
|
|||||||
import { StrictMode } from 'react'
|
import { StrictMode } from 'react'
|
||||||
import { createRoot } from 'react-dom/client'
|
import { createRoot } from 'react-dom/client'
|
||||||
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
|
import { BrowserRouter } from 'react-router-dom'
|
||||||
import './index.css'
|
import './index.css'
|
||||||
import App from './App'
|
import App from './App'
|
||||||
|
|
||||||
|
const queryClient = new QueryClient({
|
||||||
|
defaultOptions: {
|
||||||
|
queries: {
|
||||||
|
staleTime: 30_000,
|
||||||
|
refetchOnWindowFocus: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
createRoot(document.getElementById('root')!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
|
<QueryClientProvider client={queryClient}>
|
||||||
|
<BrowserRouter>
|
||||||
<App />
|
<App />
|
||||||
|
</BrowserRouter>
|
||||||
|
</QueryClientProvider>
|
||||||
</StrictMode>,
|
</StrictMode>,
|
||||||
)
|
)
|
||||||
|
|||||||
139
frontend/src/pages/Dashboard.tsx
Normal file
139
frontend/src/pages/Dashboard.tsx
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { getFilaments, getPrintJobs } from '../services/api'
|
||||||
|
import SummaryCard from '../components/SummaryCard'
|
||||||
|
import RecentPrints from '../components/RecentPrints'
|
||||||
|
import LoadingSpinner from '../components/LoadingSpinner'
|
||||||
|
import { Package, AlertTriangle, Printer, DollarSign, Plus, List } from 'lucide-react'
|
||||||
|
|
||||||
|
export default function Dashboard() {
|
||||||
|
const {
|
||||||
|
data: filamentData,
|
||||||
|
isLoading: filamentLoading,
|
||||||
|
error: filamentError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['filaments', 'count'],
|
||||||
|
queryFn: () => getFilaments({ limit: 1 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: lowStockData,
|
||||||
|
isLoading: lowStockLoading,
|
||||||
|
error: lowStockError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['filaments', 'lowStock'],
|
||||||
|
queryFn: () => getFilaments({ low_stock: true, limit: 1 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: recentPrints,
|
||||||
|
isLoading: printsLoading,
|
||||||
|
error: printsError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['printJobs', 'recent'],
|
||||||
|
queryFn: () => getPrintJobs({ limit: 5 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: allPrints,
|
||||||
|
isLoading: costLoading,
|
||||||
|
error: costError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['printJobs', 'all'],
|
||||||
|
queryFn: () => getPrintJobs({ limit: 1000 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const totalSpools = filamentData?.total ?? 0
|
||||||
|
const lowStockCount = lowStockData?.total ?? 0
|
||||||
|
const recentPrintJobs = recentPrints?.data ?? []
|
||||||
|
|
||||||
|
// Calculate cost this month from all print jobs
|
||||||
|
const now = new Date()
|
||||||
|
const currentMonth = now.getMonth()
|
||||||
|
const currentYear = now.getFullYear()
|
||||||
|
const monthlyCost =
|
||||||
|
allPrints?.data
|
||||||
|
.filter((job) => {
|
||||||
|
const d = new Date(job.started_at)
|
||||||
|
return d.getMonth() === currentMonth && d.getFullYear() === currentYear
|
||||||
|
})
|
||||||
|
.reduce((sum, job) => sum + (job.cost_usd ?? 0), 0) ?? 0
|
||||||
|
|
||||||
|
const isLoading = filamentLoading || lowStockLoading || printsLoading || costLoading
|
||||||
|
const error = filamentError || lowStockError || printsError || costError
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-slate-900">
|
||||||
|
<LoadingSpinner />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-slate-900">
|
||||||
|
<div className="p-6 rounded-lg bg-red-900/30 border border-red-500 text-red-200 max-w-md">
|
||||||
|
<h2 className="text-xl font-bold mb-2">Error</h2>
|
||||||
|
<p className="text-sm">{(error as Error).message || 'Failed to load dashboard data.'}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-slate-900 p-4 md:p-8">
|
||||||
|
<div className="max-w-6xl mx-auto">
|
||||||
|
<header className="mb-8">
|
||||||
|
<h1 className="text-3xl font-bold text-emerald-400 mb-2">Dashboard</h1>
|
||||||
|
<p className="text-slate-400">Overview of your Extrudex inventory and prints</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
{/* Summary Cards Grid */}
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-8">
|
||||||
|
<SummaryCard
|
||||||
|
title="Total Spools"
|
||||||
|
value={totalSpools}
|
||||||
|
icon={Package}
|
||||||
|
color="emerald"
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Low Stock"
|
||||||
|
value={lowStockCount}
|
||||||
|
icon={AlertTriangle}
|
||||||
|
color={lowStockCount > 0 ? 'amber' : 'emerald'}
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Recent Prints"
|
||||||
|
value={recentPrintJobs.length}
|
||||||
|
icon={Printer}
|
||||||
|
color="sky"
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Cost This Month"
|
||||||
|
value={`$${monthlyCost.toFixed(2)}`}
|
||||||
|
icon={DollarSign}
|
||||||
|
color="violet"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Quick Actions */}
|
||||||
|
<div className="flex flex-wrap gap-3 mb-8">
|
||||||
|
<button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 hover:bg-emerald-500 text-white font-medium transition-colors active:scale-95 touch-manipulation">
|
||||||
|
<Plus size={18} />
|
||||||
|
Add Spool
|
||||||
|
</button>
|
||||||
|
<button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-slate-700 hover:bg-slate-600 text-slate-100 font-medium transition-colors active:scale-95 touch-manipulation">
|
||||||
|
<List size={18} />
|
||||||
|
View Inventory
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Recent Prints Section */}
|
||||||
|
<section>
|
||||||
|
<h2 className="text-xl font-semibold text-slate-100 mb-4">Recent Prints</h2>
|
||||||
|
<RecentPrints jobs={recentPrintJobs} />
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -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>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
19
frontend/src/services/api.ts
Normal file
19
frontend/src/services/api.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { ListResponse, FilamentSpool, PrintJob } from '../types'
|
||||||
|
|
||||||
|
const api = axios.create({
|
||||||
|
baseURL: '/api',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
})
|
||||||
|
|
||||||
|
export async function getFilaments(params?: { low_stock?: boolean; limit?: number; offset?: number }) {
|
||||||
|
const res = await api.get<ListResponse<FilamentSpool>>('/filaments', { params })
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getPrintJobs(params?: { limit?: number; offset?: number }) {
|
||||||
|
const res = await api.get<ListResponse<PrintJob>>('/print-jobs', { params })
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export default api
|
||||||
42
frontend/src/types/index.ts
Normal file
42
frontend/src/types/index.ts
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
export interface FilamentSpool {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
material_base_id: number;
|
||||||
|
material_finish_id: number;
|
||||||
|
material_modifier_id: number;
|
||||||
|
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;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
deleted_at: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PrintJob {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
printer_id: number;
|
||||||
|
filament_id: number;
|
||||||
|
status: string;
|
||||||
|
duration_seconds: number;
|
||||||
|
filament_used_grams: number;
|
||||||
|
cost_usd: number;
|
||||||
|
started_at: string;
|
||||||
|
completed_at: string | null;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ListResponse<T> {
|
||||||
|
data: T[];
|
||||||
|
total: number;
|
||||||
|
limit: number;
|
||||||
|
offset: number;
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"noUnusedParameters": true,
|
"noUnusedParameters": true,
|
||||||
"noFallthroughCasesInSwitch": true,
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"ignoreDeprecations": "5.0",
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["src/*"]
|
"@/*": ["src/*"]
|
||||||
|
|||||||
Reference in New Issue
Block a user