fix: merge conflicts

This commit is contained in:
rngsurrounded
2025-03-01 20:14:52 +09:00
parent b8e83c43f8
commit da843adfe3
8 changed files with 26 additions and 291 deletions
@@ -1,7 +1,6 @@
import { Competition, CompetitionStatus } from "@/shared/types";
import { cn } from "@/shared/lib/utils";
import { Card, CardContent } from "@/components/ui/card";
import { useNavigate } from "react-router";
interface CompetitionCardProps {
competition: Competition;
@@ -12,11 +11,6 @@ export function CompetitionCard({
competition,
className,
}: CompetitionCardProps) {
const navigate = useNavigate();
const handleClick = () => {
navigate(`/competition/${competition.id}`);
};
return (
<Card
@@ -24,7 +18,6 @@ export function CompetitionCard({
"aspect-square h-full max-h-80 w-auto overflow-hidden",
className,
)}
onClick={handleClick}
>
<div className="relative h-full overflow-hidden">
<img