Compare commits
1 Commits
9b0ffc4309
...
agent/rex/
| Author | SHA1 | Date | |
|---|---|---|---|
| ba167943dd |
@@ -1,34 +0,0 @@
|
||||
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})
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
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})
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
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
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
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
|
||||
}
|
||||
@@ -45,8 +45,6 @@ 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)
|
||||
@@ -59,8 +57,6 @@ 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)
|
||||
@@ -70,8 +66,6 @@ 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)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
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'
|
||||
import FilamentDetailPage from './pages/FilamentDetailPage'
|
||||
|
||||
const queryClient = new QueryClient()
|
||||
|
||||
@@ -16,8 +16,8 @@ export default function App() {
|
||||
</header>
|
||||
<main className="p-4">
|
||||
<Routes>
|
||||
<Route path="/" element={<Dashboard />} />
|
||||
<Route path="/inventory" element={<InventoryPage />} />
|
||||
<Route path="/" element={<InventoryPage />} />
|
||||
<Route path="/filament/:id" element={<FilamentDetailPage />} />
|
||||
</Routes>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -1,360 +0,0 @@
|
||||
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>
|
||||
)
|
||||
}
|
||||
@@ -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>
|
||||
)
|
||||
}
|
||||
@@ -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`
|
||||
}
|
||||
@@ -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>
|
||||
)
|
||||
}
|
||||
@@ -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>
|
||||
</StrictMode>,
|
||||
)
|
||||
|
||||
@@ -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>
|
||||
)
|
||||
}
|
||||
391
frontend/src/pages/FilamentDetailPage.tsx
Normal file
391
frontend/src/pages/FilamentDetailPage.tsx
Normal file
@@ -0,0 +1,391 @@
|
||||
import { useState } from 'react'
|
||||
import { useParams, useNavigate } from 'react-router-dom'
|
||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { ArrowLeft, Pencil, Trash2, AlertTriangle, Loader2, Archive } from 'lucide-react'
|
||||
import ColorSwatch from '../components/ColorSwatch'
|
||||
import { fetchFilamentById, fetchUsageLogs, deleteFilament } from '../services/filamentService'
|
||||
import type { UsageLog } from '../types/filament'
|
||||
|
||||
export default function FilamentDetailPage() {
|
||||
const { id } = useParams<{ id: string }>()
|
||||
const spoolId = Number(id)
|
||||
const navigate = useNavigate()
|
||||
const queryClient = useQueryClient()
|
||||
const [deleteConfirm, setDeleteConfirm] = useState(false)
|
||||
const [deleting, setDeleting] = useState(false)
|
||||
|
||||
const {
|
||||
data: spool,
|
||||
isLoading: spoolLoading,
|
||||
error: spoolError,
|
||||
refetch: refetchSpool,
|
||||
} = useQuery({
|
||||
queryKey: ['filament', spoolId],
|
||||
queryFn: () => fetchFilamentById(spoolId),
|
||||
enabled: !isNaN(spoolId),
|
||||
})
|
||||
|
||||
const {
|
||||
data: usageLogs,
|
||||
isLoading: usageLoading,
|
||||
error: usageError,
|
||||
refetch: refetchUsage,
|
||||
} = useQuery({
|
||||
queryKey: ['usage-logs', spoolId],
|
||||
queryFn: () => fetchUsageLogs(spoolId),
|
||||
enabled: !isNaN(spoolId),
|
||||
})
|
||||
|
||||
const handleDelete = async () => {
|
||||
setDeleting(true)
|
||||
try {
|
||||
await deleteFilament(spoolId)
|
||||
queryClient.invalidateQueries({ queryKey: ['filaments'] })
|
||||
navigate('/')
|
||||
} catch {
|
||||
setDeleting(false)
|
||||
setDeleteConfirm(false)
|
||||
}
|
||||
}
|
||||
|
||||
// ── Loading state ──
|
||||
if (spoolLoading) {
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center py-24 gap-3 text-slate-400">
|
||||
<Loader2 size={32} className="animate-spin text-emerald-400" />
|
||||
<span>Loading spool details…</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// ── Error state ──
|
||||
if (spoolError || !spool) {
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center py-24 gap-4">
|
||||
<div className="flex h-14 w-14 items-center justify-center rounded-full bg-red-900/30">
|
||||
<AlertTriangle size={28} className="text-red-400" />
|
||||
</div>
|
||||
<p className="text-red-400 font-medium">Failed to load spool details.</p>
|
||||
<div className="flex gap-3">
|
||||
<button
|
||||
onClick={() => refetchSpool()}
|
||||
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors"
|
||||
>
|
||||
Retry
|
||||
</button>
|
||||
<button
|
||||
onClick={() => navigate('/')}
|
||||
className="rounded-lg bg-slate-800 border border-slate-700 px-4 py-2 text-sm font-medium text-slate-300 hover:bg-slate-700 transition-colors"
|
||||
>
|
||||
Back to Inventory
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const pctRemaining = spool.initial_grams > 0
|
||||
? (spool.remaining_grams / spool.initial_grams) * 100
|
||||
: 0
|
||||
const isLow = spool.remaining_grams <= (spool.low_stock_threshold_grams || 0)
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
{/* ── Header Bar ── */}
|
||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||
<button
|
||||
onClick={() => navigate('/')}
|
||||
className="inline-flex items-center gap-2 rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm font-medium text-slate-200 hover:bg-slate-700 active:bg-slate-600 transition-colors w-fit"
|
||||
>
|
||||
<ArrowLeft size={16} />
|
||||
Back to Inventory
|
||||
</button>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button className="inline-flex items-center gap-2 rounded-lg bg-slate-700 px-4 py-2 text-sm font-semibold text-slate-200 hover:bg-slate-600 active:bg-slate-500 transition-colors">
|
||||
<Pencil size={16} />
|
||||
Edit
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setDeleteConfirm(true)}
|
||||
className="inline-flex items-center gap-2 rounded-lg bg-red-900/30 border border-red-700 px-4 py-2 text-sm font-semibold text-red-300 hover:bg-red-900/50 active:bg-red-900/70 transition-colors"
|
||||
>
|
||||
<Trash2 size={16} />
|
||||
Delete
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Spool Info Card ── */}
|
||||
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||
{/* Card header */}
|
||||
<div className="px-6 py-5 border-b border-slate-700 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
|
||||
<div className="flex items-center gap-3">
|
||||
<ColorSwatch colorHex={spool.color_hex} size={36} />
|
||||
<div>
|
||||
<h1 className="text-xl font-bold text-slate-100">{spool.name}</h1>
|
||||
<p className="text-sm text-slate-400">
|
||||
{spool.brand && <span>{spool.brand} · </span>}
|
||||
{spool.diameter_mm}mm
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{isLow ? (
|
||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-red-900/40 border border-red-700 px-3 py-1 text-sm font-medium text-red-300">
|
||||
<AlertTriangle size={14} /> Low Stock
|
||||
</span>
|
||||
) : (
|
||||
<span className="inline-flex items-center gap-1.5 rounded-full bg-emerald-900/30 border border-emerald-700 px-3 py-1 text-sm font-medium text-emerald-300">
|
||||
In Stock
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Card body — 2-column grid */}
|
||||
<div className="px-6 py-5 grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-x-8 gap-y-4">
|
||||
<DetailItem label="Material" value={spool.material_base?.name ?? '—'} />
|
||||
<DetailItem label="Finish" value={spool.material_finish?.name ?? '—'} />
|
||||
<DetailItem
|
||||
label="Modifier"
|
||||
value={spool.material_modifier?.name ?? 'None'}
|
||||
/>
|
||||
<DetailItem label="Color" value={spool.color_hex.toUpperCase()} />
|
||||
<DetailItem label="Brand" value={spool.brand || '—'} />
|
||||
<DetailItem label="Diameter" value={`${spool.diameter_mm}mm`} />
|
||||
<DetailItem
|
||||
label="Remaining"
|
||||
value={
|
||||
<span className="font-semibold tabular-nums">
|
||||
{spool.remaining_grams.toLocaleString()} g
|
||||
</span>
|
||||
}
|
||||
/>
|
||||
<DetailItem
|
||||
label="Initial"
|
||||
value={`${spool.initial_grams.toLocaleString()} g`}
|
||||
/>
|
||||
<DetailItem
|
||||
label="Cost"
|
||||
value={
|
||||
spool.cost_usd != null
|
||||
? `$${spool.cost_usd.toFixed(2)}`
|
||||
: '—'
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Progress Bar */}
|
||||
<div className="px-6 pb-5 pt-1">
|
||||
<div className="flex items-center justify-between text-sm mb-1.5">
|
||||
<span className="text-slate-400">
|
||||
<span className="text-slate-200 font-semibold tabular-nums">
|
||||
{spool.remaining_grams.toLocaleString()}g
|
||||
</span>{' '}
|
||||
of {spool.initial_grams.toLocaleString()}g
|
||||
</span>
|
||||
<span className="text-slate-400 font-medium tabular-nums">
|
||||
{pctRemaining.toFixed(1)}%
|
||||
</span>
|
||||
</div>
|
||||
<div className="w-full h-3 rounded-full bg-slate-700 overflow-hidden">
|
||||
<div
|
||||
className={`h-full rounded-full transition-all duration-500 ${
|
||||
pctRemaining <= 10
|
||||
? 'bg-red-500'
|
||||
: pctRemaining <= 25
|
||||
? 'bg-amber-500'
|
||||
: 'bg-emerald-500'
|
||||
}`}
|
||||
style={{ width: `${Math.min(100, pctRemaining)}%` }}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Usage History ── */}
|
||||
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||
<div className="px-6 py-4 border-b border-slate-700">
|
||||
<h2 className="text-lg font-semibold text-slate-100">Usage History</h2>
|
||||
</div>
|
||||
|
||||
{/* Loading sub-state */}
|
||||
{usageLoading && (
|
||||
<div className="px-6 py-8 text-center text-slate-400">
|
||||
<Loader2 size={20} className="animate-spin inline mr-2" />
|
||||
Loading usage history…
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Usage error sub-state */}
|
||||
{usageError && !usageLoading && (
|
||||
<div className="px-6 py-8 text-center">
|
||||
<p className="text-red-400 text-sm">
|
||||
Failed to load usage history.
|
||||
</p>
|
||||
<button
|
||||
onClick={() => refetchUsage()}
|
||||
className="mt-2 text-sm text-emerald-400 hover:text-emerald-300 underline"
|
||||
>
|
||||
Retry
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Empty state */}
|
||||
{!usageLoading && !usageError && usageLogs && usageLogs.length === 0 && (
|
||||
<div className="px-6 py-10 text-center">
|
||||
<Archive size={32} className="mx-auto text-slate-600 mb-2" />
|
||||
<p className="text-slate-400 text-sm">No usage recorded yet.</p>
|
||||
<p className="text-slate-500 text-xs mt-1">
|
||||
Usage data will appear here when this spool is used in print jobs.
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Table — desktop */}
|
||||
{!usageLoading && !usageError && usageLogs && usageLogs.length > 0 && (
|
||||
<>
|
||||
<div className="hidden md:block overflow-x-auto">
|
||||
<table className="w-full text-sm">
|
||||
<thead className="bg-slate-800/50 text-slate-300">
|
||||
<tr>
|
||||
<th className="px-6 py-3 text-left font-semibold">Date</th>
|
||||
<th className="px-6 py-3 text-left font-semibold">Print Job</th>
|
||||
<th className="px-6 py-3 text-right font-semibold">mm Extruded</th>
|
||||
<th className="px-6 py-3 text-right font-semibold">Grams Used</th>
|
||||
<th className="px-6 py-3 text-right font-semibold">Cost</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-slate-700">
|
||||
{usageLogs.map((log: UsageLog) => (
|
||||
<tr
|
||||
key={log.id}
|
||||
className="hover:bg-slate-700/30 transition-colors"
|
||||
>
|
||||
<td className="px-6 py-3 text-slate-200 tabular-nums">
|
||||
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
})}
|
||||
</td>
|
||||
<td className="px-6 py-3 text-slate-300">
|
||||
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
||||
</td>
|
||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||
{log.mm_extruded.toLocaleString()}
|
||||
</td>
|
||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||
{log.grams_used.toFixed(2)} g
|
||||
</td>
|
||||
<td className="px-6 py-3 text-right text-slate-200 tabular-nums">
|
||||
{log.cost_usd != null ? `$${log.cost_usd.toFixed(3)}` : '—'}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* Mobile cards */}
|
||||
<div className="md:hidden divide-y divide-slate-700">
|
||||
{usageLogs.map((log: UsageLog) => (
|
||||
<div key={log.id} className="px-4 py-4 space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-sm font-medium text-slate-200">
|
||||
{log.print_job_name || `Job #${log.print_job_id ?? log.id}`}
|
||||
</span>
|
||||
<span className="text-xs text-slate-400 tabular-nums">
|
||||
{new Date(log.logged_at).toLocaleDateString('en-US', {
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
})}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between text-sm">
|
||||
<span className="text-slate-400">
|
||||
Extruded:{' '}
|
||||
<span className="text-slate-300 tabular-nums">
|
||||
{log.mm_extruded.toLocaleString()} mm
|
||||
</span>
|
||||
</span>
|
||||
<span className="text-slate-400">
|
||||
Used:{' '}
|
||||
<span className="text-slate-300 tabular-nums">
|
||||
{log.grams_used.toFixed(2)} g
|
||||
</span>
|
||||
</span>
|
||||
<span className="text-slate-400">
|
||||
{log.cost_usd != null ? (
|
||||
<>
|
||||
Cost:{' '}
|
||||
<span className="text-slate-300 tabular-nums">
|
||||
${log.cost_usd.toFixed(3)}
|
||||
</span>
|
||||
</>
|
||||
) : (
|
||||
'—'
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* ── Delete Confirmation Modal ── */}
|
||||
{deleteConfirm && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
|
||||
<div className="w-full max-w-sm rounded-xl bg-slate-800 border border-slate-700 p-6 shadow-2xl space-y-4">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-900/30 flex-shrink-0">
|
||||
<AlertTriangle size={20} className="text-red-400" />
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-lg font-semibold text-slate-100">
|
||||
Delete “{spool.name}”?
|
||||
</h3>
|
||||
<p className="text-sm text-slate-400">
|
||||
This permanently removes the spool and all usage history. This cannot be undone.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex justify-end gap-3">
|
||||
<button
|
||||
onClick={() => setDeleteConfirm(false)}
|
||||
disabled={deleting}
|
||||
className="rounded-lg bg-slate-700 px-4 py-2 text-sm font-medium text-slate-200 hover:bg-slate-600 transition-colors disabled:opacity-50"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
onClick={handleDelete}
|
||||
disabled={deleting}
|
||||
className="inline-flex items-center gap-2 rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-500 transition-colors disabled:opacity-50"
|
||||
>
|
||||
{deleting && <Loader2 size={16} className="animate-spin" />}
|
||||
{deleting ? 'Deleting…' : 'Delete'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/** Small detail row for the info card grid */
|
||||
function DetailItem({ label, value }: { label: string; value: React.ReactNode }) {
|
||||
return (
|
||||
<div>
|
||||
<dt className="text-xs font-medium uppercase tracking-wider text-slate-500 mb-0.5">
|
||||
{label}
|
||||
</dt>
|
||||
<dd className="text-sm text-slate-200">{value}</dd>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -2,7 +2,6 @@ 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'
|
||||
|
||||
@@ -20,9 +19,6 @@ 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,
|
||||
@@ -83,10 +79,7 @@ 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
|
||||
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"
|
||||
>
|
||||
<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>
|
||||
@@ -215,11 +208,7 @@ export default function InventoryPage() {
|
||||
</td>
|
||||
<td className="px-4 py-3 text-right">
|
||||
<div className="flex items-center justify-end gap-2">
|
||||
<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"
|
||||
>
|
||||
<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
|
||||
@@ -274,10 +263,7 @@ export default function InventoryPage() {
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-end gap-2 pt-1">
|
||||
<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"
|
||||
>
|
||||
<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
|
||||
@@ -318,16 +304,6 @@ 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">
|
||||
|
||||
@@ -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
|
||||
@@ -1,5 +1,5 @@
|
||||
import axios from 'axios'
|
||||
import type { FilamentSpool, ListResponse, FilamentFilter, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament'
|
||||
import type { FilamentSpool, ListResponse, UsageLog, FilamentFilter } from '../types/filament'
|
||||
|
||||
const API_BASE = '/api'
|
||||
|
||||
@@ -19,31 +19,16 @@ 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 fetchFilamentById(id: number): Promise<FilamentSpool> {
|
||||
const res = await axios.get<FilamentSpool>(`${API_BASE}/filaments/${id}`)
|
||||
return res.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 fetchUsageLogs(spoolId: number): Promise<UsageLog[]> {
|
||||
const res = await axios.get<UsageLog[]>(`${API_BASE}/usage-logs?spool_id=${spoolId}`)
|
||||
return res.data
|
||||
}
|
||||
|
||||
export async function deleteFilament(id: number): Promise<void> {
|
||||
await axios.delete(`${API_BASE}/filaments/${id}`)
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
@@ -59,6 +59,19 @@ export interface ListResponse<T> {
|
||||
offset: number
|
||||
}
|
||||
|
||||
export interface UsageLog {
|
||||
id: number
|
||||
spool_id: number
|
||||
print_job_id?: number
|
||||
print_job_name?: string
|
||||
mm_extruded: number
|
||||
grams_used: number
|
||||
cost_usd?: number
|
||||
logged_at: string
|
||||
notes?: string
|
||||
created_at: string
|
||||
}
|
||||
|
||||
export interface FilamentFilter {
|
||||
material?: string
|
||||
finish?: string
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -15,7 +15,6 @@
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"ignoreDeprecations": "5.0",
|
||||
"baseUrl": ".",
|
||||
"paths": {
|
||||
"@/*": ["src/*"]
|
||||
|
||||
Reference in New Issue
Block a user