feat: rename and clarify supplies sections for different cabinet types

- Seller cabinet: 'Мои поставки' (creating supplies for marketplaces)
- Fulfillment cabinet: 'Входящие поставки' (receiving goods and materials)
- Wholesale cabinet: 'Отгрузки' (shipping goods to sellers/fulfillment)
- Logistics cabinet: 'Перевозки' (managing transportation routes)

- Update sidebar navigation with specific names for each cabinet type
- Create logistics dashboard with route management functionality
- Add logistics page with transportation statistics and active routes
- Update routing logic to handle all cabinet types correctly
This commit is contained in:
Veronika Smirnova
2025-07-21 13:45:39 +03:00
parent 753ec7b2ec
commit 0e584749f3
3 changed files with 367 additions and 10 deletions

View File

@ -0,0 +1,10 @@
import { AuthGuard } from "@/components/auth-guard";
import { LogisticsDashboard } from "@/components/logistics/logistics-dashboard";
export default function LogisticsPage() {
return (
<AuthGuard>
<LogisticsDashboard />
</AuthGuard>
);
}

View File

@ -83,11 +83,22 @@ export function Sidebar() {
}
const handleSuppliesClick = () => {
// Для фулфилмент кабинетов используем новый роут
if (user?.organization?.type === 'FULFILLMENT') {
router.push('/fulfillment-supplies')
} else {
router.push('/supplies')
// Для каждого типа кабинета свой роут
switch (user?.organization?.type) {
case 'FULFILLMENT':
router.push('/fulfillment-supplies')
break
case 'SELLER':
router.push('/supplies')
break
case 'WHOLESALE':
router.push('/supplies')
break
case 'LOGIST':
router.push('/logistics')
break
default:
router.push('/supplies')
}
}
@ -103,7 +114,7 @@ export function Sidebar() {
const isServicesActive = pathname.startsWith('/services')
const isWarehouseActive = pathname.startsWith('/warehouse')
const isEmployeesActive = pathname.startsWith('/employees')
const isSuppliesActive = pathname.startsWith('/supplies') || pathname.startsWith('/fulfillment-supplies')
const isSuppliesActive = pathname.startsWith('/supplies') || pathname.startsWith('/fulfillment-supplies') || pathname.startsWith('/logistics')
const isPartnersActive = pathname.startsWith('/partners')
return (
@ -270,8 +281,8 @@ export function Sidebar() {
</Button>
)}
{/* Поставки - для селлеров и фулфилмент */}
{(user?.organization?.type === 'SELLER' || user?.organization?.type === 'FULFILLMENT') && (
{/* Мои поставки - для селлеров */}
{user?.organization?.type === 'SELLER' && (
<Button
variant={isSuppliesActive ? "secondary" : "ghost"}
className={`w-full ${isCollapsed ? 'justify-center px-2 h-9' : 'justify-start h-10'} text-left transition-all duration-200 text-xs ${
@ -280,10 +291,61 @@ export function Sidebar() {
: 'text-white/80 hover:bg-white/10 hover:text-white'
} cursor-pointer`}
onClick={handleSuppliesClick}
title={isCollapsed ? "Поставки" : ""}
title={isCollapsed ? "Мои поставки" : ""}
>
<Truck className="h-4 w-4 flex-shrink-0" />
{!isCollapsed && <span className="ml-3">Поставки</span>}
{!isCollapsed && <span className="ml-3">Мои поставки</span>}
</Button>
)}
{/* Входящие поставки - для фулфилмент */}
{user?.organization?.type === 'FULFILLMENT' && (
<Button
variant={isSuppliesActive ? "secondary" : "ghost"}
className={`w-full ${isCollapsed ? 'justify-center px-2 h-9' : 'justify-start h-10'} text-left transition-all duration-200 text-xs ${
isSuppliesActive
? 'bg-white/20 text-white hover:bg-white/30'
: 'text-white/80 hover:bg-white/10 hover:text-white'
} cursor-pointer`}
onClick={handleSuppliesClick}
title={isCollapsed ? "Входящие поставки" : ""}
>
<Truck className="h-4 w-4 flex-shrink-0" />
{!isCollapsed && <span className="ml-3">Входящие поставки</span>}
</Button>
)}
{/* Отгрузки - для оптовиков */}
{user?.organization?.type === 'WHOLESALE' && (
<Button
variant={isSuppliesActive ? "secondary" : "ghost"}
className={`w-full ${isCollapsed ? 'justify-center px-2 h-9' : 'justify-start h-10'} text-left transition-all duration-200 text-xs ${
isSuppliesActive
? 'bg-white/20 text-white hover:bg-white/30'
: 'text-white/80 hover:bg-white/10 hover:text-white'
} cursor-pointer`}
onClick={handleSuppliesClick}
title={isCollapsed ? "Отгрузки" : ""}
>
<Truck className="h-4 w-4 flex-shrink-0" />
{!isCollapsed && <span className="ml-3">Отгрузки</span>}
</Button>
)}
{/* Перевозки - для логистов */}
{user?.organization?.type === 'LOGIST' && (
<Button
variant={isSuppliesActive ? "secondary" : "ghost"}
className={`w-full ${isCollapsed ? 'justify-center px-2 h-9' : 'justify-start h-10'} text-left transition-all duration-200 text-xs ${
isSuppliesActive
? 'bg-white/20 text-white hover:bg-white/30'
: 'text-white/80 hover:bg-white/10 hover:text-white'
} cursor-pointer`}
onClick={handleSuppliesClick}
title={isCollapsed ? "Перевозки" : ""}
>
<Truck className="h-4 w-4 flex-shrink-0" />
{!isCollapsed && <span className="ml-3">Перевозки</span>}
</Button>
)}

View File

@ -0,0 +1,285 @@
"use client";
import { useState } from "react";
import { Card } from "@/components/ui/card";
import { Button } from "@/components/ui/button";
import { Badge } from "@/components/ui/badge";
import { Sidebar } from "@/components/dashboard/sidebar";
import { useSidebar } from "@/hooks/useSidebar";
import {
Truck,
Plus,
MapPin,
Clock,
Package,
TrendingUp,
AlertTriangle,
Navigation,
} from "lucide-react";
// Мок данные для перевозок
const mockLogistics = [
{
id: "1",
routeNumber: "LOG-001",
from: "Садовод",
fromAddress: "Москва, 14-й км МКАД",
to: "SFERAV Logistics",
toAddress: "Москва, ул. Складская, 15",
status: "in_transit",
distance: "45 км",
estimatedTime: "1 ч 30 мин",
cargo: "Смартфоны (50 шт.)",
price: 15000,
createdDate: "2024-01-10",
},
{
id: "2",
routeNumber: "LOG-002",
from: "SFERAV Logistics",
fromAddress: "Москва, ул. Складская, 15",
to: "Коледино WB",
toAddress: "МО, г. Подольск, Коледино",
status: "delivered",
distance: "62 км",
estimatedTime: "2 ч 15 мин",
cargo: "Одежда (120 шт.)",
price: 22000,
createdDate: "2024-01-09",
},
{
id: "3",
routeNumber: "LOG-003",
from: "Тверь Ozon",
fromAddress: "г. Тверь, ул. Складская, 88",
to: "SFERAV Logistics",
toAddress: "Москва, ул. Складская, 15",
status: "planned",
distance: "178 км",
estimatedTime: "3 ч 45 мин",
cargo: "Электроника (75 шт.)",
price: 35000,
createdDate: "2024-01-11",
},
];
export function LogisticsDashboard() {
const { getSidebarMargin } = useSidebar();
const formatCurrency = (amount: number) => {
return new Intl.NumberFormat("ru-RU", {
style: "currency",
currency: "RUB",
minimumFractionDigits: 0,
}).format(amount);
};
const formatDate = (dateString: string) => {
return new Date(dateString).toLocaleDateString("ru-RU", {
day: "2-digit",
month: "2-digit",
year: "numeric",
});
};
const getStatusBadge = (status: string) => {
const statusConfig = {
planned: {
color: "text-blue-300 border-blue-400/30",
label: "Запланировано",
},
in_transit: {
color: "text-yellow-300 border-yellow-400/30",
label: "В пути",
},
delivered: {
color: "text-green-300 border-green-400/30",
label: "Доставлено",
},
cancelled: { color: "text-red-300 border-red-400/30", label: "Отменено" },
};
const config =
statusConfig[status as keyof typeof statusConfig] || statusConfig.planned;
return (
<Badge variant="outline" className={`glass-secondary ${config.color}`}>
{config.label}
</Badge>
);
};
const getTotalRevenue = () => {
return mockLogistics.reduce((sum, route) => sum + route.price, 0);
};
const getInTransitCount = () => {
return mockLogistics.filter((route) => route.status === "in_transit")
.length;
};
const getDeliveredCount = () => {
return mockLogistics.filter((route) => route.status === "delivered").length;
};
return (
<div className="h-screen flex overflow-hidden">
<Sidebar />
<main
className={`flex-1 ${getSidebarMargin()} px-6 py-4 overflow-hidden transition-all duration-300`}
>
<div className="p-8">
{/* Заголовок */}
<div className="flex items-center justify-between mb-8">
<div>
<h1 className="text-3xl font-bold text-white mb-2">Перевозки</h1>
<p className="text-white/60">
Управление логистическими маршрутами
</p>
</div>
<Button className="bg-gradient-to-r from-blue-500 to-cyan-500 hover:from-blue-600 hover:to-cyan-600 text-white shadow-lg">
<Plus className="h-4 w-4 mr-2" />
Создать маршрут
</Button>
</div>
{/* Статистика */}
<div className="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8">
<Card className="bg-white/10 backdrop-blur border-white/20 p-6">
<div className="flex items-center space-x-3">
<div className="p-3 bg-blue-500/20 rounded-lg">
<Truck className="h-6 w-6 text-blue-400" />
</div>
<div>
<p className="text-white/60 text-sm">Всего маршрутов</p>
<p className="text-2xl font-bold text-white">
{mockLogistics.length}
</p>
</div>
</div>
</Card>
<Card className="bg-white/10 backdrop-blur border-white/20 p-6">
<div className="flex items-center space-x-3">
<div className="p-3 bg-yellow-500/20 rounded-lg">
<Navigation className="h-6 w-6 text-yellow-400" />
</div>
<div>
<p className="text-white/60 text-sm">В пути</p>
<p className="text-2xl font-bold text-white">
{getInTransitCount()}
</p>
</div>
</div>
</Card>
<Card className="bg-white/10 backdrop-blur border-white/20 p-6">
<div className="flex items-center space-x-3">
<div className="p-3 bg-green-500/20 rounded-lg">
<Package className="h-6 w-6 text-green-400" />
</div>
<div>
<p className="text-white/60 text-sm">Доставлено</p>
<p className="text-2xl font-bold text-white">
{getDeliveredCount()}
</p>
</div>
</div>
</Card>
<Card className="bg-white/10 backdrop-blur border-white/20 p-6">
<div className="flex items-center space-x-3">
<div className="p-3 bg-purple-500/20 rounded-lg">
<TrendingUp className="h-6 w-6 text-purple-400" />
</div>
<div>
<p className="text-white/60 text-sm">Выручка</p>
<p className="text-2xl font-bold text-white">
{formatCurrency(getTotalRevenue())}
</p>
</div>
</div>
</Card>
</div>
{/* Список маршрутов */}
<Card className="bg-white/10 backdrop-blur border-white/20 overflow-hidden">
<div className="p-6">
<h2 className="text-xl font-semibold text-white mb-4">
Активные маршруты
</h2>
<div className="space-y-4">
{mockLogistics.map((route) => (
<Card
key={route.id}
className="glass-card p-4 hover:bg-white/5 transition-colors"
>
<div className="flex items-center justify-between">
<div className="flex-1">
<div className="flex items-center gap-3 mb-3">
<h3 className="text-white font-semibold text-lg">
{route.routeNumber}
</h3>
{getStatusBadge(route.status)}
</div>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-4 mb-3">
<div className="space-y-2">
<div className="flex items-center gap-2">
<MapPin className="h-4 w-4 text-green-400" />
<div>
<p className="text-white font-medium">
{route.from}
</p>
<p className="text-white/60 text-sm">
{route.fromAddress}
</p>
</div>
</div>
<div className="flex items-center gap-2">
<MapPin className="h-4 w-4 text-red-400" />
<div>
<p className="text-white font-medium">
{route.to}
</p>
<p className="text-white/60 text-sm">
{route.toAddress}
</p>
</div>
</div>
</div>
<div className="space-y-2">
<div className="flex items-center gap-2">
<Package className="h-4 w-4 text-blue-400" />
<span className="text-white">{route.cargo}</span>
</div>
<div className="flex items-center gap-2">
<Clock className="h-4 w-4 text-yellow-400" />
<span className="text-white">
{route.distance} {route.estimatedTime}
</span>
</div>
</div>
</div>
<div className="flex items-center justify-between">
<span className="text-white/60 text-sm">
Создано: {formatDate(route.createdDate)}
</span>
<span className="text-green-400 font-semibold text-lg">
{formatCurrency(route.price)}
</span>
</div>
</div>
</div>
</Card>
))}
</div>
</div>
</Card>
</div>
</main>
</div>
);
}