Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ export default function MySubmissionPanel() {
status !== 'WITHDRAWN';

const handleView = () => {
router.push(`/projects/${submission.id}?type=submission`);
window.open(
`/projects/${submission.id}?type=submission`,
'_blank',
'noopener,noreferrer'
);
};

const handleEdit = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ const SubmissionCard = ({ submission }: SubmissionCardProps) => {
</>
)}

<a href={projectUrl} target='_blank' rel='noopener noreferrer'>
<Link href={projectUrl} target='_blank' rel='noopener noreferrer'>
<BoundlessButton
variant='outline'
size='sm'
className='hover:bg-primary h-9 rounded-xl border-white/5 bg-white/5 px-4 text-xs font-bold transition-all hover:text-black'
>
View Project
</BoundlessButton>
</a>
</Link>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Link from 'next/link';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { HackathonWinner } from '@/lib/api/hackathons';
import { SubmissionCardProps } from '@/types/hackathon';
Expand All @@ -14,7 +15,7 @@ export const GeneralWinnerCard = ({
const projectUrl = `/projects/${winner.submissionId}?type=submission`;

return (
<a
<Link
href={projectUrl}
target='_blank'
rel='noopener noreferrer'
Expand All @@ -35,6 +36,6 @@ export const GeneralWinnerCard = ({
</div>

<div className='text-primary text-xs font-bold'>{winner.prize}</div>
</a>
</Link>
);
};
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Link from 'next/link';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { HackathonWinner } from '@/lib/api/hackathons';
import { Trophy } from 'lucide-react';
Expand Down Expand Up @@ -53,15 +54,15 @@ export const PodiumWinnerCard = ({
</div>
</div>

<a href={projectUrl} target='_blank' rel='noopener noreferrer'>
<Link href={projectUrl} target='_blank' rel='noopener noreferrer'>
<BoundlessButton
variant='outline'
size='sm'
className='hover:bg-primary h-8 rounded-lg border-white/5 bg-white/5 px-3 text-[10px] font-bold transition-all hover:text-black'
>
View Project
</BoundlessButton>
</a>
</Link>
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Link from 'next/link';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { HackathonWinner } from '@/lib/api/hackathons';
import { Trophy } from 'lucide-react';
Expand Down Expand Up @@ -79,15 +80,15 @@ export const TopWinnerCard = ({ winner, submission }: TopWinnerCardProps) => {
</div>
</div>

<a href={projectUrl} target='_blank' rel='noopener noreferrer'>
<Link href={projectUrl} target='_blank' rel='noopener noreferrer'>
<BoundlessButton
variant='outline'
size='sm'
className='hover:bg-primary h-9 rounded-xl border-white/5 bg-white/5 px-4 text-xs font-bold transition-all hover:text-black'
>
View Project
</BoundlessButton>
</a>
</Link>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,14 @@ import { reportError, reportMessage } from '@/lib/error-reporting';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { JudgingCriteriaList } from '@/components/organization/hackathons/judging/JudgingCriteriaList';
import JudgingResultsTable from '@/components/organization/hackathons/judging/JudgingResultsTable';
import TrackResultsSection from '@/components/organization/hackathons/judging/TrackResultsSection';
import AllocationPreviewCard from '@/components/organization/hackathons/judging/AllocationPreviewCard';
import CoverageMatrix from '@/components/organization/hackathons/judging/CoverageMatrix';
import { OrganizerJudgesPanel } from '@/components/organization/hackathons/judging/OrganizerJudgesPanel';
import {
useHackathon,
useHackathonTracks,
} from '@/hooks/hackathon/use-hackathon-queries';
import { Input } from '@/components/ui/input';
import {
AlertDialog,
Expand All @@ -79,6 +86,38 @@ export default function JudgingPage() {
const hackathonId = params.hackathonId as string;

const { activeOrgId, activeOrg } = useOrganization();

// Hackathon + tracks for the per-track Results section. Both are
// best-effort — a 404 or empty array degrades gracefully (the
// per-track UI just won't render).
const { data: hackathonDetail } = useHackathon(hackathonId);
const { data: tracksData } = useHackathonTracks(hackathonId);
const tracks = tracksData ?? [];

// Map trackId → human prize string ("$2,000 USDC") sourced from the
// hackathon's bound prize tiers. Used as a chip on each track section
// header so organizers know which prize a track is paying out.
const prizeByTrackId = useMemo<Record<string, string>>(() => {
const tiers =
(
hackathonDetail as
| { prizeTiers?: Array<Record<string, unknown>> }
| undefined
)?.prizeTiers ?? [];
const out: Record<string, string> = {};
for (const t of tiers) {
if (t?.kind !== 'TRACK' || !t?.trackId) continue;
const amount = String(t.prizeAmount ?? '').trim();
const currency = String(t.currency ?? 'USDC').trim();
if (!amount) continue;
out[t.trackId as string] =
currency.length === 1
? `${currency}${amount}`
: `${amount} ${currency}`;
}
return out;
}, [hackathonDetail]);

const [submissions, setSubmissions] = useState<JudgingSubmission[]>([]);
const [criteria, setCriteria] = useState<JudgingCriterion[]>([]);
const [isLoading, setIsLoading] = useState(true);
Expand Down Expand Up @@ -710,6 +749,14 @@ export default function JudgingPage() {
</div>

<TabsContent value='overview' className='mt-6 space-y-6'>
{/* Coverage heatmap. Surfaces idle judges + orphan
submissions before they become a publish blocker. */}
<CoverageMatrix
organizationId={organizationId}
hackathonId={hackathonId}
refreshKey={submissionsPage}
/>

{isLoading && submissions.length === 0 ? (
<div className='flex items-center justify-center py-12'>
<Loader2 className='h-8 w-8 animate-spin text-gray-400' />
Expand Down Expand Up @@ -1019,6 +1066,14 @@ export default function JudgingPage() {
</div>
)}

{!resultsPublished && (
<AllocationPreviewCard
organizationId={organizationId}
hackathonId={hackathonId}
refreshKey={resultsPage}
/>
)}

{winners.length > 0 && (
<div className='space-y-4'>
<h2 className='flex items-center gap-2 text-lg font-bold text-yellow-500'>
Expand All @@ -1037,6 +1092,20 @@ export default function JudgingPage() {
</div>
)}

{tracks.length > 0 && judgingResults.length > 0 && (
<TrackResultsSection
tracks={tracks}
results={judgingResults}
totalJudges={currentJudges.length}
criteria={criteria}
canManage={canManageJudges}
winnerOverrides={judgingSummary?.winnerOverrides}
prizeByTrackId={prizeByTrackId}
organizationId={organizationId}
hackathonId={hackathonId}
/>
)}

<div className='space-y-4'>
<h2 className='text-lg font-bold text-gray-200'>
Current Standings
Expand Down
13 changes: 9 additions & 4 deletions app/judge/[hackathonId]/submissions/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import Link from 'next/link';
import { useParams, useRouter } from 'next/navigation';
import { useParams } from 'next/navigation';
import { useEffect, useMemo, useState } from 'react';
import {
CheckCircle2,
Expand Down Expand Up @@ -29,7 +29,6 @@ export default function JudgeSubmissionsPage() {

function SubmissionsList() {
const params = useParams<{ hackathonId: string }>();
const router = useRouter();
const hackathonId = params?.hackathonId ?? '';

const [filter, setFilter] = useState<Filter>('all');
Expand Down Expand Up @@ -88,13 +87,17 @@ function SubmissionsList() {
} else if (e.key === 'Enter') {
const s = visible[focusIdx];
if (s) {
router.push(`/judge/${hackathonId}/submissions/${s.submission.id}`);
window.open(
`/judge/${hackathonId}/submissions/${s.submission.id}`,
'_blank',
'noopener,noreferrer'
);
}
}
};
window.addEventListener('keydown', onKey);
return () => window.removeEventListener('keydown', onKey);
}, [visible, focusIdx, router, hackathonId]);
}, [visible, focusIdx, hackathonId]);

return (
<div className='space-y-5'>
Expand Down Expand Up @@ -277,6 +280,8 @@ function Row({
return (
<Link
href={`/judge/${hackathonId}/submissions/${submission.submission.id}`}
target='_blank'
rel='noopener noreferrer'
onMouseEnter={onHover}
className={cn(
'group flex items-center gap-3 rounded-xl border bg-[#101010] px-4 py-3 transition-all',
Expand Down
9 changes: 5 additions & 4 deletions app/me/hackathons/submissions/submission-components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
import { Separator } from '@/components/ui/separator';
import { TableCell, TableRow as ShadcnTableRow } from '@/components/ui/table';
import Image from 'next/image';
import Link from 'next/link';
import { format } from 'date-fns';
import React, { useState } from 'react';

Expand Down Expand Up @@ -206,7 +207,7 @@ export function SubmissionsSheetContent({
</div>
<div className='flex items-center gap-3'>
<StatusBadge status={submission.status} />
<a
<Link
href={viewUrl}
target='_blank'
rel='noopener noreferrer'
Expand All @@ -216,7 +217,7 @@ export function SubmissionsSheetContent({
>
<ExternalLink className='h-3.5 w-3.5' />
View Page
</a>
</Link>
</div>
</div>

Expand Down Expand Up @@ -463,7 +464,7 @@ export function TableRow({
{submission.projectName}
</span>
{/* Always in DOM — fade via opacity so no layout shift */}
<a
<Link
href={viewUrl}
target='_blank'
rel='noopener noreferrer'
Expand All @@ -477,7 +478,7 @@ export function TableRow({
aria-label={`Open ${submission.projectName} in new tab`}
>
<ExternalLink className='h-3.5 w-3.5' />
</a>
</Link>
</div>
</div>
</TableCell>
Expand Down
7 changes: 6 additions & 1 deletion components/hackathons/winners/WinnersTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,12 @@ const TrackWinnerCard = ({
</div>

{projectUrl ? (
<Link href={projectUrl}>
<Link
href={projectUrl}
target='_blank'
rel='noopener noreferrer'
className='block no-underline'
>
<div className='flex items-center justify-between rounded-lg border border-gray-900 bg-black/20 p-2 transition-colors hover:bg-black/40'>
<p className='line-clamp-1 text-sm font-medium text-white'>
{trackWinner.projectName}
Expand Down
4 changes: 4 additions & 0 deletions components/organization/cards/JudgingParticipant.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ const JudgingParticipant = ({
<span className='h-1 w-1 rounded-full bg-gray-700' />
<Link
href={`/projects/${submissionData.id}?type=submission`}
target='_blank'
rel='noopener noreferrer'
className='flex items-center gap-1 transition-colors hover:text-white'
>
View Details <ExternalLink className='h-3 w-3' />
Expand Down Expand Up @@ -433,6 +435,8 @@ const JudgingParticipant = ({
)}
<Link
href={`/projects/${submissionData.id}?type=submission`}
target='_blank'
rel='noopener noreferrer'
className='flex h-7 w-7 items-center justify-center rounded-md border border-gray-800 text-gray-500 hover:bg-white/5 hover:text-white'
>
<ExternalLink className='h-3 w-3' />
Expand Down
Loading
Loading