MOPC/MOPC-Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: multi-role jury fix, country flags, applicant deadline banner, timeline
Some checks failed
Build and Push Docker Image / build (push) Has been cancelled
Details

Browse Source 
- Fix project list returning empty for users with both SUPER_ADMIN and
  JURY_MEMBER roles (jury filter now skips admins) in project, assignment,
  and evaluation routers
- Add CountryDisplay component showing flag emoji + name everywhere
  country is displayed (admin, observer, jury, mentor views — 17 files)
- Add countdown deadline banner on applicant dashboard for INTAKE,
  SUBMISSION, and MENTORING rounds with live timer
- Remove quick action buttons from applicant dashboard
- Fix competition timeline sidebar: green dots/connectors only up to
  current round, yellow dot for current round, red connector into
  rejected round, grey after

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Matt
2026-03-06 15:00:29 +01:00
parent a1e758bc39
commit 37351044ed
21 changed files with 172 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/admin/members-content.tsx
View File

@@ -5,6 +5,7 @@ import Link from 'next/link'
import { useSearchParams, usePathname } from 'next/navigation'
import { trpc } from '@/lib/trpc/client'
import { Badge } from '@/components/ui/badge'
import { CountryDisplay } from '@/components/shared/country-display'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Checkbox } from '@/components/ui/checkbox'
@@ -805,7 +806,7 @@ function ApplicantsTabContent({ search, searchInput, setSearchInput }: { search:
)}
</TableCell>
<TableCell>
<span className="text-sm">{user.nationality || <span className="text-muted-foreground">-</span>}</span>
<span className="text-sm">{user.nationality ? <CountryDisplay country={user.nationality} /> : <span className="text-muted-foreground">-</span>}</span>
</TableCell>
<TableCell>
<span className="text-sm">{user.institution || <span className="text-muted-foreground">-</span>}</span>

9
src/components/admin/round/award-shortlist.tsx
View File

