diff --git a/app/components/home/colle-card.tsx b/app/components/home/colle-card.tsx index a7846eb..27d552e 100644 --- a/app/components/home/colle-card.tsx +++ b/app/components/home/colle-card.tsx @@ -1,17 +1,11 @@ -import type React from "react"; import type { Colle } from "~/lib/api"; import { Link } from "react-router"; -import { - Card, - CardContent, - CardHeader, - CardFooter, -} from "~/components/ui/card"; -import { User, UserCheck, Paperclip, Star, MapPinHouse } from "lucide-react"; +import { Card } from "~/components/ui/card"; +import { User, Star, CalendarDays, MapPin } from "lucide-react"; import { Badge } from "~/components/ui/badge"; import { Button } from "~/components/ui/button"; -import { formatDate, formatGrade, formatTime } from "~/lib/utils"; +import { cn, formatDate, formatGrade, formatTime } from "~/lib/utils"; // TODO: Preferences for subject colors const getSubjectColor = (_: string) => { @@ -35,12 +29,12 @@ export default function ColleCard({ isFavorite, }: ColleCardProps) { // TODO: Favorites - const handleToggleFavorite = (e: React.MouseEvent) => { - e.stopPropagation(); // Prevent card click - e.preventDefault(); - const newValue = !isFavorite; - onToggleFavorite(colle.id, newValue); - }; + // const handleToggleFavorite = (e: React.MouseEvent) => { + // e.stopPropagation(); // Prevent card click + // e.preventDefault(); + // const newValue = !isFavorite; + // onToggleFavorite(colle.id, newValue); + // }; const subjectColor = getSubjectColor(colle.subject.name); const subjectEmoji = getSubjectEmoji(colle.subject.name); @@ -49,84 +43,88 @@ export default function ColleCard({ - -
-
{formatDate(colle.date)}
-
- {formatTime(colle.date)} -
-
- {colle.grade && ( -
- -
- {formatGrade(colle.grade)}/20 +
+
+ +
+
+
+

+ {colle.student.fullName} +

+ {colle.grade && ( +
+ {/* */} +
+ {formatGrade(colle.grade)}/20 +
+
+ )}
- )} - - -
-
-
- - {colle.student.fullName} +
+
+ + + {formatDate(colle.date)} à {formatTime(colle.date)} +
- -
- - {colle.examiner.name} +
+ + {colle.room?.name} +
+
+ + {colle.examiner?.name}
- - {colle.room && ( -
- - {colle.room.name} -
- )}
-
- - -
-
- - {colle.subject.name + " " + subjectEmoji} - - {isFavorite && ( - - - Favori +
+
+ + {colle.subject.name + " " + subjectEmoji} - )} -
- {/* TODO: Attachments */} - {/* {colle.attachmentsCount > 0 && ( + {isFavorite && ( + + + Favori + + )} +
+ {/* TODO: Attachments */} + {/* {colle.attachmentsCount > 0 && (
{colle.attachmentsCount}
)} */} +
-
+
); diff --git a/app/lib/utils.ts b/app/lib/utils.ts index 3db2c85..15fe984 100644 --- a/app/lib/utils.ts +++ b/app/lib/utils.ts @@ -63,7 +63,7 @@ export const formatTime = (date: string) => { return dt.toLocaleString({ hour: "2-digit", minute: "2-digit", - }); + })?.replace(":", "h") || "N/A"; }; export const formatGrade = (grade?: number) => {