mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-19 21:18:25 +02:00
Merge pull request #245 from R0m1k3/1.1
Update calendar to use a more distinct green color for pending items
This commit is contained in:
1 file changed
+6
-6
@@ -68,9 +68,9 @@ function CalendarItem({ item, type, onItemClick }: { item: any, type: 'order' |
|
|||||||
case 'delivered':
|
case 'delivered':
|
||||||
return 'bg-gray-400 text-white shadow-md border-l-4 border-gray-500';
|
return 'bg-gray-400 text-white shadow-md border-l-4 border-gray-500';
|
||||||
case 'pending':
|
case 'pending':
|
||||||
return 'bg-emerald-200 text-gray-800 shadow-md border-l-4 border-emerald-400';
|
return 'bg-teal-200 text-gray-800 shadow-md border-l-4 border-teal-500';
|
||||||
default:
|
default:
|
||||||
return 'bg-emerald-200 text-gray-800 shadow-md border-l-4 border-emerald-400';
|
return 'bg-teal-200 text-gray-800 shadow-md border-l-4 border-teal-500';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -89,7 +89,7 @@ function CalendarItem({ item, type, onItemClick }: { item: any, type: 'order' |
|
|||||||
</span>
|
</span>
|
||||||
<div style={{display: 'flex', alignItems: 'center', marginLeft: '4px'}}>
|
<div style={{display: 'flex', alignItems: 'center', marginLeft: '4px'}}>
|
||||||
{item.status === 'pending' && (
|
{item.status === 'pending' && (
|
||||||
<div className="w-2 h-2 bg-emerald-500 rounded-full" title="En attente" />
|
<div className="w-2 h-2 bg-teal-600 rounded-full" title="En attente" />
|
||||||
)}
|
)}
|
||||||
{item.status === 'delivered' && (
|
{item.status === 'delivered' && (
|
||||||
<Check className="w-3 h-3" />
|
<Check className="w-3 h-3" />
|
||||||
@@ -168,7 +168,7 @@ function DayItemsContainer({ dayOrders, dayDeliveries, onItemClick }: { dayOrder
|
|||||||
? 'bg-yellow-50 border-yellow-200'
|
? 'bg-yellow-50 border-yellow-200'
|
||||||
: isOrder
|
: isOrder
|
||||||
? 'bg-blue-50 border-blue-200'
|
? 'bg-blue-50 border-blue-200'
|
||||||
: 'bg-emerald-50 border-emerald-200';
|
: 'bg-teal-50 border-teal-200';
|
||||||
|
|
||||||
const statusText = item.status === 'delivered' ? 'Livré' :
|
const statusText = item.status === 'delivered' ? 'Livré' :
|
||||||
item.status === 'planned' ? 'Planifié' : 'En attente';
|
item.status === 'planned' ? 'Planifié' : 'En attente';
|
||||||
@@ -179,7 +179,7 @@ function DayItemsContainer({ dayOrders, dayDeliveries, onItemClick }: { dayOrder
|
|||||||
? <div className="w-2 h-2 bg-yellow-500 rounded-full" />
|
? <div className="w-2 h-2 bg-yellow-500 rounded-full" />
|
||||||
: isOrder
|
: isOrder
|
||||||
? <div className="w-2 h-2 bg-blue-500 rounded-full" />
|
? <div className="w-2 h-2 bg-blue-500 rounded-full" />
|
||||||
: <div className="w-2 h-2 bg-emerald-500 rounded-full" />;
|
: <div className="w-2 h-2 bg-teal-600 rounded-full" />;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -202,7 +202,7 @@ function DayItemsContainer({ dayOrders, dayDeliveries, onItemClick }: { dayOrder
|
|||||||
<span className={`text-xs px-1.5 py-0.5 rounded font-medium ${
|
<span className={`text-xs px-1.5 py-0.5 rounded font-medium ${
|
||||||
item.status === 'delivered' ? 'bg-gray-200 text-gray-700' :
|
item.status === 'delivered' ? 'bg-gray-200 text-gray-700' :
|
||||||
item.status === 'planned' ? 'bg-yellow-200 text-yellow-800' :
|
item.status === 'planned' ? 'bg-yellow-200 text-yellow-800' :
|
||||||
isOrder ? 'bg-blue-200 text-blue-800' : 'bg-emerald-200 text-emerald-800'
|
isOrder ? 'bg-blue-200 text-blue-800' : 'bg-teal-200 text-teal-800'
|
||||||
}`}>
|
}`}>
|
||||||
{statusText}
|
{statusText}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in new issue
Block a user