Updated api usage, corrected table designs
This commit is contained in:
@@ -494,31 +494,31 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="bg-[#0f1523]/80 backdrop-blur-md rounded-2xl border border-slate-800/80 shadow-xl overflow-hidden">
|
||||
<div className="bg-[#0f1523]/80 rounded-2xl border border-slate-800/80 shadow-lg backdrop-blur-sm overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-left border-collapse">
|
||||
<table className="w-full text-left text-xs border-collapse">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-800/80 bg-slate-900/50 text-[11px] font-semibold text-slate-400 uppercase tracking-wider">
|
||||
<SortableTh column="name" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort}>
|
||||
<tr className="bg-[#0d121f]/95 border-b border-slate-800/80 text-slate-400 uppercase tracking-wider font-semibold text-[11px]">
|
||||
<SortableTh column="name" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort} className="py-3.5 px-5 whitespace-nowrap">
|
||||
Beneficiary / Cohort
|
||||
</SortableTh>
|
||||
<SortableTh column="category" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort}>
|
||||
<SortableTh column="category" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Category
|
||||
</SortableTh>
|
||||
<SortableTh column="location" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort}>
|
||||
<SortableTh column="location" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Location
|
||||
</SortableTh>
|
||||
<SortableTh column="targetCount" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort}>
|
||||
<SortableTh column="targetCount" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Target Headcount
|
||||
</SortableTh>
|
||||
<SortableTh column="reachedCount" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort}>
|
||||
<SortableTh column="reachedCount" currentColumn={benSortCol} direction={benSortDir} onSort={handleBenSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Reached Headcount
|
||||
</SortableTh>
|
||||
<th className="py-3 px-4">Reach Progress</th>
|
||||
<th className="py-3 px-4 text-right">Actions</th>
|
||||
<th className="py-3.5 px-4 font-semibold whitespace-nowrap">Reach Progress</th>
|
||||
<th className="py-3.5 px-5 text-right font-medium whitespace-nowrap">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-slate-800/60 text-xs">
|
||||
<tbody className="divide-y divide-slate-800/60">
|
||||
{loadingBens ? (
|
||||
<tr>
|
||||
<td colSpan={7} className="py-12 text-center text-slate-400">
|
||||
@@ -538,27 +538,27 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
sortedBens.map((b) => {
|
||||
const prog = b.targetCount && b.targetCount > 0 ? Math.round(((b.reachedCount || 0) / b.targetCount) * 100) : 0;
|
||||
return (
|
||||
<tr key={b.id} className="hover:bg-slate-800/30 transition">
|
||||
<td className="py-3.5 px-4 font-semibold text-white">
|
||||
<tr key={b.id} className="hover:bg-slate-800/40 transition-colors">
|
||||
<td className="py-3.5 px-5 whitespace-nowrap font-semibold text-white">
|
||||
<div className="flex items-center gap-2">
|
||||
<Users className="w-3.5 h-3.5 text-blue-400 shrink-0" />
|
||||
<span>{b.name}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 text-slate-300">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap text-slate-300">
|
||||
<span className="bg-slate-800/80 px-2 py-0.5 rounded-md border border-slate-700/60 text-[11px]">
|
||||
{b.category || 'General'}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 text-slate-300">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap text-slate-300">
|
||||
<div className="flex items-center gap-1.5 text-slate-400">
|
||||
<MapPin className="w-3 h-3 text-slate-500" />
|
||||
<span>{b.location || 'Not Specified'}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 font-medium text-slate-200">{(b.targetCount || 0).toLocaleString()}</td>
|
||||
<td className="py-3.5 px-4 font-bold text-emerald-400">{(b.reachedCount || 0).toLocaleString()}</td>
|
||||
<td className="py-3.5 px-4">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap font-medium text-slate-200">{(b.targetCount || 0).toLocaleString()}</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap font-bold text-emerald-400">{(b.reachedCount || 0).toLocaleString()}</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<div className="flex items-center gap-2 max-w-[140px]">
|
||||
<div className="flex-1 bg-slate-800 h-1.5 rounded-full overflow-hidden">
|
||||
<div className="bg-emerald-500 h-full rounded-full" style={{ width: `${Math.min(100, prog)}%` }} />
|
||||
@@ -566,7 +566,7 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
<span className="text-[11px] font-mono text-slate-400">{prog}%</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 text-right space-x-2">
|
||||
<td className="py-3.5 px-5 text-right whitespace-nowrap space-x-2">
|
||||
<button
|
||||
onClick={() => {
|
||||
setSelectedBenForDetail(b);
|
||||
@@ -679,27 +679,27 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-[#0f1523]/80 backdrop-blur-md rounded-2xl border border-slate-800/80 shadow-xl overflow-hidden">
|
||||
<div className="bg-[#0f1523]/80 rounded-2xl border border-slate-800/80 shadow-lg backdrop-blur-sm overflow-hidden">
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-left border-collapse">
|
||||
<table className="w-full text-left text-xs border-collapse">
|
||||
<thead>
|
||||
<tr className="border-b border-slate-800/80 bg-slate-900/50 text-[11px] font-semibold text-slate-400 uppercase tracking-wider">
|
||||
<SortableTh column="title" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort}>
|
||||
<tr className="bg-[#0d121f]/95 border-b border-slate-800/80 text-slate-400 uppercase tracking-wider font-semibold text-[11px]">
|
||||
<SortableTh column="title" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort} className="py-3.5 px-5 whitespace-nowrap">
|
||||
Compliance Title
|
||||
</SortableTh>
|
||||
<SortableTh column="requirements" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort}>
|
||||
<SortableTh column="requirements" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Requirements
|
||||
</SortableTh>
|
||||
<SortableTh column="status" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort}>
|
||||
<SortableTh column="status" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Verification Status
|
||||
</SortableTh>
|
||||
<SortableTh column="createdAt" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort}>
|
||||
<SortableTh column="createdAt" currentColumn={compSortCol} direction={compSortDir} onSort={handleCompSort} className="py-3.5 px-4 whitespace-nowrap">
|
||||
Created
|
||||
</SortableTh>
|
||||
<th className="py-3 px-4 text-right">Actions</th>
|
||||
<th className="py-3.5 px-5 text-right font-medium whitespace-nowrap">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-slate-800/60 text-xs">
|
||||
<tbody className="divide-y divide-slate-800/60">
|
||||
{loadingComps ? (
|
||||
<tr>
|
||||
<td colSpan={5} className="py-12 text-center text-slate-400">
|
||||
@@ -717,8 +717,8 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
</tr>
|
||||
) : (
|
||||
sortedComps.map((c) => (
|
||||
<tr key={c.id} className="hover:bg-slate-800/30 transition">
|
||||
<td className="py-3.5 px-4 font-semibold text-white">
|
||||
<tr key={c.id} className="hover:bg-slate-800/40 transition-colors">
|
||||
<td className="py-3.5 px-5 whitespace-nowrap font-semibold text-white">
|
||||
<div className="flex items-center gap-2">
|
||||
<ShieldCheck className="w-3.5 h-3.5 text-cyan-400 shrink-0" />
|
||||
<span>{c.title}</span>
|
||||
@@ -727,9 +727,9 @@ export const BeneficiariesPage: React.FC = () => {
|
||||
<td className="py-3.5 px-4 text-slate-300 max-w-xs truncate" title={c.requirements || ''}>
|
||||
{c.requirements || 'None'}
|
||||
</td>
|
||||
<td className="py-3.5 px-4">{getApprovalStatusBadge(c.status)}</td>
|
||||
<td className="py-3.5 px-4 text-slate-400">{formatDate(c.createdAt)}</td>
|
||||
<td className="py-3.5 px-4 text-right">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">{getApprovalStatusBadge(c.status)}</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap text-slate-400">{formatDate(c.createdAt)}</td>
|
||||
<td className="py-3.5 px-5 text-right whitespace-nowrap">
|
||||
<button
|
||||
onClick={() => handleOpenEditComp(c)}
|
||||
className="p-1 text-slate-400 hover:text-white hover:bg-slate-800 rounded-lg transition cursor-pointer"
|
||||
|
||||
Reference in New Issue
Block a user