added chrom

apps/discord-server/modules/discord.ts

@@ -1,7 +1,7 @@
 import { Client, GatewayIntentBits } from "discord.js";
 
 const client = new Client({
-	intents: [GatewayIntentBits.Guilds],
+	intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMembers],
 });
 
 const token = process.env.DISCORD_BOT_TOKEN;

apps/discord-server/routes/member.ts

@@ -51,12 +51,15 @@ const handleRoleChange = (action: "add" | "remove") => async (req: Request, res:
 				? roleIds.filter((id: string) => !currentRoleIds.includes(id))
 				: roleIds.filter((id: string) => currentRoleIds.includes(id));
 
-		console.log(`Attempting to ${action} roles:`, filteredRoleIds, roleIds);
+		console.log(
+			`Attempting to ${action} roles: ${filteredRoleIds.join(", ")} to member ${member.nickname || member.user.username}`,
+		);
 		// Option to skip if no roles to add/remove
-		/* if (filteredRoleIds.length === 0) {
+		if (filteredRoleIds.length === 0) {
+			console.log(`No roles to ${action}`);
 			res.status(200).json({ message: `No roles to ${action}` });
 			return;
-		} */
+		}
 
 		await member.roles[action](roleIds);
 		res.status(200).json({ message: `Roles ${action}ed successfully` });

apps/hub-server/modules/chron.ts

@@ -1,10 +1,11 @@
 import { getMoodleCourseCompletionStatus, getMoodleUserById } from "./moodle";
 import { CronJob } from "cron";
-import { DISCORD_ROLES, prisma } from "@repo/db";
+import { DISCORD_ROLES, ParticipantLog, prisma } from "@repo/db";
 import { sendCourseCompletedEmail } from "modules/mail";
 import { handleParticipantFinished } from "modules/event";
 import { eventCompleted } from "helper/events";
 import { addRolesToMember, removeRolesFromMember } from "modules/discord";
