Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 15cdd75f01 | |||
| d8c0991dc6 | |||
| 10c9340e74 | |||
| ffff4213b6 | |||
| 32798fbf14 |
+214
@@ -0,0 +1,214 @@
|
|||||||
|
# Extrudex — Project Context
|
||||||
|
|
||||||
|
> **Last updated:** 2026-05-21
|
||||||
|
> **Repo:** `CubeCraft-Creations/Extrudex` | **Host:** `code.cubecraftcreations.com`
|
||||||
|
> **Local clone:** `/mnt/ai-storage/projects/Extrudex` | **Default branch:** `dev`
|
||||||
|
> **Discord:** `DISCORD_DEV_EXTRUDEX_CHANNEL_ID`
|
||||||
|
> **Linear Epic:** [CUB-110](https://linear.app/cubecraft-creations/issue/CUB-110)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Custom filament inventory and print tracking system for CubeCraft Creations. Tracks spool consumption, material costs, and per-print COGS across a fleet of 6 FDM printers (5 Bambu Lab + 1 Elegoo Centauri Carbon) + resin printers. Kiosk interface on Raspberry Pi 5 with USB barcode scanner.
|
||||||
|
|
||||||
|
**Active refactor in progress:** .NET → Go + React (CUB-110 epic).
|
||||||
|
|
||||||
|
## Tech Stack
|
||||||
|
|
||||||
|
| Layer | Technology | Notes |
|
||||||
|
|-------|-----------|-------|
|
||||||
|
| Backend (legacy) | ASP.NET Core 9 + EF Core | Being replaced by Go |
|
||||||
|
| Backend (new) | Go 1.24+ | Chi router, pgx (PostgreSQL), gorilla/websocket, paho.mqtt.golang |
|
||||||
|
| Frontend (legacy) | Angular 17+ | Being replaced by React |
|
||||||
|
| Frontend (new) | React 18 + TypeScript + Tailwind CSS | Vite |
|
||||||
|
| Database | PostgreSQL 16+ | snake_case naming |
|
||||||
|
| Real-time | SSE (Server-Sent Events) | Replaces SignalR |
|
||||||
|
| Printer integrations | Moonraker REST + WebSocket, MQTT TLS | Elegoo/Klipper + Bambu Lab |
|
||||||
|
| CI/CD | Gitea Actions | `.gitea/workflows/dev.yml` |
|
||||||
|
| Deployment | Docker/Compose, Pi 5 kiosk | |
|
||||||
|
|
||||||
|
## Key Design Decisions
|
||||||
|
|
||||||
|
1. **Custom system over Spoolman** — Full control over data model and integrations
|
||||||
|
2. **MaterialFinish required** on every spool; default is "Basic"
|
||||||
|
3. **MaterialModifier is optional**
|
||||||
|
4. **Grams derived from:** `mm_extruded × filament_cross_section_area × material_density`
|
||||||
|
5. **Push over poll** — SSE + MQTT preferred; Moonraker polling is fallback
|
||||||
|
6. **Snake_case** for all PostgreSQL identifiers
|
||||||
|
|
||||||
|
## Project Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
Extrudex/
|
||||||
|
├── backend/ # Original .NET backend (being replaced)
|
||||||
|
│ ├── API/Controllers/ # Filaments, Spools, PrintJobs, Printers, Materials, QR, UsageLogs, Cost
|
||||||
|
│ ├── API/DTOs/ # DTOs per domain
|
||||||
|
│ ├── API/Validators/ # FluentValidation rules
|
||||||
|
│ ├── API/Hubs/ # SignalR PrinterHub
|
||||||
|
│ ├── API/Jobs/ # Background sync jobs
|
||||||
|
│ ├── Domain/Entities/ # EF Core entities (Printer, Spool, PrintJob, MaterialBase, etc.)
|
||||||
|
│ ├── Domain/Enums/ # ConnectionType, DataSource, JobStatus, PrinterStatus, QrResourceType
|
||||||
|
│ ├── Domain/Interfaces/ # Service interfaces
|
||||||
|
│ ├── Infrastructure/Data/ # EF DbContext, Configurations, Migrations, SeedData
|
||||||
|
│ ├── Infrastructure/Services/ # MoonrakerClient, CostPerPrint, UsageLog, FilamentUsage, QR
|
||||||
|
│ └── Program.cs # ASP.NET entry point
|
||||||
|
├── cmd/server/main.go # Go entrypoint (new), worker discovery, graceful shutdown
|
||||||
|
├── internal/ # Go backend (new)
|
||||||
|
│ ├── config/config.go # Env vars
|
||||||
|
│ ├── db/db.go # PostgreSQL connection pool (pgx)
|
||||||
|
│ ├── models/models.go # Go domain structs
|
||||||
|
│ ├── router/router.go # Chi HTTP routes
|
||||||
|
│ ├── sse/broadcaster.go # SSE broadcaster
|
||||||
|
│ ├── sse/events.go # SSE event types
|
||||||
|
│ ├── sse/handler.go # SSE HTTP handler
|
||||||
|
│ ├── handlers/ # API handlers (filament, health, material, print_job, printer, usage_log)
|
||||||
|
│ ├── repositories/ # DB access layer
|
||||||
|
│ └── services/ # Business logic + validation
|
||||||
|
├── migrations/ # Go-migrate SQL migrations
|
||||||
|
│ ├── 000001_initial_schema.up.sql
|
||||||
|
│ ├── 000001_initial_schema.down.sql
|
||||||
|
│ ├── 000002_seed_data.up.sql
|
||||||
|
│ └── 000002_seed_data.down.sql
|
||||||
|
├── frontend/ # React frontend (new)
|
||||||
|
│ ├── src/
|
||||||
|
│ │ ├── App.tsx
|
||||||
|
│ │ ├── main.tsx
|
||||||
|
│ │ ├── components/ # ColorSwatch, LoadingSpinner, RecentPrints, SummaryCard
|
||||||
|
│ │ ├── pages/
|
||||||
|
│ │ │ ├── Dashboard.tsx # Main dashboard with summary cards + recent prints
|
||||||
|
│ │ │ └── InventoryPage.tsx # Filament inventory list (table + filters)
|
||||||
|
│ │ ├── services/
|
||||||
|
│ │ │ ├── api.ts # Axios client
|
||||||
|
│ │ │ └── filamentService.ts
|
||||||
|
│ │ ├── stores/ # State stores (WIP)
|
||||||
|
│ │ ├── types/
|
||||||
|
│ │ │ ├── filament.ts
|
||||||
|
│ │ │ └── index.ts
|
||||||
|
│ │ └── hooks/
|
||||||
|
│ ├── Dockerfile + nginx.conf
|
||||||
|
│ └── vite.config.ts, tailwind.config.js
|
||||||
|
├── design/ # UX/design specs + mockup images
|
||||||
|
│ ├── homepage-spec.md
|
||||||
|
│ ├── 01-filament-inventory-list.md
|
||||||
|
│ ├── 02-spool-detail-view.md
|
||||||
|
│ ├── 03-smart-intake-workflow.md
|
||||||
|
│ ├── smart-intake-identify-spec.md
|
||||||
|
│ └── *.jpg / *.png # Mockup images (kiosk + mobile)
|
||||||
|
├── docker-compose.dev.yml
|
||||||
|
└── deploy.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Database Schema (PostgreSQL — .NET EF Core Migrations)
|
||||||
|
|
||||||
|
Core entities managed by EF Core with full configurations:
|
||||||
|
- **Printers** — id, name, type (BambuLab/Moonraker), connection_type, status, ip_address, mac_address, ams_count
|
||||||
|
- **AmsUnit / AmsSlot** — Bambu Lab AMS tray tracking
|
||||||
|
- **Spools** — filament inventory with material, color, weight, location, QR support
|
||||||
|
- **MaterialBase / MaterialFinish / MaterialModifier** — material taxonomy
|
||||||
|
- **PrintJobs** — job tracking with status, cost, filament consumption
|
||||||
|
- **UsageLogs** — per-printer filament consumption records
|
||||||
|
- **FilamentUsage** — aggregated per-spool consumption tracking
|
||||||
|
- **FilamentUsageSyncJob** — background Moonraker polling
|
||||||
|
- **MoonrakerPrinterSyncJob** — background printer status sync
|
||||||
|
|
||||||
|
## API Endpoints (.NET)
|
||||||
|
|
||||||
|
| Method | Endpoint | Description |
|
||||||
|
|--------|----------|-------------|
|
||||||
|
| GET | /api/filaments | List filaments (paginated, filterable) |
|
||||||
|
| POST | /api/filaments | Create filament |
|
||||||
|
| GET | /api/filaments/{id} | Get filament detail |
|
||||||
|
| PUT | /api/filaments/{id} | Update filament |
|
||||||
|
| DELETE | /api/filaments/{id} | Delete filament |
|
||||||
|
| GET | /api/spools | List spools |
|
||||||
|
| POST | /api/spools | Create spool |
|
||||||
|
| GET | /api/spools/{id} | Get spool detail |
|
||||||
|
| PUT | /api/spools/{id} | Update spool |
|
||||||
|
| DELETE | /api/spools/{id} | Delete spool |
|
||||||
|
| GET | /api/print-jobs | List print jobs |
|
||||||
|
| POST | /api/print-jobs | Create print job |
|
||||||
|
| GET | /api/print-jobs/{id} | Get print job detail |
|
||||||
|
| GET | /api/printers | List printers |
|
||||||
|
| POST | /api/printers | Register printer |
|
||||||
|
| GET | /api/printers/{id} | Get printer detail |
|
||||||
|
| GET | /api/printers/{id}/costs | Per-print cost summary |
|
||||||
|
| GET | /api/printers/{id}/usage | Filament usage history |
|
||||||
|
| GET | /api/materials/bases | List material bases |
|
||||||
|
| POST | /api/materials/bases | Create material base |
|
||||||
|
| GET | /api/materials/finishes | List material finishes |
|
||||||
|
| POST | /api/materials/finishes | Create material finish |
|
||||||
|
| GET | /api/materials/modifiers | List material modifiers |
|
||||||
|
| POST | /api/materials/modifiers | Create modifier |
|
||||||
|
| GET | /api/materials/lookups | Unified material lookup |
|
||||||
|
| GET | /api/qr/resolve/{code} | QR code resolve |
|
||||||
|
| GET | /api/usage-logs | List usage logs |
|
||||||
|
| POST | /api/usage-logs | Create usage log |
|
||||||
|
|
||||||
|
## CUB-110 Epic Progress (Go + React Rewrite)
|
||||||
|
|
||||||
|
| Sub-task | Title | Status | Agent |
|
||||||
|
|----------|-------|--------|-------|
|
||||||
|
| CUB-111 | Design PostgreSQL schema | Done | Hex |
|
||||||
|
| CUB-112 | Scaffold Go backend | Done | Dex |
|
||||||
|
| CUB-113 | Core CRUD API endpoints | Done | Dex |
|
||||||
|
| CUB-116 | Scaffold React frontend | In Review | Rex |
|
||||||
|
| CUB-117 | Moonraker + MQTT integrations | In Progress | Dex |
|
||||||
|
| CUB-118 | (deprecated → CUB-135 + CUB-136) | — | — |
|
||||||
|
| CUB-130 | Add/Edit Filament form | In Review | Rex |
|
||||||
|
| CUB-131 | Filament Detail page | In Review | Rex |
|
||||||
|
| CUB-132 | Filament Inventory list | Done | Rex |
|
||||||
|
| CUB-133 | Dashboard summary cards | In Review | Rex |
|
||||||
|
| CUB-134 | Printers list page | Todo | Rex |
|
||||||
|
| CUB-135 | Subscribe to SSE in React | In Review | Rex |
|
||||||
|
| CUB-136 | Add SSE endpoint in Go | In Review | Dex |
|
||||||
|
| CUB-128 | Settings page | Todo | — |
|
||||||
|
| CUB-129 | Print Jobs list page | Todo | — |
|
||||||
|
| CUB-114 | Pi 5 kiosk deployment | Todo | — |
|
||||||
|
|
||||||
|
## Active Branches
|
||||||
|
|
||||||
|
| Branch | Agent | Issue | Status |
|
||||||
|
|--------|-------|-------|--------|
|
||||||
|
| `agent/dex/CUB-117-moonraker-mqtt-go` | Dex | CUB-117 | Local commit ready |
|
||||||
|
| `agent/dex/CUB-136-sse-endpoint` | Dex | CUB-136 | PR open |
|
||||||
|
| `agent/rex/CUB-130-filament-form` | Rex | CUB-130 | PR open |
|
||||||
|
| `agent/rex/CUB-131-filament-detail` | Rex | CUB-131 | PR open |
|
||||||
|
| `agent/rex/CUB-133-dashboard-cards` | Rex | CUB-133 | PR open |
|
||||||
|
| `agent/rex/CUB-135-sse-subscribe` | Rex | CUB-135 | PR open |
|
||||||
|
|
||||||
|
## Known Limitations
|
||||||
|
|
||||||
|
- Go rewrite is in progress — backend `internal/` is new Go code, but legacy .NET code still serves endpoints
|
||||||
|
- Kiosk deployment not finalized (CUB-114)
|
||||||
|
- Smart intake workflow is designed but not implemented
|
||||||
|
- MQTT Bambu Lab integration is partially complete (CUB-117)
|
||||||
|
|
||||||
|
## Default Agent Assignments
|
||||||
|
|
||||||
|
| Area | Agent | Notes |
|
||||||
|
|------|-------|-------|
|
||||||
|
| Backend (Go API, Moonraker, MQTT) | Dex | gitea-dex MCP |
|
||||||
|
| Database (PostgreSQL schema, migrations) | Hex | gitea-hex MCP |
|
||||||
|
| Frontend (React, Tailwind) | Rex | gitea-rex MCP |
|
||||||
|
| Design (wireframes, UX) | Sketch | |
|
||||||
|
|
||||||
|
## Getting Started
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /mnt/ai-storage/projects/Extrudex
|
||||||
|
git checkout dev
|
||||||
|
git pull origin dev
|
||||||
|
|
||||||
|
# Legacy .NET backend
|
||||||
|
cd backend && dotnet run
|
||||||
|
|
||||||
|
# New Go backend
|
||||||
|
go run cmd/server/main.go
|
||||||
|
|
||||||
|
# React frontend
|
||||||
|
cd frontend && npm install && npm run dev
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
docker compose -f docker-compose.dev.yml up --build
|
||||||
|
```
|
||||||
+34
-12
@@ -1,34 +1,56 @@
|
|||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
import { BrowserRouter, Routes, Route, NavLink } from 'react-router-dom'
|
||||||
|
import { Package, Settings } from 'lucide-react'
|
||||||
import InventoryPage from './pages/InventoryPage'
|
import InventoryPage from './pages/InventoryPage'
|
||||||
import ToastContainer from './components/ToastContainer'
|
import SettingsPage from './pages/SettingsPage'
|
||||||
import { useSSE } from './hooks/useSSE'
|
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
|
|
||||||
function SSEProvider({ children }: { children: React.ReactNode }) {
|
|
||||||
useSSE()
|
|
||||||
return <>{children}</>
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<SSEProvider>
|
|
||||||
<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">
|
||||||
|
<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={<InventoryPage />} />
|
||||||
|
<Route path="/settings" element={<SettingsPage />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
<ToastContainer />
|
|
||||||
</SSEProvider>
|
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
import { Printer } from 'lucide-react'
|
|
||||||
|
|
||||||
const STYLES = {
|
|
||||||
online: 'bg-emerald-600 text-white',
|
|
||||||
offline: 'bg-slate-600 text-slate-200',
|
|
||||||
printing: 'bg-blue-600 text-white animate-pulse',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function PrinterStatusBadge({ status, name }: { status: string; name?: string }) {
|
|
||||||
const style = STYLES[status as keyof typeof STYLES] ?? STYLES.offline
|
|
||||||
return (
|
|
||||||
<span className={`inline-flex items-center gap-1.5 rounded-full px-2.5 py-1 text-xs font-medium ${style}`}>
|
|
||||||
<Printer size={12} />
|
|
||||||
{name ? `${name} · ${status}` : status}
|
|
||||||
</span>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -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`
|
||||||
|
}
|
||||||
@@ -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,70 +0,0 @@
|
|||||||
import { useEffect, useState, useCallback } from 'react'
|
|
||||||
import { X, CheckCircle, AlertTriangle, Info } from 'lucide-react'
|
|
||||||
import { addToastListener, type ToastMessage } from '../hooks/useSSE'
|
|
||||||
|
|
||||||
const ICONS = {
|
|
||||||
info: Info,
|
|
||||||
success: CheckCircle,
|
|
||||||
warning: AlertTriangle,
|
|
||||||
}
|
|
||||||
|
|
||||||
const STYLES = {
|
|
||||||
info: 'border-blue-600 bg-blue-900/40 text-blue-100',
|
|
||||||
success: 'border-emerald-600 bg-emerald-900/40 text-emerald-100',
|
|
||||||
warning: 'border-amber-600 bg-amber-900/40 text-amber-100',
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ToastContainer() {
|
|
||||||
const [toasts, setToasts] = useState<ToastMessage[]>([])
|
|
||||||
|
|
||||||
const remove = useCallback((id: string) => {
|
|
||||||
setToasts(prev => prev.filter(t => t.id !== id))
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
return addToastListener((toast) => {
|
|
||||||
setToasts(prev => {
|
|
||||||
// Prevent duplicate identical toasts within 3 seconds
|
|
||||||
const now = Date.now()
|
|
||||||
const recent = prev.filter(
|
|
||||||
t => t.title === toast.title && now - parseInt(t.id.split('-').pop() || '0', 10) < 3000
|
|
||||||
)
|
|
||||||
if (recent.length > 0) return prev
|
|
||||||
return [...prev.slice(-4), toast]
|
|
||||||
})
|
|
||||||
// Auto-dismiss after 5 seconds
|
|
||||||
setTimeout(() => remove(toast.id), 5000)
|
|
||||||
})
|
|
||||||
}, [remove])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="fixed bottom-4 right-4 z-50 flex flex-col gap-2 max-w-sm w-full pointer-events-none">
|
|
||||||
{toasts.map((toast) => {
|
|
||||||
const Icon = ICONS[toast.type]
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={toast.id}
|
|
||||||
className={`pointer-events-auto rounded-lg border px-4 py-3 shadow-lg backdrop-blur-sm transition-all ${STYLES[toast.type]}`}
|
|
||||||
>
|
|
||||||
<div className="flex items-start gap-3">
|
|
||||||
<Icon size={18} className="mt-0.5 shrink-0" />
|
|
||||||
<div className="flex-1 min-w-0">
|
|
||||||
<p className="text-sm font-semibold leading-snug">{toast.title}</p>
|
|
||||||
{toast.body && (
|
|
||||||
<p className="text-xs opacity-80 mt-0.5">{toast.body}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
onClick={() => remove(toast.id)}
|
|
||||||
className="shrink-0 -mr-1 -mt-1 p-1 rounded hover:bg-white/10 text-current opacity-70 hover:opacity-100 transition-opacity"
|
|
||||||
aria-label="Dismiss"
|
|
||||||
>
|
|
||||||
<X size={14} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
import { useEffect, useRef, useCallback } from 'react'
|
|
||||||
import { useQueryClient } from '@tanstack/react-query'
|
|
||||||
|
|
||||||
export type SSEEventType =
|
|
||||||
| 'printer.status'
|
|
||||||
| 'job.started'
|
|
||||||
| 'job.completed'
|
|
||||||
| 'filament.low'
|
|
||||||
|
|
||||||
export interface SSEEvent {
|
|
||||||
type: SSEEventType
|
|
||||||
payload: unknown
|
|
||||||
timestamp: string
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ToastMessage {
|
|
||||||
id: string
|
|
||||||
type: 'info' | 'success' | 'warning'
|
|
||||||
title: string
|
|
||||||
body?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
let toastListeners: Array<(toast: ToastMessage) => void> = []
|
|
||||||
|
|
||||||
export function addToastListener(cb: (toast: ToastMessage) => void) {
|
|
||||||
toastListeners.push(cb)
|
|
||||||
return () => {
|
|
||||||
toastListeners = toastListeners.filter(l => l !== cb)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function emitToast(toast: ToastMessage) {
|
|
||||||
toastListeners.forEach(cb => cb(toast))
|
|
||||||
}
|
|
||||||
|
|
||||||
const RECONNECT_BASE_MS = 1000
|
|
||||||
const RECONNECT_MAX_MS = 30000
|
|
||||||
|
|
||||||
export function useSSE(enabled = true) {
|
|
||||||
const queryClient = useQueryClient()
|
|
||||||
const esRef = useRef<EventSource | null>(null)
|
|
||||||
const reconnectTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
|
|
||||||
const attemptRef = useRef(0)
|
|
||||||
|
|
||||||
const connect = useCallback(() => {
|
|
||||||
if (!enabled) return
|
|
||||||
if (esRef.current) {
|
|
||||||
esRef.current.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
const es = new EventSource('/api/events')
|
|
||||||
esRef.current = es
|
|
||||||
|
|
||||||
es.onopen = () => {
|
|
||||||
attemptRef.current = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
es.addEventListener('printer.status', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
printer_id: number
|
|
||||||
printer_name: string
|
|
||||||
status: string
|
|
||||||
}
|
|
||||||
// Update printer list cache if it exists
|
|
||||||
queryClient.setQueryData(['printers'], (old: unknown) => {
|
|
||||||
if (!Array.isArray(old)) return old
|
|
||||||
return old.map((p: any) =>
|
|
||||||
p.id === payload.printer_id
|
|
||||||
? { ...p, status: payload.status, name: payload.printer_name }
|
|
||||||
: p
|
|
||||||
)
|
|
||||||
})
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('job.started', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
job_id: number
|
|
||||||
job_name: string
|
|
||||||
printer_id: number
|
|
||||||
spool_id?: number
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `job-started-${payload.job_id}-${Date.now()}`,
|
|
||||||
type: 'info',
|
|
||||||
title: `Job started: ${payload.job_name}`,
|
|
||||||
body: `Printer #${payload.printer_id}`,
|
|
||||||
})
|
|
||||||
// Invalidate print jobs list
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['print-jobs'] })
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('job.completed', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
job_id: number
|
|
||||||
job_name: string
|
|
||||||
printer_id: number
|
|
||||||
duration_seconds?: number
|
|
||||||
total_grams_used?: number
|
|
||||||
total_cost_usd?: number
|
|
||||||
}
|
|
||||||
const parts: string[] = []
|
|
||||||
if (payload.duration_seconds != null) {
|
|
||||||
const mins = Math.round(payload.duration_seconds / 60)
|
|
||||||
parts.push(`${mins} min`)
|
|
||||||
}
|
|
||||||
if (payload.total_grams_used != null) {
|
|
||||||
parts.push(`${payload.total_grams_used.toFixed(1)} g used`)
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `job-completed-${payload.job_id}-${Date.now()}`,
|
|
||||||
type: 'success',
|
|
||||||
title: `Job completed: ${payload.job_name}`,
|
|
||||||
body: parts.join(' · ') || `Printer #${payload.printer_id}`,
|
|
||||||
})
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['print-jobs'] })
|
|
||||||
queryClient.invalidateQueries({ queryKey: ['filaments'] })
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.addEventListener('filament.low', (e) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(e.data) as SSEEvent
|
|
||||||
const payload = data.payload as {
|
|
||||||
spool_id: number
|
|
||||||
spool_name: string
|
|
||||||
remaining_grams: number
|
|
||||||
threshold_grams: number
|
|
||||||
}
|
|
||||||
emitToast({
|
|
||||||
id: `filament-low-${payload.spool_id}-${Date.now()}`,
|
|
||||||
type: 'warning',
|
|
||||||
title: `Low filament: ${payload.spool_name}`,
|
|
||||||
body: `${payload.remaining_grams} g remaining (threshold ${payload.threshold_grams} g)`,
|
|
||||||
})
|
|
||||||
// Update filament inventory cache in place for instant UI feedback
|
|
||||||
queryClient.setQueryData(['filaments'], (old: unknown) => {
|
|
||||||
if (!old || typeof old !== 'object') return old
|
|
||||||
const o = old as { data?: Array<Record<string, unknown>>; total?: number }
|
|
||||||
if (!Array.isArray(o.data)) return old
|
|
||||||
return {
|
|
||||||
...o,
|
|
||||||
data: o.data.map((f) =>
|
|
||||||
(f.id as number) === payload.spool_id
|
|
||||||
? { ...f, remaining_grams: payload.remaining_grams }
|
|
||||||
: f
|
|
||||||
),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch {
|
|
||||||
// ignore malformed event
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
es.onerror = () => {
|
|
||||||
es.close()
|
|
||||||
// Exponential backoff with jitter
|
|
||||||
const base = Math.min(RECONNECT_MAX_MS, RECONNECT_BASE_MS * 2 ** attemptRef.current)
|
|
||||||
const jitter = Math.random() * 1000
|
|
||||||
const delay = base + jitter
|
|
||||||
attemptRef.current += 1
|
|
||||||
reconnectTimerRef.current = setTimeout(() => {
|
|
||||||
connect()
|
|
||||||
}, delay)
|
|
||||||
}
|
|
||||||
}, [enabled, queryClient])
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
connect()
|
|
||||||
return () => {
|
|
||||||
if (reconnectTimerRef.current) {
|
|
||||||
clearTimeout(reconnectTimerRef.current)
|
|
||||||
}
|
|
||||||
if (esRef.current) {
|
|
||||||
esRef.current.close()
|
|
||||||
esRef.current = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [connect])
|
|
||||||
}
|
|
||||||
@@ -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>,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,290 @@
|
|||||||
|
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -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