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 @@ -3,7 +3,7 @@
import { useState, useRef } from "react";
import { useRouter } from "next/navigation";
import Link from "next/link";
import { ChevronRight, Calendar, CalendarClock, Lock } from "lucide-react";
import { ChevronRight, Calendar, CalendarClock, Lock, Pencil } from "lucide-react";
import { PropWithUserForecast } from "@/types/db_types";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
Expand Down Expand Up @@ -253,6 +253,17 @@ export function CompetitionPropView({
</p>
)}
</div>
{isAdmin && (
<Button
variant="outline"
size="sm"
onClick={() => setIsEditDialogOpen(true)}
className="shrink-0"
>
<Pencil className="h-3.5 w-3.5 mr-1.5" />
Edit
</Button>
)}
</div>

{/* Deadline info */}
Expand Down
29 changes: 14 additions & 15 deletions app/competitions/[competitionId]/props/[propId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,20 @@ async function CompetitionPropPageContent({
}
const competition = competitionResult.data;

// For private competitions, verify membership
if (competition.is_private) {
const roleResult = await getCurrentUserRole(competitionId);
if (!roleResult.success) {
return <ErrorPage title={roleResult.error} />;
}
const roleResult = await getCurrentUserRole(competitionId);
if (!roleResult.success) {
return <ErrorPage title={roleResult.error} />;
}
const userRole = roleResult.data;

if (roleResult.data === null) {
return (
<InaccessiblePage
title="Private Competition"
message="You are not a member of this competition."
/>
);
}
// For private competitions, verify membership
if (competition.is_private && userRole === null) {
return (
<InaccessiblePage
title="Private Competition"
message="You are not a member of this competition."
/>
);
}

// Get the prop with user's forecast
Expand Down Expand Up @@ -102,7 +101,7 @@ async function CompetitionPropPageContent({
competitionId={competitionId}
competitionName={competition.name}
isForecastingOpen={isForecastingOpen}
isAdmin={user.is_admin}
isAdmin={user.is_admin || userRole === "admin"}
/>
);
}
Loading