+import { JsonValueType } from "@repo/db/zod";
 
 const syncMoodleIds = async () => {
 	try {
@@ -122,9 +123,23 @@ const checkUnfinishedParticipants = async () => {
 
 		if (completed) return;
 
+		if (!p.Event.discordRoleId) {
+			await prisma.participant.update({
+				where: {
+					id: p.id,
+				},
+				data: {
+					inscriptionWorkflowCompleted: true,
+				},
+			});
+			return;
+		}
+		console.log(
+			`User ${p.User.firstname} ${p.User.lastname} - ${p.User.publicId} did not finish event ${p.Event.name}`,
+		);
 		if (p.User.discordAccounts[0] && p.Event.discordRoleId) {
 			await addRolesToMember(p.User.discordAccounts[0].discordId, [p.Event.discordRoleId]);
-			prisma.participant.update({
+			await prisma.participant.update({
 				where: {
 					id: p.id,
 				},
@@ -135,7 +150,7 @@ const checkUnfinishedParticipants = async () => {
 							event: "Discord-Rolle hinzugefügt",
 							timestamp: new Date(),
 							user: "system",
-						},
+						} as ParticipantLog as any,
 					},
 				},
 			});

apps/hub-server/modules/mail-templates/CourseCompleted.tsx

@@ -117,7 +117,7 @@ const Template = ({ event, user }: { user: User; event: Event }) => (
 									<tr>
 										<td style={{ textAlign: "center", padding: "20px" }}>
 											{event.finishedBadges.map((badge) => (
-												<Badge badge={badge} />
+												<Badge key={badge} badge={badge} />
 											))}
 										</td>
 									</tr>

apps/hub/app/(app)/admin/event/_components/ParticipantModal.tsx

@@ -11,17 +11,12 @@ interface ParticipantModalProps {
 	ref: RefObject<HTMLDialogElement | null>;
 }
 
-export const ParticipantModal = ({
+export const ParticipantModal = ({ participantForm, ref }: ParticipantModalProps) => {
-	participantForm,
-	ref,
-}: ParticipantModalProps) => {
 	return (
 		<dialog className="modal" ref={ref}>
 			<div className="modal-box">
 				<form method="dialog">
-					<button className="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">
+					<button className="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
-						✕
-					</button>
 				</form>
 				<h1 className="text-2xl">Teilnehmer bearbeiten</h1>
 				<form
@@ -35,21 +30,18 @@ export const ParticipantModal = ({
 					})}
 					className="space-y-1"
 				>
-					<Switch
+					<Switch form={participantForm} name="attended" label="Termin Teilgenommen" />
-						form={participantForm}
+					<Switch form={participantForm} name="appointmentCancelled" label="Termin abgesagt" />
-						name="attended"
-						label="Termin Teilgenommen"
-					/>
-					<Switch
-						form={participantForm}
-						name="appointmentCancelled"
-						label="Termin abgesagt"
-					/>
 					<Switch
 						form={participantForm}
 						name="finisherMoodleCurseCompleted"
 						label="Abschluss-Moodle-Kurs abgeschlossen"
 					/>
+					<Switch
+						form={participantForm}
+						name="inscriptionWorkflowCompleted"
+						label="Anmeldeprozess abgeschlossen (Discord-rollen vergeben)"
+					/>
 					<Switch
 						form={participantForm}
 						name="completetionWorkflowFinished"
@@ -60,18 +52,12 @@ export const ParticipantModal = ({
 
 						<p className="w-full flex justify-between">
 							<span>Termin ausgewählt am</span>
-							<span>
+							<span>{new Date(participantForm.watch("enscriptionDate")).toLocaleString()}</span>
-								{new Date(
-									participantForm.watch("enscriptionDate"),
-								).toLocaleString()}
-							</span>
 						</p>
 					</div>
 					<div className="flex flex-col">
 						<h3 className="text-xl">Verlauf</h3>
-						{(
+						{(participantForm.watch("statusLog") as unknown as ParticipantLog[])?.map((s) => (
-							participantForm.watch("statusLog") as unknown as ParticipantLog[]
-						)?.map((s) => (
 							<div className="flex justify-between" key={(s as any).timestamp}>
 								<p>{s.event}</p>
 								<p>{s.user}</p>

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

@@ -161,13 +161,6 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 			<div className="flex-1">
 				<h2 className="card-title">
 					<MixerHorizontalIcon className="w-5 h-5" /> Dispo-Verbindungs Historie
-					<button
-						onClick={() => {
-							dispoTableRef.current?.refresh();
-						}}
-					>
-						refresh
-					</button>
 				</h2>
 				<PaginatedTable
 					ref={dispoTableRef}

apps/hub/app/_components/Table.tsx

@@ -90,6 +90,13 @@ export default function SortableTable<TData>({
 							))}
 						</tr>
 					))}
+					{table.getRowModel().rows.length === 0 && (
+						<tr>
+							<td colSpan={columns.length} className="text-center font-bold text-sm text-gray-500">
+								Keine Daten gefunden
+							</td>
+						</tr>
+					)}
 				</tbody>
 			</table>
 		</div>

apps/hub/app/api/discord-redirect/route.ts

@@ -1,7 +1,8 @@
 import axios, { AxiosError } from "axios";
 import { NextRequest, NextResponse } from "next/server";
-import { DiscordAccount, prisma, PrismaClient } from "@repo/db";
+import { DISCORD_ROLES, DiscordAccount, getPublicUser, prisma, PrismaClient } from "@repo/db";
 import { getServerSession } from "../auth/[...nextauth]/auth";
+import { addRolesToMember, removeRolesFromMember, renameMember } from "../../../helper/discord";
 
 export const GET = async (req: NextRequest) => {
 	const session = await getServerSession();
@@ -67,8 +68,25 @@ export const GET = async (req: NextRequest) => {
 			update: discordObject, // Updates if found
 			create: discordObject, // Creates if not found
 		});
+		const user = await prisma.user.findUnique({
+			where: { id: session.user.id },
+		});
+		if (user) {
+			await renameMember(discordUser.id, `${getPublicUser(user).fullName} - ${user?.publicId}`);
+		}
+		if (user?.permissions.includes("PILOT")) {
+			await addRolesToMember(discordUser.id, [DISCORD_ROLES.PILOT]);
+		} else {
+			await removeRolesFromMember(discordUser.id, [DISCORD_ROLES.PILOT]);
+		}
+		if (user?.permissions.includes("DISPO")) {
+			await addRolesToMember(discordUser.id, [DISCORD_ROLES.ONLINE_DISPATCHER]);
+		} else {
+			await removeRolesFromMember(discordUser.id, [DISCORD_ROLES.PILOT]);
+		}
+
 		return NextResponse.redirect(`${process.env.NEXT_PUBLIC_HUB_URL}/settings`);
-	} catch (error: any) {
+	} catch (error) {
 		console.error(error);
 		return NextResponse.json(
 			{

apps/hub/helper/discord.ts

@@ -2,7 +2,7 @@
 import axios from "axios";
 
 const discordAxiosClient = axios.create({
-	baseURL: process.env.DISCORD_SERVER_URL || "https://discord.com/api/v10",
+	baseURL: process.env.DISCORD_SERVER_URL || "http://localhost:3005",
 });
 
 export const renameMember = async (memberId: string, newName: string) => {