Compare commits
1 Commits
9b0ffc4309
...
agent/pip/
| Author | SHA1 | Date | |
|---|---|---|---|
| a1d47f2536 |
@@ -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 ──────────────────────────────────────────────────────
|
// ── 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)
|
||||||
|
|||||||
15
deploy.sh
15
deploy.sh
@@ -1,10 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
echo "🔧 Deploying Extrudex Docker runtime..."
|
echo "🔧 Deploying Extrudex (Go + React) on Raspberry Pi..."
|
||||||
|
|
||||||
# Check if Docker Compose is available
|
# Check if Docker Compose is available
|
||||||
if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
|
if ! docker compose version &>/dev/null && ! command -v docker-compose &>/dev/null; then
|
||||||
echo "❌ Docker Compose is not installed"
|
echo "❌ Docker Compose is not installed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -14,18 +14,21 @@ if command -v docker-compose &> /dev/null; then
|
|||||||
COMPOSE_CMD="docker-compose"
|
COMPOSE_CMD="docker-compose"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "📦 Building and starting services..."
|
echo "📦 Building and starting Go backend + React frontend + PostgreSQL..."
|
||||||
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
$COMPOSE_CMD -f docker-compose.dev.yml up -d --build
|
||||||
|
|
||||||
echo "⏳ Waiting for services to become healthy..."
|
echo "⏳ Waiting for services to become healthy..."
|
||||||
sleep 15
|
sleep 10
|
||||||
|
|
||||||
echo "✅ Deployment complete!"
|
echo "✅ Deployment complete!"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Services running:"
|
echo "Services running:"
|
||||||
echo " • PostgreSQL: localhost:5433"
|
echo " • PostgreSQL: localhost:5433"
|
||||||
echo " • Extrudex API: http://localhost:5080"
|
echo " • Extrudex API (Go): http://localhost:5080"
|
||||||
echo " • Extrudex Web: http://localhost:5081"
|
echo " • Extrudex Web (React): http://localhost:5081"
|
||||||
|
echo ""
|
||||||
|
echo "Barcode scanner: HID keyboard input — focus any text field to start scanning."
|
||||||
|
echo "Kiosk mode: Chromium auto-starts on boot via systemd (extrudex-kiosk.service)."
|
||||||
echo ""
|
echo ""
|
||||||
echo "To view logs:"
|
echo "To view logs:"
|
||||||
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
echo " $COMPOSE_CMD -f docker-compose.dev.yml logs -f"
|
||||||
|
|||||||
@@ -28,13 +28,10 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "5080:8080"
|
- "5080:8080"
|
||||||
environment:
|
environment:
|
||||||
- ASPNETCORE_ENVIRONMENT=Development
|
- DATABASE_URL=postgres://extrudex:changeme@extrudex-db:5432/extrudex?sslmode=disable
|
||||||
- ASPNETCORE_URLS=http://+:8080
|
- PORT=8080
|
||||||
- EXTRUDEX_DB_HOST=extrudex-db
|
- CORS_ORIGIN=*
|
||||||
- EXTRUDEX_DB_PORT=5432
|
- LOG_LEVEL=info
|
||||||
- EXTRUDEX_DB_NAME=extrudex
|
|
||||||
- EXTRUDEX_DB_USER=extrudex
|
|
||||||
- EXTRUDEX_DB_PASSWORD=changeme
|
|
||||||
depends_on:
|
depends_on:
|
||||||
extrudex-db:
|
extrudex-db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -44,7 +41,7 @@ services:
|
|||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 40s
|
start_period: 15s
|
||||||
networks:
|
networks:
|
||||||
- extrudex-network
|
- extrudex-network
|
||||||
|
|
||||||
|
|||||||
168
docs/PI-KIOSK-SETUP.md
Normal file
168
docs/PI-KIOSK-SETUP.md
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
# Pi 5 Kiosk Setup — Extrudex (Go + React)
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- Raspberry Pi 5 (4 GB or 8 GB)
|
||||||
|
- MicroSD card (32 GB minimum, Class 10+)
|
||||||
|
- HDMI touchscreen display
|
||||||
|
- USB barcode scanner (HID keyboard mode)
|
||||||
|
- Power supply (27W USB-C recommended)
|
||||||
|
|
||||||
|
## One-Line Setup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Install Raspberry Pi OS (64-bit, Desktop)
|
||||||
|
# 2. Enable SSH and VNC
|
||||||
|
# 3. Run the automated bootstrap
|
||||||
|
curl -sSL https://raw.githubusercontent.com/CubeCraft-Creations/Extrudex/dev/scripts/pi-bootstrap.sh | bash
|
||||||
|
```
|
||||||
|
|
||||||
|
Or follow the manual steps below.
|
||||||
|
|
||||||
|
## Manual Setup
|
||||||
|
|
||||||
|
### 1. Install Docker
|
||||||
|
|
||||||
|
```bash
|
||||||
|
curl -fsSL https://get.docker.com | sh
|
||||||
|
sudo usermod -aG docker pi
|
||||||
|
```
|
||||||
|
|
||||||
|
Log out and back in for group changes to take effect.
|
||||||
|
|
||||||
|
### 2. Clone and deploy
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /home/pi
|
||||||
|
git clone https://code.cubecraftcreations.com/CubeCraft-Creations/Extrudex.git
|
||||||
|
cd Extrudex
|
||||||
|
git checkout dev
|
||||||
|
|
||||||
|
# Run the deploy script
|
||||||
|
chmod +x deploy.sh
|
||||||
|
./deploy.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Verify services
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.dev.yml ps
|
||||||
|
# All three services should be "Up"
|
||||||
|
```
|
||||||
|
|
||||||
|
Check the health endpoint:
|
||||||
|
```bash
|
||||||
|
curl http://localhost:5080/health
|
||||||
|
# Expected: {"status":"ok","db_connected":true,"timestamp":"..."}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Configure kiosk auto-start
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Enable the Docker stack service (starts on boot)
|
||||||
|
sudo cp systemd/extrudex.service /etc/systemd/system/
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable extrudex.service
|
||||||
|
|
||||||
|
# Enable the kiosk service (starts Chromium after Docker stack)
|
||||||
|
sudo cp systemd/extrudex-kiosk.service /etc/systemd/system/
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable extrudex-kiosk.service
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Configure display server
|
||||||
|
|
||||||
|
For Pi 5, Raspberry Pi OS uses Wayland by default. If you encounter
|
||||||
|
X11-specific issues, switch to X11 in raspi-config (Advanced Options →
|
||||||
|
Resolution → X11).
|
||||||
|
|
||||||
|
The kiosk service supports both Wayland and X11 display servers.
|
||||||
|
|
||||||
|
### 6. Touchscreen calibration (if needed)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install calibration tools
|
||||||
|
sudo apt install -y xinput-calibrator
|
||||||
|
|
||||||
|
# Run calibration, note the device ID and parameters
|
||||||
|
xinput_calibrator
|
||||||
|
```
|
||||||
|
|
||||||
|
Add the calibration to `~/.config/labwc/labwc.conf` or `/etc/X11/xorg.conf.d/`
|
||||||
|
as appropriate for your display server.
|
||||||
|
|
||||||
|
## USB Barcode Scanner
|
||||||
|
|
||||||
|
The USB barcode scanner works as a HID keyboard device — it types scanned
|
||||||
|
codes followed by an Enter keypress. No driver configuration is needed.
|
||||||
|
|
||||||
|
On the React frontend, the search input auto-focuses on page load and
|
||||||
|
will capture barcode input immediately. After a touch on another element,
|
||||||
|
tap the search field again to re-focus.
|
||||||
|
|
||||||
|
## Auto-Refresh on Wake
|
||||||
|
|
||||||
|
The React app polls the SSE endpoint every 30 seconds for real-time
|
||||||
|
updates. When the Pi wakes from sleep, the next poll will immediately
|
||||||
|
sync the UI.
|
||||||
|
|
||||||
|
The kiosk service has `Restart=always` and `RestartSec=10`, so Chromium
|
||||||
|
will restart within 10 seconds of any crash or power cycle.
|
||||||
|
|
||||||
|
## Touch Gestures
|
||||||
|
|
||||||
|
Chromium is launched with `--touch-events=enabled` and `--enable-pinch`
|
||||||
|
for native touch gesture support:
|
||||||
|
- **Tap** — click/submit
|
||||||
|
- **Two-finger scroll** — page scrolling
|
||||||
|
- **Pinch** — zoom (disabled in kiosk mode by default; enable if needed)
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Services not starting
|
||||||
|
```bash
|
||||||
|
sudo systemctl status extrudex
|
||||||
|
sudo systemctl status extrudex-kiosk
|
||||||
|
docker compose -f docker-compose.dev.yml logs
|
||||||
|
```
|
||||||
|
|
||||||
|
### Kiosk shows blank page
|
||||||
|
- Ensure Docker stack is running: `docker compose ps`
|
||||||
|
- Check nginx is serving the React build: `curl http://localhost:5081`
|
||||||
|
- Check Chromium logs: `journalctl -u extrudex-kiosk -n 50`
|
||||||
|
|
||||||
|
### Barcode not working
|
||||||
|
- Verify scanner is in HID keyboard mode (most USB scanners default to this)
|
||||||
|
- Open a text field and scan — you should see digits appear
|
||||||
|
- Check with `dmesg | grep -i usb` for device enumeration
|
||||||
|
|
||||||
|
### PostgreSQL connection refused
|
||||||
|
```bash
|
||||||
|
docker compose -f docker-compose.dev.yml restart extrudex-db
|
||||||
|
# Wait 15 seconds, then check health
|
||||||
|
curl http://localhost:5080/health
|
||||||
|
```
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────────────────────────────────────────┐
|
||||||
|
│ Pi 5 (Raspberry Pi OS 64-bit) │
|
||||||
|
│ │
|
||||||
|
│ ┌─────────────┐ ┌──────────┐ ┌─────────┐ │
|
||||||
|
│ │ Chromium │ │ Nginx │ │ Go │ │
|
||||||
|
│ │ Kiosk │→│ (React) │→│ API │ │
|
||||||
|
│ │ :5081 │ │ :5080 │ │ :8080 │ │
|
||||||
|
│ └─────────────┘ └──────────┘ └────┬────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌────────▼────┐ │
|
||||||
|
│ │ PostgreSQL │ │
|
||||||
|
│ │ :5432 │ │
|
||||||
|
│ └─────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────┐ │
|
||||||
|
│ │ USB │ │
|
||||||
|
│ │ Scanner │ → HID keyboard → Browser │
|
||||||
|
│ └──────────┘ │
|
||||||
|
└──────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
@@ -10,7 +10,7 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location /api/ {
|
location /api/ {
|
||||||
proxy_pass http://backend:8080/api/;
|
proxy_pass http://extrudex-api:8080/api/;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection 'upgrade';
|
proxy_set_header Connection 'upgrade';
|
||||||
|
|||||||
@@ -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>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -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">
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
|
||||||
|
|||||||
36
systemd/extrudex-kiosk.service
Normal file
36
systemd/extrudex-kiosk.service
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Kiosk (Chromium, Go + React frontend)
|
||||||
|
After=network-online.target extrudex.service
|
||||||
|
Requires=extrudex.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=pi
|
||||||
|
Group=pi
|
||||||
|
Environment=DISPLAY=:0
|
||||||
|
Environment=XAUTHORITY=/home/pi/.Xauthority
|
||||||
|
WorkingDirectory=/home/pi
|
||||||
|
|
||||||
|
ExecStart=/usr/bin/chromium-browser \
|
||||||
|
--no-first-run \
|
||||||
|
--no-default-browser-check \
|
||||||
|
--autoplay-policy=no-user-gesture-required \
|
||||||
|
--disable-infobars \
|
||||||
|
--disable-window-activation \
|
||||||
|
--disable-full-screen-modal \
|
||||||
|
--kiosk http://localhost:5081 \
|
||||||
|
--disable-features=TranslateUI \
|
||||||
|
--touch-events=enabled \
|
||||||
|
--enable-pinch
|
||||||
|
|
||||||
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
|
||||||
|
# Touchscreen / kiosk
|
||||||
|
Environment=QT_QPA_PLATFORM=wayland
|
||||||
|
Environment=QT_WAYLAND_SHELL_INTEGRATION=wayland
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
12
systemd/extrudex-kiosk@.service
Normal file
12
systemd/extrudex-kiosk@.service
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Kiosk Session (user-level, seat %i)
|
||||||
|
After=graphical-session.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
Environment=DISPLAY=:0
|
||||||
|
ExecStart=/bin/true
|
||||||
|
Restart=on-failure
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=graphical-session.target
|
||||||
16
systemd/extrudex.service
Normal file
16
systemd/extrudex.service
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Extrudex Docker Compose Stack (Go + React)
|
||||||
|
After=network-online.target docker.service
|
||||||
|
Requires=docker.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=oneshot
|
||||||
|
RemainAfterExit=yes
|
||||||
|
WorkingDirectory=/home/pi/extrudex
|
||||||
|
ExecStart=/usr/bin/docker compose -f docker-compose.dev.yml up -d
|
||||||
|
ExecStop=/usr/bin/docker compose -f docker-compose.dev.yml down
|
||||||
|
TimeoutStartSec=120
|
||||||
|
TimeoutStopSec=120
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Reference in New Issue
Block a user