@@ -35,6 +35,7 @@ import {
AlertTriangle,
Search,
} from 'lucide-react'
import { CountryDisplay } from '@/components/shared/country-display'
type AwardShortlistProps = {
awardId: string
@@ -342,7 +343,13 @@ export function AwardShortlist({
</a>
</p>
<p className="text-xs text-muted-foreground">
{[e.project.teamName, e.project.country, e.project.competitionCategory].filter(Boolean).join(', ') || '—'}
{[e.project.teamName, e.project.competitionCategory].filter(Boolean).length > 0 || e.project.country ? (
<>
{[e.project.teamName, e.project.competitionCategory].filter(Boolean).join(', ')}
{(e.project.teamName || e.project.competitionCategory) && e.project.country ? ', ' : ''}
{e.project.country && <CountryDisplay country={e.project.country} />}
</>
) : '—'}
</p>
</div>
</td>

3
src/components/admin/round/filtering-dashboard.tsx
View File

@@ -74,6 +74,7 @@ import { motion, AnimatePresence } from 'motion/react'
import Link from 'next/link'
import type { Route } from 'next'
import { AwardShortlist } from './award-shortlist'
import { CountryDisplay } from '@/components/shared/country-display'
type FilteringDashboardProps = {
competitionId: string
@@ -924,7 +925,7 @@ export function FilteringDashboard({ competitionId, roundId }: FilteringDashboar
</div>
<p className="text-xs text-muted-foreground truncate">
{result.project?.teamName}
{result.project?.country && ` \u00b7 ${result.project.country}`}
{result.project?.country && <> · <CountryDisplay country={result.project.country} /></>}
</p>
</div>
</div>

3
src/components/admin/round/finalization-tab.tsx
View File

@@ -44,6 +44,7 @@ import {
import { cn } from '@/lib/utils'
import { projectStateConfig } from '@/lib/round-config'
import { EmailPreviewDialog } from './email-preview-dialog'
import { CountryDisplay } from '@/components/shared/country-display'
// ── Types ──────────────────────────────────────────────────────────────────
@@ -233,7 +234,7 @@ export function FinalizationTab({ roundId, roundStatus }: FinalizationTabProps)
{project.category === 'STARTUP' ? 'Startup' : project.category === 'BUSINESS_CONCEPT' ? 'Concept' : project.category ?? '-'}
</td>
<td className="px-3 py-2.5 hidden md:table-cell text-muted-foreground">
{project.country ?? '-'}
{project.country ? <CountryDisplay country={project.country} /> : '-'}
</td>
<td className="px-3 py-2.5 text-center">
<Badge variant="secondary" className={cn('text-xs', stateLabelColors[project.currentState] ?? '')}>

7
src/components/admin/round/project-states-table.tsx
View File

@@ -63,6 +63,7 @@ import {
} from 'lucide-react'
import Link from 'next/link'
import type { Route } from 'next'
import { CountryDisplay } from '@/components/shared/country-display'
const PROJECT_STATES = ['PENDING', 'IN_PROGRESS', 'PASSED', 'REJECTED', 'COMPLETED', 'WITHDRAWN'] as const
type ProjectState = (typeof PROJECT_STATES)[number]
@@ -448,7 +449,7 @@ export function ProjectStatesTable({ competitionId, roundId, roundStatus, compet
</Badge>
</div>
<div className="text-xs text-muted-foreground truncate">
{ps.project?.country || '—'}
{ps.project?.country ? <CountryDisplay country={ps.project.country} /> : '—'}
</div>
<div>
<Badge variant="outline" className={`text-xs ${cfg.color}`}>
@@ -1087,7 +1088,7 @@ function AddProjectDialog({
<p className="text-sm font-medium truncate">{project.title}</p>
<p className="text-xs text-muted-foreground truncate">
{project.teamName}
{project.country && <> &middot; {project.country}</>}
{project.country && <> &middot; <CountryDisplay country={project.country} /></>}
</p>
</div>
{project.competitionCategory && (
@@ -1237,7 +1238,7 @@ function AddProjectDialog({
<p className="text-sm font-medium truncate">{project.title}</p>
<p className="text-xs text-muted-foreground truncate">
{project.teamName}
{project.country && <> &middot; {project.country}</>}
{project.country && <> &middot; <CountryDisplay country={project.country} /></>}
</p>
</div>
<div className="flex items-center gap-1.5 ml-2 shrink-0">

3
src/components/admin/round/ranking-dashboard.tsx
View File

@@ -55,6 +55,7 @@ import {
Download,
} from 'lucide-react'
import type { RankedProjectEntry } from '@/server/services/ai-ranking'
import { CountryDisplay } from '@/components/shared/country-display'
// ─── Types ────────────────────────────────────────────────────────────────────
@@ -163,7 +164,7 @@ function SortableProjectRow({
{projectInfo?.teamName && (
<p className="text-xs text-muted-foreground truncate">
{projectInfo.teamName}
{projectInfo.country ? ` · ${projectInfo.country}` : ''}
{projectInfo.country ? <> · <CountryDisplay country={projectInfo.country} /></> : ''}
</p>
)}
</div>

3
src/components/admin/semi-finalists-content.tsx
View File

@@ -6,6 +6,7 @@ import type { Route } from 'next'
import { useRouter } from 'next/navigation'
import { trpc } from '@/lib/trpc/client'
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
import { CountryDisplay } from '@/components/shared/country-display'
import { Input } from '@/components/ui/input'
import { Badge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
@@ -214,7 +215,7 @@ export function SemiFinalistsContent({ editionId }: SemiFinalistsContentProps) {
{categoryLabels[project.category ?? ''] ?? project.category}
</Badge>
</TableCell>
<TableCell className="text-sm">{project.country || '—'}</TableCell>
<TableCell className="text-sm">{project.country ? <CountryDisplay country={project.country} /> : '—'}</TableCell>
<TableCell className="text-sm">{project.currentRound}</TableCell>
<TableCell>
<TooltipProvider>