Compare commits

..

3 Commits

Author SHA1 Message Date
overseer e76a32eafe CUB-129: fix lint warning in useMemo and add typescript-eslint dev dep
Dev Build / build-test (pull_request) Successful in 2m58s
2026-05-26 10:40:46 -04:00
Hex 23d4c6fc92 CUB-129: Build Print Jobs list page
- Add PrintJob types (PrintJob, PrintJobFilter) with status union type
- Add printJobService.ts using axios + TanStack Query
- Build PrintJobsPage.tsx with:
  - Desktop table: job name, printer, color-coded status badge, started time, duration, filament used, cost
  - Mobile card layout with grid-based info display
  - Filter by status (pending/printing/completed/failed)
  - Filter by printer name
  - Sort by any column (name, started_at, duration, filament, cost)
  - Pagination with 20 per page
  - Loading spinner, error with retry, empty state
  - Client-side text search by job/printer name
  - Duration formatting (h/m/s)
- Add navigation bar in App.tsx with Inventory + Print Jobs tabs using NavLink
2026-05-26 10:36:45 -04:00
Otto d8c0991dc6 docs: add comprehensive project context file (CONTEXT.md) for agent reference
Dev Build / build-test (push) Failing after 1s
2026-05-21 13:29:24 -04:00
15 changed files with 892 additions and 588 deletions
@@ -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
}
-6
View File
@@ -45,8 +45,6 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
// ── Repositories ────────────────────────────────────────────────────── // ── Repositories ──────────────────────────────────────────────────────
materialRepo := repositories.NewMaterialRepository(dbPool) materialRepo := repositories.NewMaterialRepository(dbPool)
finishRepo := repositories.NewMaterialFinishRepository(dbPool)
modifierRepo := repositories.NewMaterialModifierRepository(dbPool)
filamentRepo := repositories.NewFilamentRepository(dbPool) filamentRepo := repositories.NewFilamentRepository(dbPool)
printerRepo := repositories.NewPrinterRepository(dbPool) printerRepo := repositories.NewPrinterRepository(dbPool)
printJobRepo := repositories.NewPrintJobRepository(dbPool) printJobRepo := repositories.NewPrintJobRepository(dbPool)
@@ -59,8 +57,6 @@ func New(cfg *config.Config, dbPool *pgxpool.Pool, sseBC *sse.Broadcaster) chi.R
// ── Handlers ────────────────────────────────────────────────────────── // ── Handlers ──────────────────────────────────────────────────────────
materialHandler := handlers.NewMaterialHandler(materialRepo) materialHandler := handlers.NewMaterialHandler(materialRepo)
finishHandler := handlers.NewMaterialFinishHandler(finishRepo)
modifierHandler := handlers.NewMaterialModifierHandler(modifierRepo)
filamentHandler := handlers.NewFilamentHandler(filamentService) filamentHandler := handlers.NewFilamentHandler(filamentService)
printerHandler := handlers.NewPrinterHandler(printerService) printerHandler := handlers.NewPrinterHandler(printerService)
printJobHandler := handlers.NewPrintJobHandler(printJobService) 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.Route("/api", func(r chi.Router) {
r.Use(middleware.Timeout(60 * time.Second)) r.Use(middleware.Timeout(60 * time.Second))
r.Get("/materials", materialHandler.List) r.Get("/materials", materialHandler.List)
r.Get("/finishes", finishHandler.List)
r.Get("/modifiers", modifierHandler.List)
r.Route("/filaments", func(r chi.Router) { r.Route("/filaments", func(r chi.Router) {
r.Get("/", filamentHandler.List) r.Get("/", filamentHandler.List)
+214
View File
@@ -0,0 +1,214 @@
# Extrudex — Project Context
> **Last updated:** 2026-05-21
> **Repo:** `CubeCraft-Creations/Extrudex` | **Host:** `code.cubecraftcreations.com`
> **Local clone:** `/mnt/ai-storage/projects/Extrudex` | **Default branch:** `dev`
> **Discord:** `DISCORD_DEV_EXTRUDEX_CHANNEL_ID`
> **Linear Epic:** [CUB-110](https://linear.app/cubecraft-creations/issue/CUB-110)
---
## Overview
Custom filament inventory and print tracking system for CubeCraft Creations. Tracks spool consumption, material costs, and per-print COGS across a fleet of 6 FDM printers (5 Bambu Lab + 1 Elegoo Centauri Carbon) + resin printers. Kiosk interface on Raspberry Pi 5 with USB barcode scanner.
**Active refactor in progress:** .NET → Go + React (CUB-110 epic).
## Tech Stack
| Layer | Technology | Notes |
|-------|-----------|-------|
| Backend (legacy) | ASP.NET Core 9 + EF Core | Being replaced by Go |
| Backend (new) | Go 1.24+ | Chi router, pgx (PostgreSQL), gorilla/websocket, paho.mqtt.golang |
| Frontend (legacy) | Angular 17+ | Being replaced by React |
| Frontend (new) | React 18 + TypeScript + Tailwind CSS | Vite |
| Database | PostgreSQL 16+ | snake_case naming |
| Real-time | SSE (Server-Sent Events) | Replaces SignalR |
| Printer integrations | Moonraker REST + WebSocket, MQTT TLS | Elegoo/Klipper + Bambu Lab |
| CI/CD | Gitea Actions | `.gitea/workflows/dev.yml` |
| Deployment | Docker/Compose, Pi 5 kiosk | |
## Key Design Decisions
1. **Custom system over Spoolman** — Full control over data model and integrations
2. **MaterialFinish required** on every spool; default is "Basic"
3. **MaterialModifier is optional**
4. **Grams derived from:** `mm_extruded × filament_cross_section_area × material_density`
5. **Push over poll** — SSE + MQTT preferred; Moonraker polling is fallback
6. **Snake_case** for all PostgreSQL identifiers
## Project Structure
```
Extrudex/
├── backend/ # Original .NET backend (being replaced)
│ ├── API/Controllers/ # Filaments, Spools, PrintJobs, Printers, Materials, QR, UsageLogs, Cost
│ ├── API/DTOs/ # DTOs per domain
│ ├── API/Validators/ # FluentValidation rules
│ ├── API/Hubs/ # SignalR PrinterHub
│ ├── API/Jobs/ # Background sync jobs
│ ├── Domain/Entities/ # EF Core entities (Printer, Spool, PrintJob, MaterialBase, etc.)
│ ├── Domain/Enums/ # ConnectionType, DataSource, JobStatus, PrinterStatus, QrResourceType
│ ├── Domain/Interfaces/ # Service interfaces
│ ├── Infrastructure/Data/ # EF DbContext, Configurations, Migrations, SeedData
│ ├── Infrastructure/Services/ # MoonrakerClient, CostPerPrint, UsageLog, FilamentUsage, QR
│ └── Program.cs # ASP.NET entry point
├── cmd/server/main.go # Go entrypoint (new), worker discovery, graceful shutdown
├── internal/ # Go backend (new)
│ ├── config/config.go # Env vars
│ ├── db/db.go # PostgreSQL connection pool (pgx)
│ ├── models/models.go # Go domain structs
│ ├── router/router.go # Chi HTTP routes
│ ├── sse/broadcaster.go # SSE broadcaster
│ ├── sse/events.go # SSE event types
│ ├── sse/handler.go # SSE HTTP handler
│ ├── handlers/ # API handlers (filament, health, material, print_job, printer, usage_log)
│ ├── repositories/ # DB access layer
│ └── services/ # Business logic + validation
├── migrations/ # Go-migrate SQL migrations
│ ├── 000001_initial_schema.up.sql
│ ├── 000001_initial_schema.down.sql
│ ├── 000002_seed_data.up.sql
│ └── 000002_seed_data.down.sql
├── frontend/ # React frontend (new)
│ ├── src/
│ │ ├── App.tsx
│ │ ├── main.tsx
│ │ ├── components/ # ColorSwatch, LoadingSpinner, RecentPrints, SummaryCard
│ │ ├── pages/
│ │ │ ├── Dashboard.tsx # Main dashboard with summary cards + recent prints
│ │ │ └── InventoryPage.tsx # Filament inventory list (table + filters)
│ │ ├── services/
│ │ │ ├── api.ts # Axios client
│ │ │ └── filamentService.ts
│ │ ├── stores/ # State stores (WIP)
│ │ ├── types/
│ │ │ ├── filament.ts
│ │ │ └── index.ts
│ │ └── hooks/
│ ├── Dockerfile + nginx.conf
│ └── vite.config.ts, tailwind.config.js
├── design/ # UX/design specs + mockup images
│ ├── homepage-spec.md
│ ├── 01-filament-inventory-list.md
│ ├── 02-spool-detail-view.md
│ ├── 03-smart-intake-workflow.md
│ ├── smart-intake-identify-spec.md
│ └── *.jpg / *.png # Mockup images (kiosk + mobile)
├── docker-compose.dev.yml
└── deploy.sh
```
## Database Schema (PostgreSQL — .NET EF Core Migrations)
Core entities managed by EF Core with full configurations:
- **Printers** — id, name, type (BambuLab/Moonraker), connection_type, status, ip_address, mac_address, ams_count
- **AmsUnit / AmsSlot** — Bambu Lab AMS tray tracking
- **Spools** — filament inventory with material, color, weight, location, QR support
- **MaterialBase / MaterialFinish / MaterialModifier** — material taxonomy
- **PrintJobs** — job tracking with status, cost, filament consumption
- **UsageLogs** — per-printer filament consumption records
- **FilamentUsage** — aggregated per-spool consumption tracking
- **FilamentUsageSyncJob** — background Moonraker polling
- **MoonrakerPrinterSyncJob** — background printer status sync
## API Endpoints (.NET)
| Method | Endpoint | Description |
|--------|----------|-------------|
| GET | /api/filaments | List filaments (paginated, filterable) |
| POST | /api/filaments | Create filament |
| GET | /api/filaments/{id} | Get filament detail |
| PUT | /api/filaments/{id} | Update filament |
| DELETE | /api/filaments/{id} | Delete filament |
| GET | /api/spools | List spools |
| POST | /api/spools | Create spool |
| GET | /api/spools/{id} | Get spool detail |
| PUT | /api/spools/{id} | Update spool |
| DELETE | /api/spools/{id} | Delete spool |
| GET | /api/print-jobs | List print jobs |
| POST | /api/print-jobs | Create print job |
| GET | /api/print-jobs/{id} | Get print job detail |
| GET | /api/printers | List printers |
| POST | /api/printers | Register printer |
| GET | /api/printers/{id} | Get printer detail |
| GET | /api/printers/{id}/costs | Per-print cost summary |
| GET | /api/printers/{id}/usage | Filament usage history |
| GET | /api/materials/bases | List material bases |
| POST | /api/materials/bases | Create material base |
| GET | /api/materials/finishes | List material finishes |
| POST | /api/materials/finishes | Create material finish |
| GET | /api/materials/modifiers | List material modifiers |
| POST | /api/materials/modifiers | Create modifier |
| GET | /api/materials/lookups | Unified material lookup |
| GET | /api/qr/resolve/{code} | QR code resolve |
| GET | /api/usage-logs | List usage logs |
| POST | /api/usage-logs | Create usage log |
## CUB-110 Epic Progress (Go + React Rewrite)
| Sub-task | Title | Status | Agent |
|----------|-------|--------|-------|
| CUB-111 | Design PostgreSQL schema | Done | Hex |
| CUB-112 | Scaffold Go backend | Done | Dex |
| CUB-113 | Core CRUD API endpoints | Done | Dex |
| CUB-116 | Scaffold React frontend | In Review | Rex |
| CUB-117 | Moonraker + MQTT integrations | In Progress | Dex |
| CUB-118 | (deprecated → CUB-135 + CUB-136) | — | — |
| CUB-130 | Add/Edit Filament form | In Review | Rex |
| CUB-131 | Filament Detail page | In Review | Rex |
| CUB-132 | Filament Inventory list | Done | Rex |
| CUB-133 | Dashboard summary cards | In Review | Rex |
| CUB-134 | Printers list page | Todo | Rex |
| CUB-135 | Subscribe to SSE in React | In Review | Rex |
| CUB-136 | Add SSE endpoint in Go | In Review | Dex |
| CUB-128 | Settings page | Todo | — |
| CUB-129 | Print Jobs list page | Todo | — |
| CUB-114 | Pi 5 kiosk deployment | Todo | — |
## Active Branches
| Branch | Agent | Issue | Status |
|--------|-------|-------|--------|
| `agent/dex/CUB-117-moonraker-mqtt-go` | Dex | CUB-117 | Local commit ready |
| `agent/dex/CUB-136-sse-endpoint` | Dex | CUB-136 | PR open |
| `agent/rex/CUB-130-filament-form` | Rex | CUB-130 | PR open |
| `agent/rex/CUB-131-filament-detail` | Rex | CUB-131 | PR open |
| `agent/rex/CUB-133-dashboard-cards` | Rex | CUB-133 | PR open |
| `agent/rex/CUB-135-sse-subscribe` | Rex | CUB-135 | PR open |
## Known Limitations
- Go rewrite is in progress — backend `internal/` is new Go code, but legacy .NET code still serves endpoints
- Kiosk deployment not finalized (CUB-114)
- Smart intake workflow is designed but not implemented
- MQTT Bambu Lab integration is partially complete (CUB-117)
## Default Agent Assignments
| Area | Agent | Notes |
|------|-------|-------|
| Backend (Go API, Moonraker, MQTT) | Dex | gitea-dex MCP |
| Database (PostgreSQL schema, migrations) | Hex | gitea-hex MCP |
| Frontend (React, Tailwind) | Rex | gitea-rex MCP |
| Design (wireframes, UX) | Sketch | |
## Getting Started
```bash
cd /mnt/ai-storage/projects/Extrudex
git checkout dev
git pull origin dev
# Legacy .NET backend
cd backend && dotnet run
# New Go backend
go run cmd/server/main.go
# React frontend
cd frontend && npm install && npm run dev
# Docker
docker compose -f docker-compose.dev.yml up --build
```
+315
View File
@@ -28,6 +28,7 @@
"postcss": "^8.4.49", "postcss": "^8.4.49",
"tailwindcss": "^4.0.0", "tailwindcss": "^4.0.0",
"typescript": "~5.6.0", "typescript": "~5.6.0",
"typescript-eslint": "^8.60.0",
"vite": "^6.0.0" "vite": "^6.0.0"
} }
}, },
@@ -1658,6 +1659,285 @@
"@types/react": "^19.2.0" "@types/react": "^19.2.0"
} }
}, },
"node_modules/@typescript-eslint/eslint-plugin": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.0.tgz",
"integrity": "sha512-QYb/sa74/s7OKMbACMjrYnGspj9Hs5YI5aaffSL65UfeBUzVzBJfVo3oWSpbzPurvm7yaCCo2Lk7lVj610HqKw==",
"dev": true,
"dependencies": {
"@eslint-community/regexpp": "^4.12.2",
"@typescript-eslint/scope-manager": "8.60.0",
"@typescript-eslint/type-utils": "8.60.0",
"@typescript-eslint/utils": "8.60.0",
"@typescript-eslint/visitor-keys": "8.60.0",
"ignore": "^7.0.5",
"natural-compare": "^1.4.0",
"ts-api-utils": "^2.5.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"@typescript-eslint/parser": "^8.60.0",
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
"integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
"dev": true,
"engines": {
"node": ">= 4"
}
},
"node_modules/@typescript-eslint/parser": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.0.tgz",
"integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==",
"dev": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.60.0",
"@typescript-eslint/types": "8.60.0",
"@typescript-eslint/typescript-estree": "8.60.0",
"@typescript-eslint/visitor-keys": "8.60.0",
"debug": "^4.4.3"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/project-service": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.0.tgz",
"integrity": "sha512-aZu74NNKJeUWqCjDddzdiKaS82dgYgV/vmf+Ui3ZdZejmgfXR/q+pRumgobnQ2cCJTgGTWp4ypiwsuofFubavg==",
"dev": true,
"dependencies": {
"@typescript-eslint/tsconfig-utils": "^8.60.0",
"@typescript-eslint/types": "^8.60.0",
"debug": "^4.4.3"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/scope-manager": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.0.tgz",
"integrity": "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "8.60.0",
"@typescript-eslint/visitor-keys": "8.60.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
}
},
"node_modules/@typescript-eslint/tsconfig-utils": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.0.tgz",
"integrity": "sha512-BZPR3RGYlAXnly6ymAxfkVn5rCbZzQNou0rxv3GfWZ8cTQp+hhVd73khbGLAd8k1TlAPLISH337M+tAgAnaJDQ==",
"dev": true,
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/type-utils": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.0.tgz",
"integrity": "sha512-SX46wEUtitCpq7AN38HkUU/+zvUpdKf7ephtWAFgckH8O7PQIyL5gvrhQgBLuEYgLfuKWOVvWVskMbuFHAz5xg==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "8.60.0",
"@typescript-eslint/typescript-estree": "8.60.0",
"@typescript-eslint/utils": "8.60.0",
"debug": "^4.4.3",
"ts-api-utils": "^2.5.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/types": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.0.tgz",
"integrity": "sha512-AsE7x2XaAK+CVbeih0Fvbn+r1qHxtpLDJ3XUuFcIinT318T90yHMJC+Zgv+jUuDjQQd06HKwxnDu6sz1IcTilA==",
"dev": true,
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
}
},
"node_modules/@typescript-eslint/typescript-estree": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.0.tgz",
"integrity": "sha512-3AcZNBGMClm6CXDyo8kYvVGT/sx29sS0oBsIb9oZI2gunA4Vm2M3YHzRLPvsUBBsl+yB5FPtltq7gGH0iTlp9g==",
"dev": true,
"dependencies": {
"@typescript-eslint/project-service": "8.60.0",
"@typescript-eslint/tsconfig-utils": "8.60.0",
"@typescript-eslint/types": "8.60.0",
"@typescript-eslint/visitor-keys": "8.60.0",
"debug": "^4.4.3",
"minimatch": "^10.2.2",
"semver": "^7.7.3",
"tinyglobby": "^0.2.15",
"ts-api-utils": "^2.5.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
"dev": true,
"engines": {
"node": "18 || 20 || >=22"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
"version": "5.0.6",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
"integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
"dev": true,
"dependencies": {
"balanced-match": "^4.0.2"
},
"engines": {
"node": "18 || 20 || >=22"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
"version": "10.2.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
"dev": true,
"dependencies": {
"brace-expansion": "^5.0.5"
},
"engines": {
"node": "18 || 20 || >=22"
},
"funding": {
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
"version": "7.8.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz",
"integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/@typescript-eslint/utils": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.0.tgz",
"integrity": "sha512-HtXuPfrHTyBDkameWpl+vJb1Uevu2tznAyahM1Oc4AENidCLTPiZDWIo4GfcxNdC/RcfGcadzzkqbRG87dUrQA==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.9.1",
"@typescript-eslint/scope-manager": "8.60.0",
"@typescript-eslint/types": "8.60.0",
"@typescript-eslint/typescript-estree": "8.60.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/@typescript-eslint/visitor-keys": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.0.tgz",
"integrity": "sha512-9WI52t8ZGLVGrPMBet25yAftqY/n95+zmoUUtJBBQTKDSKUu7OsPTroT2op7U9JatkoRccL0YkWDNMFfC4Sjxg==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "8.60.0",
"eslint-visitor-keys": "^5.0.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
}
},
"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
"integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
"dev": true,
"engines": {
"node": "^20.19.0 || ^22.13.0 || >=24"
},
"funding": {
"url": "https://opencollective.com/eslint"
}
},
"node_modules/@vitejs/plugin-react": { "node_modules/@vitejs/plugin-react": {
"version": "4.7.0", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
@@ -3504,6 +3784,18 @@
"url": "https://github.com/sponsors/SuperchupuDev" "url": "https://github.com/sponsors/SuperchupuDev"
} }
}, },
"node_modules/ts-api-utils": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
"integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
"dev": true,
"engines": {
"node": ">=18.12"
},
"peerDependencies": {
"typescript": ">=4.8.4"
}
},
"node_modules/type-check": { "node_modules/type-check": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -3529,6 +3821,29 @@
"node": ">=14.17" "node": ">=14.17"
} }
}, },
"node_modules/typescript-eslint": {
"version": "8.60.0",
"resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.0.tgz",
"integrity": "sha512-9f65qWLZdAW9m1JaxBDUHcqRUfL8bkxxXL7XxEfI+F09q56PkBvIfCjLF3yInsDM/BBmwkqmCQdCZe/RYlIWEw==",
"dev": true,
"dependencies": {
"@typescript-eslint/eslint-plugin": "8.60.0",
"@typescript-eslint/parser": "8.60.0",
"@typescript-eslint/typescript-estree": "8.60.0",
"@typescript-eslint/utils": "8.60.0"
},
"engines": {
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/typescript-eslint"
},
"peerDependencies": {
"eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
"typescript": ">=4.8.4 <6.1.0"
}
},
"node_modules/update-browserslist-db": { "node_modules/update-browserslist-db": {
"version": "1.2.3", "version": "1.2.3",
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+1
View File
@@ -30,6 +30,7 @@
"postcss": "^8.4.49", "postcss": "^8.4.49",
"tailwindcss": "^4.0.0", "tailwindcss": "^4.0.0",
"typescript": "~5.6.0", "typescript": "~5.6.0",
"typescript-eslint": "^8.60.0",
"vite": "^6.0.0" "vite": "^6.0.0"
} }
} }
+26 -1
View File
@@ -1,10 +1,29 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { BrowserRouter, Routes, Route } from 'react-router-dom' import { BrowserRouter, Routes, Route, NavLink } from 'react-router-dom'
import { Box, Printer } from 'lucide-react'
import Dashboard from './pages/Dashboard' import Dashboard from './pages/Dashboard'
import InventoryPage from './pages/InventoryPage' import InventoryPage from './pages/InventoryPage'
import PrintJobsPage from './pages/PrintJobsPage'
const queryClient = new QueryClient() const queryClient = new QueryClient()
function NavItem({ to, icon: Icon, label }: { to: string; icon: React.ComponentType<{ size?: number }>; label: string }) {
return (
<NavLink
to={to}
className={({ isActive }) =>
`inline-flex items-center gap-2 rounded-lg px-3 py-2 text-sm font-medium transition-colors ${
isActive
? 'bg-emerald-600/20 text-emerald-300 border border-emerald-700'
: 'text-slate-400 hover:text-slate-200 hover:bg-slate-700/50'
}`
}
>
<Icon size={16} /> {label}
</NavLink>
)
}
export default function App() { export default function App() {
return ( return (
<QueryClientProvider client={queryClient}> <QueryClientProvider client={queryClient}>
@@ -13,11 +32,17 @@ export default function App() {
<header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20"> <header className="bg-slate-800 border-b border-slate-700 px-4 py-3 flex items-center gap-3 sticky top-0 z-20">
<div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div> <div className="w-8 h-8 rounded bg-emerald-500 flex items-center justify-center text-slate-900 font-bold text-lg">E</div>
<h1 className="text-lg font-semibold">Extrudex</h1> <h1 className="text-lg font-semibold">Extrudex</h1>
<nav className="ml-6 flex items-center gap-1">
<NavItem to="/" icon={Box} label="Dashboard" />
<NavItem to="/inventory" icon={Box} label="Inventory" />
<NavItem to="/print-jobs" icon={Printer} label="Print Jobs" />
</nav>
</header> </header>
<main className="p-4"> <main className="p-4">
<Routes> <Routes>
<Route path="/" element={<Dashboard />} /> <Route path="/" element={<Dashboard />} />
<Route path="/inventory" element={<InventoryPage />} /> <Route path="/inventory" element={<InventoryPage />} />
<Route path="/print-jobs" element={<PrintJobsPage />} />
</Routes> </Routes>
</main> </main>
</div> </div>
-360
View File
@@ -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>
)
}
+3 -27
View File
@@ -2,7 +2,6 @@ import { useState, useMemo } from 'react'
import { useQuery } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query'
import { Search, Filter, ChevronLeft, ChevronRight, Trash2, Pencil, Plus, AlertTriangle } from 'lucide-react' import { Search, Filter, ChevronLeft, ChevronRight, Trash2, Pencil, Plus, AlertTriangle } from 'lucide-react'
import ColorSwatch from '../components/ColorSwatch' import ColorSwatch from '../components/ColorSwatch'
import FilamentForm from '../components/FilamentForm'
import { fetchFilaments, deleteFilament } from '../services/filamentService' import { fetchFilaments, deleteFilament } from '../services/filamentService'
import type { FilamentSpool, FilamentFilter } from '../types/filament' import type { FilamentSpool, FilamentFilter } from '../types/filament'
@@ -20,9 +19,6 @@ export default function InventoryPage() {
const [sortDir, setSortDir] = useState<SortDir>('asc') const [sortDir, setSortDir] = useState<SortDir>('asc')
const [page, setPage] = useState(0) const [page, setPage] = useState(0)
const [deleteId, setDeleteId] = useState<number | null>(null) 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(() => ({ const filter: FilamentFilter = useMemo(() => ({
material: material || undefined, material: material || undefined,
@@ -83,10 +79,7 @@ export default function InventoryPage() {
<h2 className="text-xl font-bold text-slate-100">Filament Inventory</h2> <h2 className="text-xl font-bold text-slate-100">Filament Inventory</h2>
<p className="text-sm text-slate-400">{total} spool(s) total</p> <p className="text-sm text-slate-400">{total} spool(s) total</p>
</div> </div>
<button <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">
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 <Plus size={16} /> Add Spool
</button> </button>
</div> </div>
@@ -215,11 +208,7 @@ export default function InventoryPage() {
</td> </td>
<td className="px-4 py-3 text-right"> <td className="px-4 py-3 text-right">
<div className="flex items-center justify-end gap-2"> <div className="flex items-center justify-end gap-2">
<button <button className="p-1.5 rounded hover:bg-slate-600 text-slate-400 hover:text-blue-400 transition-colors" title="Edit">
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} /> <Pencil size={14} />
</button> </button>
<button <button
@@ -274,10 +263,7 @@ export default function InventoryPage() {
</div> </div>
<div className="flex items-center justify-end gap-2 pt-1"> <div className="flex items-center justify-end gap-2 pt-1">
<button <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">
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 <Pencil size={12} /> Edit
</button> </button>
<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 */} {/* Delete confirmation modal */}
{deleteId !== null && ( {deleteId !== null && (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4"> <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
+283
View File
@@ -0,0 +1,283 @@
import { useState, useMemo } from 'react'
import { useQuery } from '@tanstack/react-query'
import { Search, Filter, ChevronLeft, ChevronRight, Loader2 } from 'lucide-react'
import { fetchPrintJobs } from '../services/printJobService'
import type { PrintJob, PrintJobFilter, PrintJobStatus } from '../types/printJob'
const PAGE_SIZE = 20
type SortField = 'name' | 'started_at' | 'duration_seconds' | 'filament_grams_used' | 'cost_usd'
type SortDir = 'asc' | 'desc'
// ── Status helpers ────────────────────────────────────────────────────────────
const STATUS_CONFIG: Record<PrintJobStatus, { label: string; badge: string; icon: string }> = {
pending: { label: 'Pending', badge: 'bg-slate-700 text-slate-300 border-slate-600', icon: '⏳' },
printing: { label: 'Printing', badge: 'bg-blue-900/40 text-blue-300 border-blue-700', icon: '🖨️' },
completed: { label: 'Completed', badge: 'bg-emerald-900/30 text-emerald-300 border-emerald-700', icon: '✅' },
failed: { label: 'Failed', badge: 'bg-red-900/40 text-red-300 border-red-700', icon: '❌' },
}
function StatusBadge({ status }: { status: PrintJobStatus }) {
const cfg = STATUS_CONFIG[status] ?? STATUS_CONFIG.pending
return (
<span className={`inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-xs font-medium ${cfg.badge}`}>
<span className="text-xs">{cfg.icon}</span> {cfg.label}
</span>
)
}
// ── Duration formatter ────────────────────────────────────────────────────────
function formatDuration(totalSeconds?: number): string {
if (totalSeconds == null || totalSeconds <= 0) return '—'
const h = Math.floor(totalSeconds / 3600)
const m = Math.floor((totalSeconds % 3600) / 60)
const s = totalSeconds % 60
if (h > 0) return `${h}h ${m}m`
if (m > 0) return `${m}m ${s}s`
return `${s}s`
}
function formatDateTime(iso: string): string {
const d = new Date(iso)
return d.toLocaleString(undefined, {
month: 'short', day: 'numeric',
hour: 'numeric', minute: '2-digit',
})
}
// ── Component ─────────────────────────────────────────────────────────────────
export default function PrintJobsPage() {
const [search, setSearch] = useState('')
const [statusFilter, setStatusFilter] = useState<PrintJobStatus | ''>('')
const [printerFilter, setPrinterFilter] = useState('')
const [sortBy, setSortBy] = useState<SortField>('started_at')
const [sortDir, setSortDir] = useState<SortDir>('desc')
const [page, setPage] = useState(0)
const filter: PrintJobFilter = useMemo(() => ({
status: statusFilter || undefined,
printer: printerFilter || undefined,
sort_by: sortBy,
sort_dir: sortDir,
limit: PAGE_SIZE,
offset: page * PAGE_SIZE,
}), [statusFilter, printerFilter, sortBy, sortDir, page])
const { data, isLoading, error, refetch } = useQuery({
queryKey: ['printJobs', filter],
queryFn: () => fetchPrintJobs(filter),
})
const total = data?.total ?? 0
const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
// Client-side search (name + printer name)
const filtered = useMemo(() => {
const jobList = data?.data ?? []
if (!search.trim()) return jobList
const q = search.toLowerCase()
return jobList.filter(
(j: PrintJob) =>
j.name.toLowerCase().includes(q) ||
j.printer_name.toLowerCase().includes(q)
)
}, [data?.data, search])
const handleSort = (field: SortField) => {
if (sortBy === field) {
setSortDir(prev => (prev === 'asc' ? 'desc' : 'asc'))
} else {
setSortBy(field)
setSortDir('asc')
}
setPage(0)
}
const SortIndicator = ({ field }: { field: SortField }) => {
if (sortBy !== field) return <span className="text-slate-600 ml-1"></span>
return <span className="text-emerald-400 ml-1">{sortDir === 'asc' ? '↑' : '↓'}</span>
}
return (
<div className="space-y-4">
{/* Header */}
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3">
<div>
<h2 className="text-xl font-bold text-slate-100">Print Jobs</h2>
<p className="text-sm text-slate-400">{total} job(s) total</p>
</div>
</div>
{/* Filters */}
<div className="flex flex-col lg:flex-row gap-3">
{/* Search */}
<div className="relative flex-1">
<Search size={16} className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-400" />
<input
type="text"
placeholder="Search by job or printer name…"
value={search}
onChange={e => { setSearch(e.target.value); setPage(0) }}
className="w-full rounded-lg bg-slate-800 border border-slate-700 pl-9 pr-3 py-2 text-sm text-slate-100 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500"
/>
</div>
{/* Status filter */}
<select
value={statusFilter}
onChange={e => { setStatusFilter(e.target.value as PrintJobStatus | ''); setPage(0) }}
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-emerald-500"
>
<option value="">All Statuses</option>
<option value="pending">Pending</option>
<option value="printing">Printing</option>
<option value="completed">Completed</option>
<option value="failed">Failed</option>
</select>
{/* Printer filter */}
<input
type="text"
placeholder="Filter by printer…"
value={printerFilter}
onChange={e => { setPrinterFilter(e.target.value); setPage(0) }}
className="rounded-lg bg-slate-800 border border-slate-700 px-3 py-2 text-sm text-slate-100 placeholder-slate-500 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500 min-w-[160px]"
/>
{/* Filter indicator */}
{(statusFilter || printerFilter) && (
<span className="inline-flex items-center gap-1 rounded-lg bg-emerald-900/30 border border-emerald-700 px-3 py-2 text-xs text-emerald-300">
<Filter size={14} />
{[statusFilter && `Status: ${statusFilter}`, printerFilter && `Printer: ${printerFilter}`].filter(Boolean).join(' · ')}
</span>
)}
</div>
{/* Loading / Error */}
{isLoading && (
<div className="flex items-center justify-center py-12 gap-2 text-slate-400">
<Loader2 size={18} className="animate-spin" /> Loading print jobs
</div>
)}
{error && (
<div className="text-center py-12 text-red-400">
Failed to load print jobs.
<button onClick={() => refetch()} className="ml-2 underline hover:text-red-300">Retry</button>
</div>
)}
{/* Desktop Table */}
{!isLoading && !error && (
<>
<div className="hidden md:block overflow-x-auto rounded-lg border border-slate-700">
<table className="w-full text-sm">
<thead className="bg-slate-800 text-slate-300">
<tr>
<th className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('name')}>
Job <SortIndicator field="name" />
</th>
<th className="px-4 py-3 text-left font-semibold">Printer</th>
<th className="px-4 py-3 text-left font-semibold">Status</th>
<th className="px-4 py-3 text-left font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('started_at')}>
Started <SortIndicator field="started_at" />
</th>
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('duration_seconds')}>
Duration <SortIndicator field="duration_seconds" />
</th>
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('filament_grams_used')}>
Filament <SortIndicator field="filament_grams_used" />
</th>
<th className="px-4 py-3 text-right font-semibold cursor-pointer select-none hover:text-slate-100" onClick={() => handleSort('cost_usd')}>
Cost <SortIndicator field="cost_usd" />
</th>
</tr>
</thead>
<tbody className="divide-y divide-slate-700">
{filtered.length === 0 && (
<tr>
<td colSpan={7} className="px-4 py-8 text-center text-slate-500">No print jobs found.</td>
</tr>
)}
{filtered.map((job: PrintJob) => (
<tr key={job.id} className="bg-slate-800/50 hover:bg-slate-700/50 transition-colors">
<td className="px-4 py-3 font-medium text-slate-100">{job.name}</td>
<td className="px-4 py-3 text-slate-300">{job.printer_name}</td>
<td className="px-4 py-3"><StatusBadge status={job.status} /></td>
<td className="px-4 py-3 text-slate-300">{formatDateTime(job.started_at)}</td>
<td className="px-4 py-3 text-right tabular-nums text-slate-300">{formatDuration(job.duration_seconds)}</td>
<td className="px-4 py-3 text-right tabular-nums text-slate-300">{job.filament_grams_used != null ? `${job.filament_grams_used.toLocaleString()} g` : '—'}</td>
<td className="px-4 py-3 text-right tabular-nums text-slate-300">{job.cost_usd != null ? `$${job.cost_usd.toFixed(2)}` : '—'}</td>
</tr>
))}
</tbody>
</table>
</div>
{/* Mobile Cards */}
<div className="md:hidden space-y-3">
{filtered.length === 0 && (
<div className="text-center py-12 text-slate-500">No print jobs found.</div>
)}
{filtered.map((job: PrintJob) => (
<div key={job.id} className="rounded-lg border border-slate-700 bg-slate-800 p-4 space-y-3">
<div className="flex items-start justify-between">
<div>
<div className="font-semibold text-slate-100">{job.name}</div>
<div className="text-xs text-slate-400 mt-0.5">{job.printer_name}</div>
</div>
<StatusBadge status={job.status} />
</div>
<div className="grid grid-cols-2 gap-2 text-sm">
<div>
<span className="text-slate-500 text-xs">Started</span>
<div className="text-slate-300">{formatDateTime(job.started_at)}</div>
</div>
<div>
<span className="text-slate-500 text-xs">Duration</span>
<div className="text-slate-300 tabular-nums">{formatDuration(job.duration_seconds)}</div>
</div>
<div>
<span className="text-slate-500 text-xs">Filament</span>
<div className="text-slate-300 tabular-nums">{job.filament_grams_used != null ? `${job.filament_grams_used.toLocaleString()} g` : '—'}</div>
</div>
<div>
<span className="text-slate-500 text-xs">Cost</span>
<div className="text-slate-300 tabular-nums">{job.cost_usd != null ? `$${job.cost_usd.toFixed(2)}` : '—'}</div>
</div>
</div>
</div>
))}
</div>
{/* Pagination */}
<div className="flex items-center justify-between pt-2">
<span className="text-sm text-slate-400">
Showing {total === 0 ? 0 : page * PAGE_SIZE + 1}{Math.min((page + 1) * PAGE_SIZE, total)} of {total}
</span>
<div className="flex items-center gap-2">
<button
onClick={() => setPage(p => Math.max(0, p - 1))}
disabled={page === 0}
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
>
<ChevronLeft size={16} />
</button>
<span className="text-sm text-slate-300 tabular-nums">{page + 1} / {totalPages}</span>
<button
onClick={() => setPage(p => Math.min(totalPages - 1, p + 1))}
disabled={page >= totalPages - 1}
className="p-2 rounded-lg bg-slate-800 border border-slate-700 text-slate-300 hover:bg-slate-700 disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
>
<ChevronRight size={16} />
</button>
</div>
</div>
</>
)}
</div>
)
}
+1 -26
View File
@@ -1,5 +1,5 @@
import axios from 'axios' import axios from 'axios'
import type { FilamentSpool, ListResponse, FilamentFilter, MaterialBase, MaterialFinish, MaterialModifier } from '../types/filament' import type { FilamentSpool, ListResponse, FilamentFilter } from '../types/filament'
const API_BASE = '/api' const API_BASE = '/api'
@@ -19,31 +19,6 @@ export async function fetchFilaments(filter: FilamentFilter): Promise<ListRespon
return res.data 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> { export async function deleteFilament(id: number): Promise<void> {
await axios.delete(`${API_BASE}/filaments/${id}`) 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
}
+17
View File
@@ -0,0 +1,17 @@
import axios from 'axios'
import type { PrintJob, ListResponse, PrintJobFilter } from '../types/printJob'
const API_BASE = '/api'
export async function fetchPrintJobs(filter: PrintJobFilter): Promise<ListResponse<PrintJob>> {
const params = new URLSearchParams()
if (filter.status) params.set('status', filter.status)
if (filter.printer) params.set('printer', filter.printer)
if (filter.sort_by) params.set('sort_by', filter.sort_by)
if (filter.sort_dir) params.set('sort_dir', filter.sort_dir)
if (filter.limit !== undefined) params.set('limit', String(filter.limit))
if (filter.offset !== undefined) params.set('offset', String(filter.offset))
const res = await axios.get<ListResponse<PrintJob>>(`${API_BASE}/print-jobs?${params.toString()}`)
return res.data
}
+32
View File
@@ -0,0 +1,32 @@
// Print Job domain types
export type PrintJobStatus = 'pending' | 'printing' | 'completed' | 'failed'
export interface PrintJob {
id: number
name: string
printer_name: string
status: PrintJobStatus
started_at: string
duration_seconds?: number
filament_grams_used?: number
cost_usd?: number
created_at: string
updated_at: string
}
export interface ListResponse<T> {
data: T[]
total: number
limit: number
offset: number
}
export interface PrintJobFilter {
status?: PrintJobStatus
printer?: string
sort_by?: string
sort_dir?: 'asc' | 'desc'
limit?: number
offset?: number
}