Compare commits
5 Commits
62d74beba4
...
agent/Rex/
| Author | SHA1 | Date | |
|---|---|---|---|
| 3cb5ab7d4e | |||
| 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,57 @@
|
|||||||
import { useState, useEffect } from 'react'
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
|
import { BrowserRouter, Routes, Route, NavLink } from 'react-router-dom'
|
||||||
|
import { Package, Settings } from 'lucide-react'
|
||||||
|
import InventoryPage from './pages/InventoryPage'
|
||||||
|
import SettingsPage from './pages/SettingsPage'
|
||||||
|
|
||||||
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-4 sticky top-0 z-20">
|
||||||
{health && (
|
<div className="flex items-center gap-3 mr-4">
|
||||||
<pre className="text-xs bg-slate-900 p-3 rounded overflow-auto">
|
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
|
||||||
{JSON.stringify(health, null, 2)}
|
<h1 className="text-lg font-semibold">Extrudex</h1>
|
||||||
</pre>
|
|
||||||
)}
|
|
||||||
</div>
|
</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>
|
||||||
|
<main className="p-4">
|
||||||
|
<Routes>
|
||||||
|
<Route path="/" element={<InventoryPage />} />
|
||||||
|
<Route path="/settings" element={<SettingsPage />} />
|
||||||
|
</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}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
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>
|
||||||
|
)
|
||||||
|
}
|
||||||
290
frontend/src/pages/SettingsPage.tsx
Normal file
290
frontend/src/pages/SettingsPage.tsx
Normal file
@@ -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>
|
||||||
|
)
|
||||||
|
}
|
||||||
24
frontend/src/services/filamentService.ts
Normal file
24
frontend/src/services/filamentService.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { FilamentSpool, ListResponse, 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 deleteFilament(id: number): Promise<void> {
|
||||||
|
await axios.delete(`${API_BASE}/filaments/${id}`)
|
||||||
|
}
|
||||||
72
frontend/src/types/filament.ts
Normal file
72
frontend/src/types/filament.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
// 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 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