Penalty Nachricht im Admin form, abgelaufen für Timebans in tabelle werden Farblich dargestellt

apps/dispatch-server/helper.ts

@@ -1,32 +0,0 @@
-import { prisma } from "@repo/db";
-
-export const getUserPenaltys = async (userId: string) => {
-	const openTimeban = await prisma.penalty.findMany({
-		where: {
-			userId: userId,
-			until: {
-				gte: new Date(),
-			},
-			suspended: false,
-			type: "TIME_BAN",
-		},
-		include: {
-			CreatedUser: true,
-		},
-	});
-
-	const openBans = await prisma.penalty.findMany({
-		where: {
-			userId: userId,
-			suspended: false,
-			type: "BAN",
-		},
-		include: {
-			CreatedUser: true,
-		},
-	});
-	return {
-		openTimeban,
-		openBans,
-	};
-};

apps/dispatch-server/socket-events/connect-dispatch.ts

@@ -1,9 +1,8 @@
 import { getPublicUser, prisma, User } from "@repo/db";
 import { addRolesToMember, removeRolesFromMember, renameMember } from "modules/discord";
-import { getNextDateWithTime } from "@repo/shared-components";
+import { getNextDateWithTime, getUserPenaltys } from "@repo/shared-components";
 import { DISCORD_ROLES } from "@repo/db";
 import { Server, Socket } from "socket.io";
-import { getUserPenaltys } from "helper";
 
 export const handleConnectDispatch =
 	(socket: Socket, io: Server) =>

apps/dispatch-server/socket-events/connect-pilot.ts

@@ -1,9 +1,8 @@
 import { getPublicUser, prisma, User } from "@repo/db";
 import { addRolesToMember, removeRolesFromMember, renameMember } from "modules/discord";
-import { getNextDateWithTime } from "@repo/shared-components";
 import { DISCORD_ROLES } from "@repo/db";
 import { Server, Socket } from "socket.io";
-import { getUserPenaltys } from "helper";
+import { getUserPenaltys } from "@repo/shared-components";
 
 export const handleConnectPilot =
 	(socket: Socket, io: Server) =>

apps/hub/app/(app)/admin/penalty/columns.tsx

@@ -30,12 +30,17 @@ export const penaltyColumns: ColumnDef<Penalty & { Report: Report; CreatedUser:
 						new Date(row.original.until || Date.now()),
 						{ locale: de },
 					);
+					const isExpired = new Date(row.original.until || Date.now()) < new Date();
 					return (
 						<div
-							className={cn("text-warning flex gap-3", row.original.suspended && "text-gray-400")}
+							className={cn(
+								"text-warning flex gap-3",
+								(row.original.suspended || isExpired) && "text-gray-400",
+							)}
 						>
 							<Timer />
-							Zeit Sperre ({length}) {row.original.suspended && "(ausgesetzt)"}
+							Zeit Sperre ({length}) {row.original.suspended && "(ausgesetzt)"}{" "}
+							{isExpired && !row.original.suspended && "(abgelaufen)"}
 						</div>
 					);
 				}
@@ -78,14 +83,14 @@ export const penaltyColumns: ColumnDef<Penalty & { Report: Report; CreatedUser:
 				<div className="flex gap-2">
 					<Link href={`/admin/penalty/${row.original.id}`}>
 						<button className="btn btn-sm btn-outline btn-info flex items-center gap-2">
-							<Shield className="w-4 h-4" />
+							<Shield className="h-4 w-4" />
 							Anzeigen
 						</button>
 					</Link>
 					{report && (
 						<Link href={`/admin/report/${report.id}`}>
 							<button className="btn btn-sm btn-outliney flex items-center gap-2">
-								<TriangleAlert className="w-4 h-4" />
+								<TriangleAlert className="h-4 w-4" />
 								Report Anzeigen
 							</button>
 						</Link>

apps/hub/app/(app)/admin/penalty/page.tsx

@@ -10,6 +10,12 @@ export default function ReportPage() {
 				CreatedUser: true,
 				Report: true,
 			}}
+			initialOrderBy={[
+				{
+					id: "timestamp",
+					desc: true,
+				},
+			]}
 			columns={penaltyColumns}
 		/>
 	);

apps/hub/app/(app)/admin/user/[id]/page.tsx

@@ -8,10 +8,10 @@ import {
 	UserReports,
 } from "./_components/forms";
 import { Error } from "../../../../_components/Error";
+import { getUserPenaltys } from "@repo/shared-components";
 
 export default async function Page({ params }: { params: Promise<{ id: string }> }) {
 	const { id } = await params;
-
 	const user = await prisma.user.findUnique({
 		where: {
 			id: id,
@@ -20,6 +20,7 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
 			discordAccounts: true,
 		},
 	});
+	if (!user) return <Error statusCode={404} title="User not found" />;
 
 	const dispoSessions = await prisma.connectedDispatcher.findMany({
 		where: {
@@ -97,41 +98,43 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
 		open: totalReportsOpen,
 		total60Days: totalReports60Days,
 	};
-	if (!user) return <Error statusCode={404} title="User not found" />;
+	const { openBans, openTimeban } = await getUserPenaltys(user?.id);
 
 	return (
 		<div className="grid grid-cols-6 gap-4">
-			<div className="col-span-full flex justify-between items-center">
-				<p className="text-2xl font-semibold text-left flex items-center gap-2">
-					<PersonIcon className="w-5 h-5" />
+			<div className="col-span-full flex items-center justify-between">
+				<p className="flex items-center gap-2 text-left text-2xl font-semibold">
+					<PersonIcon className="h-5 w-5" />
 					{user?.firstname} {user?.lastname} #{user?.publicId}
 				</p>
 				<p
-					className="text-sm text-gray-400 font-thin tooltip tooltip-left"
+					className="tooltip tooltip-left text-sm font-thin text-gray-400"
 					data-tip="Account erstellt am"
 				>
 					{new Date(user.createdAt).toLocaleString("de-DE")}
 				</p>
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-3">
 				<ProfileForm user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-3">
 				<AdminForm
 					user={user}
 					dispoTime={dispoTime}
 					pilotTime={pilotTime}
 					reports={reports}
 					discordAccount={user.discordAccounts[0]}
+					openBans={openBans}
+					openTimebans={openTimeban}
 				/>
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<UserReports user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<UserPenalties user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<ConnectionHistory user={user} />
 			</div>
 		</div>