Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: display rating on group card #121

Merged
merged 2 commits into from
Jan 2, 2025
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
3 changes: 2 additions & 1 deletion frontend/src/app/plans/edit/[id]/page.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ export function CreateNewPlanPage({
</div>
);
}

return (
<div className="flex w-full flex-1 flex-col items-center justify-center gap-5 py-3 md:flex-row md:items-start">
<div className="flex max-h-screen w-full flex-none flex-col items-center justify-center gap-2 px-2 md:ml-4 md:w-[350px] md:flex-col">
Expand Down Expand Up @@ -399,6 +398,8 @@ export function CreateNewPlanPage({
.split(":")
.slice(0, 2)
.join(":"),
spotsOccupied: g.spotsOccupied,
spotsTotal: g.spotsTotal,
}) satisfies ExtendedGroup,
),
}))
Expand Down
39 changes: 39 additions & 0 deletions frontend/src/components/class-block-stars.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { StarHalfIcon, StarIcon } from "lucide-react";

function customRound(rating: number): number {
const integerPart = Math.floor(rating);
const decimalPart = rating - integerPart;

if (decimalPart > 0.7) {
return integerPart + 1;
} else if (decimalPart >= 0.3) {
return integerPart + 0.5;
} else {
return integerPart;
}
}

export function StarsRating({ rating }: { rating: number }) {
const roundedRating = customRound(rating);
const fullPoints = Math.floor(roundedRating);
const isHalfPoint = roundedRating % 1 === 0.5;
return (
<div className="flex gap-1">
{Array.from({ length: fullPoints }).map((_, index) => {
return (
<StarIcon
fill="#9e881c"
color="#9e881c"
// eslint-disable-next-line react/no-array-index-key
key={index}
width={10}
height={10}
/>
);
})}
{isHalfPoint ? (
<StarHalfIcon fill="#9e881c" color="#9e881c" width={10} height={10} />
) : null}
</div>
);
}
24 changes: 22 additions & 2 deletions frontend/src/components/class-block.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";

import { StarsRating } from "@/components/class-block-stars";
import { cn } from "@/lib/utils";

export const typeClasses = {
Expand Down Expand Up @@ -34,6 +35,8 @@ export function ClassBlock({
courseType,
isChecked,
isDisabled,
spotsOccupied,
spotsTotal,
onClick,
isReadonly = false,
}: {
Expand All @@ -47,11 +50,13 @@ export function ClassBlock({
isChecked: boolean;
isDisabled: boolean;
isReadonly?: boolean;
spotsOccupied: number;
spotsTotal: number;
onClick: () => void;
}) {
const position = calculatePosition(startTime, endTime);
const [startGrid, durationSpan] = position;

const randomRating = Math.random() * 5;
return (
<button
suppressHydrationWarning={true}
Expand All @@ -74,11 +79,26 @@ export function ClassBlock({
)}
>
<div className="flex w-full justify-between">
<p>{`${courseType} ${week === "" ? "" : `|${week}`}`}</p>
<div className="flex gap-1">
<p>{`${courseType} ${week === "" ? "" : `|${week}`}`}</p>
<StarsRating rating={randomRating} />
</div>
<p>{`Grupa ${groupNumber}`}</p>
</div>
<p className="truncate font-bold">{courseName}</p>
<p className="truncate font-semibold">{lecturer}</p>
<p className="mt-2 flex w-full justify-between truncate">
Miejsca:
<span className="font-bold">
{spotsOccupied}/{spotsTotal}
</span>
</p>
<p className="flex w-full justify-between truncate">
Średnia ocena:
<span className="font-bold">
{randomRating.toFixed(1)} (1200 opinii)
</span>
</p>
</button>
);
}
2 changes: 2 additions & 0 deletions frontend/src/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ export interface ClassBlockProps {
week: "" | "TN" | "TP";
courseType: "C" | "L" | "P" | "S" | "W";
registrationId: string;
spotsOccupied: number;
spotsTotal: number;
}

export interface Registration {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/utils/update-local-plan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export const updateLocalPlan = async (
week: g.week.replace("-", "") as "" | "TN" | "TP",
endTime: g.endTime.split(":").slice(0, 2).join(":"),
startTime: g.startTime.split(":").slice(0, 2).join(":"),
spotsOccupied: g.spotsOccupied,
spotsTotal: g.spotsTotal,
}));
return {
id: c.id,
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ export type CourseType = {
type: "C" | "L" | "P" | "S" | "W";
url: string;
courseId: string;
spotsOccupied: number;
spotsTotal: number;
createdAt: string;
updatedAt: string;
}[];
Expand Down
Loading