diff --git a/app/dashboard/company/[slug]/hackathons/page.tsx b/app/dashboard/company/[slug]/hackathons/page.tsx index d4016773..6b029595 100644 --- a/app/dashboard/company/[slug]/hackathons/page.tsx +++ b/app/dashboard/company/[slug]/hackathons/page.tsx @@ -29,7 +29,7 @@ interface Hackathon { excerpt: string category: string status: string - approval_status: string + approval_status: 'draft' | 'pending' | 'approved' | 'rejected' | 'changes_requested' date: string time: string duration: string @@ -167,8 +167,25 @@ export default function CompanyHackathonsPage() { } } - const getStatusBadge = (status: string) => { - switch (status) { + const getStatusBadge = (hackathon: Hackathon) => { + // If not approved, show approval status instead of event status + if (hackathon.approval_status !== 'approved') { + switch (hackathon.approval_status) { + case 'pending': + return Pending Review + case 'draft': + return Draft + case 'rejected': + return Rejected + case 'changes_requested': + return Changes Requested + default: + return {hackathon.approval_status} + } + } + + // If approved, show event status + switch (hackathon.status) { case 'live': case 'published': return Live @@ -179,7 +196,7 @@ export default function CompanyHackathonsPage() { case 'completed': return Completed default: - return {status} + return {hackathon.status} } } @@ -321,7 +338,7 @@ export default function CompanyHackathonsPage() { {hackathon.category || 'General'} - {getStatusBadge(hackathon.status)} + {getStatusBadge(hackathon)} {getApprovalBadge(hackathon.approval_status)}
diff --git a/components/dashboard/CompanyDashboard.tsx b/components/dashboard/CompanyDashboard.tsx index a7d03833..262c2a37 100644 --- a/components/dashboard/CompanyDashboard.tsx +++ b/components/dashboard/CompanyDashboard.tsx @@ -19,6 +19,7 @@ import { ArrowDownRight, Activity, FileText, + Trophy, } from 'lucide-react' import { Company } from '@/types/company' import { format, formatDistanceToNow } from 'date-fns' @@ -229,7 +230,7 @@ export function CompanyDashboard({ company }: CompanyDashboardProps) { return (
{/* Stats Cards */} -
+
+ Common tasks and shortcuts -
+
{canManageEvents && ( - + <> + + + )} {canManageTeam && (