diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index b240be2..d6be50e 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -14,7 +14,7 @@ import Reports from '@/components/Reports';
import OpportunityBoard from '@/components/OpportunityBoard';
import TargetManager from '@/components/TargetManager';
import IncentiveManager from '@/components/IncentiveManager';
-import FollowupsManager from '@/components/FollowupsManager';
+import ActivitiesManager from '@/components/ActivitiesManager';
import FunnelAnalysisPage from '@/components/FunnelAnalysisPage';
import CallLogs from '@/components/CallLogs';
import Settings from '@/components/Settings';
@@ -53,7 +53,7 @@ export default function DashboardPage() {
{ id: 'incentives', label: 'Incentives', icon: TrendingUp },
{ id: 'reports', label: 'Reports', icon: BarChart },
...(user?.role === 'ADMIN' || user?.role === 'GENERAL_MANAGER' ? [{ id: 'targets', label: 'Targets', icon: Target }] : []),
- { id: 'followups', label: 'Follow-ups', icon: CalendarCheck },
+ { id: 'activities', label: 'Activities', icon: CalendarCheck },
{ id: 'call-logs', label: 'Call Logs', icon: PhoneCall },
...(user?.role === 'ADMIN' || user?.role === 'GENERAL_MANAGER' ? [{ id: 'funnel-analysis', label: 'Funnel Analysis', icon: GitMerge }] : []),
{ id: 'products', label: 'Products', icon: Package },
@@ -102,8 +102,8 @@ export default function DashboardPage() {
return
Track and manage all scheduled pipeline activities
+📭
+No activities match these filters.
+{a.notes}
+ {a.type === 'DEMO' && a.demoPersonName && ( +Met: {a.demoPersonName}
+Contact: {a.demoContactDetails}
+ {a.competitorMention &&Competitor: {a.competitorMention}
} ++ 🕐 {new Date(a.date).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} +
+| Name | -Contact | +Company | +Contact Person | +Contact Details | Status | Action |
- {client.name.charAt(0).toUpperCase()}
+ {(client.companyName || client.name).charAt(0).toUpperCase()}
+
+
+ {client.companyName || 'N/A'}
- {client.name}
|
+ + {client.contactName || client.name} + |
- {client.email || 'N/A'}
- {client.phone}
+ {client.email || 'N/A'}
+ {client.phone}
|
+ client.status === 'QUALITY' ? 'bg-amber-50 text-amber-700 border-amber-200' : + client.status === 'POTENTIAL' ? 'bg-blue-50 text-blue-700 border-blue-200' : + 'bg-gray-100 text-gray-800 border-gray-200'}`}> {client.status} | @@ -320,12 +355,18 @@ export default function ClientList() {
|---|