@@ -407,27 +606,27 @@ export default function AwardDetailPage({
{award.useAiEligibility ? (
- {runEligibility.isPending ? (
+ {runEligibility.isPending || isPollingJob ? (
) : (
- {runEligibility.isPending ? (
+ {runEligibility.isPending || isPollingJob ? (
)}
@@ -527,6 +726,59 @@ export default function AwardDetailPage({
+ {/* Eligibility job progress */}
+ {isPollingJob && jobStatus && (
+
+
+
+
+
+
+
+ {jobStatus.eligibilityJobStatus === 'PENDING'
+ ? 'Preparing...'
+ : `Processing... ${jobStatus.eligibilityJobDone ?? 0} of ${jobStatus.eligibilityJobTotal ?? '?'} projects`}
+
+ {jobStatus.eligibilityJobTotal && jobStatus.eligibilityJobTotal > 0 && (
+
+ {Math.round(
+ ((jobStatus.eligibilityJobDone ?? 0) / jobStatus.eligibilityJobTotal) * 100
+ )}%
+
+ )}
+
+
0
+ ? ((jobStatus.eligibilityJobDone ?? 0) / jobStatus.eligibilityJobTotal) * 100
+ : 0
+ }
+ />
+
+
+
+ )}
+
+ {/* Failed job notice */}
+ {!isPollingJob && award.eligibilityJobStatus === 'FAILED' && (
+
+
+
+
+
+ Last eligibility run failed: {award.eligibilityJobError || 'Unknown error'}
+
+
+
+ Retry
+
+
+
+ )}
+
{!award.useAiEligibility && (
AI eligibility is off for this award. Projects are loaded for manual selection.
@@ -542,67 +794,146 @@ export default function AwardDetailPage({
Category
Country
Method
+ {award.useAiEligibility && AI Confidence }
Eligible
Actions
- {eligibilityData.eligibilities.map((e) => (
-
-
-
-
{e.project.title}
-
- {e.project.teamName}
-
-
-
- {e.project.competitionCategory ? (
-
- {e.project.competitionCategory.replace('_', ' ')}
-
- ) : (
- '-'
- )}
-
- {e.project.country || '-'}
-
-
- {e.method === 'MANUAL' ? 'Manual' : 'Auto'}
-
-
-
-
- handleToggleEligibility(e.projectId, checked)
- }
- />
-
-
- handleRemoveFromEligibility(e.projectId)}
- className="text-destructive hover:text-destructive"
- >
-
-
-
- ))}
+ {eligibilityData.eligibilities.map((e) => {
+ const aiReasoning = e.aiReasoningJson as { confidence?: number; reasoning?: string } | null
+ const hasReasoning = !!aiReasoning?.reasoning
+ const isExpanded = expandedRows.has(e.id)
+
+ return (
+ {
+ setExpandedRows((prev) => {
+ const next = new Set(prev)
+ if (open) next.add(e.id)
+ else next.delete(e.id)
+ return next
+ })
+ }} asChild>
+ <>
+
+
+
+ {hasReasoning && (
+
+
+
+
+ )}
+
+
{e.project.title}
+
+ {e.project.teamName}
+
+
+
+
+ {e.project.competitionCategory ? (
+
+ {e.project.competitionCategory.replace('_', ' ')}
+
+ ) : (
+ '-'
+ )}
+
+ {e.project.country || '-'}
+
+
+ {e.method === 'MANUAL' ? 'Manual' : 'Auto'}
+
+
+ {award.useAiEligibility && (
+
+ {aiReasoning?.confidence != null ? (
+
+
+
+
+
+ AI confidence: {Math.round(aiReasoning.confidence * 100)}%
+
+
+
+ ) : (
+ -
+ )}
+
+ )}
+
+
+ handleToggleEligibility(e.projectId, checked)
+ }
+ />
+
+
+ handleRemoveFromEligibility(e.projectId)}
+ className="text-destructive hover:text-destructive"
+ >
+
+
+
+ {hasReasoning && (
+
+
+
+
+
+
+
+
AI Reasoning
+
{aiReasoning?.reasoning}
+
+
+
+
+
+ )}
+
+
+ )
+ })}
) : (
-
- No eligibility data
-
- Run AI eligibility to evaluate projects or manually add projects
+
+
+
+ No eligibility data yet
+
+ {award.useAiEligibility
+ ? 'Run AI eligibility to automatically evaluate projects against this award\'s criteria, or manually add projects.'
+ : 'Load all eligible projects into the evaluation list, or manually add specific projects.'}
+
+
+ {award.useAiEligibility ? (
+ <>
+
setAddProjectDialogOpen(true)}>
+
+
)}
@@ -680,11 +1011,13 @@ export default function AwardDetailPage({
) : (
-
- No jurors assigned
-
- Add members as jurors for this award
+
+
+
+ No jurors assigned
+
+ Add jury members who will vote on eligible projects for this award. Select from existing jury members above.
@@ -693,84 +1026,134 @@ export default function AwardDetailPage({
{/* Results Tab */}
- {voteResults && voteResults.results.length > 0 ? (
- <>
-
-
- {voteResults.votedJurorCount} of {voteResults.jurorCount}{' '}
- jurors voted
-
-
- {voteResults.scoringMode.replace('_', ' ')}
-
-
+ {voteResults && voteResults.results.length > 0 ? (() => {
+ const maxPoints = Math.max(...voteResults.results.map((r) => r.points), 1)
+ return (
+ <>
+
+
+ {voteResults.votedJurorCount} of {voteResults.jurorCount}{' '}
+ jurors voted
+
+
+ {voteResults.scoringMode.replace('_', ' ')}
+
+
-
-
-
-
- #
- Project
- Votes
- Points
- Actions
-
-
-
- {voteResults.results.map((r, i) => (
-
- {i + 1}
-
-
- {r.project.id === voteResults.winnerId && (
-
- )}
-
-
{r.project.title}
-
- {r.project.teamName}
-
-
-
- {r.votes}
-
- {r.points}
-
-
- {r.project.id !== voteResults.winnerId && (
- handleSetWinner(r.project.id)}
- disabled={setWinner.isPending}
- >
-
- )}
-
+
+
+
+
+ #
+ Project
+ Votes
+ Score
+ Actions
- ))}
-
-
-
-
- ) : (
+
+
+ {voteResults.results.map((r, i) => {
+ const isWinner = r.project.id === voteResults.winnerId
+ const barPercent = (r.points / maxPoints) * 100
+ return (
+
+
+
+ {i + 1}
+
+
+
+
+ {isWinner && (
+
+ )}
+
+
{r.project.title}
+
+ {r.project.teamName}
+
+
+
+
+ {r.votes}
+
+
+
+
+
+ {!isWinner && (
+ handleSetWinner(r.project.id)}
+ disabled={setWinner.isPending}
+ >
+
+ )}
+
+
+ )
+ })}
+
+
+
+
+ )
+ })() : (
-
- No votes yet
-
- Votes will appear here once jurors submit their selections
+
+
+
+ No votes yet
+
+ {award._count.jurors === 0
+ ? 'Assign jurors to this award first, then open voting to collect their selections.'
+ : award.status === 'DRAFT' || award.status === 'NOMINATIONS_OPEN'
+ ? 'Open voting to allow jurors to submit their selections for this award.'
+ : 'Votes will appear here as jurors submit their selections.'}
+ {award.status === 'NOMINATIONS_OPEN' && (
+ handleStatusChange('VOTING_OPEN')}
+ disabled={updateStatus.isPending}
+ >
+
+ )}
)}
diff --git a/src/app/(admin)/admin/awards/page.tsx b/src/app/(admin)/admin/awards/page.tsx
index 8fe3bcb..1ac190a 100644
--- a/src/app/(admin)/admin/awards/page.tsx
+++ b/src/app/(admin)/admin/awards/page.tsx
@@ -1,5 +1,7 @@
'use client'
+import { useState, useMemo } from 'react'
+import { useDebounce } from '@/hooks/use-debounce'
import Link from 'next/link'
import { trpc } from '@/lib/trpc/client'
import { Button } from '@/components/ui/button'
@@ -12,7 +14,15 @@ import {
} from '@/components/ui/card'
import { Badge } from '@/components/ui/badge'
import { Skeleton } from '@/components/ui/skeleton'
-import { Plus, Trophy, Users, CheckCircle2 } from 'lucide-react'
+import { Input } from '@/components/ui/input'
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@/components/ui/select'
+import { Plus, Trophy, Users, CheckCircle2, Search } from 'lucide-react'
const STATUS_COLORS: Record = {
DRAFT: 'secondary',
@@ -31,16 +41,46 @@ const SCORING_LABELS: Record = {
export default function AwardsListPage() {
const { data: awards, isLoading } = trpc.specialAward.list.useQuery({})
+ const [search, setSearch] = useState('')
+ const debouncedSearch = useDebounce(search, 300)
+ const [statusFilter, setStatusFilter] = useState('all')
+ const [scoringFilter, setScoringFilter] = useState('all')
+
+ const filteredAwards = useMemo(() => {
+ if (!awards) return []
+ return awards.filter((award) => {
+ const matchesSearch =
+ !debouncedSearch ||
+ award.name.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
+ award.description?.toLowerCase().includes(debouncedSearch.toLowerCase())
+ const matchesStatus = statusFilter === 'all' || award.status === statusFilter
+ const matchesScoring = scoringFilter === 'all' || award.scoringMode === scoringFilter
+ return matchesSearch && matchesStatus && matchesScoring
+ })
+ }, [awards, debouncedSearch, statusFilter, scoringFilter])
+
if (isLoading) {
return (
+ {/* Toolbar skeleton */}
+
+ {/* Cards skeleton */}
- {[...Array(3)].map((_, i) => (
-
@@ -67,12 +107,58 @@ export default function AwardsListPage() {
+ {/* Toolbar */}
+
+
+
+
+
+
+
+
+ All statuses
+ Draft
+ Nominations Open
+ Voting Open
+ Closed
+ Archived
+
+
+
+
+
+
+ All scoring
+ Pick Winner
+ Ranked
+ Scored
+
+
+
+
+ {filteredAwards.length} of {awards.length} awards
+
+ )}
+
{/* Awards Grid */}
- {awards && awards.length > 0 ? (
+ {filteredAwards.length > 0 ? (
- {awards.map((award) => (
+ {filteredAwards.map((award) => (
-
+
@@ -118,13 +204,22 @@ export default function AwardsListPage() {
))}
+ ) : awards && awards.length > 0 ? (
+
+
+
+ No awards match your filters
+
+
+
) : (
- No awards yet
-
- Create special awards for outstanding projects
+
No awards yet
+
+ Create special awards with eligibility criteria and jury voting for outstanding projects.
= {
ALL: 'bg-gray-100 text-gray-800',
SEMIFINALIST: 'bg-blue-100 text-blue-800',
FINALIST: 'bg-purple-100 text-purple-800',
}
-async function LearningResourcesList() {
- const caller = await api()
- const { data: resources } = await caller.learningResource.list({
- perPage: 50,
- })
+export default function LearningHubPage() {
+ const { data, isLoading } = trpc.learningResource.list.useQuery({ perPage: 50 })
+ const resources = data?.data
- if (resources.length === 0) {
+ const [search, setSearch] = useState('')
+ const debouncedSearch = useDebounce(search, 300)
+ const [typeFilter, setTypeFilter] = useState('all')
+ const [cohortFilter, setCohortFilter] = useState('all')
+
+ const filteredResources = useMemo(() => {
+ if (!resources) return []
+ return resources.filter((resource) => {
+ const matchesSearch =
+ !debouncedSearch ||
+ resource.title.toLowerCase().includes(debouncedSearch.toLowerCase())
+ const matchesType = typeFilter === 'all' || resource.resourceType === typeFilter
+ const matchesCohort = cohortFilter === 'all' || resource.cohortLevel === cohortFilter
+ return matchesSearch && matchesType && matchesCohort
+ })
+ }, [resources, debouncedSearch, typeFilter, cohortFilter])
+
+ if (isLoading) {
return (
-
-
- No resources yet
-
- Start by adding your first learning resource
-
-
-
-
-
-
+
+
+ {/* Toolbar skeleton */}
+
+ {/* Resource list skeleton */}
+
+ {[...Array(5)].map((_, i) => (
+
+
+
+
+
+
+ ))}
+
+
- {resources.map((resource) => {
- const Icon = resourceTypeIcons[resource.resourceType]
- return (
-
-
-
-
-
-
-
{resource.title}
- {!resource.isPublished && (
- Draft
- )}
-
-
-
- {resource.cohortLevel}
-
- {resource.resourceType}
- -
- {resource._count.accessLogs} views
-
-
- {resource.externalUrl && (
-
-
-
-
- )}
-
-
-
-
-
-
- )
- })}
-
- {[1, 2, 3].map((i) => (
-
-
-
-
-
-
- ))}
-
+ {/* Header */}
Learning Hub
@@ -151,9 +120,128 @@ export default function LearningHubPage() {
-
}>
-
-
+ {/* Toolbar */}
+
+
+
+
+
+
+
+
+ All types
+ PDF
+ Video
+ Document
+ Link
+ Other
+
+
+
+
+
+
+ All cohorts
+ All (cohort)
+ Semifinalist
+ Finalist
+
+
+
+
+
+ {/* Results count */}
+ {resources && (
+
+ {filteredResources.length} of {resources.length} resources
+
+ )}
+
+ {/* Resource List */}
+ {filteredResources.length > 0 ? (
+
+ {filteredResources.map((resource) => {
+ const Icon = resourceTypeIcons[resource.resourceType as keyof typeof resourceTypeIcons] || File
+ return (
+
+
+
+
+
+
+
{resource.title}
+ {!resource.isPublished && (
+ Draft
+ )}
+
+
+
+ {resource.cohortLevel}
+
+ {resource.resourceType}
+ -
+ {resource._count.accessLogs} views
+
+
+ {resource.externalUrl && (
+
+
+
+
+ )}
+
+
+
+
+
+
+ )
+ })}
+
+ ) : resources && resources.length > 0 ? (
+
+
+
+ No resources match your filters
+
+
+
+ ) : (
+
+
+ No resources yet
+
+ Add learning materials like videos, documents, and links for program participants.
+
+
+
+
+
+ )}
)
}
diff --git a/src/app/(admin)/admin/messages/page.tsx b/src/app/(admin)/admin/messages/page.tsx
index 017b9b3..021e0d7 100644
--- a/src/app/(admin)/admin/messages/page.tsx
+++ b/src/app/(admin)/admin/messages/page.tsx
@@ -41,6 +41,14 @@ import {
TableHeader,
TableRow,
} from '@/components/ui/table'
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@/components/ui/dialog'
import {
Send,
Mail,
@@ -51,6 +59,7 @@ import {
AlertCircle,
Inbox,
CheckCircle2,
+ Eye,
} from 'lucide-react'
import { toast } from 'sonner'
import { formatDate } from '@/lib/utils'
@@ -79,6 +88,7 @@ export default function MessagesPage() {
const [deliveryChannels, setDeliveryChannels] = useState
(['EMAIL', 'IN_APP'])
const [isScheduled, setIsScheduled] = useState(false)
const [scheduledAt, setScheduledAt] = useState('')
+ const [showPreview, setShowPreview] = useState(false)
const utils = trpc.useUtils()
@@ -152,7 +162,42 @@ export default function MessagesPage() {
}
}
- const handleSend = () => {
+ const getRecipientDescription = (): string => {
+ switch (recipientType) {
+ case 'ALL':
+ return 'All platform users'
+ case 'ROLE': {
+ const roleLabel = selectedRole ? selectedRole.replace(/_/g, ' ') : ''
+ return roleLabel ? `All ${roleLabel}s` : 'By Role (none selected)'
+ }
+ case 'ROUND_JURY': {
+ if (!roundId) return 'Round Jury (none selected)'
+ const round = (rounds as Array<{ id: string; name: string; program?: { name: string } }> | undefined)?.find(
+ (r) => r.id === roundId
+ )
+ return round
+ ? `Jury of ${round.program ? `${round.program.name} - ` : ''}${round.name}`
+ : 'Round Jury'
+ }
+ case 'PROGRAM_TEAM': {
+ if (!selectedProgramId) return 'Program Team (none selected)'
+ const program = (programs as Array<{ id: string; name: string }> | undefined)?.find(
+ (p) => p.id === selectedProgramId
+ )
+ return program ? `Team of ${program.name}` : 'Program Team'
+ }
+ case 'USER': {
+ if (!selectedUserId) return 'Specific User (none selected)'
+ const userList = (users as { users: Array<{ id: string; name: string | null; email: string }> } | undefined)?.users
+ const user = userList?.find((u) => u.id === selectedUserId)
+ return user ? (user.name || user.email) : 'Specific User'
+ }
+ default:
+ return 'Unknown'
+ }
+ }
+
+ const handlePreview = () => {
if (!subject.trim()) {
toast.error('Subject is required')
return
@@ -182,6 +227,10 @@ export default function MessagesPage() {
return
}
+ setShowPreview(true)
+ }
+
+ const handleActualSend = () => {
sendMutation.mutate({
recipientType,
recipientFilter: buildRecipientFilter(),
@@ -192,6 +241,7 @@ export default function MessagesPage() {
scheduledAt: isScheduled && scheduledAt ? new Date(scheduledAt).toISOString() : undefined,
templateId: selectedTemplateId && selectedTemplateId !== '__none__' ? selectedTemplateId : undefined,
})
+ setShowPreview(false)
}
return (
@@ -474,13 +524,13 @@ export default function MessagesPage() {
{/* Send button */}
-
+
{sendMutation.isPending ? (
@@ -581,6 +631,68 @@ export default function MessagesPage() {
+
+ {/* Preview Dialog */}
+
+
+
+ Preview Message
+ Review your message before sending
+
+
+
+
Recipients
+
{getRecipientDescription()}
+
+
+
+
+
Delivery Channels
+
+ {deliveryChannels.includes('EMAIL') && (
+
+
+ )}
+ {deliveryChannels.includes('IN_APP') && (
+
+
+ )}
+
+
+ {isScheduled && scheduledAt && (
+
+
Scheduled For
+
{formatDate(new Date(scheduledAt))}
+
+ )}
+
+ setShowPreview(false)}>
+ Edit
+
+
+ {sendMutation.isPending ? (
+
+
+
+
= {
+ CREATE: `created a ${entity}`,
+ UPDATE: `updated a ${entity}`,
+ DELETE: `deleted a ${entity}`,
+ LOGIN: 'logged in',
+ EXPORT: `exported ${entity} data`,
+ SUBMIT: `submitted an ${entity}`,
+ ASSIGN: `assigned a ${entity}`,
+ INVITE: `invited a user`,
+ STATUS_CHANGE: `changed ${entity} status`,
+ BULK_UPDATE: `bulk updated ${entity}s`,
+ IMPORT: `imported ${entity}s`,
+ }
+ return actionMap[action] || `${action.toLowerCase()} ${entity}`
+ }
+
+ // Helper: pick an icon for an audit action
+ function getActionIcon(action: string) {
+ switch (action) {
+ case 'CREATE': return
-
-
- Rounds
-
-
- {totalRoundCount}
-
- {activeRoundCount} active round{activeRoundCount !== 1 ? 's' : ''}
-
-
-
-
-
-
- Projects
-
-
- {projectCount}
-
- {newProjectsThisWeek > 0
- ? `${newProjectsThisWeek} new this week`
- : 'In this edition'}
-
-
-
-
-
-
- Jury Members
-
-
- {totalJurors}
-
- {activeJurors} active{invitedJurors > 0 && `, ${invitedJurors} invited`}
-
-
-
-
-
-
- Evaluations
-
-
-
- {submittedCount}
- {totalAssignments > 0 && (
-
- {' '}/ {totalAssignments}
-
- )}
-
-
-
-
- {completionRate.toFixed(0)}% completion rate
+
+
+
+ Rounds
+
+
+ {totalRoundCount}
+
+ {activeRoundCount} active round{activeRoundCount !== 1 ? 's' : ''}
-
-
+
+
+
+
+
+
+
+ Projects
+
+
+ {projectCount}
+
+ {newProjectsThisWeek > 0
+ ? `${newProjectsThisWeek} new this week`
+ : 'In this edition'}
+
+
+
+
+
+
+
+
+ Jury Members
+
+
+ {totalJurors}
+
+ {activeJurors} active{invitedJurors > 0 && `, ${invitedJurors} invited`}
+
+
+
+
+
+
+
+
+ Evaluations
+
+
+
+ {submittedCount}
+ {totalAssignments > 0 && (
+
+ {' '}/ {totalAssignments}
+
+ )}
+
+
+
+
+ {completionRate.toFixed(0)}% completion rate
+
+
+
+
+
+
+
+
+
+
+
+
{round.name}
-
- {round.status}
-
+
{round._count.projects} projects · {round._count.assignments} assignments
@@ -447,7 +560,7 @@ async function DashboardStats({ editionId, sessionName }: DashboardStatsProps) {
href={`/admin/projects/${project.id}`}
className="block"
>
-
+
{truncate(project.title, 45)}
-
- {(project.status ?? 'SUBMITTED').replace('_', ' ')}
-
+
{[
@@ -500,6 +612,53 @@ async function DashboardStats({ editionId, sessionName }: DashboardStatsProps) {
{/* Right Column */}
+ {/* Pending Actions Card */}
+
+
+
+
+
+
+
+ {pendingCOIs > 0 && (
+
+
+ COI declarations to review
+
+
{pendingCOIs}
+
+ )}
+ {unassignedProjects > 0 && (
+
+
+ Projects without assignments
+
+
{unassignedProjects}
+
+ )}
+ {draftRounds > 0 && (
+
+
+ Draft rounds to activate
+
+
{draftRounds}
+
+ )}
+ {pendingCOIs === 0 && unassignedProjects === 0 && draftRounds === 0 && (
+
+ )}
+
+
+
{/* Evaluation Progress Card */}
@@ -604,6 +763,45 @@ async function DashboardStats({ editionId, sessionName }: DashboardStatsProps) {
+ {/* Recent Activity Card */}
+
+
+
+
+
+
+ {recentActivity.length === 0 ? (
+
+
+
+ No recent activity
+
+
+ {recentActivity.map((log) => (
+
+
+ {getActionIcon(log.action)}
+
+
+
+ {log.user?.name || 'System'}
+ {' '}{formatAction(log.action, log.entityType)}
+
+
+ {formatRelativeTime(log.timestamp)}
+
+
+
+ ))}
+
+
+
{/* Upcoming Deadlines Card */}
diff --git a/src/app/(admin)/admin/partners/page.tsx b/src/app/(admin)/admin/partners/page.tsx
index 333c088..bacf690 100644
--- a/src/app/(admin)/admin/partners/page.tsx
+++ b/src/app/(admin)/admin/partners/page.tsx
@@ -1,6 +1,9 @@
-import { Suspense } from 'react'
+'use client'
+
+import { useState, useMemo } from 'react'
+import { useDebounce } from '@/hooks/use-debounce'
import Link from 'next/link'
-import { api } from '@/lib/trpc/server'
+import { trpc } from '@/lib/trpc/client'
import { Button } from '@/components/ui/button'
import {
Card,
@@ -8,6 +11,14 @@ import {
} from '@/components/ui/card'
import { Badge } from '@/components/ui/badge'
import { Skeleton } from '@/components/ui/skeleton'
+import { Input } from '@/components/ui/input'
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@/components/ui/select'
import {
Plus,
Pencil,
@@ -16,6 +27,7 @@ import {
Eye,
EyeOff,
Globe,
+ Search,
} from 'lucide-react'
const visibilityIcons = {
@@ -24,7 +36,7 @@ const visibilityIcons = {
PUBLIC: Globe,
}
-const partnerTypeColors = {
+const partnerTypeColors: Record = {
SPONSOR: 'bg-yellow-100 text-yellow-800',
PARTNER: 'bg-blue-100 text-blue-800',
SUPPORTER: 'bg-green-100 text-green-800',
@@ -32,115 +44,73 @@ const partnerTypeColors = {
OTHER: 'bg-gray-100 text-gray-800',
}
-async function PartnersList() {
- const caller = await api()
- const { data: partners } = await caller.partner.list({
- perPage: 50,
- })
+export default function PartnersPage() {
+ const { data, isLoading } = trpc.partner.list.useQuery({ perPage: 50 })
+ const partners = data?.data
- if (partners.length === 0) {
+ const [search, setSearch] = useState('')
+ const debouncedSearch = useDebounce(search, 300)
+ const [typeFilter, setTypeFilter] = useState('all')
+ const [activeFilter, setActiveFilter] = useState('all')
+
+ const filteredPartners = useMemo(() => {
+ if (!partners) return []
+ return partners.filter((partner) => {
+ const matchesSearch =
+ !debouncedSearch ||
+ partner.name.toLowerCase().includes(debouncedSearch.toLowerCase()) ||
+ partner.description?.toLowerCase().includes(debouncedSearch.toLowerCase())
+ const matchesType = typeFilter === 'all' || partner.partnerType === typeFilter
+ const matchesActive =
+ activeFilter === 'all' ||
+ (activeFilter === 'active' && partner.isActive) ||
+ (activeFilter === 'inactive' && !partner.isActive)
+ return matchesSearch && matchesType && matchesActive
+ })
+ }, [partners, debouncedSearch, typeFilter, activeFilter])
+
+ if (isLoading) {
return (
-
-
- No partners yet
-
- Start by adding your first partner organization
-
-
-
-
-
-
+
+
+ {/* Toolbar skeleton */}
+
+ {/* Partner cards skeleton */}
+
+ {[...Array(6)].map((_, i) => (
+
+
+
+
+
+ ))}
+
+
- {partners.map((partner) => {
- const VisibilityIcon = visibilityIcons[partner.visibility]
- return (
-
-
-
-
-
-
-
-
{partner.name}
- {!partner.isActive && (
- Inactive
- )}
-
-
-
- {partner.partnerType}
-
-
- {partner.description && (
-
- {partner.description}
-
- )}
-
-
-
- )
- })}
-
- {[1, 2, 3, 4, 5, 6].map((i) => (
-
-
-
-
-
- ))}
-
+ {/* Header */}
Partners
@@ -156,9 +126,134 @@ export default function PartnersPage() {
-
}>
-
-
+ {/* Toolbar */}
+
+
+
+
+
+
+
+
+ All types
+ Sponsor
+ Partner
+ Supporter
+ Media
+ Other
+
+
+
+
+
+
+ All statuses
+ Active
+ Inactive
+
+
+
+
+
+ {/* Results count */}
+ {partners && (
+
+ {filteredPartners.length} of {partners.length} partners
+
+ )}
+
+ {/* Partners Grid */}
+ {filteredPartners.length > 0 ? (
+
+ {filteredPartners.map((partner) => {
+ const VisibilityIcon = visibilityIcons[partner.visibility as keyof typeof visibilityIcons] || Eye
+ return (
+
+
+
+
+
+
+
+
{partner.name}
+ {!partner.isActive && (
+ Inactive
+ )}
+
+
+
+ {partner.partnerType}
+
+
+ {partner.description && (
+
+ {partner.description}
+
+ )}
+
+
+
+ )
+ })}
+
+ ) : partners && partners.length > 0 ? (
+
+
+
+ No partners match your filters
+
+
+
+ ) : (
+
+
+ No partners yet
+
+ Add sponsor and partner organizations to showcase on the platform.
+
+
+
+
+
+ )}
)
}
diff --git a/src/app/(admin)/admin/programs/[id]/apply-settings/page.tsx b/src/app/(admin)/admin/programs/[id]/apply-settings/page.tsx
index f530433..0903790 100644
--- a/src/app/(admin)/admin/programs/[id]/apply-settings/page.tsx
+++ b/src/app/(admin)/admin/programs/[id]/apply-settings/page.tsx
@@ -57,6 +57,7 @@ import {
RotateCcw,
Download,
Upload,
+ ExternalLink,
} from 'lucide-react'
import {
DndContext,
@@ -643,7 +644,7 @@ export default function ApplySettingsPage() {
{program?.name} {program?.year}
/
-
Apply Settings
+
Apply Page
+ {/* View public apply page */}
+ {program?.slug && (
+
+
+
+
+ )}
{/* Template controls */}
{
diff --git a/src/app/(admin)/admin/projects/new/page.tsx b/src/app/(admin)/admin/projects/new/page.tsx
index c67bf7d..bd45e73 100644
--- a/src/app/(admin)/admin/projects/new/page.tsx
+++ b/src/app/(admin)/admin/projects/new/page.tsx
@@ -24,6 +24,8 @@ import {
} from '@/components/ui/select'
import { Skeleton } from '@/components/ui/skeleton'
import { TagInput } from '@/components/shared/tag-input'
+import { CountrySelect } from '@/components/ui/country-select'
+import { PhoneInput } from '@/components/ui/phone-input'
import { toast } from 'sonner'
import {
ArrowLeft,
@@ -31,15 +33,15 @@ import {
Loader2,
AlertCircle,
FolderPlus,
- Plus,
- X,
} from 'lucide-react'
function NewProjectPageContent() {
const router = useRouter()
const searchParams = useSearchParams()
const roundIdParam = searchParams.get('round')
+ const programIdParam = searchParams.get('program')
+ const [selectedProgramId, setSelectedProgramId] = useState(programIdParam || '')
const [selectedRoundId, setSelectedRoundId] = useState(roundIdParam || '')
// Form state
@@ -49,15 +51,25 @@ function NewProjectPageContent() {
const [tags, setTags] = useState([])
const [contactEmail, setContactEmail] = useState('')
const [contactName, setContactName] = useState('')
+ const [contactPhone, setContactPhone] = useState('')
const [country, setCountry] = useState('')
- const [customFields, setCustomFields] = useState<{ key: string; value: string }[]>([])
+ const [city, setCity] = useState('')
+ const [institution, setInstitution] = useState('')
+ const [competitionCategory, setCompetitionCategory] = useState('')
+ const [oceanIssue, setOceanIssue] = useState('')
- // Fetch active programs with rounds
+ // Fetch programs
const { data: programs, isLoading: loadingPrograms } = trpc.program.list.useQuery({
status: 'ACTIVE',
includeRounds: true,
})
+ // Fetch wizard config for selected program (dropdown options)
+ const { data: wizardConfig } = trpc.program.getWizardConfig.useQuery(
+ { programId: selectedProgramId },
+ { enabled: !!selectedProgramId }
+ )
+
// Create mutation
const utils = trpc.useUtils()
const createProject = trpc.project.create.useMutation({
@@ -65,68 +77,46 @@ function NewProjectPageContent() {
toast.success('Project created successfully')
utils.project.list.invalidate()
utils.round.get.invalidate()
- router.push(`/admin/projects?round=${selectedRoundId}`)
+ router.push('/admin/projects')
},
onError: (error) => {
toast.error(error.message)
},
})
- // Get all rounds from programs
- const rounds = programs?.flatMap((p) =>
- (p.rounds || []).map((r) => ({
- ...r,
- programId: p.id,
- programName: `${p.year} Edition`,
- }))
- ) || []
+ // Get rounds for selected program
+ const selectedProgram = programs?.find((p) => p.id === selectedProgramId)
+ const rounds = selectedProgram?.rounds || []
- const selectedRound = rounds.find((r) => r.id === selectedRoundId)
-
- const addCustomField = () => {
- setCustomFields([...customFields, { key: '', value: '' }])
- }
-
- const updateCustomField = (index: number, key: string, value: string) => {
- const newFields = [...customFields]
- newFields[index] = { key, value }
- setCustomFields(newFields)
- }
-
- const removeCustomField = (index: number) => {
- setCustomFields(customFields.filter((_, i) => i !== index))
- }
+ // Get dropdown options from wizard config
+ const categoryOptions = wizardConfig?.competitionCategories || []
+ const oceanIssueOptions = wizardConfig?.oceanIssues || []
const handleSubmit = () => {
if (!title.trim()) {
toast.error('Please enter a project title')
return
}
- if (!selectedRoundId) {
- toast.error('Please select a round')
+ if (!selectedProgramId) {
+ toast.error('Please select a program')
return
}
- // Build metadata
- const metadataJson: Record = {}
- if (contactEmail) metadataJson.contactEmail = contactEmail
- if (contactName) metadataJson.contactName = contactName
- if (country) metadataJson.country = country
-
- // Add custom fields
- customFields.forEach((field) => {
- if (field.key.trim() && field.value.trim()) {
- metadataJson[field.key.trim()] = field.value.trim()
- }
- })
-
createProject.mutate({
- roundId: selectedRoundId,
+ programId: selectedProgramId,
+ roundId: selectedRoundId || undefined,
title: title.trim(),
teamName: teamName.trim() || undefined,
description: description.trim() || undefined,
tags: tags.length > 0 ? tags : undefined,
- metadataJson: Object.keys(metadataJson).length > 0 ? metadataJson : undefined,
+ country: country || undefined,
+ competitionCategory: competitionCategory as 'STARTUP' | 'BUSINESS_CONCEPT' | undefined || undefined,
+ oceanIssue: oceanIssue as 'POLLUTION_REDUCTION' | 'CLIMATE_MITIGATION' | 'TECHNOLOGY_INNOVATION' | 'SUSTAINABLE_SHIPPING' | 'BLUE_CARBON' | 'HABITAT_RESTORATION' | 'COMMUNITY_CAPACITY' | 'SUSTAINABLE_FISHING' | 'CONSUMER_AWARENESS' | 'OCEAN_ACIDIFICATION' | 'OTHER' | undefined || undefined,
+ institution: institution.trim() || undefined,
+ contactPhone: contactPhone.trim() || undefined,
+ contactEmail: contactEmail.trim() || undefined,
+ contactName: contactName.trim() || undefined,
+ city: city.trim() || undefined,
})
}
@@ -156,64 +146,67 @@ function NewProjectPageContent() {
- {/* Round selection */}
- {!selectedRoundId ? (
-
-
- Select Round
-
- Choose the round for this project submission
-
-
-
- {rounds.length === 0 ? (
-
-
-
No Active Rounds
-
- Create a round first before adding projects
-
-
-
-
+ {/* Program & Round selection */}
+
+
+ Program & Round
+
+ Select the program for this project. Round assignment is optional.
+
+
+
+ {!programs || programs.length === 0 ? (
+
+
+
No Active Programs
+
+ Create a program first before adding projects
+
+
+
+
Program *
+
{
+ setSelectedProgramId(v)
+ setSelectedRoundId('') // Reset round on program change
+ }}>
-
- {rounds.map((round) => (
-
- {round.programName} - {round.name}
+ {programs.map((p) => (
+
+ {p.name} {p.year}
))}
-
- )}
-
-
- ) : (
- <>
- {/* Selected round info */}
-
-
-
-
{selectedRound?.programName}
-
{selectedRound?.name}
setSelectedRoundId('')}
- >
- Change Round
-
-
-
+
+ Round (optional)
+ setSelectedRoundId(v === '__none__' ? '' : v)} disabled={!selectedProgramId}>
+
+
+
+ No round assigned
+ {rounds.map((r: { id: string; name: string }) => (
+
+ {r.name}
+
+ ))}
+
+
+
+
+ )}
+
+
+
+ {selectedProgramId && (
+ <>
{/* Basic Info */}
@@ -265,6 +258,52 @@ function NewProjectPageContent() {
maxTags={10}
/>
+
+ {categoryOptions.length > 0 && (
+
+ Competition Category
+
+
+
+
+ {categoryOptions.map((opt: { value: string; label: string }) => (
+
+ {opt.label}
+
+ ))}
+
+
+
+ )}
+
+ {oceanIssueOptions.length > 0 && (
+
+ Ocean Issue
+
+
+
+
+ {oceanIssueOptions.map((opt: { value: string; label: string }) => (
+
+ {opt.label}
+
+ ))}
+
+
+
+ )}
+
+
+ Institution
+
@@ -299,11 +338,28 @@ function NewProjectPageContent() {
-
Country
-
Contact Phone
+
+
+ Country
+ setCountry(e.target.value)}
+ onChange={setCountry}
+ />
+
+
+
+ City
+
@@ -311,65 +367,6 @@ function NewProjectPageContent() {
- {/* Custom Fields */}
-
-
-
- Additional Information
-
-
-
-
- Add custom metadata fields for this project
-
-
-
- {customFields.length === 0 ? (
-
- No additional fields. Click "Add Field" to add custom information.
-
- ) : (
-
- )}
-
-
-
{/* Actions */}
@@ -377,7 +374,7 @@ function NewProjectPageContent() {
{createProject.isPending ? (
('')
@@ -420,6 +426,19 @@ export default function ProjectsPage() {
? data.projects.some((p) => selectedIds.has(p.id)) && !allVisibleSelected
: false
+ const assignToRound = trpc.projectPool.assignToRound.useMutation({
+ onSuccess: () => {
+ toast.success('Project assigned to round')
+ utils.project.list.invalidate()
+ setAssignDialogOpen(false)
+ setProjectToAssign(null)
+ setAssignRoundId('')
+ },
+ onError: (error) => {
+ toast.error(error.message || 'Failed to assign project')
+ },
+ })
+
const deleteProject = trpc.project.delete.useMutation({
onSuccess: () => {
toast.success('Project deleted successfully')
@@ -448,6 +467,12 @@ export default function ProjectsPage() {
+
+
setAiTagDialogOpen(true)}>
-
{project.round?.name ?? '-'}
+ {project.round ? (
+
{project.round.name}
+ ) : (
+
+ Unassigned
+
+ )}
{project.status === 'REJECTED' && (
Eliminated
@@ -620,11 +651,7 @@ export default function ProjectsPage() {
-
- {(project.status ?? 'SUBMITTED').replace('_', ' ')}
-
+
@@ -647,6 +674,18 @@ export default function ProjectsPage() {
Edit
+ {!project.round && (
+ {
+ e.stopPropagation()
+ setProjectToAssign({ id: project.id, title: project.title })
+ setAssignDialogOpen(true)
+ }}
+ >
+
+ )}
{project.title}
-
- {(project.status ?? 'SUBMITTED').replace('_', ' ')}
-
+ />
{project.teamName}
@@ -857,6 +892,59 @@ export default function ProjectsPage() {
+ {/* Assign to Round Dialog */}
+
{
+ setAssignDialogOpen(open)
+ if (!open) { setProjectToAssign(null); setAssignRoundId('') }
+ }}>
+
+
+ Assign to Round
+
+ Assign "{projectToAssign?.title}" to a round.
+
+
+
+
+ Select Round
+
+
+
+
+ {programs?.flatMap((p) =>
+ (p.rounds || []).map((r: { id: string; name: string }) => (
+
+ {p.name} {p.year} - {r.name}
+
+ ))
+ )}
+
+
+
+
+ setAssignDialogOpen(false)}>
+ Cancel
+
+ {
+ if (projectToAssign && assignRoundId) {
+ assignToRound.mutate({
+ projectIds: [projectToAssign.id],
+ roundId: assignRoundId,
+ })
+ }
+ }}
+ disabled={!assignRoundId || assignToRound.isPending}
+ >
+ {assignToRound.isPending &&
+
+
+
+
{/* AI Tagging Dialog */}
diff --git a/src/app/(admin)/admin/rounds/[id]/edit/page.tsx b/src/app/(admin)/admin/rounds/[id]/edit/page.tsx
index 77b6468..8dc4dab 100644
--- a/src/app/(admin)/admin/rounds/[id]/edit/page.tsx
+++ b/src/app/(admin)/admin/rounds/[id]/edit/page.tsx
@@ -32,7 +32,17 @@ import {
type Criterion,
} from '@/components/forms/evaluation-form-builder'
import { RoundTypeSettings } from '@/components/forms/round-type-settings'
-import { ArrowLeft, Loader2, AlertCircle, AlertTriangle, Bell, GitCompare, MessageSquare, FileText, Calendar } from 'lucide-react'
+import { ArrowLeft, Loader2, AlertCircle, AlertTriangle, Bell, GitCompare, MessageSquare, FileText, Calendar, LayoutTemplate } from 'lucide-react'
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from '@/components/ui/dialog'
+import { toast } from 'sonner'
import { Switch } from '@/components/ui/switch'
import { Slider } from '@/components/ui/slider'
import { Label } from '@/components/ui/label'
@@ -113,9 +123,23 @@ function EditRoundContent({ roundId }: { roundId: string }) {
roundId,
})
+ const [saveTemplateOpen, setSaveTemplateOpen] = useState(false)
+ const [templateName, setTemplateName] = useState('')
+
const utils = trpc.useUtils()
// Mutations
+ const saveAsTemplate = trpc.roundTemplate.create.useMutation({
+ onSuccess: () => {
+ toast.success('Round saved as template')
+ setSaveTemplateOpen(false)
+ setTemplateName('')
+ },
+ onError: (error) => {
+ toast.error(error.message)
+ },
+ })
+
const updateRound = trpc.round.update.useMutation({
onSuccess: () => {
// Invalidate cache to ensure fresh data
@@ -825,6 +849,58 @@ function EditRoundContent({ roundId }: { roundId: string }) {
{/* Actions */}
+
+
+
+
+
+
+
+ Save as Template
+
+ Save the current round configuration as a reusable template.
+
+
+
+
+ Template Name
+
+
+ setSaveTemplateOpen(false)}
+ >
+ Cancel
+
+ {
+ saveAsTemplate.mutate({
+ name: templateName.trim(),
+ roundType: roundType,
+ criteriaJson: criteria,
+ settingsJson: roundSettings,
+ programId: round?.programId,
+ })
+ }}
+ >
+ {saveAsTemplate.isPending && (
+
+
+
+
diff --git a/src/app/(admin)/admin/rounds/[id]/filtering/results/page.tsx b/src/app/(admin)/admin/rounds/[id]/filtering/results/page.tsx
index 7c6608f..cf4c3da 100644
--- a/src/app/(admin)/admin/rounds/[id]/filtering/results/page.tsx
+++ b/src/app/(admin)/admin/rounds/[id]/filtering/results/page.tsx
@@ -1,6 +1,6 @@
'use client'
-import { use, useState } from 'react'
+import { use, useState, useCallback } from 'react'
import Link from 'next/link'
import { trpc } from '@/lib/trpc/client'
import { Button } from '@/components/ui/button'
@@ -43,6 +43,7 @@ import {
CollapsibleTrigger,
} from '@/components/ui/collapsible'
import { Pagination } from '@/components/shared/pagination'
+import { CsvExportDialog } from '@/components/shared/csv-export-dialog'
import { toast } from 'sonner'
import {
ArrowLeft,
@@ -114,37 +115,17 @@ export default function FilteringResultsPage({
{ roundId },
{ enabled: false }
)
+ const [showExportDialog, setShowExportDialog] = useState(false)
- const handleExport = async () => {
- const result = await exportResults.refetch()
- if (result.data) {
- const { data: rows, columns } = result.data
-
- const csvContent = [
- columns.join(','),
- ...rows.map((row) =>
- columns
- .map((col) => {
- const value = row[col as keyof typeof row]
- if (typeof value === 'string' && (value.includes(',') || value.includes('"'))) {
- return `"${value.replace(/"/g, '""')}"`
- }
- return value ?? ''
- })
- .join(',')
- ),
- ].join('\n')
-
- const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
- const url = URL.createObjectURL(blob)
- const link = document.createElement('a')
- link.href = url
- link.download = `filtering-results-${new Date().toISOString().split('T')[0]}.csv`
- link.click()
- URL.revokeObjectURL(url)
- }
+ const handleExport = () => {
+ setShowExportDialog(true)
}
+ const handleRequestExportData = useCallback(async () => {
+ const result = await exportResults.refetch()
+ return result.data ?? undefined
+ }, [exportResults])
+
const toggleRow = (id: string) => {
const next = new Set(expandedRows)
if (next.has(id)) next.delete(id)
@@ -601,6 +582,16 @@ export default function FilteringResultsPage({
+
+ {/* CSV Export Dialog with Column Selection */}
+
-
-
+
+
Check your email
@@ -105,22 +113,27 @@ export default function LoginPage() {
-
- Click the link in the email to sign in. The link will expire in 15
- minutes.
-
-
+
+
Click the link in the email to sign in. The link will expire in 15 minutes.
+
If you don't see it, check your spam folder.
+
+
{
setIsSent(false)
- setEmail('')
- setPassword('')
+ setError(null)
}}
>
- Use a different email
+ Send to a different email
+
+ Having trouble?{' '}
+
+ Contact support
+
+
diff --git a/src/app/(auth)/onboarding/page.tsx b/src/app/(auth)/onboarding/page.tsx
index 4678a86..1c2199a 100644
--- a/src/app/(auth)/onboarding/page.tsx
+++ b/src/app/(auth)/onboarding/page.tsx
@@ -22,6 +22,7 @@ import {
SelectTrigger,
SelectValue,
} from '@/components/ui/select'
+import { cn } from '@/lib/utils'
import { toast } from 'sonner'
import { ExpertiseSelect } from '@/components/shared/expertise-select'
import { AvatarUpload } from '@/components/shared/avatar-upload'
@@ -195,6 +196,30 @@ export default function OnboardingPage() {
+ {steps.slice(0, -1).map((s, i) => {
+ const labels: Record
= {
+ name: 'Name',
+ photo: 'Photo',
+ country: 'Country',
+ bio: 'About',
+ phone: 'Phone',
+ tags: 'Expertise',
+ preferences: 'Settings',
+ }
+ return (
+
+
+ {labels[s] || s}
+
+
+ )
+ })}
+
Step {currentIndex + 1} of {totalVisibleSteps}
@@ -530,10 +555,12 @@ export default function OnboardingPage() {
{/* Step 7: Complete */}
{step === 'complete' && (
-
+
-
Welcome, {name}!
+
+ Welcome, {name}!
+
Your profile is all set up. You'll be redirected to your dashboard
shortly.
diff --git a/src/app/(jury)/jury/assignments/page.tsx b/src/app/(jury)/jury/assignments/page.tsx
index 8f453dd..3d0c0e0 100644
--- a/src/app/(jury)/jury/assignments/page.tsx
+++ b/src/app/(jury)/jury/assignments/page.tsx
@@ -30,7 +30,7 @@ import {
AlertCircle,
} from 'lucide-react'
import { Progress } from '@/components/ui/progress'
-import { formatDate, truncate } from '@/lib/utils'
+import { cn, formatDate, truncate } from '@/lib/utils'
function getCriteriaProgress(evaluation: {
criterionScoresJson: unknown
@@ -47,6 +47,17 @@ function getCriteriaProgress(evaluation: {
return { completed, total }
}
+function getDeadlineUrgency(deadline: Date | null): { label: string; className: string } | null {
+ if (!deadline) return null
+ const now = new Date()
+ const diff = deadline.getTime() - now.getTime()
+ const daysLeft = Math.ceil(diff / (1000 * 60 * 60 * 24))
+ if (daysLeft < 0) return { label: 'Overdue', className: 'text-muted-foreground' }
+ if (daysLeft <= 2) return { label: `${daysLeft}d left`, className: 'text-red-600 font-semibold' }
+ if (daysLeft <= 7) return { label: `${daysLeft}d left`, className: 'text-amber-600 font-medium' }
+ return { label: `${daysLeft}d left`, className: 'text-muted-foreground' }
+}
+
async function AssignmentsContent({
roundId,
}: {
@@ -134,8 +145,46 @@ async function AssignmentsContent({
const now = new Date()
+ const completedCount = assignments.filter(a => a.evaluation?.status === 'SUBMITTED').length
+ const inProgressCount = assignments.filter(a => a.evaluation?.status === 'DRAFT').length
+ const pendingCount = assignments.filter(a => !a.evaluation).length
+ const overallProgress = assignments.length > 0 ? Math.round((completedCount / assignments.length) * 100) : 0
+
return (
+ {/* Progress Summary */}
+
+
+
+
+
+
+
{completedCount}
+
Completed
+
+
+
+
+
+
{inProgressCount}
+
In Progress
+
+
+
+
+
+
{pendingCount}
+
Pending
+
+
+
+
+
{overallProgress}% complete
+
+
+
+
{/* Desktop table view */}
@@ -185,15 +234,22 @@ async function AssignmentsContent({
{assignment.round.votingEndAt ? (
-
- {formatDate(assignment.round.votingEndAt)}
-
+
+
+ {formatDate(assignment.round.votingEndAt)}
+
+ {(() => {
+ const urgency = getDeadlineUrgency(assignment.round.votingEndAt ? new Date(assignment.round.votingEndAt) : null)
+ if (!urgency || isCompleted) return null
+ return
{urgency.label}
+ })()}
+
No deadline
)}
@@ -309,7 +365,14 @@ async function AssignmentsContent({
{assignment.round.votingEndAt && (
Deadline
-
{formatDate(assignment.round.votingEndAt)}
+
+
{formatDate(assignment.round.votingEndAt)}
+ {(() => {
+ const urgency = getDeadlineUrgency(assignment.round.votingEndAt ? new Date(assignment.round.votingEndAt) : null)
+ if (!urgency || isCompleted) return null
+ return
{urgency.label}
+ })()}
+
)}
{isDraft && (() => {
diff --git a/src/app/(jury)/jury/compare/page.tsx b/src/app/(jury)/jury/compare/page.tsx
index fce154f..ec006f3 100644
--- a/src/app/(jury)/jury/compare/page.tsx
+++ b/src/app/(jury)/jury/compare/page.tsx
@@ -31,6 +31,7 @@ import {
SelectValue,
} from '@/components/ui/select'
import {
+ AlertCircle,
ArrowLeft,
GitCompare,
MapPin,
@@ -354,6 +355,44 @@ export default function CompareProjectsPage() {
scales={data.scales}
/>
)}
+
+ {/* Divergence Summary */}
+ {data.criteria && (() => {
+ const scCriteria = data.criteria.filter((c) => c.type !== 'section_header')
+ const getMaxForCriterion = (criterion: Criterion) => {
+ if (criterion.scale && data.scales && data.scales[criterion.scale]) return data.scales[criterion.scale].max
+ return 10
+ }
+ const getScoreForItem = (item: ComparisonItem, criterionId: string): number | null => {
+ const scores = (item.evaluation?.criterionScoresJson || item.evaluation?.scores) as Record | undefined
+ if (!scores) return null
+ const val = scores[criterionId]
+ if (val == null) return null
+ const num = Number(val)
+ return isNaN(num) ? null : num
+ }
+ const divergentCount = scCriteria.filter(criterion => {
+ const scores = data.items.map(item => getScoreForItem(item, criterion.id)).filter((s): s is number => s !== null)
+ if (scores.length < 2) return false
+ const max = Math.max(...scores)
+ const min = Math.min(...scores)
+ const range = getMaxForCriterion(criterion)
+ return range > 0 && (max - min) / range >= 0.4
+ }).length
+
+ if (divergentCount === 0) return null
+
+ return (
+
+
+
+
+ {divergentCount} criterion{divergentCount > 1 ? 'a' : ''} with significant score divergence ({'>'}40% range difference)
+
+
+
+
-
+
{criterion.label}
{criterion.weight && criterion.weight > 1 && (
(x{criterion.weight})
)}
+ {isDivergent && Divergent }
{items.map((item, idx) => {
diff --git a/src/app/(jury)/jury/page.tsx b/src/app/(jury)/jury/page.tsx
index 9091542..7774205 100644
--- a/src/app/(jury)/jury/page.tsx
+++ b/src/app/(jury)/jury/page.tsx
@@ -244,7 +244,7 @@ async function JuryDashboardContent() {
{/* Stats */}
{stats.map((stat) => (
-
+
@@ -432,7 +432,7 @@ async function JuryDashboardContent() {
diff --git a/src/app/(mentor)/mentor/page.tsx b/src/app/(mentor)/mentor/page.tsx
index efa0208..a5e22bf 100644
--- a/src/app/(mentor)/mentor/page.tsx
+++ b/src/app/(mentor)/mentor/page.tsx
@@ -1,5 +1,6 @@
'use client'
+import { useState, useMemo } from 'react'
import Link from 'next/link'
import type { Route } from 'next'
import { trpc } from '@/lib/trpc/client'
@@ -15,6 +16,14 @@ import { Badge } from '@/components/ui/badge'
import { Skeleton } from '@/components/ui/skeleton'
import { Progress } from '@/components/ui/progress'
import { Avatar, AvatarFallback } from '@/components/ui/avatar'
+import { Input } from '@/components/ui/input'
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@/components/ui/select'
import {
Users,
Briefcase,
@@ -27,6 +36,7 @@ import {
CheckCircle2,
Circle,
Clock,
+ Search,
} from 'lucide-react'
import { formatDateOnly } from '@/lib/utils'
@@ -72,15 +82,27 @@ function DashboardSkeleton() {
export default function MentorDashboard() {
const { data: assignments, isLoading } = trpc.mentor.getMyProjects.useQuery()
-
- if (isLoading) {
- return
- }
+ const [search, setSearch] = useState('')
+ const [statusFilter, setStatusFilter] = useState('all')
const projects = assignments || []
const completedCount = projects.filter((a) => a.completionStatus === 'completed').length
const inProgressCount = projects.filter((a) => a.completionStatus === 'in_progress').length
+ const filteredProjects = useMemo(() => {
+ return projects.filter(a => {
+ const matchesSearch = !search ||
+ a.project.title.toLowerCase().includes(search.toLowerCase()) ||
+ a.project.teamName?.toLowerCase().includes(search.toLowerCase())
+ const matchesStatus = statusFilter === 'all' || a.completionStatus === statusFilter
+ return matchesSearch && matchesStatus
+ })
+ }, [projects, search, statusFilter])
+
+ if (isLoading) {
+ return
+ }
+
return (
{/* Header */}
@@ -154,10 +176,46 @@ export default function MentorDashboard() {
+ {/* Quick Actions */}
+
+
+
+
+
{/* Projects List */}
Your Mentees
+ {/* Search and Filter */}
+ {projects.length > 0 && (
+
+
+
+
+
+
+
+ All statuses
+ In Progress
+ Completed
+ Paused
+
+
+
+ )}
+
{projects.length === 0 ? (
@@ -171,9 +229,26 @@ export default function MentorDashboard() {
+ ) : filteredProjects.length === 0 ? (
+
+
+
+ No projects match your search criteria
+
+ { setSearch(''); setStatusFilter('all') }}
+ >
+ Clear filters
+
+
+
) : (
- {projects.map((assignment) => {
+ {filteredProjects.map((assignment) => {
const project = assignment.project
const teamLead = project.teamMembers?.find(
(m) => m.role === 'LEAD'
diff --git a/src/app/(observer)/observer/page.tsx b/src/app/(observer)/observer/page.tsx
index 67cae03..eb64891 100644
--- a/src/app/(observer)/observer/page.tsx
+++ b/src/app/(observer)/observer/page.tsx
@@ -21,8 +21,9 @@ import {
Users,
CheckCircle2,
Eye,
+ BarChart3,
} from 'lucide-react'
-import { formatDateOnly } from '@/lib/utils'
+import { cn, formatDateOnly } from '@/lib/utils'
async function ObserverDashboardContent() {
const [
@@ -32,6 +33,7 @@ async function ObserverDashboardContent() {
jurorCount,
evaluationStats,
recentRounds,
+ evaluationScores,
] = await Promise.all([
prisma.program.count(),
prisma.round.count({ where: { status: 'ACTIVE' } }),
@@ -52,8 +54,17 @@ async function ObserverDashboardContent() {
assignments: true,
},
},
+ assignments: {
+ select: {
+ evaluation: { select: { status: true } },
+ },
+ },
},
}),
+ prisma.evaluation.findMany({
+ where: { status: 'SUBMITTED', globalScore: { not: null } },
+ select: { globalScore: true },
+ }),
])
const submittedCount =
@@ -64,6 +75,21 @@ async function ObserverDashboardContent() {
const completionRate =
totalEvaluations > 0 ? (submittedCount / totalEvaluations) * 100 : 0
+ // Score distribution computation
+ const scores = evaluationScores.map(e => e.globalScore!).filter(s => s != null)
+ const buckets = [
+ { label: '9-10', min: 9, max: 10, color: 'bg-green-500' },
+ { label: '7-8', min: 7, max: 8.99, color: 'bg-emerald-400' },
+ { label: '5-6', min: 5, max: 6.99, color: 'bg-amber-400' },
+ { label: '3-4', min: 3, max: 4.99, color: 'bg-orange-400' },
+ { label: '1-2', min: 1, max: 2.99, color: 'bg-red-400' },
+ ]
+ const maxCount = Math.max(...buckets.map(b => scores.filter(s => s >= b.min && s <= b.max).length), 1)
+ const scoreDistribution = buckets.map(b => {
+ const count = scores.filter(s => s >= b.min && s <= b.max).length
+ return { ...b, count, percentage: (count / maxCount) * 100 }
+ })
+
return (
<>
{/* Observer Notice */}
@@ -88,7 +114,7 @@ async function ObserverDashboardContent() {
{/* Stats Grid */}
-
+
Programs
-
+
Projects
-
+
Jury Members
-
+
Evaluations
@@ -192,6 +218,74 @@ async function ObserverDashboardContent() {
)}
+
+ {/* Score Distribution */}
+
+
+ Score Distribution
+ Distribution of global scores across all evaluations
+
+
+ {scoreDistribution.length === 0 ? (
+
+
+
No completed evaluations yet
+
+ {scoreDistribution.map((bucket) => (
+
+
{bucket.label}
+
+
{bucket.count}
+
+ ))}
+
+
+
+ {/* Jury Completion by Round */}
+
+
+ Jury Completion by Round
+ Evaluation completion rate per round
+
+
+ {recentRounds.length === 0 ? (
+
+
+
No rounds available
+
+ {recentRounds.map((round) => {
+ const submittedInRound = round.assignments.filter(a => a.evaluation?.status === 'SUBMITTED').length
+ const totalAssignments = round.assignments.length
+ const percent = totalAssignments > 0 ? Math.round((submittedInRound / totalAssignments) * 100) : 0
+ return (
+
+
+
+ {round.name}
+ {round.status}
+
+
{percent}%
+
+
+
{submittedInRound} of {totalAssignments} evaluations submitted
+
+ )
+ })}
+
+
)
}
diff --git a/src/components/admin/members-content.tsx b/src/components/admin/members-content.tsx
index e61a014..f247cf2 100644
--- a/src/components/admin/members-content.tsx
+++ b/src/components/admin/members-content.tsx
@@ -28,7 +28,7 @@ import { UserAvatar } from '@/components/shared/user-avatar'
import { UserActions, UserMobileActions } from '@/components/admin/user-actions'
import { Pagination } from '@/components/shared/pagination'
import { Plus, Users, Search } from 'lucide-react'
-import { formatDate } from '@/lib/utils'
+import { formatRelativeTime } from '@/lib/utils'
type RoleValue = 'SUPER_ADMIN' | 'PROGRAM_ADMIN' | 'JURY_MEMBER' | 'MENTOR' | 'OBSERVER'
type TabKey = 'all' | 'jury' | 'mentors' | 'observers' | 'admins'
@@ -221,7 +221,9 @@ export function MembersContent() {
{user.lastLoginAt ? (
- formatDate(user.lastLoginAt)
+
+ {formatRelativeTime(user.lastLoginAt)}
+
) : (
Never
)}
@@ -280,6 +282,16 @@ export function MembersContent() {
: `${(user as unknown as { _count: { mentorAssignments: number; assignments: number } })._count.assignments} assigned`}
+
+ Last Login
+
+ {user.lastLoginAt ? (
+ formatRelativeTime(user.lastLoginAt)
+ ) : (
+ Never
+ )}
+
+
{user.expertiseTags && user.expertiseTags.length > 0 && (
{user.expertiseTags.map((tag) => (
diff --git a/src/components/forms/evaluation-form.tsx b/src/components/forms/evaluation-form.tsx
index 075ca8d..bb0fd1f 100644
--- a/src/components/forms/evaluation-form.tsx
+++ b/src/components/forms/evaluation-form.tsx
@@ -644,7 +644,35 @@ export function EvaluationForm({
{/* Bottom submit button for mobile */}
{!isReadOnly && (
-
+
+ {/* Autosave Status */}
+
+ {autosaveStatus === 'saved' && (
+
+
+ )}
+ {autosaveStatus === 'saving' && (
+
+
+ )}
+ {autosaveStatus === 'error' && (
+
+
+ )}
+ {autosaveStatus === 'idle' && isDirty && (
+
+
+ )}
+
+
)}
diff --git a/src/components/layouts/admin-sidebar.tsx b/src/components/layouts/admin-sidebar.tsx
index 1ae830d..308db07 100644
--- a/src/components/layouts/admin-sidebar.tsx
+++ b/src/components/layouts/admin-sidebar.tsx
@@ -32,7 +32,6 @@ import {
History,
Trophy,
User,
- LayoutTemplate,
MessageSquare,
Wand2,
} from 'lucide-react'
@@ -51,80 +50,85 @@ interface AdminSidebarProps {
}
}
+type NavItem = {
+ name: string
+ href: string
+ icon: typeof LayoutDashboard
+ activeMatch?: string // pathname must include this to be active
+ activeExclude?: string // pathname must NOT include this to be active
+}
+
// Main navigation - scoped to selected edition
-const navigation = [
+const navigation: NavItem[] = [
{
name: 'Dashboard',
- href: '/admin' as const,
+ href: '/admin',
icon: LayoutDashboard,
},
{
name: 'Rounds',
- href: '/admin/rounds' as const,
+ href: '/admin/rounds',
icon: CircleDot,
},
- {
- name: 'Templates',
- href: '/admin/round-templates' as const,
- icon: LayoutTemplate,
- },
{
name: 'Awards',
- href: '/admin/awards' as const,
+ href: '/admin/awards',
icon: Trophy,
},
{
name: 'Projects',
- href: '/admin/projects' as const,
+ href: '/admin/projects',
icon: ClipboardList,
},
{
name: 'Members',
- href: '/admin/members' as const,
+ href: '/admin/members',
icon: Users,
},
{
name: 'Reports',
- href: '/admin/reports' as const,
+ href: '/admin/reports',
icon: FileSpreadsheet,
},
{
name: 'Learning Hub',
- href: '/admin/learning' as const,
+ href: '/admin/learning',
icon: BookOpen,
},
{
name: 'Messages',
- href: '/admin/messages' as const,
+ href: '/admin/messages',
icon: MessageSquare,
},
{
name: 'Partners',
- href: '/admin/partners' as const,
+ href: '/admin/partners',
icon: Handshake,
},
]
// Admin-only navigation
-const adminNavigation = [
+const adminNavigation: NavItem[] = [
{
name: 'Manage Editions',
- href: '/admin/programs' as const,
+ href: '/admin/programs',
icon: FolderKanban,
+ activeExclude: 'apply-settings',
},
{
- name: 'Apply Settings',
- href: '/admin/programs' as const,
+ name: 'Apply Page',
+ href: '/admin/programs',
icon: Wand2,
+ activeMatch: 'apply-settings',
},
{
name: 'Audit Log',
- href: '/admin/audit' as const,
+ href: '/admin/audit',
icon: History,
},
{
name: 'Settings',
- href: '/admin/settings' as const,
+ href: '/admin/settings',
icon: Settings,
},
]
@@ -232,11 +236,16 @@ export function AdminSidebar({ user }: AdminSidebarProps) {
Administration
{adminNavigation.map((item) => {
- const isActive = pathname.startsWith(item.href)
+ let isActive = pathname.startsWith(item.href)
+ if (item.activeMatch) {
+ isActive = pathname.includes(item.activeMatch)
+ } else if (item.activeExclude && pathname.includes(item.activeExclude)) {
+ isActive = false
+ }
return (
setIsMobileMenuOpen(false)}
className={cn(
'group flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm font-medium transition-all duration-150',
diff --git a/src/components/shared/animated-container.tsx b/src/components/shared/animated-container.tsx
new file mode 100644
index 0000000..472ea3d
--- /dev/null
+++ b/src/components/shared/animated-container.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import { motion } from 'motion/react'
+import { type ReactNode } from 'react'
+
+export function AnimatedCard({ children, index = 0 }: { children: ReactNode; index?: number }) {
+ return (
+
+ {children}
+
+ )
+}
+
+export function AnimatedList({ children }: { children: ReactNode }) {
+ return (
+
+ {children}
+
+ )
+}
diff --git a/src/components/shared/csv-export-dialog.tsx b/src/components/shared/csv-export-dialog.tsx
new file mode 100644
index 0000000..a22f384
--- /dev/null
+++ b/src/components/shared/csv-export-dialog.tsx
@@ -0,0 +1,212 @@
+'use client'
+
+import { useState, useEffect, useCallback } from 'react'
+import { Button } from '@/components/ui/button'
+import { Label } from '@/components/ui/label'
+import { Checkbox } from '@/components/ui/checkbox'
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@/components/ui/dialog'
+import { Download, Loader2 } from 'lucide-react'
+
+/**
+ * Converts a camelCase or snake_case column name to Title Case.
+ * e.g. "projectTitle" -> "Project Title", "ai_meetsCriteria" -> "Ai Meets Criteria"
+ */
+function formatColumnName(col: string): string {
+ // Replace underscores with spaces
+ let result = col.replace(/_/g, ' ')
+ // Insert space before uppercase letters (camelCase -> spaced)
+ result = result.replace(/([a-z])([A-Z])/g, '$1 $2')
+ // Capitalize first letter of each word
+ return result
+ .split(' ')
+ .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+ .join(' ')
+}
+
+type ExportData = {
+ data: Record
[]
+ columns: string[]
+}
+
+type CsvExportDialogProps = {
+ open: boolean
+ onOpenChange: (open: boolean) => void
+ exportData: ExportData | undefined
+ isLoading: boolean
+ filename: string
+ onRequestData: () => Promise
+}
+
+export function CsvExportDialog({
+ open,
+ onOpenChange,
+ exportData,
+ isLoading,
+ filename,
+ onRequestData,
+}: CsvExportDialogProps) {
+ const [selectedColumns, setSelectedColumns] = useState>(new Set())
+ const [dataLoaded, setDataLoaded] = useState(false)
+
+ // When dialog opens, fetch data if not already loaded
+ useEffect(() => {
+ if (open && !dataLoaded) {
+ onRequestData().then((result) => {
+ if (result?.columns) {
+ setSelectedColumns(new Set(result.columns))
+ }
+ setDataLoaded(true)
+ })
+ }
+ }, [open, dataLoaded, onRequestData])
+
+ // Sync selected columns when export data changes
+ useEffect(() => {
+ if (exportData?.columns) {
+ setSelectedColumns(new Set(exportData.columns))
+ }
+ }, [exportData])
+
+ // Reset state when dialog closes
+ useEffect(() => {
+ if (!open) {
+ setDataLoaded(false)
+ }
+ }, [open])
+
+ const toggleColumn = (col: string, checked: boolean) => {
+ const next = new Set(selectedColumns)
+ if (checked) {
+ next.add(col)
+ } else {
+ next.delete(col)
+ }
+ setSelectedColumns(next)
+ }
+
+ const toggleAll = () => {
+ if (!exportData) return
+ if (selectedColumns.size === exportData.columns.length) {
+ setSelectedColumns(new Set())
+ } else {
+ setSelectedColumns(new Set(exportData.columns))
+ }
+ }
+
+ const handleDownload = () => {
+ if (!exportData) return
+
+ const columnsArray = exportData.columns.filter((col) => selectedColumns.has(col))
+
+ // Build CSV header with formatted names
+ const csvHeader = columnsArray.map((col) => {
+ const formatted = formatColumnName(col)
+ // Escape quotes in header
+ if (formatted.includes(',') || formatted.includes('"')) {
+ return `"${formatted.replace(/"/g, '""')}"`
+ }
+ return formatted
+ })
+
+ const csvContent = [
+ csvHeader.join(','),
+ ...exportData.data.map((row) =>
+ columnsArray
+ .map((col) => {
+ const value = row[col]
+ if (value === null || value === undefined) return ''
+ const str = String(value)
+ if (str.includes(',') || str.includes('"') || str.includes('\n')) {
+ return `"${str.replace(/"/g, '""')}"`
+ }
+ return str
+ })
+ .join(',')
+ ),
+ ].join('\n')
+
+ const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
+ const url = URL.createObjectURL(blob)
+ const link = document.createElement('a')
+ link.href = url
+ link.download = `${filename}-${new Date().toISOString().split('T')[0]}.csv`
+ link.click()
+ URL.revokeObjectURL(url)
+ onOpenChange(false)
+ }
+
+ const allSelected = exportData ? selectedColumns.size === exportData.columns.length : false
+ const noneSelected = selectedColumns.size === 0
+
+ return (
+
+
+
+ Export CSV
+
+ Select which columns to include in the export
+
+
+
+ {isLoading ? (
+
+ Loading data...
+
+ ) : exportData ? (
+
+
+
+ {selectedColumns.size} of {exportData.columns.length} columns selected
+
+
+ {allSelected ? 'Deselect all' : 'Select all'}
+
+
+
+ {exportData.columns.map((col) => (
+
+ toggleColumn(col, !!checked)}
+ />
+
+ {formatColumnName(col)}
+
+
+ ))}
+
+
+ {exportData.data.length} row{exportData.data.length !== 1 ? 's' : ''} will be exported
+
+
+ No data available for export.
+
+ )}
+
+
+ onOpenChange(false)}>
+ Cancel
+
+
+
+
+
+
+ )
+}
diff --git a/src/components/shared/file-viewer.tsx b/src/components/shared/file-viewer.tsx
index ddf559d..8e72b7c 100644
--- a/src/components/shared/file-viewer.tsx
+++ b/src/components/shared/file-viewer.tsx
@@ -30,6 +30,21 @@ import {
import { cn } from '@/lib/utils'
import { toast } from 'sonner'
+const OFFICE_MIME_TYPES = [
+ 'application/vnd.openxmlformats-officedocument.presentationml.presentation', // .pptx
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // .docx
+ 'application/vnd.ms-powerpoint', // .ppt
+ 'application/msword', // .doc
+]
+
+const OFFICE_EXTENSIONS = ['.pptx', '.ppt', '.docx', '.doc']
+
+function isOfficeFile(mimeType: string, fileName: string): boolean {
+ if (OFFICE_MIME_TYPES.includes(mimeType)) return true
+ const ext = fileName.toLowerCase().slice(fileName.lastIndexOf('.'))
+ return OFFICE_EXTENSIONS.includes(ext)
+}
+
interface ProjectFile {
id: string
fileType: 'EXEC_SUMMARY' | 'PRESENTATION' | 'VIDEO' | 'OTHER' | 'BUSINESS_PLAN' | 'VIDEO_PITCH' | 'SUPPORTING_DOC'
@@ -210,7 +225,8 @@ function FileItem({ file }: { file: ProjectFile }) {
const canPreview =
file.mimeType.startsWith('video/') ||
file.mimeType === 'application/pdf' ||
- file.mimeType.startsWith('image/')
+ file.mimeType.startsWith('image/') ||
+ isOfficeFile(file.mimeType, file.fileName)
return (
@@ -264,6 +280,7 @@ function FileItem({ file }: { file: ProjectFile }) {
)}
)}
+
@@ -462,6 +479,45 @@ function BulkDownloadButton({ projectId, fileIds }: { projectId: string; fileIds
)
}
+function FileOpenButton({ file }: { file: ProjectFile }) {
+ const [loading, setLoading] = useState(false)
+
+ const { refetch } = trpc.file.getDownloadUrl.useQuery(
+ { bucket: file.bucket, objectKey: file.objectKey },
+ { enabled: false }
+ )
+
+ const handleOpen = async () => {
+ setLoading(true)
+ try {
+ const result = await refetch()
+ if (result.data?.url) {
+ window.open(result.data.url, '_blank')
+ }
+ } catch (error) {
+ console.error('Failed to get URL:', error)
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ return (
+
+ {loading ? (
+
+ )
+}
+
function FileDownloadButton({ file }: { file: ProjectFile }) {
const [downloading, setDownloading] = useState(false)
@@ -475,8 +531,14 @@ function FileDownloadButton({ file }: { file: ProjectFile }) {
try {
const result = await refetch()
if (result.data?.url) {
- // Open in new tab for download
- window.open(result.data.url, '_blank')
+ // Force browser download via
+ const link = document.createElement('a')
+ link.href = result.data.url
+ link.download = file.fileName
+ link.rel = 'noopener noreferrer'
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
}
} catch (error) {
console.error('Failed to get download URL:', error)
@@ -562,6 +624,31 @@ function FilePreview({ file, url }: { file: ProjectFile; url: string }) {
)
}
+ // Office documents (PPTX, DOCX, PPT, DOC)
+ if (isOfficeFile(file.mimeType, file.fileName)) {
+ const viewerUrl = `https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(url)}`
+ return (
+
+ )
+ }
+
return (
Preview not available for this file type
diff --git a/src/components/shared/logo-upload.tsx b/src/components/shared/logo-upload.tsx
index 9b1d9cb..740dfa9 100644
--- a/src/components/shared/logo-upload.tsx
+++ b/src/components/shared/logo-upload.tsx
@@ -1,6 +1,8 @@
'use client'
import { useState, useRef, useCallback } from 'react'
+import Cropper from 'react-easy-crop'
+import type { Area } from 'react-easy-crop'
import {
Dialog,
DialogContent,
@@ -13,8 +15,9 @@ import {
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
+import { Slider } from '@/components/ui/slider'
import { ProjectLogo } from './project-logo'
-import { Upload, Loader2, Trash2, ImagePlus } from 'lucide-react'
+import { Upload, Loader2, Trash2, ImagePlus, ZoomIn } from 'lucide-react'
import { trpc } from '@/lib/trpc/client'
import { toast } from 'sonner'
@@ -32,6 +35,48 @@ type LogoUploadProps = {
const MAX_SIZE_MB = 5
const ALLOWED_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp']
+/**
+ * Crop an image client-side using canvas and return a Blob.
+ */
+async function getCroppedImg(imageSrc: string, pixelCrop: Area): Promise
{
+ const image = new Image()
+ image.crossOrigin = 'anonymous'
+
+ await new Promise((resolve, reject) => {
+ image.onload = () => resolve()
+ image.onerror = reject
+ image.src = imageSrc
+ })
+
+ const canvas = document.createElement('canvas')
+ canvas.width = pixelCrop.width
+ canvas.height = pixelCrop.height
+ const ctx = canvas.getContext('2d')!
+
+ ctx.drawImage(
+ image,
+ pixelCrop.x,
+ pixelCrop.y,
+ pixelCrop.width,
+ pixelCrop.height,
+ 0,
+ 0,
+ pixelCrop.width,
+ pixelCrop.height
+ )
+
+ return new Promise((resolve, reject) => {
+ canvas.toBlob(
+ (blob) => {
+ if (blob) resolve(blob)
+ else reject(new Error('Canvas toBlob failed'))
+ },
+ 'image/png',
+ 0.9
+ )
+ })
+}
+
export function LogoUpload({
project,
currentLogoUrl,
@@ -39,8 +84,10 @@ export function LogoUpload({
children,
}: LogoUploadProps) {
const [open, setOpen] = useState(false)
- const [preview, setPreview] = useState(null)
- const [selectedFile, setSelectedFile] = useState(null)
+ const [imageSrc, setImageSrc] = useState(null)
+ const [crop, setCrop] = useState({ x: 0, y: 0 })
+ const [zoom, setZoom] = useState(1)
+ const [croppedAreaPixels, setCroppedAreaPixels] = useState(null)
@@ -50,6 +97,10 @@ export function LogoUpload({
const confirmUpload = trpc.logo.confirmUpload.useMutation()
const deleteLogo = trpc.logo.delete.useMutation()
+ const onCropComplete = useCallback((_croppedArea: Area, croppedPixels: Area) => {
+ setCroppedAreaPixels(croppedPixels)
+ }, [])
+
const handleFileSelect = useCallback((e: React.ChangeEvent) => {
const file = e.target.files?.[0]
if (!file) return
@@ -66,34 +117,36 @@ export function LogoUpload({
return
}
- setSelectedFile(file)
-
- // Create preview
const reader = new FileReader()
- reader.onload = (e) => {
- setPreview(e.target?.result as string)
+ reader.onload = (ev) => {
+ setImageSrc(ev.target?.result as string)
+ setCrop({ x: 0, y: 0 })
+ setZoom(1)
}
reader.readAsDataURL(file)
}, [])
const handleUpload = async () => {
- if (!selectedFile) return
+ if (!imageSrc || !croppedAreaPixels) return
setIsUploading(true)
try {
- // Get pre-signed upload URL (includes provider type for tracking)
+ // Crop the image client-side
+ const croppedBlob = await getCroppedImg(imageSrc, croppedAreaPixels)
+
+ // Get pre-signed upload URL
const { uploadUrl, key, providerType } = await getUploadUrl.mutateAsync({
projectId: project.id,
- fileName: selectedFile.name,
- contentType: selectedFile.type,
+ fileName: 'logo.png',
+ contentType: 'image/png',
})
- // Upload file directly to storage
+ // Upload cropped blob directly to storage
const uploadResponse = await fetch(uploadUrl, {
method: 'PUT',
- body: selectedFile,
+ body: croppedBlob,
headers: {
- 'Content-Type': selectedFile.type,
+ 'Content-Type': 'image/png',
},
})
@@ -109,8 +162,7 @@ export function LogoUpload({
toast.success('Logo updated successfully')
setOpen(false)
- setPreview(null)
- setSelectedFile(null)
+ resetState()
onUploadComplete?.()
} catch (error) {
console.error('Upload error:', error)
@@ -136,9 +188,16 @@ export function LogoUpload({
}
}
+ const resetState = () => {
+ setImageSrc(null)
+ setCrop({ x: 0, y: 0 })
+ setZoom(1)
+ setCroppedAreaPixels(null)
+ if (fileInputRef.current) fileInputRef.current.value = ''
+ }
+
const handleCancel = () => {
- setPreview(null)
- setSelectedFile(null)
+ resetState()
setOpen(false)
}
@@ -156,37 +215,85 @@ export function LogoUpload({
Update Project Logo
- Upload a logo for "{project.title}". Allowed formats: JPEG, PNG, GIF, WebP.
- Max size: {MAX_SIZE_MB}MB.
+ {imageSrc
+ ? 'Drag to reposition and use the slider to zoom. The logo will be cropped to a square.'
+ : `Upload a logo for "${project.title}". Allowed formats: JPEG, PNG, GIF, WebP. Max size: ${MAX_SIZE_MB}MB.`}
- {/* Preview */}
-
+ {imageSrc ? (
+ <>
+ {/* Cropper */}
+
+
- {/* File input */}
-
- Select image
-
+ {/* Zoom slider */}
+
+ setZoom(val)}
+ className="flex-1"
+ />
+
+
+ {/* Change image button */}
+
{
+ resetState()
+ fileInputRef.current?.click()
+ }}
+ className="w-full"
+ >
+ Choose a different image
+
+
+ ) : (
+ <>
+ {/* Current logo preview */}
+
+
+ {/* File input */}
+
+ Select image
+
+
+ )}
- {currentLogoUrl && !preview && (
+ {currentLogoUrl && !imageSrc && (
Cancel
-
- {isUploading ? (
-
+ {imageSrc && (
+
+ {isUploading ? (
+
+ )}
= {
+ // Round statuses
+ DRAFT: { variant: 'secondary' },
+ ACTIVE: { variant: 'default', className: 'bg-blue-500/10 text-blue-700 border-blue-200 dark:text-blue-400' },
+ EVALUATION: { variant: 'default', className: 'bg-violet-500/10 text-violet-700 border-violet-200 dark:text-violet-400' },
+ CLOSED: { variant: 'secondary', className: 'bg-slate-500/10 text-slate-600 border-slate-200' },
+
+ // Project statuses
+ SUBMITTED: { variant: 'secondary', className: 'bg-indigo-500/10 text-indigo-700 border-indigo-200 dark:text-indigo-400' },
+ ELIGIBLE: { variant: 'default', className: 'bg-emerald-500/10 text-emerald-700 border-emerald-200 dark:text-emerald-400' },
+ ASSIGNED: { variant: 'default', className: 'bg-violet-500/10 text-violet-700 border-violet-200 dark:text-violet-400' },
+ UNDER_REVIEW: { variant: 'default', className: 'bg-blue-500/10 text-blue-700 border-blue-200 dark:text-blue-400' },
+ SHORTLISTED: { variant: 'default', className: 'bg-amber-500/10 text-amber-700 border-amber-200 dark:text-amber-400' },
+ SEMIFINALIST: { variant: 'default', className: 'bg-amber-500/10 text-amber-700 border-amber-200 dark:text-amber-400' },
+ FINALIST: { variant: 'default', className: 'bg-orange-500/10 text-orange-700 border-orange-200 dark:text-orange-400' },
+ WINNER: { variant: 'default', className: 'bg-yellow-500/10 text-yellow-800 border-yellow-300 dark:text-yellow-400' },
+ REJECTED: { variant: 'destructive' },
+ WITHDRAWN: { variant: 'secondary' },
+
+ // Evaluation statuses
+ IN_PROGRESS: { variant: 'default', className: 'bg-blue-500/10 text-blue-700 border-blue-200 dark:text-blue-400' },
+ COMPLETED: { variant: 'default', className: 'bg-emerald-500/10 text-emerald-700 border-emerald-200 dark:text-emerald-400' },
+
+ // User statuses
+ INVITED: { variant: 'secondary', className: 'bg-sky-500/10 text-sky-700 border-sky-200 dark:text-sky-400' },
+ INACTIVE: { variant: 'secondary' },
+ SUSPENDED: { variant: 'destructive' },
+}
+
+type StatusBadgeProps = {
+ status: string
+ className?: string
+ size?: 'sm' | 'default'
+}
+
+export function StatusBadge({ status, className, size = 'default' }: StatusBadgeProps) {
+ const style = STATUS_STYLES[status] || { variant: 'secondary' as const }
+ const label = status.replace(/_/g, ' ')
+
+ return (
+
+ {label}
+
+ )
+}
diff --git a/src/hooks/use-debounce.ts b/src/hooks/use-debounce.ts
new file mode 100644
index 0000000..d439945
--- /dev/null
+++ b/src/hooks/use-debounce.ts
@@ -0,0 +1,12 @@
+import { useState, useEffect } from 'react'
+
+export function useDebounce(value: T, delay: number = 300): T {
+ const [debouncedValue, setDebouncedValue] = useState(value)
+
+ useEffect(() => {
+ const timer = setTimeout(() => setDebouncedValue(value), delay)
+ return () => clearTimeout(timer)
+ }, [value, delay])
+
+ return debouncedValue
+}
diff --git a/src/server/routers/project.ts b/src/server/routers/project.ts
index c7ad7fe..f7e0088 100644
--- a/src/server/routers/project.ts
+++ b/src/server/routers/project.ts
@@ -10,6 +10,16 @@ import {
import { normalizeCountryToCode } from '@/lib/countries'
import { logAudit } from '../utils/audit'
+// Valid project status transitions
+const VALID_PROJECT_TRANSITIONS: Record = {
+ SUBMITTED: ['ELIGIBLE', 'REJECTED'], // New submissions get screened
+ ELIGIBLE: ['ASSIGNED', 'REJECTED'], // Eligible projects get assigned to jurors
+ ASSIGNED: ['SEMIFINALIST', 'FINALIST', 'REJECTED'], // After evaluation
+ SEMIFINALIST: ['FINALIST', 'REJECTED'], // Semi-finalists advance or get cut
+ FINALIST: ['REJECTED'], // Finalists can only be rejected (rare)
+ REJECTED: ['SUBMITTED'], // Rejected can be re-submitted (admin override)
+}
+
export const projectRouter = router({
/**
* List projects with filtering and pagination
@@ -288,29 +298,73 @@ export const projectRouter = router({
create: adminProcedure
.input(
z.object({
- roundId: z.string(),
+ programId: z.string(),
+ roundId: z.string().optional(),
title: z.string().min(1).max(500),
teamName: z.string().optional(),
description: z.string().optional(),
tags: z.array(z.string()).optional(),
+ country: z.string().optional(),
+ competitionCategory: z.enum(['STARTUP', 'BUSINESS_CONCEPT']).optional(),
+ oceanIssue: z.enum([
+ 'POLLUTION_REDUCTION', 'CLIMATE_MITIGATION', 'TECHNOLOGY_INNOVATION',
+ 'SUSTAINABLE_SHIPPING', 'BLUE_CARBON', 'HABITAT_RESTORATION',
+ 'COMMUNITY_CAPACITY', 'SUSTAINABLE_FISHING', 'CONSUMER_AWARENESS',
+ 'OCEAN_ACIDIFICATION', 'OTHER',
+ ]).optional(),
+ institution: z.string().optional(),
+ contactPhone: z.string().optional(),
+ contactEmail: z.string().email('Invalid email address').optional(),
+ contactName: z.string().optional(),
+ city: z.string().optional(),
metadataJson: z.record(z.unknown()).optional(),
})
)
.mutation(async ({ ctx, input }) => {
- const { metadataJson, ...rest } = input
+ const {
+ metadataJson,
+ contactPhone, contactEmail, contactName, city,
+ ...rest
+ } = input
- // Get round to fetch programId
- const round = await ctx.prisma.round.findUniqueOrThrow({
- where: { id: input.roundId },
- select: { programId: true },
- })
+ // If roundId provided, derive programId from round for validation
+ let resolvedProgramId = input.programId
+ if (input.roundId) {
+ const round = await ctx.prisma.round.findUniqueOrThrow({
+ where: { id: input.roundId },
+ select: { programId: true },
+ })
+ resolvedProgramId = round.programId
+ }
+
+ // Build metadata from contact fields + any additional metadata
+ const fullMetadata: Record = { ...metadataJson }
+ if (contactPhone) fullMetadata.contactPhone = contactPhone
+ if (contactEmail) fullMetadata.contactEmail = contactEmail
+ if (contactName) fullMetadata.contactName = contactName
+ if (city) fullMetadata.city = city
+
+ // Normalize country to ISO code if provided
+ const normalizedCountry = input.country
+ ? normalizeCountryToCode(input.country)
+ : undefined
const project = await ctx.prisma.$transaction(async (tx) => {
const created = await tx.project.create({
data: {
- ...rest,
- programId: round.programId,
- metadataJson: metadataJson as Prisma.InputJsonValue ?? undefined,
+ programId: resolvedProgramId,
+ roundId: input.roundId || null,
+ title: input.title,
+ teamName: input.teamName,
+ description: input.description,
+ tags: input.tags || [],
+ country: normalizedCountry,
+ competitionCategory: input.competitionCategory,
+ oceanIssue: input.oceanIssue,
+ institution: input.institution,
+ metadataJson: Object.keys(fullMetadata).length > 0
+ ? (fullMetadata as Prisma.InputJsonValue)
+ : undefined,
status: 'SUBMITTED',
},
})
@@ -321,7 +375,7 @@ export const projectRouter = router({
action: 'CREATE',
entityType: 'Project',
entityId: created.id,
- detailsJson: { title: input.title, roundId: input.roundId },
+ detailsJson: { title: input.title, roundId: input.roundId, programId: resolvedProgramId },
ipAddress: ctx.ip,
userAgent: ctx.userAgent,
})
@@ -368,26 +422,45 @@ export const projectRouter = router({
? (country === null ? null : normalizeCountryToCode(country))
: undefined
- const project = await ctx.prisma.project.update({
- where: { id },
- data: {
- ...data,
- ...(status && { status }),
- ...(normalizedCountry !== undefined && { country: normalizedCountry }),
- metadataJson: metadataJson as Prisma.InputJsonValue ?? undefined,
- },
- })
-
- // Record status change in history
+ // Validate status transition if status is being changed
if (status) {
- await ctx.prisma.projectStatusHistory.create({
+ const currentProject = await ctx.prisma.project.findUniqueOrThrow({
+ where: { id },
+ select: { status: true },
+ })
+ const allowedTransitions = VALID_PROJECT_TRANSITIONS[currentProject.status] || []
+ if (!allowedTransitions.includes(status)) {
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: `Invalid status transition: cannot change from ${currentProject.status} to ${status}. Allowed: ${allowedTransitions.join(', ') || 'none'}`,
+ })
+ }
+ }
+
+ const project = await ctx.prisma.$transaction(async (tx) => {
+ const updated = await tx.project.update({
+ where: { id },
data: {
- projectId: id,
- status,
- changedBy: ctx.user.id,
+ ...data,
+ ...(status && { status }),
+ ...(normalizedCountry !== undefined && { country: normalizedCountry }),
+ metadataJson: metadataJson as Prisma.InputJsonValue ?? undefined,
},
})
- }
+
+ // Record status change in history
+ if (status) {
+ await tx.projectStatusHistory.create({
+ data: {
+ projectId: id,
+ status,
+ changedBy: ctx.user.id,
+ },
+ })
+ }
+
+ return updated
+ })
// Send notifications if status changed
if (status) {
@@ -660,34 +733,52 @@ export const projectRouter = router({
const matchingIds = projects.map((p) => p.id)
- const updated = await ctx.prisma.project.updateMany({
- where: {
- id: { in: matchingIds },
- roundId: input.roundId,
- },
- data: { status: input.status },
+ // Validate status transitions for all projects
+ const projectsWithStatus = await ctx.prisma.project.findMany({
+ where: { id: { in: matchingIds }, roundId: input.roundId },
+ select: { id: true, title: true, status: true },
})
-
- // Record status change in history for each project
- if (matchingIds.length > 0) {
- await ctx.prisma.projectStatusHistory.createMany({
- data: matchingIds.map((projectId) => ({
- projectId,
- status: input.status,
- changedBy: ctx.user.id,
- })),
+ const invalidTransitions: string[] = []
+ for (const p of projectsWithStatus) {
+ const allowed = VALID_PROJECT_TRANSITIONS[p.status] || []
+ if (!allowed.includes(input.status)) {
+ invalidTransitions.push(`"${p.title}" (${p.status} → ${input.status})`)
+ }
+ }
+ if (invalidTransitions.length > 0) {
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: `Invalid transitions for ${invalidTransitions.length} project(s): ${invalidTransitions.slice(0, 3).join('; ')}${invalidTransitions.length > 3 ? ` and ${invalidTransitions.length - 3} more` : ''}`,
})
}
- // Audit log
- await logAudit({
- prisma: ctx.prisma,
- userId: ctx.user.id,
- action: 'BULK_UPDATE_STATUS',
- entityType: 'Project',
- detailsJson: { ids: matchingIds, roundId: input.roundId, status: input.status, count: updated.count },
- ipAddress: ctx.ip,
- userAgent: ctx.userAgent,
+ const updated = await ctx.prisma.$transaction(async (tx) => {
+ const result = await tx.project.updateMany({
+ where: { id: { in: matchingIds }, roundId: input.roundId },
+ data: { status: input.status },
+ })
+
+ if (matchingIds.length > 0) {
+ await tx.projectStatusHistory.createMany({
+ data: matchingIds.map((projectId) => ({
+ projectId,
+ status: input.status,
+ changedBy: ctx.user.id,
+ })),
+ })
+ }
+
+ await logAudit({
+ prisma: tx,
+ userId: ctx.user.id,
+ action: 'BULK_UPDATE_STATUS',
+ entityType: 'Project',
+ detailsJson: { ids: matchingIds, roundId: input.roundId, status: input.status, count: result.count },
+ ipAddress: ctx.ip,
+ userAgent: ctx.userAgent,
+ })
+
+ return result
})
// Helper to get notification title based on type
diff --git a/src/server/routers/round.ts b/src/server/routers/round.ts
index ce234a2..818dc1c 100644
--- a/src/server/routers/round.ts
+++ b/src/server/routers/round.ts
@@ -8,6 +8,14 @@ import {
} from '../services/in-app-notification'
import { logAudit } from '@/server/utils/audit'
+// Valid round status transitions (state machine)
+const VALID_ROUND_TRANSITIONS: Record = {
+ DRAFT: ['ACTIVE', 'ARCHIVED'], // Draft can be activated or archived
+ ACTIVE: ['CLOSED'], // Active rounds can only be closed
+ CLOSED: ['ARCHIVED'], // Closed rounds can be archived
+ ARCHIVED: [], // Archived is terminal — no transitions out
+}
+
export const roundRouter = router({
/**
* List rounds for a program
@@ -296,6 +304,15 @@ export const roundRouter = router({
select: { status: true, votingStartAt: true, votingEndAt: true },
})
+ // Validate status transition
+ const allowedTransitions = VALID_ROUND_TRANSITIONS[previousRound.status] || []
+ if (!allowedTransitions.includes(input.status)) {
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: `Invalid status transition: cannot change from ${previousRound.status} to ${input.status}. Allowed transitions: ${allowedTransitions.join(', ') || 'none (terminal state)'}`,
+ })
+ }
+
const now = new Date()
// When activating a round, if votingStartAt is in the future, update it to now
diff --git a/src/server/routers/specialAward.ts b/src/server/routers/specialAward.ts
index 96f33f8..c15db46 100644
--- a/src/server/routers/specialAward.ts
+++ b/src/server/routers/specialAward.ts
@@ -3,11 +3,7 @@ import { TRPCError } from '@trpc/server'
import { Prisma } from '@prisma/client'
import { router, protectedProcedure, adminProcedure } from '../trpc'
import { logAudit } from '../utils/audit'
-import {
- applyAutoTagRules,
- aiInterpretCriteria,
- type AutoTagRule,
-} from '../services/ai-award-eligibility'
+import { processEligibilityJob } from '../services/award-eligibility-job'
export const specialAwardRouter = router({
// ─── Admin Queries ──────────────────────────────────────────────────────
@@ -267,125 +263,53 @@ export const specialAwardRouter = router({
includeSubmitted: z.boolean().optional(),
}))
.mutation(async ({ ctx, input }) => {
- const award = await ctx.prisma.specialAward.findUniqueOrThrow({
+ // Set job status to PENDING immediately
+ await ctx.prisma.specialAward.update({
where: { id: input.awardId },
- include: { program: true },
- })
-
- // Get projects in the program's rounds
- const statusFilter = input.includeSubmitted
- ? (['SUBMITTED', 'ELIGIBLE', 'ASSIGNED', 'SEMIFINALIST', 'FINALIST'] as const)
- : (['ELIGIBLE', 'ASSIGNED', 'SEMIFINALIST', 'FINALIST'] as const)
- const projects = await ctx.prisma.project.findMany({
- where: {
- round: { programId: award.programId },
- status: { in: [...statusFilter] },
- },
- select: {
- id: true,
- title: true,
- description: true,
- competitionCategory: true,
- country: true,
- geographicZone: true,
- tags: true,
- oceanIssue: true,
+ data: {
+ eligibilityJobStatus: 'PENDING',
+ eligibilityJobTotal: null,
+ eligibilityJobDone: null,
+ eligibilityJobError: null,
+ eligibilityJobStarted: null,
},
})
- if (projects.length === 0) {
- throw new TRPCError({
- code: 'BAD_REQUEST',
- message: 'No eligible projects found',
- })
- }
-
- // Phase 1: Auto-tag rules (deterministic)
- const autoTagRules = award.autoTagRulesJson as unknown as AutoTagRule[] | null
- let autoResults: Map | undefined
- if (autoTagRules && Array.isArray(autoTagRules) && autoTagRules.length > 0) {
- autoResults = applyAutoTagRules(autoTagRules, projects)
- }
-
- // Phase 2: AI interpretation (if criteria text exists AND AI eligibility is enabled)
- let aiResults: Map | undefined
- if (award.criteriaText && award.useAiEligibility) {
- const aiEvals = await aiInterpretCriteria(award.criteriaText, projects)
- aiResults = new Map(
- aiEvals.map((e) => [
- e.projectId,
- { eligible: e.eligible, confidence: e.confidence, reasoning: e.reasoning },
- ])
- )
- }
-
- // Combine results: auto-tag AND AI must agree (or just one if only one configured)
- const eligibilities = projects.map((project) => {
- const autoEligible = autoResults?.get(project.id) ?? true
- const aiEval = aiResults?.get(project.id)
- const aiEligible = aiEval?.eligible ?? true
-
- const eligible = autoEligible && aiEligible
- const method = autoResults && aiResults ? 'AUTO' : autoResults ? 'AUTO' : 'MANUAL'
-
- return {
- projectId: project.id,
- eligible,
- method,
- aiReasoningJson: aiEval
- ? { confidence: aiEval.confidence, reasoning: aiEval.reasoning }
- : null,
- }
- })
-
- // Upsert eligibilities
- await ctx.prisma.$transaction(
- eligibilities.map((e) =>
- ctx.prisma.awardEligibility.upsert({
- where: {
- awardId_projectId: {
- awardId: input.awardId,
- projectId: e.projectId,
- },
- },
- create: {
- awardId: input.awardId,
- projectId: e.projectId,
- eligible: e.eligible,
- method: e.method as 'AUTO' | 'MANUAL',
- aiReasoningJson: e.aiReasoningJson ?? undefined,
- },
- update: {
- eligible: e.eligible,
- method: e.method as 'AUTO' | 'MANUAL',
- aiReasoningJson: e.aiReasoningJson ?? undefined,
- // Clear overrides
- overriddenBy: null,
- overriddenAt: null,
- },
- })
- )
- )
-
- const eligibleCount = eligibilities.filter((e) => e.eligible).length
-
await logAudit({
userId: ctx.user.id,
action: 'UPDATE',
entityType: 'SpecialAward',
entityId: input.awardId,
- detailsJson: {
- action: 'RUN_ELIGIBILITY',
- totalProjects: projects.length,
- eligible: eligibleCount,
- },
+ detailsJson: { action: 'RUN_ELIGIBILITY_STARTED' },
})
- return {
- total: projects.length,
- eligible: eligibleCount,
- ineligible: projects.length - eligibleCount,
- }
+ // Fire and forget - process in background
+ void processEligibilityJob(
+ input.awardId,
+ input.includeSubmitted ?? false,
+ ctx.user.id
+ )
+
+ return { started: true }
+ }),
+
+ /**
+ * Get eligibility job status for polling
+ */
+ getEligibilityJobStatus: protectedProcedure
+ .input(z.object({ awardId: z.string() }))
+ .query(async ({ ctx, input }) => {
+ const award = await ctx.prisma.specialAward.findUniqueOrThrow({
+ where: { id: input.awardId },
+ select: {
+ eligibilityJobStatus: true,
+ eligibilityJobTotal: true,
+ eligibilityJobDone: true,
+ eligibilityJobError: true,
+ eligibilityJobStarted: true,
+ },
+ })
+ return award
}),
/**
diff --git a/src/server/services/award-eligibility-job.ts b/src/server/services/award-eligibility-job.ts
new file mode 100644
index 0000000..aa9eeae
--- /dev/null
+++ b/src/server/services/award-eligibility-job.ts
@@ -0,0 +1,184 @@
+import { prisma } from '@/lib/prisma'
+import {
+ applyAutoTagRules,
+ aiInterpretCriteria,
+ type AutoTagRule,
+} from './ai-award-eligibility'
+
+const BATCH_SIZE = 20
+
+/**
+ * Process eligibility for an award in the background.
+ * Updates progress in the database as it goes so the frontend can poll.
+ */
+export async function processEligibilityJob(
+ awardId: string,
+ includeSubmitted: boolean,
+ userId: string
+): Promise {
+ try {
+ // Mark job as PROCESSING
+ const award = await prisma.specialAward.findUniqueOrThrow({
+ where: { id: awardId },
+ include: { program: true },
+ })
+
+ // Get projects
+ const statusFilter = includeSubmitted
+ ? (['SUBMITTED', 'ELIGIBLE', 'ASSIGNED', 'SEMIFINALIST', 'FINALIST'] as const)
+ : (['ELIGIBLE', 'ASSIGNED', 'SEMIFINALIST', 'FINALIST'] as const)
+
+ const projects = await prisma.project.findMany({
+ where: {
+ round: { programId: award.programId },
+ status: { in: [...statusFilter] },
+ },
+ select: {
+ id: true,
+ title: true,
+ description: true,
+ competitionCategory: true,
+ country: true,
+ geographicZone: true,
+ tags: true,
+ oceanIssue: true,
+ },
+ })
+
+ if (projects.length === 0) {
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: {
+ eligibilityJobStatus: 'COMPLETED',
+ eligibilityJobTotal: 0,
+ eligibilityJobDone: 0,
+ },
+ })
+ return
+ }
+
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: {
+ eligibilityJobStatus: 'PROCESSING',
+ eligibilityJobTotal: projects.length,
+ eligibilityJobDone: 0,
+ eligibilityJobError: null,
+ eligibilityJobStarted: new Date(),
+ },
+ })
+
+ // Phase 1: Auto-tag rules (deterministic, fast)
+ const autoTagRules = award.autoTagRulesJson as unknown as AutoTagRule[] | null
+ let autoResults: Map | undefined
+ if (autoTagRules && Array.isArray(autoTagRules) && autoTagRules.length > 0) {
+ autoResults = applyAutoTagRules(autoTagRules, projects)
+ }
+
+ // Phase 2: AI interpretation (if criteria text exists AND AI eligibility is enabled)
+ // Process in batches to avoid timeouts
+ let aiResults: Map | undefined
+
+ if (award.criteriaText && award.useAiEligibility) {
+ aiResults = new Map()
+
+ for (let i = 0; i < projects.length; i += BATCH_SIZE) {
+ const batch = projects.slice(i, i + BATCH_SIZE)
+ const aiEvals = await aiInterpretCriteria(award.criteriaText, batch)
+
+ for (const e of aiEvals) {
+ aiResults.set(e.projectId, {
+ eligible: e.eligible,
+ confidence: e.confidence,
+ reasoning: e.reasoning,
+ })
+ }
+
+ // Update progress
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: {
+ eligibilityJobDone: Math.min(i + BATCH_SIZE, projects.length),
+ },
+ })
+ }
+ } else {
+ // No AI needed, mark all as done
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: { eligibilityJobDone: projects.length },
+ })
+ }
+
+ // Combine results: auto-tag AND AI must agree (or just one if only one configured)
+ const eligibilities = projects.map((project) => {
+ const autoEligible = autoResults?.get(project.id) ?? true
+ const aiEval = aiResults?.get(project.id)
+ const aiEligible = aiEval?.eligible ?? true
+
+ const eligible = autoEligible && aiEligible
+ const method = autoResults && aiResults ? 'AUTO' : autoResults ? 'AUTO' : 'MANUAL'
+
+ return {
+ projectId: project.id,
+ eligible,
+ method,
+ aiReasoningJson: aiEval
+ ? { confidence: aiEval.confidence, reasoning: aiEval.reasoning }
+ : null,
+ }
+ })
+
+ // Upsert eligibilities
+ await prisma.$transaction(
+ eligibilities.map((e) =>
+ prisma.awardEligibility.upsert({
+ where: {
+ awardId_projectId: {
+ awardId,
+ projectId: e.projectId,
+ },
+ },
+ create: {
+ awardId,
+ projectId: e.projectId,
+ eligible: e.eligible,
+ method: e.method as 'AUTO' | 'MANUAL',
+ aiReasoningJson: e.aiReasoningJson ?? undefined,
+ },
+ update: {
+ eligible: e.eligible,
+ method: e.method as 'AUTO' | 'MANUAL',
+ aiReasoningJson: e.aiReasoningJson ?? undefined,
+ overriddenBy: null,
+ overriddenAt: null,
+ },
+ })
+ )
+ )
+
+ // Mark as completed
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: {
+ eligibilityJobStatus: 'COMPLETED',
+ eligibilityJobDone: projects.length,
+ },
+ })
+ } catch (error) {
+ // Mark as failed
+ const errorMessage = error instanceof Error ? error.message : 'Unknown error'
+ try {
+ await prisma.specialAward.update({
+ where: { id: awardId },
+ data: {
+ eligibilityJobStatus: 'FAILED',
+ eligibilityJobError: errorMessage,
+ },
+ })
+ } catch {
+ // If we can't even update the status, log and give up
+ console.error('Failed to update eligibility job status:', error)
+ }
+ }
+}