Compare commits
5 Commits
62d74beba4
...
agent/rex/
| Author | SHA1 | Date | |
|---|---|---|---|
| ba167943dd | |||
| f1614029b5 | |||
| 1109d1dd2f | |||
| fd26b205bf | |||
| 41f66005a6 |
@@ -12,6 +12,7 @@ import (
|
|||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/config"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/config"
|
||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/db"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/db"
|
||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/router"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/router"
|
||||||
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/sse"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -39,15 +40,24 @@ func main() {
|
|||||||
|
|
||||||
slog.Info("database connected")
|
slog.Info("database connected")
|
||||||
|
|
||||||
|
// Create SSE broadcaster and start it
|
||||||
|
sseBC := sse.NewBroadcaster(128)
|
||||||
|
sseBC.Start()
|
||||||
|
defer sseBC.Stop()
|
||||||
|
|
||||||
|
slog.Info("sse broadcaster started")
|
||||||
|
|
||||||
// Create router
|
// Create router
|
||||||
r := router.New(cfg, dbPool)
|
r := router.New(cfg, dbPool, sseBC)
|
||||||
|
|
||||||
// Create HTTP server
|
// Create HTTP server
|
||||||
|
// WriteTimeout is 0 for SSE support — the Chi middleware.Timeout(60s)
|
||||||
|
// handles request-level timeouts on non-SSE routes.
|
||||||
server := &http.Server{
|
server := &http.Server{
|
||||||
Addr: ":" + cfg.Port,
|
Addr: ":" + cfg.Port,
|
||||||
Handler: r,
|
Handler: r,
|
||||||
ReadTimeout: 15 * time.Second,
|
ReadTimeout: 15 * time.Second,
|
||||||
WriteTimeout: 15 * time.Second,
|
WriteTimeout: 0, // disabled for SSE long-lived connections
|
||||||
IdleTimeout: 60 * time.Second,
|
IdleTimeout: 60 * time.Second,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,14 @@ import (
|
|||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/handlers"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/handlers"
|
||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
|
||||||
"github.com/CubeCraft-Creations/Extrudex/backend/internal/services"
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/services"
|
||||||
|
"github.com/CubeCraft-Creations/Extrudex/backend/internal/sse"
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/go-chi/chi/v5/middleware"
|
"github.com/go-chi/chi/v5/middleware"
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
)
|
)
|
||||||
|
|
||||||
// New creates and configures a Chi router with all middleware and handlers mounted.
|
// New creates and configures a Chi router with all middleware and handlers mounted.
|
||||||
func New(cfg *config.Config, dbPool *pgxpool.Pool) chi.Router {
|
func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.Router {
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
|
|
||||||
// Middleware
|
// Middleware
|
||||||
@@ -22,7 +23,7 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool) chi.Router {
|
|||||||
r.Use(middleware.RealIP)
|
r.Use(middleware.RealIP)
|
||||||
r.Use(middleware.Logger)
|
r.Use(middleware.Logger)
|
||||||
r.Use(middleware.Recoverer)
|
r.Use(middleware.Recoverer)
|
||||||
r.Use(middleware.Timeout(60 * time.Second))
|
// Timeout middleware is applied per-route below to exclude SSE
|
||||||
|
|
||||||
// CORS
|
// CORS
|
||||||
r.Use(func(next http.Handler) http.Handler {
|
r.Use(func(next http.Handler) http.Handler {
|
||||||
@@ -38,9 +39,9 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool) chi.Router {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// Health check
|
// Health check (with timeout)
|
||||||
healthHandler := handlers.NewHealthHandler(dbPool)
|
healthHandler := handlers.NewHealthHandler(dbPool)
|
||||||
r.Get("/health", healthHandler.ServeHTTP)
|
r.With(middleware.Timeout(30 * time.Second)).Get("/health", healthHandler.ServeHTTP)
|
||||||
|
|
||||||
// ── Repositories ──────────────────────────────────────────────────────
|
// ── Repositories ──────────────────────────────────────────────────────
|
||||||
materialRepo := repositories.NewMaterialRepository(dbPool)
|
materialRepo := repositories.NewMaterialRepository(dbPool)
|
||||||
@@ -61,8 +62,9 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool) chi.Router {
|
|||||||
printJobHandler := handlers.NewPrintJobHandler(printJobService)
|
printJobHandler := handlers.NewPrintJobHandler(printJobService)
|
||||||
usageLogHandler := handlers.NewUsageLogHandler(usageLogRepo)
|
usageLogHandler := handlers.NewUsageLogHandler(usageLogRepo)
|
||||||
|
|
||||||
// ── API Routes ────────────────────────────────────────────────────────
|
// ── API Routes (with timeout) ─────────────────────────────────────────
|
||||||
r.Route("/api", func(r chi.Router) {
|
r.Route("/api", func(r chi.Router) {
|
||||||
|
r.Use(middleware.Timeout(60 * time.Second))
|
||||||
r.Get("/materials", materialHandler.List)
|
r.Get("/materials", materialHandler.List)
|
||||||
|
|
||||||
r.Route("/filaments", func(r chi.Router) {
|
r.Route("/filaments", func(r chi.Router) {
|
||||||
@@ -78,6 +80,10 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool) chi.Router {
|
|||||||
r.Get("/printers", printerHandler.List)
|
r.Get("/printers", printerHandler.List)
|
||||||
r.Get("/print-jobs", printJobHandler.List)
|
r.Get("/print-jobs", printJobHandler.List)
|
||||||
r.Get("/usage-logs", usageLogHandler.List)
|
r.Get("/usage-logs", usageLogHandler.List)
|
||||||
|
|
||||||
|
// SSE Events stream
|
||||||
|
sseHandler := sse.NewHandler(sseBC)
|
||||||
|
r.Get("/events", sseHandler.ServeHTTP)
|
||||||
})
|
})
|
||||||
|
|
||||||
return r
|
return r
|
||||||
|
|||||||
133
backend/internal/sse/broadcaster.go
Normal file
133
backend/internal/sse/broadcaster.go
Normal file
@@ -0,0 +1,133 @@
|
|||||||
|
package sse
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// client represents a single SSE subscriber — identified by its send channel.
|
||||||
|
type client struct {
|
||||||
|
ch chan string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Broadcaster receives Events on its input channel and fans them out to every
|
||||||
|
// connected client. Subscribe adds a new client; Unsubscribe removes one.
|
||||||
|
// Start must be called before the broadcaster accepts events.
|
||||||
|
type Broadcaster struct {
|
||||||
|
input chan Event
|
||||||
|
subscribe chan client
|
||||||
|
unsubscribe chan client
|
||||||
|
clients map[chan string]struct{}
|
||||||
|
done chan struct{}
|
||||||
|
once sync.Once
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewBroadcaster creates a Broadcaster. bufSize controls the buffer depth for
|
||||||
|
// the input channel as well as for each per-client outbound channel.
|
||||||
|
func NewBroadcaster(bufSize int) *Broadcaster {
|
||||||
|
if bufSize <= 0 {
|
||||||
|
bufSize = 64
|
||||||
|
}
|
||||||
|
return &Broadcaster{
|
||||||
|
input: make(chan Event, bufSize),
|
||||||
|
subscribe: make(chan client),
|
||||||
|
unsubscribe: make(chan client),
|
||||||
|
clients: make(map[chan string]struct{}),
|
||||||
|
done: make(chan struct{}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Publish pushes an event into the broadcaster. Safe for concurrent use.
|
||||||
|
func (b *Broadcaster) Publish(ev Event) {
|
||||||
|
select {
|
||||||
|
case b.input <- ev:
|
||||||
|
case <-b.done:
|
||||||
|
// Silently drop during shutdown.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start launches the broadcaster's fan-out loop in a goroutine.
|
||||||
|
// It must be called before Publish is used.
|
||||||
|
func (b *Broadcaster) Start() {
|
||||||
|
go b.loop()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop terminates the fan-out loop and closes all client channels.
|
||||||
|
// It is safe to call multiple times.
|
||||||
|
func (b *Broadcaster) Stop() {
|
||||||
|
b.once.Do(func() {
|
||||||
|
close(b.done)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Subscribe returns a new client channel that receives SSE-formatted strings.
|
||||||
|
func (b *Broadcaster) Subscribe() chan string {
|
||||||
|
c := client{ch: make(chan string, 64)}
|
||||||
|
select {
|
||||||
|
case b.subscribe <- c:
|
||||||
|
case <-b.done:
|
||||||
|
// Broadcaster already stopped — return a closed chan so the handler
|
||||||
|
// can bail out quickly.
|
||||||
|
ch := make(chan string)
|
||||||
|
close(ch)
|
||||||
|
return ch
|
||||||
|
}
|
||||||
|
return c.ch
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unsubscribe removes a client channel and closes it.
|
||||||
|
func (b *Broadcaster) Unsubscribe(ch chan string) {
|
||||||
|
c := client{ch: ch}
|
||||||
|
select {
|
||||||
|
case b.unsubscribe <- c:
|
||||||
|
case <-b.done:
|
||||||
|
// Already shutting down — channels will be cleaned up by Stop.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loop is the core fan-out goroutine.
|
||||||
|
func (b *Broadcaster) loop() {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case ev := <-b.input:
|
||||||
|
sse := ev.toSSE()
|
||||||
|
for ch := range b.clients {
|
||||||
|
// Non-blocking send — slow clients are dropped.
|
||||||
|
select {
|
||||||
|
case ch <- sse:
|
||||||
|
default:
|
||||||
|
slog.Warn("sse broadcaster: dropping event for slow client", "type", ev.Type)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
case c := <-b.subscribe:
|
||||||
|
b.clients[c.ch] = struct{}{}
|
||||||
|
slog.Debug("sse broadcaster: client connected", "total_clients", len(b.clients))
|
||||||
|
|
||||||
|
case c := <-b.unsubscribe:
|
||||||
|
if _, ok := b.clients[c.ch]; ok {
|
||||||
|
delete(b.clients, c.ch)
|
||||||
|
close(c.ch)
|
||||||
|
slog.Debug("sse broadcaster: client disconnected", "total_clients", len(b.clients))
|
||||||
|
}
|
||||||
|
|
||||||
|
case <-b.done:
|
||||||
|
// Drain remaining events in input before shutting down.
|
||||||
|
for ev := range b.input {
|
||||||
|
sse := ev.toSSE()
|
||||||
|
for ch := range b.clients {
|
||||||
|
select {
|
||||||
|
case ch <- sse:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Close all remaining client channels.
|
||||||
|
for ch := range b.clients {
|
||||||
|
close(ch)
|
||||||
|
}
|
||||||
|
b.clients = nil
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
92
backend/internal/sse/events.go
Normal file
92
backend/internal/sse/events.go
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
// Package sse provides Server-Sent Events infrastructure for real-time updates.
|
||||||
|
// Includes event types, a central broadcaster, and an HTTP handler.
|
||||||
|
package sse
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// EventType identifies the category of an SSE event.
|
||||||
|
type EventType string
|
||||||
|
|
||||||
|
const (
|
||||||
|
EventPrinterStatus EventType = "printer.status"
|
||||||
|
EventJobStarted EventType = "job.started"
|
||||||
|
EventJobCompleted EventType = "job.completed"
|
||||||
|
EventFilamentLow EventType = "filament.low"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Event is a JSON-serializable SSE event pushed through the broadcaster.
|
||||||
|
type Event struct {
|
||||||
|
Type EventType `json:"type"`
|
||||||
|
Payload json.RawMessage `json:"payload"`
|
||||||
|
Timestamp time.Time `json:"timestamp"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PrinterStatusPayload carries printer online/offline/printing state.
|
||||||
|
type PrinterStatusPayload struct {
|
||||||
|
PrinterID int `json:"printer_id"`
|
||||||
|
PrinterName string `json:"printer_name"`
|
||||||
|
Status string `json:"status"` // "online", "offline", "printing"
|
||||||
|
}
|
||||||
|
|
||||||
|
// JobStartedPayload carries initial print job info.
|
||||||
|
type JobStartedPayload struct {
|
||||||
|
JobID int `json:"job_id"`
|
||||||
|
JobName string `json:"job_name"`
|
||||||
|
PrinterID int `json:"printer_id"`
|
||||||
|
SpoolID *int `json:"spool_id,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// JobCompletedPayload carries final print job data including usage.
|
||||||
|
type JobCompletedPayload struct {
|
||||||
|
JobID int `json:"job_id"`
|
||||||
|
JobName string `json:"job_name"`
|
||||||
|
PrinterID int `json:"printer_id"`
|
||||||
|
DurationSeconds *int `json:"duration_seconds,omitempty"`
|
||||||
|
TotalGramsUsed *float64 `json:"total_grams_used,omitempty"`
|
||||||
|
TotalCostUSD *float64 `json:"total_cost_usd,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FilamentLowPayload alerts that a spool is below its threshold.
|
||||||
|
type FilamentLowPayload struct {
|
||||||
|
SpoolID int `json:"spool_id"`
|
||||||
|
SpoolName string `json:"spool_name"`
|
||||||
|
RemainingGrams int `json:"remaining_grams"`
|
||||||
|
ThresholdGrams int `json:"threshold_grams"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewEvent creates an Event with the current timestamp from a typed payload.
|
||||||
|
func NewEvent(eventType EventType, payload any) (Event, error) {
|
||||||
|
raw, err := json.Marshal(payload)
|
||||||
|
if err != nil {
|
||||||
|
return Event{}, err
|
||||||
|
}
|
||||||
|
return Event{
|
||||||
|
Type: eventType,
|
||||||
|
Payload: raw,
|
||||||
|
Timestamp: time.Now().UTC(),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// MustEvent creates an Event and panics on marshal failure (for use with
|
||||||
|
// known-good payloads in tests and internal wiring).
|
||||||
|
func MustEvent(eventType EventType, payload any) Event {
|
||||||
|
ev, err := NewEvent(eventType, payload)
|
||||||
|
if err != nil {
|
||||||
|
panic("sse.MustEvent: failed to marshal payload: " + err.Error())
|
||||||
|
}
|
||||||
|
return ev
|
||||||
|
}
|
||||||
|
|
||||||
|
// toSSE formats this Event as a standard SSE message string ready to be
|
||||||
|
// written to a response writer. The format is:
|
||||||
|
//
|
||||||
|
// event: <type>
|
||||||
|
// data: <json>
|
||||||
|
//
|
||||||
|
func (e Event) toSSE() string {
|
||||||
|
data, _ := json.Marshal(e)
|
||||||
|
return "event: " + string(e.Type) + "\n" + "data: " + string(data) + "\n\n"
|
||||||
|
}
|
||||||
59
backend/internal/sse/handler.go
Normal file
59
backend/internal/sse/handler.go
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
package sse
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handler is the HTTP handler for the GET /api/events SSE stream.
|
||||||
|
// It registers a client with the broadcaster, streams events as they arrive,
|
||||||
|
// and unregisters on disconnect.
|
||||||
|
type Handler struct {
|
||||||
|
bc *Broadcaster
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHandler creates a Handler backed by the given Broadcaster.
|
||||||
|
func NewHandler(bc *Broadcaster) *Handler {
|
||||||
|
return &Handler{bc: bc}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServeHTTP implements the SSE streaming endpoint.
|
||||||
|
// Flusher is required; clients that do not support flushing receive a 501.
|
||||||
|
func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
|
flusher, ok := w.(http.Flusher)
|
||||||
|
if !ok {
|
||||||
|
http.Error(w, "streaming not supported", http.StatusNotImplemented)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// SSE-specific headers
|
||||||
|
w.Header().Set("Content-Type", "text/event-stream")
|
||||||
|
w.Header().Set("Cache-Control", "no-cache")
|
||||||
|
w.Header().Set("Connection", "keep-alive")
|
||||||
|
w.Header().Set("X-Accel-Buffering", "no") // Disable nginx buffering
|
||||||
|
|
||||||
|
// Write headers immediately
|
||||||
|
flusher.Flush()
|
||||||
|
|
||||||
|
// Subscribe to the broadcaster
|
||||||
|
ch := h.bc.Subscribe()
|
||||||
|
defer h.bc.Unsubscribe(ch)
|
||||||
|
|
||||||
|
// Use request context for cancellation when the client disconnects.
|
||||||
|
ctx := r.Context()
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case msg, ok := <-ch:
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, err := w.Write([]byte(msg))
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
flusher.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,28 +1,27 @@
|
|||||||
import { useState, useEffect } from 'react'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
|
import { BrowserRouter, Routes, Route } from 'react-router-dom'
|
||||||
|
import InventoryPage from './pages/InventoryPage'
|
||||||
|
import FilamentDetailPage from './pages/FilamentDetailPage'
|
||||||
|
|
||||||
function App() {
|
const queryClient = new QueryClient()
|
||||||
const [health, setHealth] = useState<any>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
fetch('/api/health')
|
|
||||||
.then(r => r.json())
|
|
||||||
.then(setHealth)
|
|
||||||
.catch(console.error)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<div className="min-h-screen flex items-center justify-center">
|
<QueryClientProvider client={queryClient}>
|
||||||
<div className="p-6 rounded-lg bg-slate-800 shadow-xl max-w-md w-full">
|
<BrowserRouter>
|
||||||
<h1 className="text-2xl font-bold mb-4 text-emerald-400">Extrudex</h1>
|
<div className="min-h-screen bg-slate-900 text-slate-50">
|
||||||
<p className="text-slate-300 mb-4">React frontend scaffold</p>
|
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20">
|
||||||
{health && (
|
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
||||||
<pre className="text-xs bg-slate-900 p-3 rounded overflow-auto">
|
<h1 className="text-lg font-semibold">Extrudex</h1>
|
||||||
{JSON.stringify(health, null, 2)}
|
</header>
|
||||||
</pre>
|
<main className="p-4">
|
||||||
)}
|
<Routes>
|
||||||
</div>
|
<Route path="/" element={<InventoryPage />} />
|
||||||
|
<Route path="/filament/:id" element={<FilamentDetailPage />} />
|
||||||
|
</Routes>
|
||||||
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
</BrowserRouter>
|
||||||
|
</QueryClientProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default App
|
|
||||||
|
|||||||
18
frontend/src/components/ColorSwatch.tsx
Normal file
18
frontend/src/components/ColorSwatch.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
interface ColorSwatchProps {
|
||||||
|
colorHex: string
|
||||||
|
size?: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function ColorSwatch({ colorHex, size = 24 }: ColorSwatchProps) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="rounded-full border border-slate-600 shadow-sm inline-block"
|
||||||
|
style={{
|
||||||
|
backgroundColor: colorHex.startsWith('#') ? colorHex : `#${colorHex}`,
|
||||||
|
width: size,
|
||||||
|
height: size,
|
||||||
|
}}
|
||||||
|
title={colorHex}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
391
frontend/src/pages/FilamentDetailPage.tsx
Normal file
391
frontend/src/pages/FilamentDetailPage.tsx
Normal file
@@ -0,0 +1,391 @@
|
|||||||
|
import { useState } from 'react'
|
||||||
|
import { useParams, useNavigate } from 'react-router-dom'
|
||||||
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
|
import { ArrowLeft, Pencil, Trash2, AlertTriangle, Loader2, Archive } from 'lucide-react'
|
||||||
|
import ColorSwatch from '../components/ColorSwatch'
|
||||||
|
import { fetchFilamentById, fetchUsageLogs, deleteFilament } from '../services/filamentService'
|
||||||
|
import type { UsageLog } from '../types/filament'
|
||||||
|
|
||||||
|
export default function FilamentDetailPage() {
|
||||||
|
const { id } = useParams<{ id: string }>()
|
||||||
|
const spoolId = Number(id)
|
||||||
|
const navigate = useNavigate()
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const [deleteConfirm, setDeleteConfirm] = useState(false)
|
||||||
|
const [deleting, setDeleting] = useState(false)
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: spool,
|
||||||
|
isLoading: spoolLoading,
|
||||||
|
error: spoolError,
|
||||||
|
refetch: refetchSpool,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['filament', spoolId],
|
||||||
|
queryFn: () => fetchFilamentById(spoolId),
|
||||||
|
enabled: !isNaN(spoolId),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: usageLogs,
|
||||||
|
isLoading: usageLoading,
|
||||||
|
error: usageError,
|
||||||
|
refetch: refetchUsage,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['usage-logs', spoolId],
|
||||||
|
queryFn: () => fetchUsageLogs(spoolId),
|
||||||
|
enabled: !isNaN(spoolId),
|
||||||
|
})
|
||||||
|
|
||||||
|
const handleDelete = async () => {
|
||||||
|
setDeleting(true)
|
||||||
|
try {
|
||||||
|
await deleteFilament(spoolId)
|
||||||
|
queryClient.invalidateQueries({ queryKey: ['filaments'] })
|
||||||
|
navigate('/')
|
||||||
|
} catch {
|
||||||
|
setDeleting(false)
|
||||||
|
setDeleteConfirm(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Loading state ──
|
||||||
|
if (spoolLoading) {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center justify-center py-24 gap-3 text-slate-400">
|
||||||
|
<Loader2 size={32} className="animate-spin text-emerald-400" />
|
||||||
|
<span>Loading spool details…</span>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Error state ──
|
||||||
|
if (spoolError || !spool) {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center justify-center py-24 gap-4">
|
||||||
|
<div className="flex h-14 w-14 items-center justify-center rounded-full bg-red-900/30">
|
||||||
|
<AlertTriangle size={28} className="text-red-400" />
|
||||||
|
</div>
|
||||||
|
<p className="text-red-400 font-medium">Failed to load spool details.</p>
|
||||||
|
<div className="flex gap-3">
|
||||||
|
<button
|
||||||
|
onClick={() => refetchSpool()}
|
||||||
|
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
|
||||||
|
>
|
||||||
|
Retry
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => navigate('/')}
|
||||||
|
className="rounded-lg bg-slate-800 border border-slate-700 px-4 py-2 text-sm font-medium text-slate-300 hover:bg-slate-700 transition-colors"
|
||||||
|
>
|
||||||
|
Back to Inventory
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const pctRemaining = spool.initial_grams > 0
|
||||||
|
? (spool.remaining_grams / spool.initial_grams) * 100
|
||||||
|
: 0
|
||||||
|
const isLow = spool.remaining_grams <= (spool.low_stock_threshold_grams || 0)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-6">
|
||||||
|
{/* ── Header Bar ── */}
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
|
<button
|
||||||
|
onClick={() => navigate('/')}
|
||||||
|
className="inline-flex items-center gap-2 rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm font-medium text-slate-200 hover:bg-slate-700 active:bg-slate-600 transition-colors w-fit"
|
||||||
|
>
|
||||||
|
<ArrowLeft size={16} />
|
||||||
|
Back to Inventory
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button className="inline-flex items-center gap-2 rounded-lg bg-slate-700 px-4 py-2 text-sm font-semibold text-slate-200 hover:bg-slate-600 active:bg-slate-500 transition-colors">
|
||||||
|
<Pencil size={16} />
|
||||||
|
Edit
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteConfirm(true)}
|
||||||
|
className="inline-flex items-center gap-2 rounded-lg bg-red-900/30 border border-red-700 px-4 py-2 text-sm font-semibold text-red-300 hover:bg-red-900/50 active:bg-red-900/70 transition-colors"
|
||||||
|
>
|
||||||
|
<Trash2 size={16} />
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Spool Info Card ── */}
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||||
|
{/* Card header */}
|
||||||
|
<div className="px-6 py-5 border-b border-slate-700 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<ColorSwatch colorHex={spool.color_hex} size={36} />
|
||||||
|
<div>
|
||||||
|
<h1 className="text-xl font-bold text-slate-100">{spool.name}</h1>
|
||||||
|
<p className="text-sm text-slate-400">
|
||||||
|
{spool.brand && <span>{spool.brand} · </span>}
|
||||||
|
{spool.diameter_mm}mm
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{isLow ? (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-red-900/40 border border-red-700 px-3 py-1 text-sm font-medium text-red-300">
|
||||||
|
<AlertTriangle size={14} /> Low Stock
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-emerald-900/30 border border-emerald-700 px-3 py-1 text-sm font-medium text-emerald-300">
|
||||||
|
In Stock
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Card body — 2-column grid */}
|
||||||
|
<div className="px-6 py-5 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-4">
|
||||||
|
<DetailItem label="Material" value={spool.material_base?.name ?? '—'} />
|
||||||
|
<DetailItem label="Finish" value={spool.material_finish?.name ?? '—'} />
|
||||||
|
<DetailItem
|
||||||
|
label="Modifier"
|
||||||
|
value={spool.material_modifier?.name ?? 'None'}
|
||||||
|
/>
|
||||||
|
<DetailItem label="Color" value={spool.color_hex.toUpperCase()} />
|
||||||
|
<DetailItem label="Brand" value={spool.brand || '—'} />
|
||||||
|
<DetailItem label="Diameter" value={`${spool.diameter_mm}mm`} />
|
||||||
|
<DetailItem
|
||||||
|
label="Remaining"
|
||||||
|
value={
|
||||||
|
<span className="font-semibold tabular-nums">
|
||||||
|
{spool.remaining_grams.toLocaleString()} g
|
||||||
|
</span>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<DetailItem
|
||||||
|
label="Initial"
|
||||||
|
value={`${spool.initial_grams.toLocaleString()} g`}
|
||||||
|
/>
|
||||||
|
<DetailItem
|
||||||
|
label="Cost"
|
||||||
|
value={
|
||||||
|
spool.cost_usd != null
|
||||||
|
? `$${spool.cost_usd.toFixed(2)}`
|
||||||
|
: '—'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Progress Bar */}
|
||||||
|
<div className="px-6 pb-5 pt-1">
|
||||||
|
<div className="flex items-center justify-between text-sm mb-1.5">
|
||||||
|
<span className="text-slate-400">
|
||||||
|
<span className="text-slate-200 font-semibold tabular-nums">
|
||||||
|
{spool.remaining_grams.toLocaleString()}g
|
||||||
|
</span>{' '}
|
||||||
|
of {spool.initial_grams.toLocaleString()}g
|
||||||
|
</span>
|
||||||
|
<span className="text-slate-400 font-medium tabular-nums">
|
||||||
|
{pctRemaining.toFixed(1)}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="w-full h-3 rounded-full bg-slate-700 overflow-hidden">
|
||||||
|
<div
|
||||||
|
className={`h-full rounded-full transition-all duration-500 ${
|
||||||
|
pctRemaining <= 10
|
||||||
|
? 'bg-red-500'
|
||||||
|
: pctRemaining <= 25
|
||||||
|
? 'bg-amber-500'
|
||||||
|
: 'bg-emerald-500'
|
||||||
|
}`}
|
||||||
|
style={{ width: `${Math.min(100, pctRemaining)}%` }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Usage History ── */}
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||||
|
<div className="px-6 py-4 border-b border-slate-700">
|
||||||
|
<h2 className="text-lg font-semibold text-slate-100">Usage History</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Loading sub-state */}
|
||||||
|
{usageLoading && (
|
||||||
|
<div className="px-6 py-8 text-center text-slate-400">
|
||||||
|
<Loader2 size={20} className="animate-spin inline mr-2" />
|
||||||
|
Loading usage history…
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Usage error sub-state */}
|
||||||
|
{usageError && !usageLoading && (
|
||||||
|
<div className="px-6 py-8 text-center">
|
||||||
|
<p className="text-red-400 text-sm">
|
||||||
|
Failed to load usage history.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
onClick={() => refetchUsage()}
|
||||||
|
className="mt-2 text-sm text-emerald-400 hover:text-emerald-300 underline"
|
||||||
|
>
|
||||||
|
Retry
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Empty state */}
|
||||||
|
{!usageLoading && !usageError && usageLogs && usageLogs.length === 0 && (
|
||||||
|
<div className="px-6 py-10 text-center">
|
||||||
|
<Archive size={32} className="mx-auto text-slate-600 mb-2" />
|
||||||
|
<p className="text-slate-400 text-sm">No usage recorded yet.</p>
|
||||||
|
<p className="text-slate-500 text-xs mt-1">
|
||||||
|
Usage data will appear here when this spool is used in print jobs.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Table — desktop */}
|
||||||
|
{!usageLoading && !usageError && usageLogs && usageLogs.length > 0 && (
|
||||||
|
<>
|
||||||
|
<div className="hidden md:block overflow-x-auto">
|
||||||
|
<table className="w-full text-sm">
|
||||||
|
<thead className="bg-slate-800/50 text-slate-300">
|
||||||
|
<tr>
|
||||||
|
<th className="px-6 py-3 text-left font-semibold">Date</th>
|
||||||
|
<th className="px-6 py-3 text-left font-semibold">Print Job</th>
|
||||||
|
<th className="px-6 py-3 text-right font-semibold">mm Extruded</th>
|
||||||
|
<th className="px-6 py-3 text-right font-semibold">Grams Used</th>
|
||||||
|
<th className="px-6 py-3 text-right font-semibold">Cost</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-slate-700">
|
||||||
|
{usageLogs.map((log: UsageLog) => (
|
||||||
|
<tr
|
||||||
|
key={log.id}
|
||||||
|
className="hover:bg-slate-700/30 transition-colors"
|
||||||
|
>
|
||||||
|
<td className="px-6 py-3 text-slate-200 tabular-nums">
|
||||||
|
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: 'short',
|
||||||
|
day: 'numeric',
|
||||||
|
})}
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-3 text-slate-300">
|
||||||
|
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||||
|
{log.mm_extruded.toLocaleString()}
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||||
|
{log.grams_used.toFixed(2)} g
|
||||||
|
</td>
|
||||||
|
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||||
|
{log.cost_usd != null ? `$${log.cost_usd.toFixed(3)}` : '—'}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Mobile cards */}
|
||||||
|
<div className="md:hidden divide-y divide-slate-700">
|
||||||
|
{usageLogs.map((log: UsageLog) => (
|
||||||
|
<div key={log.id} className="px-4 py-4 space-y-2">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<span className="text-sm font-medium text-slate-200">
|
||||||
|
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
||||||
|
</span>
|
||||||
|
<span className="text-xs text-slate-400 tabular-nums">
|
||||||
|
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
||||||
|
month: 'short',
|
||||||
|
day: 'numeric',
|
||||||
|
})}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center justify-between text-sm">
|
||||||
|
<span className="text-slate-400">
|
||||||
|
Extruded:{' '}
|
||||||
|
<span className="text-slate-300 tabular-nums">
|
||||||
|
{log.mm_extruded.toLocaleString()} mm
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="text-slate-400">
|
||||||
|
Used:{' '}
|
||||||
|
<span className="text-slate-300 tabular-nums">
|
||||||
|
{log.grams_used.toFixed(2)} g
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
<span className="text-slate-400">
|
||||||
|
{log.cost_usd != null ? (
|
||||||
|
<>
|
||||||
|
Cost:{' '}
|
||||||
|
<span className="text-slate-300 tabular-nums">
|
||||||
|
${log.cost_usd.toFixed(3)}
|
||||||
|
</span>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
'—'
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Delete Confirmation Modal ── */}
|
||||||
|
{deleteConfirm && (
|
||||||
|
<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 flex-shrink-0">
|
||||||
|
<AlertTriangle size={20} className="text-red-400" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 className="text-lg font-semibold text-slate-100">
|
||||||
|
Delete “{spool.name}”?
|
||||||
|
</h3>
|
||||||
|
<p className="text-sm text-slate-400">
|
||||||
|
This permanently removes the spool and all usage history. This cannot be undone.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteConfirm(false)}
|
||||||
|
disabled={deleting}
|
||||||
|
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={handleDelete}
|
||||||
|
disabled={deleting}
|
||||||
|
className="inline-flex items-center gap-2 rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-500 transition-colors disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{deleting && <Loader2 size={16} className="animate-spin" />}
|
||||||
|
{deleting ? 'Deleting…' : 'Delete'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Small detail row for the info card grid */
|
||||||
|
function DetailItem({ label, value }: { label: string; value: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<dt className="text-xs font-medium uppercase tracking-wider text-slate-500 mb-0.5">
|
||||||
|
{label}
|
||||||
|
</dt>
|
||||||
|
<dd className="text-sm text-slate-200">{value}</dd>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
339
frontend/src/pages/InventoryPage.tsx
Normal file
339
frontend/src/pages/InventoryPage.tsx
Normal file
@@ -0,0 +1,339 @@
|
|||||||
|
import { useState, useMemo } from 'react'
|
||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { Search, Filter, ChevronLeft, ChevronRight, Trash2, Pencil, Plus, AlertTriangle } from 'lucide-react'
|
||||||
|
import ColorSwatch from '../components/ColorSwatch'
|
||||||
|
import { fetchFilaments, deleteFilament } from '../services/filamentService'
|
||||||
|
import type { FilamentSpool, FilamentFilter } from '../types/filament'
|
||||||
|
|
||||||
|
const PAGE_SIZE = 20
|
||||||
|
|
||||||
|
type SortField = 'name' | 'remaining_grams' | 'cost_usd'
|
||||||
|
type SortDir = 'asc' | 'desc'
|
||||||
|
|
||||||
|
export default function InventoryPage() {
|
||||||
|
const [search, setSearch] = useState('')
|
||||||
|
const [material, setMaterial] = useState('')
|
||||||
|
const [finish, setFinish] = useState('')
|
||||||
|
const [lowStockOnly, setLowStockOnly] = useState(false)
|
||||||
|
const [sortBy, setSortBy] = useState<SortField>('name')
|
||||||
|
const [sortDir, setSortDir] = useState<SortDir>('asc')
|
||||||
|
const [page, setPage] = useState(0)
|
||||||
|
const [deleteId, setDeleteId] = useState<number | null>(null)
|
||||||
|
|
||||||
|
const filter: FilamentFilter = useMemo(() => ({
|
||||||
|
material: material || undefined,
|
||||||
|
finish: finish || undefined,
|
||||||
|
low_stock: lowStockOnly,
|
||||||
|
sort_by: sortBy,
|
||||||
|
sort_dir: sortDir,
|
||||||
|
limit: PAGE_SIZE,
|
||||||
|
offset: page * PAGE_SIZE,
|
||||||
|
}), [material, finish, lowStockOnly, sortBy, sortDir, page])
|
||||||
|
|
||||||
|
const { data, isLoading, error, refetch } = useQuery({
|
||||||
|
queryKey: ['filaments', filter],
|
||||||
|
queryFn: () => fetchFilaments(filter),
|
||||||
|
})
|
||||||
|
|
||||||
|
const filaments = data?.data ?? []
|
||||||
|
const total = data?.total ?? 0
|
||||||
|
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
|
||||||
|
|
||||||
|
// Client-side search filter (name/barcode) since backend may not support it yet.
|
||||||
|
const filtered = useMemo(() => {
|
||||||
|
if (!search.trim()) return filaments
|
||||||
|
const q = search.toLowerCase()
|
||||||
|
return filaments.filter(
|
||||||
|
(f: FilamentSpool) =>
|
||||||
|
f.name.toLowerCase().includes(q) ||
|
||||||
|
(f.barcode && f.barcode.toLowerCase().includes(q))
|
||||||
|
)
|
||||||
|
}, [filaments, search])
|
||||||
|
|
||||||
|
const handleSort = (field: SortField) => {
|
||||||
|
if (sortBy === field) {
|
||||||
|
setSortDir(prev => (prev === 'asc' ? 'desc' : 'asc'))
|
||||||
|
} else {
|
||||||
|
setSortBy(field)
|
||||||
|
setSortDir('asc')
|
||||||
|
}
|
||||||
|
setPage(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
await deleteFilament(id)
|
||||||
|
setDeleteId(null)
|
||||||
|
refetch()
|
||||||
|
}
|
||||||
|
|
||||||
|
const SortIndicator = ({ field }: { field: SortField }) => {
|
||||||
|
if (sortBy !== field) return <span className="text-slate-600 ml-1">↕</span>
|
||||||
|
return <span className="text-emerald-400 ml-1">{sortDir === 'asc' ? '↑' : '↓'}</span>
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||||
|
<div>
|
||||||
|
<h2 className="text-xl font-bold text-slate-100">Filament Inventory</h2>
|
||||||
|
<p className="text-sm text-slate-400">{total} spool(s) total</p>
|
||||||
|
</div>
|
||||||
|
<button className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 transition-colors">
|
||||||
|
<Plus size={16} /> Add Spool
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Filters */}
|
||||||
|
<div className="flex flex-col lg:flex-row gap-3">
|
||||||
|
{/* Search */}
|
||||||
|
<div className="relative flex-1">
|
||||||
|
<Search size={16} className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-400" />
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Search by name or barcode…"
|
||||||
|
value={search}
|
||||||
|
onChange={e => { setSearch(e.target.value); setPage(0) }}
|
||||||
|
className="w-full rounded-lg bg-slate-800 border border-slate-700 pl-9 pr-3 py-2 text-sm text-slate-100 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Material filter */}
|
||||||
|
<select
|
||||||
|
value={material}
|
||||||
|
onChange={e => { setMaterial(e.target.value); setPage(0) }}
|
||||||
|
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
|
||||||
|
>
|
||||||
|
<option value="">All Materials</option>
|
||||||
|
<option value="PLA">PLA</option>
|
||||||
|
<option value="PETG">PETG</option>
|
||||||
|
<option value="ABS">ABS</option>
|
||||||
|
<option value="TPU">TPU</option>
|
||||||
|
<option value="ASA">ASA</option>
|
||||||
|
<option value="Nylon">Nylon</option>
|
||||||
|
<option value="PC">PC</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
{/* Finish filter */}
|
||||||
|
<select
|
||||||
|
value={finish}
|
||||||
|
onChange={e => { setFinish(e.target.value); setPage(0) }}
|
||||||
|
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
|
||||||
|
>
|
||||||
|
<option value="">All Finishes</option>
|
||||||
|
<option value="Basic">Basic</option>
|
||||||
|
<option value="Silk">Silk</option>
|
||||||
|
<option value="Matte">Matte</option>
|
||||||
|
<option value="Glossy">Glossy</option>
|
||||||
|
<option value="Wood">Wood</option>
|
||||||
|
<option value="Marble">Marble</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
{/* Low stock toggle */}
|
||||||
|
<label className="inline-flex items-center gap-2 rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 cursor-pointer select-none hover:bg-slate-750">
|
||||||
|
<Filter size={14} className="text-amber-400" />
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={lowStockOnly}
|
||||||
|
onChange={e => { setLowStockOnly(e.target.checked); setPage(0) }}
|
||||||
|
className="accent-amber-500"
|
||||||
|
/>
|
||||||
|
Low Stock Only
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Loading / Error */}
|
||||||
|
{isLoading && (
|
||||||
|
<div className="text-center py-12 text-slate-400">Loading spools…</div>
|
||||||
|
)}
|
||||||
|
{error && (
|
||||||
|
<div className="text-center py-12 text-red-400">
|
||||||
|
Failed to load inventory.
|
||||||
|
<button onClick={() => refetch()} className="ml-2 underline hover:text-red-300">Retry</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Desktop Table */}
|
||||||
|
{!isLoading && !error && (
|
||||||
|
<>
|
||||||
|
<div className="hidden md:block overflow-x-auto rounded-lg border border-slate-700">
|
||||||
|
<table className="w-full text-sm">
|
||||||
|
<thead className="bg-slate-800 text-slate-300">
|
||||||
|
<tr>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('name')}>
|
||||||
|
Name <SortIndicator field="name" />
|
||||||
|
</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Material</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Finish</th>
|
||||||
|
<th className="px-4 py-3 text-left font-semibold">Color</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('remaining_grams')}>
|
||||||
|
Remaining <SortIndicator field="remaining_grams" />
|
||||||
|
</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('cost_usd')}>
|
||||||
|
Cost <SortIndicator field="cost_usd" />
|
||||||
|
</th>
|
||||||
|
<th className="px-4 py-3 text-center font-semibold">Status</th>
|
||||||
|
<th className="px-4 py-3 text-right font-semibold">Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody className="divide-y divide-slate-700">
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<tr>
|
||||||
|
<td colSpan={8} className="px-4 py-8 text-center text-slate-500">No spools found.</td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
|
{filtered.map((spool: FilamentSpool) => {
|
||||||
|
const isLow = spool.remaining_grams <= spool.low_stock_threshold_grams
|
||||||
|
return (
|
||||||
|
<tr key={spool.id} className={`${isLow ? 'bg-red-900/20' : 'bg-slate-800/50'} hover:bg-slate-700/50 transition-colors`}>
|
||||||
|
<td className="px-4 py-3 font-medium text-slate-100">{spool.name}</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">{spool.material_base?.name ?? '—'}</td>
|
||||||
|
<td className="px-4 py-3 text-slate-300">{spool.material_finish?.name ?? '—'}</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ColorSwatch colorHex={spool.color_hex} size={20} />
|
||||||
|
<span className="text-xs text-slate-400 uppercase">{spool.color_hex}</span>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-right tabular-nums text-slate-200">{spool.remaining_grams.toLocaleString()} g</td>
|
||||||
|
<td className="px-4 py-3 text-right tabular-nums text-slate-300">{spool.cost_usd != null ? `$${spool.cost_usd.toFixed(2)}` : '—'}</td>
|
||||||
|
<td className="px-4 py-3 text-center">
|
||||||
|
{isLow ? (
|
||||||
|
<span className="inline-flex items-center gap-1 rounded-full bg-red-900/50 border border-red-700 px-2 py-0.5 text-xs font-medium text-red-300">
|
||||||
|
<AlertTriangle size={12} /> Low
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center rounded-full bg-emerald-900/30 border border-emerald-700 px-2 py-0.5 text-xs font-medium text-emerald-300">OK</span>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-right">
|
||||||
|
<div className="flex items-center justify-end gap-2">
|
||||||
|
<button className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-blue-400 transition-colors" title="Edit">
|
||||||
|
<Pencil size={14} />
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteId(spool.id)}
|
||||||
|
className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-red-400 transition-colors"
|
||||||
|
title="Delete"
|
||||||
|
>
|
||||||
|
<Trash2 size={14} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Mobile Cards */}
|
||||||
|
<div className="md:hidden space-y-3">
|
||||||
|
{filtered.length === 0 && (
|
||||||
|
<div className="text-center py-12 text-slate-500">No spools found.</div>
|
||||||
|
)}
|
||||||
|
{filtered.map((spool: FilamentSpool) => {
|
||||||
|
const isLow = spool.remaining_grams <= spool.low_stock_threshold_grams
|
||||||
|
return (
|
||||||
|
<div key={spool.id} className={`rounded-lg border ${isLow ? 'border-red-700 bg-red-900/10' : 'border-slate-700 bg-slate-800'} p-4 space-y-2`}>
|
||||||
|
<div className="flex items-start justify-between">
|
||||||
|
<div>
|
||||||
|
<div className="font-semibold text-slate-100">{spool.name}</div>
|
||||||
|
<div className="text-xs text-slate-400 mt-0.5">{spool.material_base?.name ?? '—'} · {spool.material_finish?.name ?? '—'}</div>
|
||||||
|
</div>
|
||||||
|
{isLow ? (
|
||||||
|
<span className="inline-flex items-center gap-1 rounded-full bg-red-900/50 border border-red-700 px-2 py-0.5 text-xs font-medium text-red-300">
|
||||||
|
<AlertTriangle size={12} /> Low
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<span className="inline-flex items-center rounded-full bg-emerald-900/30 border border-emerald-700 px-2 py-0.5 text-xs font-medium text-emerald-300">OK</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-3 text-sm">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ColorSwatch colorHex={spool.color_hex} size={20} />
|
||||||
|
<span className="text-slate-400 uppercase text-xs">{spool.color_hex}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center justify-between text-sm">
|
||||||
|
<span className="text-slate-400">Remaining: <span className="text-slate-200 font-medium tabular-nums">{spool.remaining_grams.toLocaleString()} g</span></span>
|
||||||
|
<span className="text-slate-400">{spool.cost_usd != null ? `$${spool.cost_usd.toFixed(2)}` : '—'}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center justify-end gap-2 pt-1">
|
||||||
|
<button className="flex items-center gap-1 rounded-md bg-slate-700 px-3 py-1.5 text-xs font-medium text-slate-200 hover:bg-slate-600">
|
||||||
|
<Pencil size={12} /> Edit
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteId(spool.id)}
|
||||||
|
className="flex items-center gap-1 rounded-md bg-red-900/30 border border-red-700 px-3 py-1.5 text-xs font-medium text-red-300 hover:bg-red-900/50"
|
||||||
|
>
|
||||||
|
<Trash2 size={12} /> Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Pagination */}
|
||||||
|
<div className="flex items-center justify-between pt-2">
|
||||||
|
<span className="text-sm text-slate-400">
|
||||||
|
Showing {page * PAGE_SIZE + 1}–{Math.min((page + 1) * PAGE_SIZE, total)} of {total}
|
||||||
|
</span>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button
|
||||||
|
onClick={() => setPage(p => Math.max(0, p - 1))}
|
||||||
|
disabled={page === 0}
|
||||||
|
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
|
||||||
|
>
|
||||||
|
<ChevronLeft size={16} />
|
||||||
|
</button>
|
||||||
|
<span className="text-sm text-slate-300 tabular-nums">{page + 1} / {totalPages}</span>
|
||||||
|
<button
|
||||||
|
onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}
|
||||||
|
disabled={page >= totalPages - 1}
|
||||||
|
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
|
||||||
|
>
|
||||||
|
<ChevronRight size={16} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Delete confirmation modal */}
|
||||||
|
{deleteId !== null && (
|
||||||
|
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
|
||||||
|
<div className="w-full max-w-sm rounded-xl bg-slate-800 border border-slate-700 p-6 shadow-2xl space-y-4">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-900/30">
|
||||||
|
<AlertTriangle size={20} className="text-red-400" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3 className="text-lg font-semibold text-slate-100">Delete Spool?</h3>
|
||||||
|
<p className="text-sm text-slate-400">This action cannot be undone.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onClick={() => setDeleteId(null)}
|
||||||
|
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => handleDelete(deleteId)}
|
||||||
|
className="rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-500 transition-colors"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
34
frontend/src/services/filamentService.ts
Normal file
34
frontend/src/services/filamentService.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { FilamentSpool, ListResponse, UsageLog, FilamentFilter } from '../types/filament'
|
||||||
|
|
||||||
|
const API_BASE = '/api'
|
||||||
|
|
||||||
|
export async function fetchFilaments(filter: FilamentFilter): Promise<ListResponse<FilamentSpool>> {
|
||||||
|
const params = new URLSearchParams()
|
||||||
|
if (filter.material) params.set('material', filter.material)
|
||||||
|
if (filter.finish) params.set('finish', filter.finish)
|
||||||
|
if (filter.color) params.set('color', filter.color)
|
||||||
|
if (filter.low_stock) params.set('low_stock', 'true')
|
||||||
|
if (filter.search) params.set('search', filter.search)
|
||||||
|
if (filter.sort_by) params.set('sort_by', filter.sort_by)
|
||||||
|
if (filter.sort_dir) params.set('sort_dir', filter.sort_dir)
|
||||||
|
if (filter.limit !== undefined) params.set('limit', String(filter.limit))
|
||||||
|
if (filter.offset !== undefined) params.set('offset', String(filter.offset))
|
||||||
|
|
||||||
|
const res = await axios.get<ListResponse<FilamentSpool>>(`${API_BASE}/filaments?${params.toString()}`)
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchFilamentById(id: number): Promise<FilamentSpool> {
|
||||||
|
const res = await axios.get<FilamentSpool>(`${API_BASE}/filaments/${id}`)
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function fetchUsageLogs(spoolId: number): Promise<UsageLog[]> {
|
||||||
|
const res = await axios.get<UsageLog[]>(`${API_BASE}/usage-logs?spool_id=${spoolId}`)
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteFilament(id: number): Promise<void> {
|
||||||
|
await axios.delete(`${API_BASE}/filaments/${id}`)
|
||||||
|
}
|
||||||
85
frontend/src/types/filament.ts
Normal file
85
frontend/src/types/filament.ts
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
// Extrudex domain types
|
||||||
|
|
||||||
|
export interface MaterialBase {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
density_g_cm3: number
|
||||||
|
extrusion_temp_min?: number
|
||||||
|
extrusion_temp_max?: number
|
||||||
|
bed_temp_min?: number
|
||||||
|
bed_temp_max?: number
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MaterialFinish {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
description?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface MaterialModifier {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
description?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FilamentSpool {
|
||||||
|
id: number
|
||||||
|
name: string
|
||||||
|
material_base_id: number
|
||||||
|
material_base?: MaterialBase
|
||||||
|
material_finish_id: number
|
||||||
|
material_finish?: MaterialFinish
|
||||||
|
material_modifier_id?: number
|
||||||
|
material_modifier?: MaterialModifier
|
||||||
|
color_hex: string
|
||||||
|
brand?: string
|
||||||
|
diameter_mm: number
|
||||||
|
initial_grams: number
|
||||||
|
remaining_grams: number
|
||||||
|
spool_weight_grams?: number
|
||||||
|
cost_usd?: number
|
||||||
|
low_stock_threshold_grams: number
|
||||||
|
notes?: string
|
||||||
|
barcode?: string
|
||||||
|
deleted_at?: string
|
||||||
|
created_at: string
|
||||||
|
updated_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ListResponse<T> {
|
||||||
|
data: T[]
|
||||||
|
total: number
|
||||||
|
limit: number
|
||||||
|
offset: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UsageLog {
|
||||||
|
id: number
|
||||||
|
spool_id: number
|
||||||
|
print_job_id?: number
|
||||||
|
print_job_name?: string
|
||||||
|
mm_extruded: number
|
||||||
|
grams_used: number
|
||||||
|
cost_usd?: number
|
||||||
|
logged_at: string
|
||||||
|
notes?: string
|
||||||
|
created_at: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface FilamentFilter {
|
||||||
|
material?: string
|
||||||
|
finish?: string
|
||||||
|
color?: string
|
||||||
|
low_stock?: boolean
|
||||||
|
search?: string
|
||||||
|
sort_by?: string
|
||||||
|
sort_dir?: 'asc' | 'desc'
|
||||||
|
limit?: number
|
||||||
|
offset?: number
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user