mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-29 17:38:12 +00:00
improve: fleet dashboard UI + add drivers
UI Improvements: - Better card design with gradient icons - Added title + description section - Improved stat card layout (gradient backgrounds) - Added change percentage badges - Better color scheme (blue, cyan, orange, red) - Striped + highlight on hover for tables - Tab interface for vehicles/drivers Driver Management: - Fetch drivers from /drivers API - Display driver list in table - Show driver name, license, contact info - Display assigned/unassigned status - Count total drivers + assigned drivers in metrics Metrics now show: 1. Total Vehicles 2. Total Drivers (NEW) 3. Fuel Spend 4. Maintenance Spend 5. Status breakdowns 6. Cost breakdown pie chart Tabs show: - Vehicles with registration, plate, model, status - Drivers with name, license, contact, assignment Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import { Card, Stack, Group, Grid, Text, ThemeIcon, Progress, Badge, Table, RingProgress, Container } from '@mantine/core';
|
import { Card, Stack, Group, Grid, Text, ThemeIcon, Progress, Badge, Table, RingProgress, Container, Title, Box, Tabs } from '@mantine/core';
|
||||||
import { Truck, Fuel, Wrench, TrendingUp, AlertCircle } from 'lucide-react';
|
import { Truck, Fuel, Wrench, TrendingUp, AlertCircle, Users, User, MapPin, Calendar } from 'lucide-react';
|
||||||
import Breadcrumbs from '@/components/ui/Breadcrumbs';
|
import Breadcrumbs from '@/components/ui/Breadcrumbs';
|
||||||
import { QUERY_KEYS } from '@/constants/QUERY_KEYS';
|
import { QUERY_KEYS } from '@/constants/QUERY_KEYS';
|
||||||
import { api } from '@/auth/http';
|
import { api } from '@/auth/http';
|
||||||
@@ -16,6 +16,16 @@ interface Vehicle {
|
|||||||
status?: string;
|
status?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface Driver {
|
||||||
|
id: string;
|
||||||
|
firstName: string;
|
||||||
|
lastName: string;
|
||||||
|
licenseNumber?: string;
|
||||||
|
email?: string;
|
||||||
|
phone?: string;
|
||||||
|
assignedVehicle?: string;
|
||||||
|
}
|
||||||
|
|
||||||
interface FleetMetrics {
|
interface FleetMetrics {
|
||||||
totalVehicles: number;
|
totalVehicles: number;
|
||||||
activeVehicles: number;
|
activeVehicles: number;
|
||||||
@@ -24,23 +34,28 @@ interface FleetMetrics {
|
|||||||
totalMaintenanceSpend: number;
|
totalMaintenanceSpend: number;
|
||||||
averageFuelEfficiency: number;
|
averageFuelEfficiency: number;
|
||||||
costPerKm: number;
|
costPerKm: number;
|
||||||
|
totalDrivers: number;
|
||||||
|
assignedDrivers: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
const StatCard = ({ icon: Icon, label, value, color = 'blue' }: any) => (
|
const StatCard = ({ icon: Icon, label, value, color = 'blue', change }: any) => (
|
||||||
<Card withBorder>
|
<Card withBorder p="lg" radius="md">
|
||||||
<Group justify="space-between">
|
<Group justify="space-between" mb="sm">
|
||||||
<Stack gap={0}>
|
<ThemeIcon size="xl" radius="md" variant="gradient" gradient={{ from: color, to: color, deg: 135 }}>
|
||||||
<Text size="sm" c="dimmed">
|
<Icon size={28} />
|
||||||
{label}
|
|
||||||
</Text>
|
|
||||||
<Text fw={700} size="lg">
|
|
||||||
{value}
|
|
||||||
</Text>
|
|
||||||
</Stack>
|
|
||||||
<ThemeIcon size="lg" radius="md" variant="light" color={color}>
|
|
||||||
<Icon size={24} />
|
|
||||||
</ThemeIcon>
|
</ThemeIcon>
|
||||||
</Group>
|
</Group>
|
||||||
|
<Stack gap="xs">
|
||||||
|
<Text size="xs" c="dimmed" fw={500} tt="uppercase">
|
||||||
|
{label}
|
||||||
|
</Text>
|
||||||
|
<Group justify="space-between">
|
||||||
|
<Text fw={700} size="xl">
|
||||||
|
{value}
|
||||||
|
</Text>
|
||||||
|
{change && <Badge color={change > 0 ? 'green' : 'red'} size="lg">{change > 0 ? '+' : ''}{change}%</Badge>}
|
||||||
|
</Group>
|
||||||
|
</Stack>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -53,6 +68,18 @@ export function FleetDashboard() {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const { data: drivers = [] } = useQuery({
|
||||||
|
queryKey: ['drivers'],
|
||||||
|
queryFn: async () => {
|
||||||
|
try {
|
||||||
|
const res = await api.get('/drivers');
|
||||||
|
return res.data || [];
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
const { data: fuelStats } = useQuery({
|
const { data: fuelStats } = useQuery({
|
||||||
queryKey: ['fleet-fuel-stats'],
|
queryKey: ['fleet-fuel-stats'],
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
@@ -80,6 +107,8 @@ export function FleetDashboard() {
|
|||||||
const metrics = useMemo((): FleetMetrics => {
|
const metrics = useMemo((): FleetMetrics => {
|
||||||
const totalVehicles = (vehicles as Vehicle[]).length;
|
const totalVehicles = (vehicles as Vehicle[]).length;
|
||||||
const activeVehicles = (vehicles as Vehicle[]).filter(v => v.status === 'ACTIVE').length;
|
const activeVehicles = (vehicles as Vehicle[]).filter(v => v.status === 'ACTIVE').length;
|
||||||
|
const totalDrivers = (drivers as Driver[]).length;
|
||||||
|
const assignedDrivers = (drivers as Driver[]).filter(d => d.assignedVehicle).length;
|
||||||
|
|
||||||
const fuelTotal = fuelStats?.totalCost || 0;
|
const fuelTotal = fuelStats?.totalCost || 0;
|
||||||
const maintenanceTotal = maintenanceStats?.totalCost || 0;
|
const maintenanceTotal = maintenanceStats?.totalCost || 0;
|
||||||
@@ -92,8 +121,10 @@ export function FleetDashboard() {
|
|||||||
totalMaintenanceSpend: maintenanceTotal,
|
totalMaintenanceSpend: maintenanceTotal,
|
||||||
averageFuelEfficiency: fuelStats?.averageEfficiency || 0,
|
averageFuelEfficiency: fuelStats?.averageEfficiency || 0,
|
||||||
costPerKm: (fuelTotal + maintenanceTotal) / 100000, // Placeholder
|
costPerKm: (fuelTotal + maintenanceTotal) / 100000, // Placeholder
|
||||||
|
totalDrivers,
|
||||||
|
assignedDrivers,
|
||||||
};
|
};
|
||||||
}, [vehicles, fuelStats, maintenanceStats]);
|
}, [vehicles, drivers, fuelStats, maintenanceStats]);
|
||||||
|
|
||||||
const operatingCost = metrics.totalFuelSpend + metrics.totalMaintenanceSpend;
|
const operatingCost = metrics.totalFuelSpend + metrics.totalMaintenanceSpend;
|
||||||
const fuelPercent = operatingCost > 0 ? Math.round((metrics.totalFuelSpend / operatingCost) * 100) : 0;
|
const fuelPercent = operatingCost > 0 ? Math.round((metrics.totalFuelSpend / operatingCost) * 100) : 0;
|
||||||
@@ -102,24 +133,29 @@ export function FleetDashboard() {
|
|||||||
<Container size="xl" py="xl">
|
<Container size="xl" py="xl">
|
||||||
<Breadcrumbs items={[{ label: 'Fleet' }, { label: 'Dashboard' }]} />
|
<Breadcrumbs items={[{ label: 'Fleet' }, { label: 'Dashboard' }]} />
|
||||||
|
|
||||||
<Text fw={700} size="xl" mb="lg">
|
<Box mb="xl">
|
||||||
Fleet Overview
|
<Title order={1} mb="xs">
|
||||||
</Text>
|
Fleet Management Dashboard
|
||||||
|
</Title>
|
||||||
|
<Text c="dimmed" size="sm">
|
||||||
|
Real-time fleet overview, vehicle & driver management
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
|
||||||
{/* Key Metrics */}
|
{/* Primary Metrics */}
|
||||||
<Grid mb="lg">
|
<Grid mb="xl">
|
||||||
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
||||||
<StatCard icon={Truck} label="Total Vehicles" value={metrics.totalVehicles} color="blue" />
|
<StatCard icon={Truck} label="Total Vehicles" value={metrics.totalVehicles} color="blue" />
|
||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
|
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
||||||
|
<StatCard icon={Users} label="Total Drivers" value={metrics.totalDrivers} color="cyan" />
|
||||||
|
</Grid.Col>
|
||||||
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
||||||
<StatCard icon={Fuel} label="Fuel Spend" value={`$${metrics.totalFuelSpend.toFixed(0)}`} color="orange" />
|
<StatCard icon={Fuel} label="Fuel Spend" value={`$${metrics.totalFuelSpend.toFixed(0)}`} color="orange" />
|
||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
||||||
<StatCard icon={Wrench} label="Maintenance" value={`$${metrics.totalMaintenanceSpend.toFixed(0)}`} color="red" />
|
<StatCard icon={Wrench} label="Maintenance" value={`$${metrics.totalMaintenanceSpend.toFixed(0)}`} color="red" />
|
||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
<Grid.Col span={{ base: 12, sm: 6, md: 3 }}>
|
|
||||||
<StatCard icon={TrendingUp} label="Efficiency" value={`${metrics.averageFuelEfficiency.toFixed(1)} km/L`} color="green" />
|
|
||||||
</Grid.Col>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
{/* Fleet Status */}
|
{/* Fleet Status */}
|
||||||
@@ -216,46 +252,108 @@ export function FleetDashboard() {
|
|||||||
</Grid.Col>
|
</Grid.Col>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
{/* Fleet List */}
|
{/* Vehicles & Drivers Tabs */}
|
||||||
<Card withBorder>
|
<Card withBorder>
|
||||||
<Card.Section p="md" withBorder>
|
<Tabs defaultValue="vehicles" p="md">
|
||||||
<Text fw={500}>Fleet Vehicles</Text>
|
<Tabs.List>
|
||||||
</Card.Section>
|
<Tabs.Tab value="vehicles" leftSection={<Truck size={16} />}>
|
||||||
<Card.Section>
|
Vehicles ({(vehicles as Vehicle[]).length})
|
||||||
{(vehicles as Vehicle[]).length > 0 ? (
|
</Tabs.Tab>
|
||||||
<Table>
|
<Tabs.Tab value="drivers" leftSection={<Users size={16} />}>
|
||||||
<Table.Thead>
|
Drivers ({(drivers as Driver[]).length})
|
||||||
<Table.Tr>
|
</Tabs.Tab>
|
||||||
<Table.Th>Registration</Table.Th>
|
</Tabs.List>
|
||||||
<Table.Th>Plate</Table.Th>
|
|
||||||
<Table.Th>Model</Table.Th>
|
<Tabs.Panel value="vehicles" pt="md">
|
||||||
<Table.Th>Status</Table.Th>
|
{(vehicles as Vehicle[]).length > 0 ? (
|
||||||
</Table.Tr>
|
<Table striped highlightOnHover>
|
||||||
</Table.Thead>
|
<Table.Thead>
|
||||||
<Table.Tbody>
|
<Table.Tr>
|
||||||
{(vehicles as Vehicle[]).slice(0, 10).map(v => (
|
<Table.Th>Registration</Table.Th>
|
||||||
<Table.Tr key={v.id}>
|
<Table.Th>Plate</Table.Th>
|
||||||
<Table.Td fw={500}>{v.registrationNumber}</Table.Td>
|
<Table.Th>Model</Table.Th>
|
||||||
<Table.Td>{v.plateNumber}</Table.Td>
|
<Table.Th>Status</Table.Th>
|
||||||
<Table.Td>
|
|
||||||
{v.manufacturer} {v.model}
|
|
||||||
</Table.Td>
|
|
||||||
<Table.Td>
|
|
||||||
<Badge color={v.status === 'ACTIVE' ? 'green' : 'gray'}>{v.status || 'UNKNOWN'}</Badge>
|
|
||||||
</Table.Td>
|
|
||||||
</Table.Tr>
|
</Table.Tr>
|
||||||
))}
|
</Table.Thead>
|
||||||
</Table.Tbody>
|
<Table.Tbody>
|
||||||
</Table>
|
{(vehicles as Vehicle[]).slice(0, 15).map(v => (
|
||||||
) : (
|
<Table.Tr key={v.id}>
|
||||||
<Card.Section p="md">
|
<Table.Td fw={500}>{v.registrationNumber}</Table.Td>
|
||||||
<Group gap="xs">
|
<Table.Td>{v.plateNumber}</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
{v.manufacturer} {v.model}
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Badge color={v.status === 'ACTIVE' ? 'green' : v.status === 'MAINTENANCE' ? 'yellow' : 'gray'}>
|
||||||
|
{v.status || 'UNKNOWN'}
|
||||||
|
</Badge>
|
||||||
|
</Table.Td>
|
||||||
|
</Table.Tr>
|
||||||
|
))}
|
||||||
|
</Table.Tbody>
|
||||||
|
</Table>
|
||||||
|
) : (
|
||||||
|
<Group gap="xs" p="md">
|
||||||
<AlertCircle size={20} />
|
<AlertCircle size={20} />
|
||||||
<Text c="dimmed">No vehicles in fleet</Text>
|
<Text c="dimmed">No vehicles in fleet</Text>
|
||||||
</Group>
|
</Group>
|
||||||
</Card.Section>
|
)}
|
||||||
)}
|
</Tabs.Panel>
|
||||||
</Card.Section>
|
|
||||||
|
<Tabs.Panel value="drivers" pt="md">
|
||||||
|
{(drivers as Driver[]).length > 0 ? (
|
||||||
|
<Table striped highlightOnHover>
|
||||||
|
<Table.Thead>
|
||||||
|
<Table.Tr>
|
||||||
|
<Table.Th>Name</Table.Th>
|
||||||
|
<Table.Th>License</Table.Th>
|
||||||
|
<Table.Th>Contact</Table.Th>
|
||||||
|
<Table.Th>Assigned Vehicle</Table.Th>
|
||||||
|
</Table.Tr>
|
||||||
|
</Table.Thead>
|
||||||
|
<Table.Tbody>
|
||||||
|
{(drivers as Driver[]).slice(0, 15).map(d => (
|
||||||
|
<Table.Tr key={d.id}>
|
||||||
|
<Table.Td fw={500}>
|
||||||
|
<Group gap="xs">
|
||||||
|
<ThemeIcon size="sm" radius="xl" variant="light" color="blue">
|
||||||
|
<User size={14} />
|
||||||
|
</ThemeIcon>
|
||||||
|
{d.firstName} {d.lastName}
|
||||||
|
</Group>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>{d.licenseNumber || 'N/A'}</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
<Stack gap={0} size="xs">
|
||||||
|
{d.phone && (
|
||||||
|
<Text size="xs">
|
||||||
|
<Group gap={4} inline>
|
||||||
|
<MapPin size={12} /> {d.phone}
|
||||||
|
</Group>
|
||||||
|
</Text>
|
||||||
|
)}
|
||||||
|
{d.email && <Text size="xs">{d.email}</Text>}
|
||||||
|
</Stack>
|
||||||
|
</Table.Td>
|
||||||
|
<Table.Td>
|
||||||
|
{d.assignedVehicle ? (
|
||||||
|
<Badge color="green">Assigned</Badge>
|
||||||
|
) : (
|
||||||
|
<Badge color="gray">Unassigned</Badge>
|
||||||
|
)}
|
||||||
|
</Table.Td>
|
||||||
|
</Table.Tr>
|
||||||
|
))}
|
||||||
|
</Table.Tbody>
|
||||||
|
</Table>
|
||||||
|
) : (
|
||||||
|
<Group gap="xs" p="md">
|
||||||
|
<AlertCircle size={20} />
|
||||||
|
<Text c="dimmed">No drivers in system</Text>
|
||||||
|
</Group>
|
||||||
|
)}
|
||||||
|
</Tabs.Panel>
|
||||||
|
</Tabs>
|
||||||
</Card>
|
</Card>
|
||||||
</Container>
|
</Container>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user