CUB-130: Build Add/Edit Filament form with backend endpoints for finishes and modifiers

2026-05-10 14:13:29 -04:00
24 changed files with 606 additions and 588 deletions
--- a/backend/internal/handlers/material_finish_handler.go
+++ b/backend/internal/handlers/material_finish_handler.go
@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"log/slog"
+	"net/http"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/dtos"
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
+)
+
+// MaterialFinishHandler handles requests for material finish lookup data.
+type MaterialFinishHandler struct {
+	repo *repositories.MaterialFinishRepository
+}
+
+// NewMaterialFinishHandler creates a MaterialFinishHandler with the given repository.
+func NewMaterialFinishHandler(repo *repositories.MaterialFinishRepository) *MaterialFinishHandler {
+	return &MaterialFinishHandler{repo: repo}
+}
+
+// List handles GET /api/finishes — returns all material finishes.
+func (h *MaterialFinishHandler) List(w http.ResponseWriter, r *http.Request) {
+	finishes, err := h.repo.GetAll(r.Context())
+	if err != nil {
+		slog.Error("failed to list finishes", "error", err)
+		writeJSON(w, http.StatusInternalServerError, dtos.ErrorResponse{
+			Error: "internal server error",
+			Code:  http.StatusInternalServerError,
+		})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, dtos.SingleResponse{Data: finishes})
+}
--- a/backend/internal/handlers/material_modifier_handler.go
+++ b/backend/internal/handlers/material_modifier_handler.go
@@ -0,0 +1,34 @@
+package handlers
+
+import (
+	"log/slog"
+	"net/http"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/dtos"
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/repositories"
+)
+
+// MaterialModifierHandler handles requests for material modifier lookup data.
+type MaterialModifierHandler struct {
+	repo *repositories.MaterialModifierRepository
+}
+
+// NewMaterialModifierHandler creates a MaterialModifierHandler with the given repository.
+func NewMaterialModifierHandler(repo *repositories.MaterialModifierRepository) *MaterialModifierHandler {
+	return &MaterialModifierHandler{repo: repo}
+}
+
+// List handles GET /api/modifiers — returns all material modifiers.
+func (h *MaterialModifierHandler) List(w http.ResponseWriter, r *http.Request) {
+	modifiers, err := h.repo.GetAll(r.Context())
+	if err != nil {
+		slog.Error("failed to list modifiers", "error", err)
+		writeJSON(w, http.StatusInternalServerError, dtos.ErrorResponse{
+			Error: "internal server error",
+			Code:  http.StatusInternalServerError,
+		})
+		return
+	}
+
+	writeJSON(w, http.StatusOK, dtos.SingleResponse{Data: modifiers})
+}
--- a/backend/internal/repositories/material_finish_repository.go
+++ b/backend/internal/repositories/material_finish_repository.go
@@ -0,0 +1,50 @@
+package repositories
+
+import (
+	"context"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+// MaterialFinishRepository handles database queries for material finishes.
+type MaterialFinishRepository struct {
+	pool *pgxpool.Pool
+}
+
+// NewMaterialFinishRepository creates a MaterialFinishRepository backed by the given pool.
+func NewMaterialFinishRepository(pool *pgxpool.Pool) *MaterialFinishRepository {
+	return &MaterialFinishRepository{pool: pool}
+}
+
+// GetAll returns all material finishes ordered by name.
+func (r *MaterialFinishRepository) GetAll(ctx context.Context) ([]models.MaterialFinish, error) {
+	rows, err := r.pool.Query(ctx, `
+		SELECT id, name, description, created_at, updated_at
+		FROM material_finishes
+		ORDER BY name
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var finishes []models.MaterialFinish
+	for rows.Next() {
+		var f models.MaterialFinish
+		if err := rows.Scan(
+			&f.ID, &f.Name, &f.Description,
+			&f.CreatedAt, &f.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		finishes = append(finishes, f)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	if finishes == nil {
+		finishes = []models.MaterialFinish{}
+	}
+	return finishes, nil
+}
--- a/backend/internal/repositories/material_modifier_repository.go
+++ b/backend/internal/repositories/material_modifier_repository.go
@@ -0,0 +1,50 @@
+package repositories
+
+import (
+	"context"
+
+	"github.com/CubeCraft-Creations/Extrudex/backend/internal/models"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+// MaterialModifierRepository handles database queries for material modifiers.
+type MaterialModifierRepository struct {
+	pool *pgxpool.Pool
+}
+
+// NewMaterialModifierRepository creates a MaterialModifierRepository backed by the given pool.
+func NewMaterialModifierRepository(pool *pgxpool.Pool) *MaterialModifierRepository {
+	return &MaterialModifierRepository{pool: pool}
+}
+
+// GetAll returns all material modifiers ordered by name.
+func (r *MaterialModifierRepository) GetAll(ctx context.Context) ([]models.MaterialModifier, error) {
+	rows, err := r.pool.Query(ctx, `
+		SELECT id, name, description, created_at, updated_at
+		FROM material_modifiers
+		ORDER BY name
+	`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var modifiers []models.MaterialModifier
+	for rows.Next() {
+		var m models.MaterialModifier
+		if err := rows.Scan(
+			&m.ID, &m.Name, &m.Description,
+			&m.CreatedAt, &m.UpdatedAt,
+		); err != nil {
+			return nil, err
+		}
+		modifiers = append(modifiers, m)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	if modifiers == nil {
+		modifiers = []models.MaterialModifier{}
+	}
+	return modifiers, nil
+}
--- a/backend/internal/router/router.go
+++ b/backend/internal/router/router.go
@@ -45,6 +45,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R

 	// ── Repositories ──────────────────────────────────────────────────────
 	materialRepo := repositories.NewMaterialRepository(dbPool)
+	finishRepo := repositories.NewMaterialFinishRepository(dbPool)
+	modifierRepo := repositories.NewMaterialModifierRepository(dbPool)
 	filamentRepo := repositories.NewFilamentRepository(dbPool)
 	printerRepo := repositories.NewPrinterRepository(dbPool)
 	printJobRepo := repositories.NewPrintJobRepository(dbPool)
@@ -57,6 +59,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R

 	// ── Handlers ──────────────────────────────────────────────────────────
 	materialHandler := handlers.NewMaterialHandler(materialRepo)
+	finishHandler := handlers.NewMaterialFinishHandler(finishRepo)
+	modifierHandler := handlers.NewMaterialModifierHandler(modifierRepo)
 	filamentHandler := handlers.NewFilamentHandler(filamentService)
 	printerHandler := handlers.NewPrinterHandler(printerService)
 	printJobHandler := handlers.NewPrintJobHandler(printJobService)
@@ -66,6 +70,8 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
 	r.Route("/api", func(r chi.Router) {
 		r.Use(middleware.Timeout(60 * time.Second))
 		r.Get("/materials", materialHandler.List)
+		r.Get("/finishes", finishHandler.List)
+		r.Get("/modifiers", modifierHandler.List)

 		r.Route("/filaments", func(r chi.Router) {
 			r.Get("/", filamentHandler.List)
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,34 +1,31 @@
 #!/bin/bash
 set -e

-echo "🔧 Deploying Extrudex (Go + React) on Raspberry Pi..."
+echo "🔧 Deploying Extrudex Docker runtime..."

 # Check if Docker Compose is available
-if ! docker compose version &>/dev/null && ! command -v docker-compose &>/dev/null; then
+if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
    echo "❌ Docker Compose is not installed"
    exit 1
 fi

 COMPOSE_CMD="docker compose"
-if command -v docker-compose &>/dev/null; then
+if command -v docker-compose &> /dev/null; then
    COMPOSE_CMD="docker-compose"
 fi

-echo "📦 Building and starting Go backend + React frontend + PostgreSQL..."
+echo "📦 Building and starting services..."
 $COMPOSE_CMD -f docker-compose.dev.yml up -d --build

 echo "⏳ Waiting for services to become healthy..."
-sleep 10
+sleep 15

 echo "✅ Deployment complete!"
 echo ""
 echo "Services running:"
 echo "  • PostgreSQL:    localhost:5433"
-echo "  • Extrudex API (Go):   http://localhost:5080"
-echo "  • Extrudex Web (React): http://localhost:5081"
-echo ""
-echo "Barcode scanner: HID keyboard input — focus any text field to start scanning."
-echo "Kiosk mode: Chromium auto-starts on boot via systemd (extrudex-kiosk.service)."
+echo "  • Extrudex API: http://localhost:5080"
+echo "  • Extrudex Web: http://localhost:5081"
 echo ""
 echo "To view logs:"
 echo "  $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -28,10 +28,13 @@ services:
    ports:
      - "5080:8080"
    environment:
-      - DATABASE_URL=postgres://extrudex:changeme@extrudex-db:5432/extrudex?sslmode=disable
-      - PORT=8080
-      - CORS_ORIGIN=*
-      - LOG_LEVEL=info
+      - ASPNETCORE_ENVIRONMENT=Development
+      - ASPNETCORE_URLS=http://+:8080
+      - EXTRUDEX_DB_HOST=extrudex-db
+      - EXTRUDEX_DB_PORT=5432
+      - EXTRUDEX_DB_NAME=extrudex
+      - EXTRUDEX_DB_USER=extrudex
+      - EXTRUDEX_DB_PASSWORD=changeme
    depends_on:
      extrudex-db:
        condition: service_healthy
@@ -41,7 +44,7 @@ services:
      interval: 30s
      timeout: 10s
      retries: 3
-      start_period: 15s
+      start_period: 40s
    networks:
      - extrudex-network

--- a/docs/PI-KIOSK-SETUP.md
+++ b/docs/PI-KIOSK-SETUP.md
@@ -1,168 +0,0 @@
-# Pi 5 Kiosk Setup — Extrudex (Go + React)
-
-## Prerequisites
-
- Raspberry Pi 5 (4 GB or 8 GB)
- MicroSD card (32 GB minimum, Class 10+)
- HDMI touchscreen display
- USB barcode scanner (HID keyboard mode)
- Power supply (27W USB-C recommended)
-
-## One-Line Setup
-
-```bash
-# 1. Install Raspberry Pi OS (64-bit, Desktop)
-# 2. Enable SSH and VNC
-# 3. Run the automated bootstrap
-curl -sSL https://raw.githubusercontent.com/CubeCraft-Creations/Extrudex/dev/scripts/pi-bootstrap.sh | bash
-```
-
-Or follow the manual steps below.
-
-## Manual Setup
-
-### 1. Install Docker
-
-```bash
-curl -fsSL https://get.docker.com | sh
-sudo usermod -aG docker pi
-```
-
-Log out and back in for group changes to take effect.
-
-### 2. Clone and deploy
-
-```bash
-cd /home/pi
-git clone https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex.git
-cd Extrudex
-git checkout dev
-
-# Run the deploy script
-chmod +x deploy.sh
-./deploy.sh
-```
-
-### 3. Verify services
-
-```bash
-docker compose -f docker-compose.dev.yml ps
-# All three services should be "Up"
-```
-
-Check the health endpoint:
-```bash
-curl http://localhost:5080/health
-# Expected: {"status":"ok","db_connected":true,"timestamp":"..."}
-```
-
-### 4. Configure kiosk auto-start
-
-```bash
-# Enable the Docker stack service (starts on boot)
-sudo cp systemd/extrudex.service /etc/systemd/system/
-sudo systemctl daemon-reload
-sudo systemctl enable extrudex.service
-
-# Enable the kiosk service (starts Chromium after Docker stack)
-sudo cp systemd/extrudex-kiosk.service /etc/systemd/system/
-sudo systemctl daemon-reload
-sudo systemctl enable extrudex-kiosk.service
-```
-
-### 5. Configure display server
-
-For Pi 5, Raspberry Pi OS uses Wayland by default. If you encounter
-X11-specific issues, switch to X11 in raspi-config (Advanced Options →
-Resolution → X11).
-
-The kiosk service supports both Wayland and X11 display servers.
-
-### 6. Touchscreen calibration (if needed)
-
-```bash
-# Install calibration tools
-sudo apt install -y xinput-calibrator
-
-# Run calibration, note the device ID and parameters
-xinput_calibrator
-```
-
-Add the calibration to `~/.config/labwc/labwc.conf` or `/etc/X11/xorg.conf.d/`
-as appropriate for your display server.
-
-## USB Barcode Scanner
-
-The USB barcode scanner works as a HID keyboard device — it types scanned
-codes followed by an Enter keypress. No driver configuration is needed.
-
-On the React frontend, the search input auto-focuses on page load and
-will capture barcode input immediately. After a touch on another element,
-tap the search field again to re-focus.
-
-## Auto-Refresh on Wake
-
-The React app polls the SSE endpoint every 30 seconds for real-time
-updates. When the Pi wakes from sleep, the next poll will immediately
-sync the UI.
-
-The kiosk service has `Restart=always` and `RestartSec=10`, so Chromium
-will restart within 10 seconds of any crash or power cycle.
-
-## Touch Gestures
-
-Chromium is launched with `--touch-events=enabled` and `--enable-pinch`
-for native touch gesture support:
- **Tap** — click/submit
- **Two-finger scroll** — page scrolling
- **Pinch** — zoom (disabled in kiosk mode by default; enable if needed)
-
-## Troubleshooting
-
-### Services not starting
-```bash
-sudo systemctl status extrudex
-sudo systemctl status extrudex-kiosk
-docker compose -f docker-compose.dev.yml logs
-```
-
-### Kiosk shows blank page
- Ensure Docker stack is running: `docker compose ps`
- Check nginx is serving the React build: `curl http://localhost:5081`
- Check Chromium logs: `journalctl -u extrudex-kiosk -n 50`
-
-### Barcode not working
- Verify scanner is in HID keyboard mode (most USB scanners default to this)
- Open a text field and scan — you should see digits appear
- Check with `dmesg | grep -i usb` for device enumeration
-
-### PostgreSQL connection refused
-```bash
-docker compose -f docker-compose.dev.yml restart extrudex-db
-# Wait 15 seconds, then check health
-curl http://localhost:5080/health
-```
-
-## Architecture
-
-```
-┌──────────────────────────────────────────────┐
-│  Pi 5 (Raspberry Pi OS 64-bit)               │
-│                                              │
-│  ┌─────────────┐  ┌──────────┐  ┌─────────┐ │
-│  │ Chromium    │  │  Nginx   │  │  Go     │ │
-│  │ Kiosk       │→│  (React) │→│  API    │ │
-│  │ :5081       │  │  :5080   │  │  :8080  │ │
-│  └─────────────┘  └──────────┘  └────┬────┘ │
-│                                       │      │
-│                              ┌────────▼────┐ │
-│                              │  PostgreSQL │ │
-│                              │  :5432      │ │
-│                              └─────────────┘ │
-│                                              │
-│  ┌──────────┐                                │
-│  │  USB     │                                │
-│  │ Scanner  │ → HID keyboard → Browser       │
-│  └──────────┘                                │
-└──────────────────────────────────────────────┘
-```
--- a/frontend/nginx.conf
+++ b/frontend/nginx.conf
@@ -10,7 +10,7 @@ server {
    }

    location /api/ {
-        proxy_pass http://extrudex-api:8080/api/;
+        proxy_pass http://backend:8080/api/;
        proxy_http_version 1.1;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection 'upgrade';
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,6 +1,5 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { BrowserRouter, Routes, Route } from 'react-router-dom'
-import Dashboard from './pages/Dashboard'
 import InventoryPage from './pages/InventoryPage'

 const queryClient = new QueryClient()
@@ -16,8 +15,7 @@ export default function App() {
          </header>
          <main className="p-4">
            <Routes>
-              <Route path="/" element={<Dashboard />} />
-              <Route path="/inventory" element={<InventoryPage />} />
+              <Route path="/" element={<InventoryPage />} />
            </Routes>
          </main>
        </div>
--- a/frontend/src/components/FilamentForm.tsx
+++ b/frontend/src/components/FilamentForm.tsx
@@ -0,0 +1,360 @@
+import { useState, useEffect, useMemo } from 'react'
+import { X, Save, AlertCircle } from 'lucide-react'
+import ColorSwatch from './ColorSwatch'
+import { createFilament, updateFilament, fetchMaterialBases, fetchMaterialFinishes, fetchMaterialModifiers } from '../services/filamentService'
+import type { FilamentSpool, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament'
+import { useQuery } from '@tanstack/react-query'
+
+interface FilamentFormProps {
+  mode: 'create' | 'edit'
+  initialData?: FilamentSpool | null
+  onClose: () => void
+  onSuccess: () => void
+}
+
+interface FormErrors {
+  [key: string]: string
+}
+
+export default function FilamentForm({ mode, initialData, onClose, onSuccess }: FilamentFormProps) {
+  const [name, setName] = useState('')
+  const [materialBaseId, setMaterialBaseId] = useState('')
+  const [materialFinishId, setMaterialFinishId] = useState('1')
+  const [materialModifierId, setMaterialModifierId] = useState('')
+  const [colorHex, setColorHex] = useState('#3B82F6')
+  const [brand, setBrand] = useState('')
+  const [diameterMm, setDiameterMm] = useState('1.75')
+  const [initialGrams, setInitialGrams] = useState('')
+  const [remainingGrams, setRemainingGrams] = useState('')
+  const [costUsd, setCostUsd] = useState('')
+  const [lowStockThreshold, setLowStockThreshold] = useState('50')
+  const [notes, setNotes] = useState('')
+  const [barcode, setBarcode] = useState('')
+  const [errors, setErrors] = useState<FormErrors>({})
+  const [submitting, setSubmitting] = useState(false)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+
+  const { data: materials } = useQuery({
+    queryKey: ['materials'],
+    queryFn: fetchMaterialBases,
+    staleTime: Infinity,
+  })
+  const { data: finishes } = useQuery({
+    queryKey: ['finishes'],
+    queryFn: fetchMaterialFinishes,
+    staleTime: Infinity,
+  })
+  const { data: modifiers } = useQuery({
+    queryKey: ['modifiers'],
+    queryFn: fetchMaterialModifiers,
+    staleTime: Infinity,
+  })
+
+  useEffect(() => {
+    if (mode === 'edit' && initialData) {
+      setName(initialData.name ?? '')
+      setMaterialBaseId(String(initialData.material_base_id ?? ''))
+      setMaterialFinishId(String(initialData.material_finish_id ?? '1'))
+      setMaterialModifierId(initialData.material_modifier_id ? String(initialData.material_modifier_id) : '')
+      setColorHex(initialData.color_hex ?? '#3B82F6')
+      setBrand(initialData.brand ?? '')
+      setDiameterMm(String(initialData.diameter_mm ?? 1.75))
+      setInitialGrams(String(initialData.initial_grams ?? ''))
+      setRemainingGrams(String(initialData.remaining_grams ?? ''))
+      setCostUsd(initialData.cost_usd != null ? String(initialData.cost_usd) : '')
+      setLowStockThreshold(String(initialData.low_stock_threshold_grams ?? 50))
+      setNotes(initialData.notes ?? '')
+      setBarcode(initialData.barcode ?? '')
+    }
+  }, [mode, initialData])
+
+  const colorHexValid = useMemo(() => {
+    return /^#[0-9A-Fa-f]{6}$/.test(colorHex)
+  }, [colorHex])
+
+  function validate(): FormErrors {
+    const e: FormErrors = {}
+    if (!name.trim()) e.name = 'Name is required'
+    if (!materialBaseId) e.material_base_id = 'Material Base is required'
+    if (!materialFinishId) e.material_finish_id = 'Material Finish is required'
+    if (!colorHexValid) e.color_hex = 'Enter a valid hex color (e.g., #FF0000)'
+    if (!initialGrams || Number(initialGrams) <= 0) e.initial_grams = 'Must be > 0'
+    if (remainingGrams === '' || Number(remainingGrams) < 0) e.remaining_grams = 'Must be >= 0'
+    if (Number(remainingGrams) > Number(initialGrams)) e.remaining_grams = 'Cannot exceed Initial Grams'
+    if (costUsd && Number(costUsd) < 0) e.cost_usd = 'Must be >= 0'
+    if (!diameterMm || Number(diameterMm) <= 0) e.diameter_mm = 'Must be > 0'
+    if (!lowStockThreshold || Number(lowStockThreshold) < 0) e.low_stock_threshold_grams = 'Must be >= 0'
+    return e
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+    setSubmitError(null)
+    const validation = validate()
+    if (Object.keys(validation).length > 0) {
+      setErrors(validation)
+      return
+    }
+    setErrors({})
+    setSubmitting(true)
+
+    const payload: Record<string, unknown> = {
+      name: name.trim(),
+      material_base_id: Number(materialBaseId),
+      material_finish_id: Number(materialFinishId),
+      color_hex: colorHex,
+      initial_grams: Number(initialGrams),
+      remaining_grams: Number(remainingGrams),
+      diameter_mm: Number(diameterMm),
+      low_stock_threshold_grams: Number(lowStockThreshold),
+    }
+
+    if (materialModifierId) payload.material_modifier_id = Number(materialModifierId)
+    if (brand.trim()) payload.brand = brand.trim()
+    if (costUsd) payload.cost_usd = Number(costUsd)
+    if (notes.trim()) payload.notes = notes.trim()
+    if (barcode.trim()) payload.barcode = barcode.trim()
+
+    try {
+      if (mode === 'edit' && initialData) {
+        await updateFilament(initialData.id, payload)
+      } else {
+        await createFilament(payload)
+      }
+      onSuccess()
+      onClose()
+    } catch (err: any) {
+      setSubmitError(err?.response?.data?.error || 'Failed to save spool. Please try again.')
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-start justify-center sm:items-center bg-black/60 backdrop-blur-sm p-4 overflow-y-auto">
+      <div className="w-full max-w-2xl rounded-xl bg-slate-800 border border-slate-700 shadow-2xl overflow-hidden my-4">
+        {/* Header */}
+        <div className="flex items-center justify-between px-6 py-4 border-b border-slate-700">
+          <h3 className="text-lg font-semibold text-slate-100">
+            {mode === 'edit' ? 'Edit Filament Spool' : 'Add Filament Spool'}
+          </h3>
+          <button
+            onClick={onClose}
+            className="p-1.5 rounded-lg text-slate-400 hover:text-slate-100 hover:bg-slate-700 transition-colors"
+            type="button"
+            aria-label="Close"
+          >
+            <X size={18} />
+          </button>
+        </div>
+
+        {/* Error banner */}
+        {submitError && (
+          <div className="mx-6 mt-4 flex items-start gap-2 rounded-lg bg-red-900/30 border border-red-700 px-4 py-3 text-sm text-red-300">
+            <AlertCircle size={16} className="shrink-0 mt-0.5" />
+            <span>{submitError}</span>
+          </div>
+        )}
+
+        {/* Form */}
+        <form onSubmit={handleSubmit} className="px-6 py-4 space-y-5">
+          {/* Row 1: Name + Brand */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Name <span className="text-red-400">*</span></label>
+              <input
+                type="text"
+                value={name}
+                onChange={e => setName(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.name ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+                placeholder="e.g. Sunlu PLA Silk Red"
+              />
+              {errors.name && <p className="mt-1 text-xs text-red-400">{errors.name}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Brand</label>
+              <input
+                type="text"
+                value={brand}
+                onChange={e => setBrand(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+                placeholder="e.g. Hatchbox"
+              />
+            </div>
+          </div>
+
+          {/* Row 2: Material Base + Finish + Modifier */}
+          <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Material Base <span className="text-red-400">*</span></label>
+              <select
+                value={materialBaseId}
+                onChange={e => setMaterialBaseId(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.material_base_id ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              >
+                <option value="">Select…</option>
+                {materials?.map((m: MaterialBase) => (
+                  <option key={m.id} value={m.id}>{m.name}</option>
+                ))}
+              </select>
+              {errors.material_base_id && <p className="mt-1 text-xs text-red-400">{errors.material_base_id}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Finish <span className="text-red-400">*</span></label>
+              <select
+                value={materialFinishId}
+                onChange={e => setMaterialFinishId(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.material_finish_id ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              >
+                {finishes?.map((f: MaterialFinish) => (
+                  <option key={f.id} value={f.id}>{f.name}</option>
+                ))}
+              </select>
+              {errors.material_finish_id && <p className="mt-1 text-xs text-red-400">{errors.material_finish_id}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Modifier</label>
+              <select
+                value={materialModifierId}
+                onChange={e => setMaterialModifierId(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              >
+                <option value="">None</option>
+                {modifiers?.map((m: MaterialModifier) => (
+                  <option key={m.id} value={m.id}>{m.name}</option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          {/* Row 3: Color + Diameter */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Color <span className="text-red-400">*</span></label>
+              <div className="flex items-center gap-3">
+                <input
+                  type="color"
+                  value={colorHex}
+                  onChange={e => setColorHex(e.target.value)}
+                  className="h-10 w-14 rounded border border-slate-600 bg-slate-900 cursor-pointer"
+                />
+                <div className="flex-1">
+                  <input
+                    type="text"
+                    value={colorHex}
+                    onChange={e => setColorHex(e.target.value)}
+                    className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 font-mono uppercase focus:outline-none focus:ring-2 ${errors.color_hex ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+                    placeholder="#FF0000"
+                    maxLength={7}
+                  />
+                </div>
+                <ColorSwatch colorHex={colorHex} size={32} />
+              </div>
+              {errors.color_hex && <p className="mt-1 text-xs text-red-400">{errors.color_hex}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Diameter (mm) <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                step="0.01"
+                value={diameterMm}
+                onChange={e => setDiameterMm(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.diameter_mm ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.diameter_mm && <p className="mt-1 text-xs text-red-400">{errors.diameter_mm}</p>}
+            </div>
+          </div>
+
+          {/* Row 4: Grams */}
+          <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Initial Grams <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={initialGrams}
+                onChange={e => setInitialGrams(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.initial_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.initial_grams && <p className="mt-1 text-xs text-red-400">{errors.initial_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Remaining Grams <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={remainingGrams}
+                onChange={e => setRemainingGrams(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.remaining_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.remaining_grams && <p className="mt-1 text-xs text-red-400">{errors.remaining_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Cost (USD)</label>
+              <input
+                type="number"
+                step="0.01"
+                value={costUsd}
+                onChange={e => setCostUsd(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.cost_usd ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+            </div>
+          </div>
+
+          {/* Row 5: Threshold + Barcode */}
+          <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Low Stock Threshold (g) <span className="text-red-400">*</span></label>
+              <input
+                type="number"
+                value={lowStockThreshold}
+                onChange={e => setLowStockThreshold(e.target.value)}
+                className={`w-full rounded-lg bg-slate-900 border px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 ${errors.low_stock_threshold_grams ? 'border-red-500 focus:ring-red-500' : 'border-slate-600 focus:ring-emerald-500'}`}
+              />
+              {errors.low_stock_threshold_grams && <p className="mt-1 text-xs text-red-400">{errors.low_stock_threshold_grams}</p>}
+            </div>
+            <div>
+              <label className="block text-sm font-medium text-slate-300 mb-1">Barcode</label>
+              <input
+                type="text"
+                value={barcode}
+                onChange={e => setBarcode(e.target.value)}
+                className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
+                placeholder="e.g. 123456789012"
+              />
+            </div>
+          </div>
+
+          {/* Notes */}
+          <div>
+            <label className="block text-sm font-medium text-slate-300 mb-1">Notes</label>
+            <textarea
+              rows={3}
+              value={notes}
+              onChange={e => setNotes(e.target.value)}
+              className="w-full rounded-lg bg-slate-900 border border-slate-600 px-3 py-2.5 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500 resize-y"
+              placeholder="Print temperature tips, storage notes, etc."
+            />
+          </div>
+
+          {/* Footer actions */}
+          <div className="flex justify-end gap-3 pt-2">
+            <button
+              type="button"
+              onClick={onClose}
+              className="rounded-lg bg-slate-700 px-4 py-2.5 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="inline-flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2.5 text-sm font-semibold text-white hover:bg-emerald-500 active:bg-emerald-700 disabled:opacity-50 transition-colors"
+            >
+              <Save size={16} />
+              {submitting ? 'Saving…' : mode === 'edit' ? 'Update Spool' : 'Create Spool'}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+}
--- a/frontend/src/components/LoadingSpinner.tsx
+++ b/frontend/src/components/LoadingSpinner.tsx
@@ -1,8 +0,0 @@
-export default function LoadingSpinner() {
-  return (
-    <div className="flex flex-col items-center gap-3">
-      <div className="w-10 h-10 border-4 border-emerald-500/30 border-t-emerald-400 rounded-full animate-spin" />
-      <p className="text-slate-400 text-sm">Loading dashboard…</p>
-    </div>
-  )
-}
--- a/frontend/src/components/RecentPrints.tsx
+++ b/frontend/src/components/RecentPrints.tsx
@@ -1,76 +0,0 @@
-import type { PrintJob } from '../types'
-import { Clock, FileText } from 'lucide-react'
-
-interface RecentPrintsProps {
-  jobs: PrintJob[]
-}
-
-export default function RecentPrints({ jobs }: RecentPrintsProps) {
-  if (jobs.length === 0) {
-    return (
-      <div className="rounded-xl border border-slate-700 bg-slate-800 p-6 text-center text-slate-400">
-        <FileText size={32} className="mx-auto mb-3 text-slate-500" />
-        <p>No recent print jobs</p>
-      </div>
-    )
-  }
-
-  const statusColor = (status: string) => {
-    switch (status.toLowerCase()) {
-      case 'completed': return 'text-emerald-400 bg-emerald-500/10'
-      case 'in_progress': return 'text-sky-400 bg-sky-500/10'
-      case 'failed': return 'text-red-400 bg-red-500/10'
-      default: return 'text-slate-400 bg-slate-500/10'
-    }
-  }
-
-  return (
-    <div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
-      <div className="overflow-x-auto">
-        <table className="w-full text-left">
-          <thead>
-            <tr className="border-b border-slate-700">
-              <th className="px-4 py-3 text-sm font-medium text-slate-400">Name</th>
-              <th className="px-4 py-3 text-sm font-medium text-slate-400">Status</th>
-              <th className="px-4 py-3 text-sm font-medium text-slate-400">Duration</th>
-              <th className="px-4 py-3 text-sm font-medium text-slate-400">Filament</th>
-              <th className="px-4 py-3 text-sm font-medium text-slate-400">Cost</th>
-            </tr>
-          </thead>
-          <tbody>
-            {jobs.map((job) => (
-              <tr key={job.id} className="border-b border-slate-700/50 last:border-0 hover:bg-slate-700/30 transition-colors">
-                <td className="px-4 py-3 text-sm text-slate-100 font-medium">{job.name}</td>
-                <td className="px-4 py-3">
-                  <span className={`inline-flex items-center gap-1 px-2 py-1 rounded-full text-xs font-medium ${statusColor(job.status)}`}>
-                    {job.status}
-                  </span>
-                </td>
-                <td className="px-4 py-3 text-sm text-slate-300">
-                  <div className="flex items-center gap-1">
-                    <Clock size={14} />
-                    {formatDuration(job.duration_seconds)}
-                  </div>
-                </td>
-                <td className="px-4 py-3 text-sm text-slate-300">
-                  {job.filament_used_grams?.toFixed(1) ?? '-'} g
-                </td>
-                <td className="px-4 py-3 text-sm text-slate-300">
-                  ${job.cost_usd?.toFixed(2) ?? '-'}
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  )
-}
-
-function formatDuration(seconds: number): string {
-  if (!seconds) return '-'
-  const hrs = Math.floor(seconds / 3600)
-  const mins = Math.floor((seconds % 3600) / 60)
-  if (hrs > 0) return `${hrs}h ${mins}m`
-  return `${mins}m`
-}
--- a/frontend/src/components/SummaryCard.tsx
+++ b/frontend/src/components/SummaryCard.tsx
@@ -1,31 +0,0 @@
-import type { LucideIcon } from 'lucide-react'
-
-interface SummaryCardProps {
-  title: string
-  value: string | number
-  icon: LucideIcon
-  color: 'emerald' | 'amber' | 'sky' | 'violet'
-}
-
-const colorMap = {
-  emerald: { bg: 'bg-emerald-500/10', border: 'border-emerald-500/20', text: 'text-emerald-400', icon: 'text-emerald-400' },
-  amber:   { bg: 'bg-amber-500/10',  border: 'border-amber-500/20',  text: 'text-amber-400',  icon: 'text-amber-400' },
-  sky:     { bg: 'bg-sky-500/10',    border: 'border-sky-500/20',    text: 'text-sky-400',    icon: 'text-sky-400' },
-  violet:  { bg: 'bg-violet-500/10', border: 'border-violet-500/20', text: 'text-violet-400', icon: 'text-violet-400' },
-}
-
-export default function SummaryCard({ title, value, icon: Icon, color }: SummaryCardProps) {
-  const c = colorMap[color]
-
-  return (
-    <div className={`rounded-xl border ${c.border} ${c.bg} p-5 flex items-start justify-between`}>
-      <div>
-        <p className="text-sm font-medium text-slate-400 mb-1">{title}</p>
-        <p className={`text-3xl font-bold ${c.text}`}>{value}</p>
-      </div>
-      <div className={`p-2 rounded-lg ${c.bg}`}>
-        <Icon size={24} className={c.icon} />
-      </div>
-    </div>
-  )
-}
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,25 +1,10 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { BrowserRouter } from 'react-router-dom'
 import './index.css'
 import App from './App'

-const queryClient = new QueryClient({
-  defaultOptions: {
-    queries: {
-      staleTime: 30_000,
-      refetchOnWindowFocus: false,
-    },
-  },
-})
-
 createRoot(document.getElementById('root')!).render(
  <StrictMode>
-    <QueryClientProvider client={queryClient}>
-      <BrowserRouter>
-        <App />
-      </BrowserRouter>
-    </QueryClientProvider>
+    <App />
  </StrictMode>,
 )
--- a/frontend/src/pages/Dashboard.tsx
+++ b/frontend/src/pages/Dashboard.tsx
@@ -1,139 +0,0 @@
-import { useQuery } from '@tanstack/react-query'
-import { getFilaments, getPrintJobs } from '../services/api'
-import SummaryCard from '../components/SummaryCard'
-import RecentPrints from '../components/RecentPrints'
-import LoadingSpinner from '../components/LoadingSpinner'
-import { Package, AlertTriangle, Printer, DollarSign, Plus, List } from 'lucide-react'
-
-export default function Dashboard() {
-  const {
-    data: filamentData,
-    isLoading: filamentLoading,
-    error: filamentError,
-  } = useQuery({
-    queryKey: ['filaments', 'count'],
-    queryFn: () => getFilaments({ limit: 1 }),
-  })
-
-  const {
-    data: lowStockData,
-    isLoading: lowStockLoading,
-    error: lowStockError,
-  } = useQuery({
-    queryKey: ['filaments', 'lowStock'],
-    queryFn: () => getFilaments({ low_stock: true, limit: 1 }),
-  })
-
-  const {
-    data: recentPrints,
-    isLoading: printsLoading,
-    error: printsError,
-  } = useQuery({
-    queryKey: ['printJobs', 'recent'],
-    queryFn: () => getPrintJobs({ limit: 5 }),
-  })
-
-  const {
-    data: allPrints,
-    isLoading: costLoading,
-    error: costError,
-  } = useQuery({
-    queryKey: ['printJobs', 'all'],
-    queryFn: () => getPrintJobs({ limit: 1000 }),
-  })
-
-  const totalSpools = filamentData?.total ?? 0
-  const lowStockCount = lowStockData?.total ?? 0
-  const recentPrintJobs = recentPrints?.data ?? []
-
-  // Calculate cost this month from all print jobs
-  const now = new Date()
-  const currentMonth = now.getMonth()
-  const currentYear = now.getFullYear()
-  const monthlyCost =
-    allPrints?.data
-      .filter((job) => {
-        const d = new Date(job.started_at)
-        return d.getMonth() === currentMonth && d.getFullYear() === currentYear
-      })
-      .reduce((sum, job) => sum + (job.cost_usd ?? 0), 0) ?? 0
-
-  const isLoading = filamentLoading || lowStockLoading || printsLoading || costLoading
-  const error = filamentError || lowStockError || printsError || costError
-
-  if (isLoading) {
-    return (
-      <div className="min-h-screen flex items-center justify-center bg-slate-900">
-        <LoadingSpinner />
-      </div>
-    )
-  }
-
-  if (error) {
-    return (
-      <div className="min-h-screen flex items-center justify-center bg-slate-900">
-        <div className="p-6 rounded-lg bg-red-900/30 border border-red-500 text-red-200 max-w-md">
-          <h2 className="text-xl font-bold mb-2">Error</h2>
-          <p className="text-sm">{(error as Error).message || 'Failed to load dashboard data.'}</p>
-        </div>
-      </div>
-    )
-  }
-
-  return (
-    <div className="min-h-screen bg-slate-900 p-4 md:p-8">
-      <div className="max-w-6xl mx-auto">
-        <header className="mb-8">
-          <h1 className="text-3xl font-bold text-emerald-400 mb-2">Dashboard</h1>
-          <p className="text-slate-400">Overview of your Extrudex inventory and prints</p>
-        </header>
-
-        {/* Summary Cards Grid */}
-        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-8">
-          <SummaryCard
-            title="Total Spools"
-            value={totalSpools}
-            icon={Package}
-            color="emerald"
-          />
-          <SummaryCard
-            title="Low Stock"
-            value={lowStockCount}
-            icon={AlertTriangle}
-            color={lowStockCount > 0 ? 'amber' : 'emerald'}
-          />
-          <SummaryCard
-            title="Recent Prints"
-            value={recentPrintJobs.length}
-            icon={Printer}
-            color="sky"
-          />
-          <SummaryCard
-            title="Cost This Month"
-            value={`$${monthlyCost.toFixed(2)}`}
-            icon={DollarSign}
-            color="violet"
-          />
-        </div>
-
-        {/* Quick Actions */}
-        <div className="flex flex-wrap gap-3 mb-8">
-          <button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 hover:bg-emerald-500 text-white font-medium transition-colors active:scale-95 touch-manipulation">
-            <Plus size={18} />
-            Add Spool
-          </button>
-          <button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-slate-700 hover:bg-slate-600 text-slate-100 font-medium transition-colors active:scale-95 touch-manipulation">
-            <List size={18} />
-            View Inventory
-          </button>
-        </div>
-
-        {/* Recent Prints Section */}
-        <section>
-          <h2 className="text-xl font-semibold text-slate-100 mb-4">Recent Prints</h2>
-          <RecentPrints jobs={recentPrintJobs} />
-        </section>
-      </div>
-    </div>
-  )
-}
--- a/frontend/src/pages/InventoryPage.tsx
+++ b/frontend/src/pages/InventoryPage.tsx
@@ -2,6 +2,7 @@ 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 FilamentForm from '../components/FilamentForm'
 import { fetchFilaments, deleteFilament } from '../services/filamentService'
 import type { FilamentSpool, FilamentFilter } from '../types/filament'

@@ -19,6 +20,9 @@ export default function InventoryPage() {
  const [sortDir, setSortDir] = useState<SortDir>('asc')
  const [page, setPage] = useState(0)
  const [deleteId, setDeleteId] = useState<number | null>(null)
+  const [formOpen, setFormOpen] = useState(false)
+  const [formMode, setFormMode] = useState<'create' | 'edit'>('create')
+  const [formInitial, setFormInitial] = useState<FilamentSpool | null>(null)

  const filter: FilamentFilter = useMemo(() => ({
    material: material || undefined,
@@ -79,7 +83,10 @@ export default function InventoryPage() {
          <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">
+        <button
+          onClick={() => { setFormMode('create'); setFormInitial(null); setFormOpen(true) }}
+          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>
@@ -208,7 +215,11 @@ export default function InventoryPage() {
                      </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">
+                          <button
+                            onClick={() => { setFormMode('edit'); setFormInitial(spool); setFormOpen(true) }}
+                            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
@@ -263,7 +274,10 @@ export default function InventoryPage() {
                  </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">
+                    <button
+                      onClick={() => { setFormMode('edit'); setFormInitial(spool); setFormOpen(true) }}
+                      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
@@ -304,6 +318,16 @@ export default function InventoryPage() {
        </>
      )}

+      {/* Add/Edit Form Modal */}
+      {formOpen && (
+        <FilamentForm
+          mode={formMode}
+          initialData={formInitial}
+          onClose={() => setFormOpen(false)}
+          onSuccess={() => refetch()}
+        />
+      )}
+
      {/* 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">
--- a/frontend/src/services/api.ts
+++ b/frontend/src/services/api.ts
@@ -1,19 +0,0 @@
-import axios from 'axios'
-import type { ListResponse, FilamentSpool, PrintJob } from '../types'
-
-const api = axios.create({
-  baseURL: '/api',
-  headers: { 'Content-Type': 'application/json' },
-})
-
-export async function getFilaments(params?: { low_stock?: boolean; limit?: number; offset?: number }) {
-  const res = await api.get<ListResponse<FilamentSpool>>('/filaments', { params })
-  return res.data
-}
-
-export async function getPrintJobs(params?: { limit?: number; offset?: number }) {
-  const res = await api.get<ListResponse<PrintJob>>('/print-jobs', { params })
-  return res.data
-}
-
-export default api
--- a/frontend/src/services/filamentService.ts
+++ b/frontend/src/services/filamentService.ts
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import type { FilamentSpool, ListResponse, FilamentFilter } from '../types/filament'
+import type { FilamentSpool, ListResponse, FilamentFilter, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament'

 const API_BASE = '/api'

@@ -19,6 +19,31 @@ export async function fetchFilaments(filter: FilamentFilter): Promise<ListRespon
  return res.data
 }

+export async function createFilament(payload: Partial<FilamentSpool>): Promise<FilamentSpool> {
+  const res = await axios.post<{ data: FilamentSpool }>(`${API_BASE}/filaments`, payload)
+  return res.data.data
+}
+
+export async function updateFilament(id: number, payload: Partial<FilamentSpool>): Promise<FilamentSpool> {
+  const res = await axios.put<{ data: FilamentSpool }>(`${API_BASE}/filaments/${id}`, payload)
+  return res.data.data
+}
+
 export async function deleteFilament(id: number): Promise<void> {
  await axios.delete(`${API_BASE}/filaments/${id}`)
 }
+
+export async function fetchMaterialBases(): Promise<MaterialBase[]> {
+  const res = await axios.get<{ data: MaterialBase[] }>(`${API_BASE}/materials`)
+  return res.data.data
+}
+
+export async function fetchMaterialFinishes(): Promise<MaterialFinish[]> {
+  const res = await axios.get<{ data: MaterialFinish[] }>(`${API_BASE}/finishes`)
+  return res.data.data
+}
+
+export async function fetchMaterialModifiers(): Promise<MaterialModifier[]> {
+  const res = await axios.get<{ data: MaterialModifier[] }>(`${API_BASE}/modifiers`)
+  return res.data.data
+}
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -1,42 +0,0 @@
-export interface FilamentSpool {
-  id: number;
-  name: string;
-  material_base_id: number;
-  material_finish_id: number;
-  material_modifier_id: number;
-  color_hex: string;
-  brand: string;
-  diameter_mm: number;
-  initial_grams: number;
-  remaining_grams: number;
-  spool_weight_grams: number;
-  cost_usd: number;
-  low_stock_threshold_grams: number;
-  notes: string;
-  barcode: string;
-  created_at: string;
-  updated_at: string;
-  deleted_at: string | null;
-}
-
-export interface PrintJob {
-  id: number;
-  name: string;
-  printer_id: number;
-  filament_id: number;
-  status: string;
-  duration_seconds: number;
-  filament_used_grams: number;
-  cost_usd: number;
-  started_at: string;
-  completed_at: string | null;
-  created_at: string;
-  updated_at: string;
-}
-
-export interface ListResponse<T> {
-  data: T[];
-  total: number;
-  limit: number;
-  offset: number;
-}
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,7 +15,6 @@
    "noUnusedLocals": true,
    "noUnusedParameters": true,
    "noFallthroughCasesInSwitch": true,
-    "ignoreDeprecations": "5.0",
    "baseUrl": ".",
    "paths": {
      "@/*": ["src/*"]
--- a/systemd/extrudex-kiosk.service
+++ b/systemd/extrudex-kiosk.service
@@ -1,36 +0,0 @@
-[Unit]
-Description=Extrudex Kiosk (Chromium, Go + React frontend)
-After=network-online.target extrudex.service
-Requires=extrudex.service
-
-[Service]
-Type=simple
-User=pi
-Group=pi
-Environment=DISPLAY=:0
-Environment=XAUTHORITY=/home/pi/.Xauthority
-WorkingDirectory=/home/pi
-
-ExecStart=/usr/bin/chromium-browser \
-    --no-first-run \
-    --no-default-browser-check \
-    --autoplay-policy=no-user-gesture-required \
-    --disable-infobars \
-    --disable-window-activation \
-    --disable-full-screen-modal \
-    --kiosk http://localhost:5081 \
-    --disable-features=TranslateUI \
-    --touch-events=enabled \
-    --enable-pinch
-
-ExecReload=/bin/kill -HUP $MAINPID
-
-Restart=always
-RestartSec=10
-
-# Touchscreen / kiosk
-Environment=QT_QPA_PLATFORM=wayland
-Environment=QT_WAYLAND_SHELL_INTEGRATION=wayland
-
-[Install]
-WantedBy=multi-user.target
--- a/systemd/extrudex-kiosk@.service
+++ b/systemd/extrudex-kiosk@.service
@@ -1,12 +0,0 @@
-[Unit]
-Description=Extrudex Kiosk Session (user-level, seat %i)
-After=graphical-session.target
-
-[Service]
-Type=simple
-Environment=DISPLAY=:0
-ExecStart=/bin/true
-Restart=on-failure
-
-[Install]
-WantedBy=graphical-session.target
--- a/systemd/extrudex.service
+++ b/systemd/extrudex.service
@@ -1,16 +0,0 @@
-[Unit]
-Description=Extrudex Docker Compose Stack (Go + React)
-After=network-online.target docker.service
-Requires=docker.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-WorkingDirectory=/home/pi/extrudex
-ExecStart=/usr/bin/docker compose -f docker-compose.dev.yml up -d
-ExecStop=/usr/bin/docker compose -f docker-compose.dev.yml down
-TimeoutStartSec=120
-TimeoutStopSec=120
-
-[Install]
-WantedBy=multi-user.target