Merge pull request 'CUB-133: Build Dashboard page with summary cards' (#42) from agent/rex/CUB-133-dashboard-page into dev
All checks were successful
Dev Build / build-test (push) Successful in 1m34s
All checks were successful
Dev Build / build-test (push) Successful in 1m34s
Reviewed-on: #42
This commit was merged in pull request #42.
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
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 } from 'react-router-dom'
|
||||||
|
import Dashboard from './pages/Dashboard'
|
||||||
import InventoryPage from './pages/InventoryPage'
|
import InventoryPage from './pages/InventoryPage'
|
||||||
|
|
||||||
const queryClient = new QueryClient()
|
const queryClient = new QueryClient()
|
||||||
@@ -15,7 +16,8 @@ export default function App() {
|
|||||||
</header>
|
</header>
|
||||||
<main className="p-4">
|
<main className="p-4">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<InventoryPage />} />
|
<Route path="/" element={<Dashboard />} />
|
||||||
|
<Route path="/inventory" element={<InventoryPage />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
8
frontend/src/components/LoadingSpinner.tsx
Normal file
8
frontend/src/components/LoadingSpinner.tsx
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
export default function LoadingSpinner() {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center gap-3">
|
||||||
|
<div className="w-10 h-10 border-4 border-emerald-500/30 border-t-emerald-400 rounded-full animate-spin" />
|
||||||
|
<p className="text-slate-400 text-sm">Loading dashboard…</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
76
frontend/src/components/RecentPrints.tsx
Normal file
76
frontend/src/components/RecentPrints.tsx
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
import type { PrintJob } from '../types'
|
||||||
|
import { Clock, FileText } from 'lucide-react'
|
||||||
|
|
||||||
|
interface RecentPrintsProps {
|
||||||
|
jobs: PrintJob[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function RecentPrints({ jobs }: RecentPrintsProps) {
|
||||||
|
if (jobs.length === 0) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 p-6 text-center text-slate-400">
|
||||||
|
<FileText size={32} className="mx-auto mb-3 text-slate-500" />
|
||||||
|
<p>No recent print jobs</p>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const statusColor = (status: string) => {
|
||||||
|
switch (status.toLowerCase()) {
|
||||||
|
case 'completed': return 'text-emerald-400 bg-emerald-500/10'
|
||||||
|
case 'in_progress': return 'text-sky-400 bg-sky-500/10'
|
||||||
|
case 'failed': return 'text-red-400 bg-red-500/10'
|
||||||
|
default: return 'text-slate-400 bg-slate-500/10'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-slate-700 bg-slate-800 overflow-hidden">
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full text-left">
|
||||||
|
<thead>
|
||||||
|
<tr className="border-b border-slate-700">
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Name</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Status</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Duration</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Filament</th>
|
||||||
|
<th className="px-4 py-3 text-sm font-medium text-slate-400">Cost</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{jobs.map((job) => (
|
||||||
|
<tr key={job.id} className="border-b border-slate-700/50 last:border-0 hover:bg-slate-700/30 transition-colors">
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-100 font-medium">{job.name}</td>
|
||||||
|
<td className="px-4 py-3">
|
||||||
|
<span className={`inline-flex items-center gap-1 px-2 py-1 rounded-full text-xs font-medium ${statusColor(job.status)}`}>
|
||||||
|
{job.status}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<Clock size={14} />
|
||||||
|
{formatDuration(job.duration_seconds)}
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
{job.filament_used_grams?.toFixed(1) ?? '-'} g
|
||||||
|
</td>
|
||||||
|
<td className="px-4 py-3 text-sm text-slate-300">
|
||||||
|
${job.cost_usd?.toFixed(2) ?? '-'}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatDuration(seconds: number): string {
|
||||||
|
if (!seconds) return '-'
|
||||||
|
const hrs = Math.floor(seconds / 3600)
|
||||||
|
const mins = Math.floor((seconds % 3600) / 60)
|
||||||
|
if (hrs > 0) return `${hrs}h ${mins}m`
|
||||||
|
return `${mins}m`
|
||||||
|
}
|
||||||
31
frontend/src/components/SummaryCard.tsx
Normal file
31
frontend/src/components/SummaryCard.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import type { LucideIcon } from 'lucide-react'
|
||||||
|
|
||||||
|
interface SummaryCardProps {
|
||||||
|
title: string
|
||||||
|
value: string | number
|
||||||
|
icon: LucideIcon
|
||||||
|
color: 'emerald' | 'amber' | 'sky' | 'violet'
|
||||||
|
}
|
||||||
|
|
||||||
|
const colorMap = {
|
||||||
|
emerald: { bg: 'bg-emerald-500/10', border: 'border-emerald-500/20', text: 'text-emerald-400', icon: 'text-emerald-400' },
|
||||||
|
amber: { bg: 'bg-amber-500/10', border: 'border-amber-500/20', text: 'text-amber-400', icon: 'text-amber-400' },
|
||||||
|
sky: { bg: 'bg-sky-500/10', border: 'border-sky-500/20', text: 'text-sky-400', icon: 'text-sky-400' },
|
||||||
|
violet: { bg: 'bg-violet-500/10', border: 'border-violet-500/20', text: 'text-violet-400', icon: 'text-violet-400' },
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function SummaryCard({ title, value, icon: Icon, color }: SummaryCardProps) {
|
||||||
|
const c = colorMap[color]
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`rounded-xl border ${c.border} ${c.bg} p-5 flex items-start justify-between`}>
|
||||||
|
<div>
|
||||||
|
<p className="text-sm font-medium text-slate-400 mb-1">{title}</p>
|
||||||
|
<p className={`text-3xl font-bold ${c.text}`}>{value}</p>
|
||||||
|
</div>
|
||||||
|
<div className={`p-2 rounded-lg ${c.bg}`}>
|
||||||
|
<Icon size={24} className={c.icon} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,10 +1,25 @@
|
|||||||
import { StrictMode } from 'react'
|
import { StrictMode } from 'react'
|
||||||
import { createRoot } from 'react-dom/client'
|
import { createRoot } from 'react-dom/client'
|
||||||
|
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
||||||
|
import { BrowserRouter } from 'react-router-dom'
|
||||||
import './index.css'
|
import './index.css'
|
||||||
import App from './App'
|
import App from './App'
|
||||||
|
|
||||||
|
const queryClient = new QueryClient({
|
||||||
|
defaultOptions: {
|
||||||
|
queries: {
|
||||||
|
staleTime: 30_000,
|
||||||
|
refetchOnWindowFocus: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
createRoot(document.getElementById('root')!).render(
|
createRoot(document.getElementById('root')!).render(
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<App />
|
<QueryClientProvider client={queryClient}>
|
||||||
|
<BrowserRouter>
|
||||||
|
<App />
|
||||||
|
</BrowserRouter>
|
||||||
|
</QueryClientProvider>
|
||||||
</StrictMode>,
|
</StrictMode>,
|
||||||
)
|
)
|
||||||
|
|||||||
139
frontend/src/pages/Dashboard.tsx
Normal file
139
frontend/src/pages/Dashboard.tsx
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { getFilaments, getPrintJobs } from '../services/api'
|
||||||
|
import SummaryCard from '../components/SummaryCard'
|
||||||
|
import RecentPrints from '../components/RecentPrints'
|
||||||
|
import LoadingSpinner from '../components/LoadingSpinner'
|
||||||
|
import { Package, AlertTriangle, Printer, DollarSign, Plus, List } from 'lucide-react'
|
||||||
|
|
||||||
|
export default function Dashboard() {
|
||||||
|
const {
|
||||||
|
data: filamentData,
|
||||||
|
isLoading: filamentLoading,
|
||||||
|
error: filamentError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['filaments', 'count'],
|
||||||
|
queryFn: () => getFilaments({ limit: 1 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: lowStockData,
|
||||||
|
isLoading: lowStockLoading,
|
||||||
|
error: lowStockError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['filaments', 'lowStock'],
|
||||||
|
queryFn: () => getFilaments({ low_stock: true, limit: 1 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: recentPrints,
|
||||||
|
isLoading: printsLoading,
|
||||||
|
error: printsError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['printJobs', 'recent'],
|
||||||
|
queryFn: () => getPrintJobs({ limit: 5 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: allPrints,
|
||||||
|
isLoading: costLoading,
|
||||||
|
error: costError,
|
||||||
|
} = useQuery({
|
||||||
|
queryKey: ['printJobs', 'all'],
|
||||||
|
queryFn: () => getPrintJobs({ limit: 1000 }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const totalSpools = filamentData?.total ?? 0
|
||||||
|
const lowStockCount = lowStockData?.total ?? 0
|
||||||
|
const recentPrintJobs = recentPrints?.data ?? []
|
||||||
|
|
||||||
|
// Calculate cost this month from all print jobs
|
||||||
|
const now = new Date()
|
||||||
|
const currentMonth = now.getMonth()
|
||||||
|
const currentYear = now.getFullYear()
|
||||||
|
const monthlyCost =
|
||||||
|
allPrints?.data
|
||||||
|
.filter((job) => {
|
||||||
|
const d = new Date(job.started_at)
|
||||||
|
return d.getMonth() === currentMonth && d.getFullYear() === currentYear
|
||||||
|
})
|
||||||
|
.reduce((sum, job) => sum + (job.cost_usd ?? 0), 0) ?? 0
|
||||||
|
|
||||||
|
const isLoading = filamentLoading || lowStockLoading || printsLoading || costLoading
|
||||||
|
const error = filamentError || lowStockError || printsError || costError
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-slate-900">
|
||||||
|
<LoadingSpinner />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex items-center justify-center bg-slate-900">
|
||||||
|
<div className="p-6 rounded-lg bg-red-900/30 border border-red-500 text-red-200 max-w-md">
|
||||||
|
<h2 className="text-xl font-bold mb-2">Error</h2>
|
||||||
|
<p className="text-sm">{(error as Error).message || 'Failed to load dashboard data.'}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen bg-slate-900 p-4 md:p-8">
|
||||||
|
<div className="max-w-6xl mx-auto">
|
||||||
|
<header className="mb-8">
|
||||||
|
<h1 className="text-3xl font-bold text-emerald-400 mb-2">Dashboard</h1>
|
||||||
|
<p className="text-slate-400">Overview of your Extrudex inventory and prints</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
{/* Summary Cards Grid */}
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-8">
|
||||||
|
<SummaryCard
|
||||||
|
title="Total Spools"
|
||||||
|
value={totalSpools}
|
||||||
|
icon={Package}
|
||||||
|
color="emerald"
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Low Stock"
|
||||||
|
value={lowStockCount}
|
||||||
|
icon={AlertTriangle}
|
||||||
|
color={lowStockCount > 0 ? 'amber' : 'emerald'}
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Recent Prints"
|
||||||
|
value={recentPrintJobs.length}
|
||||||
|
icon={Printer}
|
||||||
|
color="sky"
|
||||||
|
/>
|
||||||
|
<SummaryCard
|
||||||
|
title="Cost This Month"
|
||||||
|
value={`$${monthlyCost.toFixed(2)}`}
|
||||||
|
icon={DollarSign}
|
||||||
|
color="violet"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Quick Actions */}
|
||||||
|
<div className="flex flex-wrap gap-3 mb-8">
|
||||||
|
<button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 hover:bg-emerald-500 text-white font-medium transition-colors active:scale-95 touch-manipulation">
|
||||||
|
<Plus size={18} />
|
||||||
|
Add Spool
|
||||||
|
</button>
|
||||||
|
<button className="flex items-center gap-2 px-4 py-2 rounded-lg bg-slate-700 hover:bg-slate-600 text-slate-100 font-medium transition-colors active:scale-95 touch-manipulation">
|
||||||
|
<List size={18} />
|
||||||
|
View Inventory
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Recent Prints Section */}
|
||||||
|
<section>
|
||||||
|
<h2 className="text-xl font-semibold text-slate-100 mb-4">Recent Prints</h2>
|
||||||
|
<RecentPrints jobs={recentPrintJobs} />
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
19
frontend/src/services/api.ts
Normal file
19
frontend/src/services/api.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
import type { ListResponse, FilamentSpool, PrintJob } from '../types'
|
||||||
|
|
||||||
|
const api = axios.create({
|
||||||
|
baseURL: '/api',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
})
|
||||||
|
|
||||||
|
export async function getFilaments(params?: { low_stock?: boolean; limit?: number; offset?: number }) {
|
||||||
|
const res = await api.get<ListResponse<FilamentSpool>>('/filaments', { params })
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getPrintJobs(params?: { limit?: number; offset?: number }) {
|
||||||
|
const res = await api.get<ListResponse<PrintJob>>('/print-jobs', { params })
|
||||||
|
return res.data
|
||||||
|
}
|
||||||
|
|
||||||
|
export default api
|
||||||
42
frontend/src/types/index.ts
Normal file
42
frontend/src/types/index.ts
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
export interface FilamentSpool {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
material_base_id: number;
|
||||||
|
material_finish_id: number;
|
||||||
|
material_modifier_id: number;
|
||||||
|
color_hex: string;
|
||||||
|
brand: string;
|
||||||
|
diameter_mm: number;
|
||||||
|
initial_grams: number;
|
||||||
|
remaining_grams: number;
|
||||||
|
spool_weight_grams: number;
|
||||||
|
cost_usd: number;
|
||||||
|
low_stock_threshold_grams: number;
|
||||||
|
notes: string;
|
||||||
|
barcode: string;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
deleted_at: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PrintJob {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
printer_id: number;
|
||||||
|
filament_id: number;
|
||||||
|
status: string;
|
||||||
|
duration_seconds: number;
|
||||||
|
filament_used_grams: number;
|
||||||
|
cost_usd: number;
|
||||||
|
started_at: string;
|
||||||
|
completed_at: string | null;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ListResponse<T> {
|
||||||
|
data: T[];
|
||||||
|
total: number;
|
||||||
|
limit: number;
|
||||||
|
offset: number;
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"noUnusedParameters": true,
|
"noUnusedParameters": true,
|
||||||
"noFallthroughCasesInSwitch": true,
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"ignoreDeprecations": "5.0",
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["src/*"]
|
"@/*": ["src/*"]
|
||||||
|
|||||||
Reference in New Issue
Block a user