Wrapper size Dynamic, class cleanup

.vscode/extensions.json

@@ -1,5 +1,7 @@
 {
   "recommendations": [
+    "EthanSK.restore-terminals",
     "dbaeumer.vscode-eslint",
+    "VisualStudioExptTeam.vscodeintellicode"
   ]
 }

apps/core-server/modules/chron.ts

@@ -1,7 +1,6 @@
-import { DISCORD_ROLES, MissionLog, NotificationPayload, prisma } from "@repo/db";
+import { MissionLog, NotificationPayload, prisma } from "@repo/db";
 import { io } from "index";
 import cron from "node-cron";
-import { changeMemberRoles } from "routes/member";
 
 const removeMission = async (id: number, reason: string) => {
 	const log: MissionLog = {
@@ -35,6 +34,7 @@ const removeMission = async (id: number, reason: string) => {
 
 	console.log(`Mission ${updatedMission.id} closed due to inactivity.`);
 };
+
 const removeClosedMissions = async () => {
 	const oldMissions = await prisma.mission.findMany({
 		where: {
@@ -140,57 +140,6 @@ const removeConnectedAircrafts = async () => {
 		}
 	});
 };
-const removePermissionsForBannedUsers = async () => {
-	const activePenalties = await prisma.penalty.findMany({
-		where: {
-			OR: [
-				{
-					type: "BAN",
-					suspended: false,
-				},
-				{
-					type: "TIME_BAN",
-					suspended: false,
-					until: {
-						gt: new Date().toISOString(),
-					},
-				},
-			],
-		},
-		include: {
-			User: {
-				include: {
-					DiscordAccount: true,
-					FormerDiscordAccounts: true,
-				},
-			},
-		},
-	});
-
-	for (const penalty of activePenalties) {
-		const user = penalty.User;
-
-		if (user.DiscordAccount) {
-			await changeMemberRoles(
-				user.DiscordAccount.discordId,
-				[DISCORD_ROLES.PILOT, DISCORD_ROLES.DISPATCHER],
-				"remove",
-			);
-		}
-
-		for (const formerAccount of user.FormerDiscordAccounts) {
-			await changeMemberRoles(
-				formerAccount.discordId,
-				[DISCORD_ROLES.PILOT, DISCORD_ROLES.DISPATCHER],
-				"remove",
-			);
-		}
-	}
-};
-
-cron.schedule("*/5 * * * *", async () => {
-	await removePermissionsForBannedUsers();
-});
 
 cron.schedule("*/1 * * * *", async () => {
 	try {

apps/core-server/routes/helper.ts

@@ -32,25 +32,6 @@ router.post("/set-standard-name", async (req, res) => {
 		},
 	});
 
-	const activePenaltys = await prisma.penalty.findMany({
-		where: {
-			userId: user.id,
-			OR: [
-				{
-					type: "BAN",
-					suspended: false,
-				},
-				{
-					type: "TIME_BAN",
-					suspended: false,
-					until: {
-						gt: new Date().toISOString(),
-					},
-				},
-			],
-		},
-	});
-
 	participant.forEach(async (p) => {
 		if (!p.Event.discordRoleId) return;
 		if (eventCompleted(p.Event, p)) {
@@ -67,12 +48,8 @@ router.post("/set-standard-name", async (req, res) => {
 	const isPilot = user.permissions.includes("PILOT");
 	const isDispatcher = user.permissions.includes("DISPO");
 
-	if (activePenaltys.length > 0) {
-		await changeMemberRoles(memberId, [DISCORD_ROLES.PILOT, DISCORD_ROLES.DISPATCHER], "remove");
-	} else {
-		await changeMemberRoles(memberId, [DISCORD_ROLES.PILOT], isPilot ? "add" : "remove");
-		await changeMemberRoles(memberId, [DISCORD_ROLES.DISPATCHER], isDispatcher ? "add" : "remove");
-	}
+	await changeMemberRoles(memberId, [DISCORD_ROLES.PILOT], isPilot ? "add" : "remove");
+	await changeMemberRoles(memberId, [DISCORD_ROLES.DISPATCHER], isDispatcher ? "add" : "remove");
 });
 
 export default router;

apps/dispatch-server/.env.example

@@ -1,8 +1,7 @@
 DISPATCH_SERVER_PORT=3002
 REDIS_HOST=localhost
 REDIS_PORT=6379
-CORE_SERVER_URL=http://localhost:3005
+CORE_SERVER_URL=http://core-server
 DISPATCH_APP_TOKEN=dispatch
 LIVEKIT_API_KEY=APIAnsGdtdYp2Ho
-LIVEKIT_API_SECRET=tdPjVsYUx8ddC7K9NvdmVAeLRF9GeADD6Fedm1x63fWC
-AUTH_HUB_SECRET=var
+LIVEKIT_API_SECRET=tdPjVsYUx8ddC7K9NvdmVAeLRF9GeADD6Fedm1x63fWC

apps/dispatch-server/index.ts

@@ -18,10 +18,7 @@ const app = express();
 const server = createServer(app);
 
 export const io = new Server(server, {
-	adapter:
-		process.env.REDIS_HOST && process.env.REDIS_PORT
-			? createAdapter(pubClient, subClient)
-			: undefined,
+	adapter: createAdapter(pubClient, subClient),
 	cors: {},
 });
 io.use(jwtMiddleware);

apps/dispatch-server/modules/redis.ts

@@ -1,17 +1,13 @@
 import { createClient, RedisClientType } from "redis";
 
 export const pubClient: RedisClientType = createClient({
-	url: `redis://${process.env.REDIS_HOST || "localhost"}:${process.env.REDIS_PORT || 6379}`,
+	url: `redis://${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`,
 });
 export const subClient: RedisClientType = pubClient.duplicate();
 
-if (!process.env.REDIS_HOST || !process.env.REDIS_PORT) {
-	console.warn("REDIS_HOST or REDIS_PORT not set, skipping Redis connection");
-} else {
-	Promise.all([pubClient.connect(), subClient.connect()]).then(() => {
-		console.log("Redis connected");
-	});
-}
+Promise.all([pubClient.connect(), subClient.connect()]).then(() => {
+	console.log("Redis connected");
+});
 
 pubClient.on("error", (err) => console.log("Redis Client Error", err));
 subClient.on("error", (err) => console.log("Redis Client Error", err));

apps/dispatch-server/routes/aircraft.ts

@@ -2,7 +2,6 @@ import {
 	AdminMessage,
 	getPublicUser,
 	MissionLog,
-	MissionSdsStatusLog,
 	NotificationPayload,
 	Prisma,
 	prisma,
@@ -131,44 +130,6 @@ router.patch("/:id", async (req, res) => {
 	}
 });
 
-router.post("/:id/send-sds-message", async (req, res) => {
-	const { id } = req.params;
-	const { sdsMessage } = req.body as { sdsMessage: MissionSdsStatusLog };
-
-	if (!sdsMessage.data.stationId || !id) {
-		res.status(400).json({ error: "Missing aircraftId or stationId" });
-		return;
-	}
-
-	await prisma.mission.updateMany({
-		where: {
-			state: "running",
-			missionStationIds: {
-				has: sdsMessage.data.stationId,
-			},
-		},
-		data: {
-			missionLog: {
-				push: sdsMessage as unknown as Prisma.InputJsonValue,
-			},
-		},
-	});
-
-	io.to(
-		sdsMessage.data.direction === "to-lst" ? "dispatchers" : `station:${sdsMessage.data.stationId}`,
-	).emit(sdsMessage.data.direction === "to-lst" ? "notification" : "sds-status", {
-		type: "station-status",
-		status: sdsMessage.data.status,
-		message: "SDS Status Message",
-		data: {
-			aircraftId: parseInt(id),
-			stationId: sdsMessage.data.stationId,
-		},
-	} as NotificationPayload);
-
-	res.sendStatus(204);
-});
-
 // Kick a connectedAircraft by ID
 router.delete("/:id", async (req, res) => {
 	const { id } = req.params;

apps/dispatch-server/routes/mission.ts

@@ -87,29 +87,6 @@ router.patch("/:id", async (req, res) => {
 			data: req.body,
 		});
 		io.to("dispatchers").emit("update-mission", { updatedMission });
-		if (req.body.state === "finished") {
-			const missionUsers = await prisma.missionOnStationUsers.findMany({
-				where: {
-					missionId: updatedMission.id,
-				},
-				select: {
-					userId: true,
-				},
-			});
-			console.log("Notifying users about mission closure:", missionUsers);
-			missionUsers?.forEach(({ userId }) => {
-				io.to(`user:${userId}`).emit("notification", {
-					type: "mission-closed",
-					status: "closed",
-					message: `Einsatz ${updatedMission.publicId} wurde beendet`,
-					data: {
-						missionId: updatedMission.id,
-						publicMissionId: updatedMission.publicId,
-					},
-				} as NotificationPayload);
-			});
-		}
-
 		res.json(updatedMission);
 	} catch (error) {
 		console.error(error);

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

@@ -96,8 +96,6 @@ export const handleConnectPilot =
 					lastHeartbeat: debug ? nowPlus2h.toISOString() : undefined,
 					posLat: randomPos?.lat,
 					posLng: randomPos?.lng,
-					posXplanePluginActive: debug ? true : undefined,
-					posH145active: debug ? true : undefined,
 				},
 			});
 

apps/dispatch/Dockerfile

@@ -1,12 +1,12 @@
 FROM node:22-alpine AS base
 
-ARG NEXT_PUBLIC_DISPATCH_URL="http://localhost:3001"
-ARG NEXT_PUBLIC_DISPATCH_SERVER_URL="http://localhost:4001"
-ARG NEXT_PUBLIC_HUB_URL="http://localhost:3002"
-ARG NEXT_PUBLIC_DISPATCH_SERVICE_ID="1"
-ARG NEXT_PUBLIC_LIVEKIT_URL="http://localhost:7880"
-ARG NEXT_PUBLIC_DISCORD_URL="https://discord.com"
-ARG NEXT_PUBLIC_OPENAIP_ACCESS=""
+ARG NEXT_PUBLIC_DISPATCH_URL
+ARG NEXT_PUBLIC_DISPATCH_SERVER_URL
+ARG NEXT_PUBLIC_HUB_URL
+ARG NEXT_PUBLIC_DISPATCH_SERVICE_ID
+ARG NEXT_PUBLIC_LIVEKIT_URL
+ARG NEXT_PUBLIC_DISCORD_URL
+ARG NEXT_PUBLIC_OPENAIP_ACCESS
 
 ENV NEXT_PUBLIC_DISPATCH_SERVER_URL=$NEXT_PUBLIC_DISPATCH_SERVER_URL
 ENV NEXT_PUBLIC_DISPATCH_URL=$NEXT_PUBLIC_DISPATCH_URL
@@ -16,13 +16,13 @@ ENV NEXT_PUBLIC_LIVEKIT_URL=$NEXT_PUBLIC_LIVEKIT_URL
 ENV NEXT_PUBLIC_OPENAIP_ACCESS=$NEXT_PUBLIC_OPENAIP_ACCESS
 ENV NEXT_PUBLIC_DISCORD_URL=$NEXT_PUBLIC_DISCORD_URL
 
-FROM base AS builder
-
 ENV PNPM_HOME="/usr/local/pnpm"
 ENV PATH="${PNPM_HOME}:${PATH}"
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
 RUN pnpm add -g turbo@^2.5
+
+FROM base AS builder
 RUN apk update
 RUN apk add --no-cache libc6-compat
 
@@ -31,20 +31,12 @@ WORKDIR /usr/app
 RUN echo "NEXT_PUBLIC_HUB_URL is: $NEXT_PUBLIC_HUB_URL"
 RUN echo "NEXT_PUBLIC_DISPATCH_SERVICE_ID is: $NEXT_PUBLIC_DISPATCH_SERVICE_ID"
 RUN echo "NEXT_PUBLIC_DISPATCH_SERVER_URL is: $NEXT_PUBLIC_DISPATCH_SERVER_URL"
-RUN echo "NEXT_PUBLIC_LIVEKIT_URL is: $NEXT_PUBLIC_LIVEKIT_URL"
 
 COPY . .
 
 RUN turbo prune dispatch --docker
 
 FROM base AS installer
-
-ENV PNPM_HOME="/usr/local/pnpm"
-ENV PATH="${PNPM_HOME}:${PATH}"
-RUN corepack enable && corepack prepare pnpm@latest --activate
-
-RUN pnpm add -g turbo@^2.5
-
 RUN apk update
 RUN apk add --no-cache libc6-compat
 
@@ -58,22 +50,19 @@ COPY --from=builder /usr/app/out/full/ .
 
 RUN turbo run build
 
-FROM node:22-alpine AS runner
+FROM base AS runner
 WORKDIR /usr/app
 
 # Don't run production as root
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
+USER nextjs
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/dispatch/.next/standalone ./
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/dispatch/.next/static ./apps/dispatch/.next/static
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/dispatch/public ./apps/dispatch/public
-
-USER nextjs
+COPY --from=installer --chown=nextjs:nodejs /usr/app/ ./
 
 # Expose the application port
-EXPOSE 3000
+EXPOSE 3001
 
-CMD ["node", "apps/dispatch/server.js"]
+CMD ["pnpm", "--dir", "apps/dispatch", "run", "start"]

apps/dispatch/app/(app)/dispatch/_components/navbar/_components/Connection.tsx

@@ -14,7 +14,7 @@ export const ConnectionBtn = () => {
 	const connection = useDispatchConnectionStore((state) => state);
 	const [form, setForm] = useState({
 		logoffTime: "",
-		selectedZone: "VAR_LST_RD_01",
+		selectedZone: "LST_01",
 		ghostMode: false,
 	});
 	const changeDispatcherMutation = useMutation({

apps/dispatch/app/(app)/dispatch/_components/navbar/_components/Settings.tsx

@@ -3,17 +3,16 @@ import { useEffect, useRef, useState } from "react";
 import { GearIcon } from "@radix-ui/react-icons";
 import { SettingsIcon, Volume2 } from "lucide-react";
 import MicVolumeBar from "_components/MicVolumeIndication";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { editUserAPI, getUserAPI } from "_querys/user";
 import { useSession } from "next-auth/react";
 import { useAudioStore } from "_store/audioStore";
 import toast from "react-hot-toast";
 import { useMapStore } from "_store/mapStore";
-import { Button } from "@repo/shared-components";
+import { set } from "date-fns";
 
 export const SettingsBtn = () => {
 	const session = useSession();
-	const queryClient = useQueryClient();
 
 	const [inputDevices, setInputDevices] = useState<MediaDeviceInfo[]>([]);
 	const { data: user } = useQuery({
@@ -24,10 +23,6 @@ export const SettingsBtn = () => {
 
 	const editUserMutation = useMutation({
 		mutationFn: editUserAPI,
-		onSuccess: async () => {
-			await queryClient.invalidateQueries({ queryKey: ["user", session.data?.user.id] });
-		},
-		
 	});
 
 	useEffect(() => {
@@ -45,7 +40,6 @@ export const SettingsBtn = () => {
 		micVolume: user?.settingsMicVolume || 1,
 		radioVolume: user?.settingsRadioVolume || 0.8,
 		autoCloseMapPopup: user?.settingsAutoCloseMapPopup || false,
-		useHPGAsDispatcher: user?.settingsUseHPGAsDispatcher || false,
 	});
 
 	const { setSettings: setAudioSettings } = useAudioStore((state) => state);
@@ -63,8 +57,7 @@ export const SettingsBtn = () => {
 				micDeviceId: user.settingsMicDevice,
 				micVolume: user.settingsMicVolume || 1,
 				radioVolume: user.settingsRadioVolume || 0.8,
-				autoCloseMapPopup: user.settingsAutoCloseMapPopup,
-				useHPGAsDispatcher: user.settingsUseHPGAsDispatcher,
+				autoCloseMapPopup: user.settingsAutoCloseMapPopup || false,
 			});
 			setUserSettings({
 				settingsAutoCloseMapPopup: user.settingsAutoCloseMapPopup || false,
@@ -205,17 +198,6 @@ export const SettingsBtn = () => {
 						/>
 						Popups automatisch schließen
 					</div>
-					<div className="mt-2 flex w-full items-center gap-2">
-						<input
-							type="checkbox"
-							className="toggle"
-							checked={settings.useHPGAsDispatcher}
-							onChange={(e) => {
-								setSettingsPartial({ useHPGAsDispatcher: e.target.checked });
-							}}
-						/>
-						HPG als Disponent verwenden
-					</div>
 
 					<div className="modal-action flex justify-between">
 						<button
@@ -229,7 +211,7 @@ export const SettingsBtn = () => {
 						>
 							Schließen
 						</button>
-						<Button
+						<button
 							className="btn btn-soft btn-success"
 							type="submit"
 							onSubmit={() => false}
@@ -242,7 +224,6 @@ export const SettingsBtn = () => {
 										settingsMicVolume: settings.micVolume,
 										settingsRadioVolume: settings.radioVolume,
 										settingsAutoCloseMapPopup: settings.autoCloseMapPopup,
-										settingsUseHPGAsDispatcher: settings.useHPGAsDispatcher,
 									},
 								});
 								setAudioSettings({
@@ -258,7 +239,7 @@ export const SettingsBtn = () => {
 							}}
 						>
 							Speichern
-						</Button>
+						</button>
 					</div>
 				</div>
 			</dialog>

apps/dispatch/app/(app)/dispatch/_components/pannel/MissionForm.tsx

@@ -28,11 +28,8 @@ import { selectRandomHPGMissionSzenery } from "_helpers/selectRandomHPGMission";
 import { AxiosError } from "axios";
 import { cn } from "@repo/shared-components";
 import { StationsSelect } from "(app)/dispatch/_components/StationSelect";
-import { getUserAPI } from "_querys/user";
 
 export const MissionForm = () => {
-	const session = useSession();
-
 	const { editingMissionId, setEditingMission } = usePannelStore();
 	const queryClient = useQueryClient();
 	const { setSearchElements, searchElements, setContextMenu } = useMapStore((s) => s);
@@ -47,10 +44,6 @@ export const MissionForm = () => {
 		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10000,
 	});
-	const { data: user } = useQuery({
-		queryKey: ["user", session.data?.user.id],
-		queryFn: () => getUserAPI(session.data!.user.id),
-	});
 
 	const createMissionMutation = useMutation({
 		mutationFn: createMissionAPI,
@@ -88,6 +81,7 @@ export const MissionForm = () => {
 		},
 	});
 
+	const session = useSession();
 	const defaultFormValues = React.useMemo(
 		() =>
 			({
@@ -114,7 +108,6 @@ export const MissionForm = () => {
 				hpgSelectedMissionString: null,
 				hpg: null,
 				missionLog: [],
-				xPlaneObjects: [],
 			}) as MissionOptionalDefaults,
 		[session.data?.user.id],
 	);
@@ -123,16 +116,13 @@ export const MissionForm = () => {
 		resolver: zodResolver(MissionOptionalDefaultsSchema),
 		defaultValues: defaultFormValues,
 	});
-	const { missionFormValues, setOpen, setMissionFormValues } = usePannelStore((state) => state);
+	const { missionFormValues, setOpen } = usePannelStore((state) => state);
 
-	const validationRequired =
-		HPGValidationRequired(
-			form.watch("missionStationIds"),
-			aircrafts,
-			form.watch("hpgMissionString"),
-		) &&
-		!form.watch("hpgMissionString")?.startsWith("kein Szenario") &&
-		user?.settingsUseHPGAsDispatcher;
+	const validationRequired = HPGValidationRequired(
+		form.watch("missionStationIds"),
+		aircrafts,
+		form.watch("hpgMissionString"),
+	);
 
 	useEffect(() => {
 		if (session.data?.user.id) {
@@ -154,7 +144,6 @@ export const MissionForm = () => {
 				return;
 			}
 			for (const key in missionFormValues) {
-				console.debug(key, missionFormValues[key as keyof MissionOptionalDefaults]);
 				if (key === "addressOSMways") continue; // Skip addressOSMways as it is handled separately
 				form.setValue(
 					key as keyof MissionOptionalDefaults,
@@ -164,22 +153,6 @@ export const MissionForm = () => {
 		}
 	}, [missionFormValues, form, defaultFormValues]);
 
-	// Sync form state to store (avoid infinity loops by using watch)
-	useEffect(() => {
-		const subscription = form.watch((values) => {
-			// Only update store if values actually changed to prevent loops
-			const currentStoreValues = JSON.stringify(missionFormValues);
-			const newFormValues = JSON.stringify(values);
-
-			if (currentStoreValues !== newFormValues) {
-				console.debug("Updating store missionFormValues", values);
-				setMissionFormValues(values as MissionOptionalDefaults);
-			}
-		});
-
-		return () => subscription.unsubscribe();
-	}, [form, setMissionFormValues, missionFormValues]);
-
 	const saveMission = async (
 		mission: MissionOptionalDefaults,
 		{ alertWhenValid = false, createNewMission = false } = {},
@@ -396,7 +369,6 @@ export const MissionForm = () => {
 						<option disabled value="please_select">
 							Einsatz Szenario auswählen...
 						</option>
-						<option value={"kein Szenario:3_1_1_1-4_1"}>Kein Szenario</option>
 						{keywords &&
 							keywords
 								.find((k) => k.name === form.watch("missionKeywordName"))
@@ -443,21 +415,6 @@ export const MissionForm = () => {
 				In diesem Einsatz gibt es {form.watch("addressOSMways").length} Gebäude
 			</p>
 
-			<div className="flex items-center justify-between">
-				<p
-					className={cn("text-sm text-gray-500", form.watch("xPlaneObjects").length && "text-info")}
-				>
-					In diesem Einsatz gibt es {form.watch("xPlaneObjects").length} Objekte
-				</p>
-				<button
-					disabled={!(form.watch("xPlaneObjects")?.length > 0)}
-					className="btn btn-xs btn-error mt-2"
-					onClick={() => form.setValue("xPlaneObjects", [])}
-				>
-					löschen
-				</button>
-			</div>
-
 			<div className="form-control min-h-[140px]">
 				<div className="flex gap-2">
 					<button
@@ -473,11 +430,7 @@ export const MissionForm = () => {
 								setSearchElements([]); // Reset search elements
 								setEditingMission(null);
 								setContextMenu(null);
-								if (editingMissionId) {
-									toast.success(`${newMission.publicId} bearbeitet`);
-								} else {
-									toast.success(`${newMission.publicId} erstellt`);
-								}
+								toast.success(`Einsatz ${newMission.publicId} erstellt`);
 								form.reset();
 								setOpen(false);
 							} catch (error) {
@@ -502,11 +455,7 @@ export const MissionForm = () => {
 
 								setSearchElements([]); // Reset search elements
 								setContextMenu(null);
-								if (editingMissionId) {
-									toast.success(`${newMission.publicId} bearbeitet`);
-								} else {
-									toast.success(`${newMission.publicId} erstellt`);
-								}
+								toast.success(`Einsatz ${newMission.publicId} erstellt`);
 								form.reset();
 								setOpen(false);
 							} catch (error) {

apps/dispatch/app/(app)/pilot/_components/mrt/Base.tsx

@@ -1,15 +0,0 @@
-import { useMrtStore } from "_store/pilot/MrtStore";
-import Image from "next/image";
-import DAY_BASE_IMG from "./images/Base_NoScreen_Day.png";
-import NIGHT_BASE_IMG from "./images/Base_NoScreen_Night.png";
-
-export const MrtBase = () => {
-	const { nightMode } = useMrtStore((state) => state);
-	return (
-		<Image
-			src={nightMode ? NIGHT_BASE_IMG : DAY_BASE_IMG}
-			alt=""
-			className="z-30 col-span-full row-span-full"
-		/>
-	);
-};

apps/dispatch/app/(app)/pilot/_components/mrt/Mrt.tsx

@@ -1,9 +1,22 @@
 import { CSSProperties } from "react";
+import MrtImage from "./MRT.png";
+import MrtMessageImage from "./MRT_MESSAGE.png";
+import { useButtons } from "./useButtons";
+import { useSounds } from "./useSounds";
 import "./mrt.css";
-import { MrtBase } from "./Base";
-import { MrtDisplay } from "./MrtDisplay";
-import { MrtButtons } from "./MrtButtons";
-import { MrtPopups } from "./MrtPopups";
+import Image from "next/image";
+import { useMrtStore } from "_store/pilot/MrtStore";
+
+const MRT_BUTTON_STYLES: CSSProperties = {
+	cursor: "pointer",
+	zIndex: "9999",
+	backgroundColor: "transparent",
+	border: "none",
+};
+const MRT_DISPLAYLINE_STYLES: CSSProperties = {
+	color: "white",
+	zIndex: 1,
+};
 
 export interface DisplayLineProps {
 	lineStyle?: CSSProperties;
@@ -14,7 +27,45 @@ export interface DisplayLineProps {
 	textSize: "1" | "2" | "3" | "4";
 }
 
+const DisplayLine = ({
+	style = {},
+	textLeft,
+	textMid,
+	textRight,
+	textSize,
+	lineStyle,
+}: DisplayLineProps) => {
+	const INNER_TEXT_PARTS: CSSProperties = {
+		fontFamily: "Melder",
+		flex: "1",
+		flexBasis: "auto",
+		overflowWrap: "break-word",
+		...lineStyle,
+	};
+
+	return (
+		<div
+			className={`text-${textSize}`}
+			style={{
+				fontFamily: "Famirids",
+				display: "flex",
+				flexWrap: "wrap",
+
+				...style,
+			}}
+		>
+			<span style={INNER_TEXT_PARTS}>{textLeft}</span>
+			<span style={{ textAlign: "center", ...INNER_TEXT_PARTS }}>{textMid}</span>
+			<span style={{ textAlign: "end", ...INNER_TEXT_PARTS }}>{textRight}</span>
+		</div>
+	);
+};
+
 export const Mrt = () => {
+	useSounds();
+	const { handleButton } = useButtons();
+	const { lines, page } = useMrtStore((state) => state);
+
 	return (
 		<div
 			id="mrt-container"
@@ -27,16 +78,150 @@ export const Mrt = () => {
 				maxHeight: "100%",
 				maxWidth: "100%",
 				color: "white",
-				gridTemplateColumns:
-					"9.75% 4.23% 8.59% 7.30% 1.16% 7.30% 1.23% 7.16% 1.09% 7.30% 3.68% 4.23% 5.59% 6.07% 1.91% 6.07% 1.84% 6.21% 9.28%",
-				gridTemplateRows:
-					"21.55% 11.83% 3.55% 2.50% 9.46% 2.76% 0.66% 4.99% 6.83% 3.55% 1.97% 9.99% 4.20% 11.04% 5.12%",
+				gridTemplateColumns: "21.83% 4.43% 24.42% 18.08% 5.93% 1.98% 6.00% 1.69% 6.00% 9.35%",
+				gridTemplateRows: "21.58% 11.87% 3.55% 5.00% 6.84% 0.53% 3.03% 11.84% 3.55% 11.84% 20.39%",
 			}}
 		>
-			<MrtPopups />
-			<MrtDisplay />
-			<MrtButtons />
-			<MrtBase />
+			{page !== "sds" && (
+				<Image
+					src={MrtImage}
+					alt="MrtImage"
+					style={{
+						zIndex: 0,
+						height: "100%",
+						width: "100%",
+						gridArea: "1 / 1 / 13 / 13",
+					}}
+				/>
+			)}
+			{page === "sds" && (
+				<Image
+					src={MrtMessageImage}
+					alt="MrtImage-Message"
+					style={{
+						zIndex: 0,
+						height: "100%",
+						width: "100%",
+						gridArea: "1 / 1 / 13 / 13",
+					}}
+				/>
+			)}
+
+			<button
+				onClick={handleButton("home")}
+				style={{ gridArea: "2 / 4 / 3 / 5", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("1")}
+				style={{ gridArea: "2 / 5 / 3 / 6", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("2")}
+				style={{ gridArea: "2 / 7 / 3 / 7", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("3")}
+				style={{ gridArea: "2 / 9 / 3 / 10", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("4")}
+				style={{ gridArea: "4 / 5 / 6 / 6", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("5")}
+				style={{ gridArea: "4 / 7 / 6 / 7", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("6")}
+				style={{ gridArea: "4 / 9 / 6 / 10", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("7")}
+				style={{ gridArea: "8 / 5 / 9 / 6", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("8")}
+				style={{ gridArea: "8 / 7 / 9 / 7", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("9")}
+				style={{ gridArea: "8 / 9 / 9 / 10", ...MRT_BUTTON_STYLES }}
+			/>
+			<button
+				onClick={handleButton("0")}
+				style={{ gridArea: "10 / 7 / 11 / 8", ...MRT_BUTTON_STYLES }}
+			/>
+
+			{lines[0] && (
+				<DisplayLine
+					{...lines[0]}
+					style={
+						page === "sds"
+							? {
+									gridArea: "2 / 3 / 3 / 4",
+									marginLeft: "9px",
+									marginTop: "auto",
+
+									...MRT_DISPLAYLINE_STYLES,
+									...lines[0]?.style,
+								}
+							: {
+									gridArea: "4 / 3 / 5 / 4",
+									marginLeft: "9px",
+									marginTop: "auto",
+									...MRT_DISPLAYLINE_STYLES,
+									...lines[0]?.style,
+								}
+					}
+				/>
+			)}
+			{lines[1] && (
+				<DisplayLine
+					lineStyle={{
+						overflowX: "hidden",
+						maxHeight: "100%",
+						overflowY: "auto",
+					}}
+					{...lines[1]}
+					style={
+						page === "sds"
+							? {
+									gridArea: "4 / 2 / 10 / 4",
+									marginLeft: "3px",
+									...MRT_DISPLAYLINE_STYLES,
+									...lines[1].style,
+								}
+							: {
+									gridArea: "5 / 3 / 7 / 4",
+									marginLeft: "3px",
+									marginTop: "auto",
+									...MRT_DISPLAYLINE_STYLES,
+									...lines[1].style,
+								}
+					}
+				/>
+			)}
+			{lines[2] && (
+				<DisplayLine
+					{...lines[2]}
+					style={{
+						gridArea: "8 / 2 / 9 / 4",
+						...MRT_DISPLAYLINE_STYLES,
+						...lines[2]?.style,
+					}}
+				/>
+			)}
+			{lines[3] && (
+				<DisplayLine
+					{...lines[3]}
+					style={{
+						gridArea: "9 / 2 / 10 / 4",
+						marginRight: "10px",
+						...MRT_DISPLAYLINE_STYLES,
+						...lines[3]?.style,
+					}}
+				/>
+			)}
 		</div>
 	);
 };

apps/dispatch/app/(app)/pilot/_components/mrt/MrtButtons.tsx

@@ -1,143 +0,0 @@
-import { CSSProperties, useRef } from "react";
-import { useButtons } from "./useButtons";
-
-const MRT_BUTTON_STYLES: CSSProperties = {
-	cursor: "pointer",
-	zIndex: "9999",
-	backgroundColor: "transparent",
-	border: "none",
-};
-
-interface MrtButtonProps {
-	onClick: () => void;
-	onHold?: () => void;
-	style: CSSProperties;
-}
-
-const MrtButton = ({ onClick, onHold, style }: MrtButtonProps) => {
-	const timeoutRef = useRef<NodeJS.Timeout | null>(null);
-
-	const handleMouseDown = () => {
-		if (!onHold) return;
-		timeoutRef.current = setTimeout(onHold, 500);
-	};
-
-	const handleMouseUp = () => {
-		if (timeoutRef.current) {
-			clearTimeout(timeoutRef.current);
-			onClick();
-		}
-	};
-
-	return (
-		<button
-			onMouseDown={handleMouseDown}
-			onMouseUp={handleMouseUp}
-			onMouseLeave={() => timeoutRef.current && clearTimeout(timeoutRef.current)}
-			style={style}
-		/>
-	);
-};
-
-export const MrtButtons = () => {
-	const { handleHold, handleKlick } = useButtons();
-
-	return (
-		<>
-			{/* BELOW DISPLAY */}
-			<MrtButton
-				onClick={handleKlick("arrow-left")}
-				onHold={handleHold("arrow-left")}
-				style={{ gridArea: "14 / 4 / 15 / 5", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onClick={handleKlick("arrow-down")}
-				onHold={handleHold("arrow-down")}
-				style={{ gridArea: "14 / 6 / 15 / 7", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onClick={handleKlick("arrow-up")}
-				onHold={handleHold("arrow-up")}
-				style={{ gridArea: "14 / 8 / 15 / 9", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onClick={handleKlick("arrow-right")}
-				onHold={handleHold("arrow-right")}
-				style={{ gridArea: "14 / 10 / 15 / 11", ...MRT_BUTTON_STYLES }}
-			/>
-
-			<MrtButton
-				onClick={handleKlick("wheel-knob")}
-				onHold={handleHold("wheel-knob")}
-				style={{ gridArea: "14 / 2 / 15 / 4", ...MRT_BUTTON_STYLES }}
-			/>
-			{/* LINE SELECT KEY */}
-			<MrtButton
-				onHold={handleHold("3r")}
-				onClick={handleKlick("3r")}
-				style={{ gridArea: "9 / 12 / 11 / 13", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("3l")}
-				onClick={handleKlick("3l")}
-				style={{ gridArea: "9 / 2 / 11 / 3", ...MRT_BUTTON_STYLES }}
-			/>
-			{/* NUM PAD */}
-			<MrtButton
-				onHold={handleHold("1")}
-				onClick={handleKlick("1")}
-				style={{ gridArea: "2 / 14 / 3 / 15", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("2")}
-				onClick={handleKlick("2")}
-				style={{ gridArea: "2 / 16 / 3 / 17", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("3")}
-				onClick={handleKlick("3")}
-				style={{ gridArea: "2 / 18 / 3 / 19", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("4")}
-				onClick={handleKlick("4")}
-				style={{ gridArea: "4 / 14 / 6 / 15", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("5")}
-				onClick={handleKlick("5")}
-				style={{ gridArea: "4 / 16 / 6 / 17", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("6")}
-				onClick={handleKlick("6")}
-				style={{ gridArea: "4 / 18 / 6 / 19", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("7")}
-				onClick={handleKlick("7")}
-				style={{ gridArea: "8 / 14 / 10 / 15", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("8")}
-				onClick={handleKlick("8")}
-				style={{ gridArea: "8 / 16 / 10 / 17", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("9")}
-				onClick={handleKlick("9")}
-				style={{ gridArea: "8 / 18 / 10 / 19", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("0")}
-				onClick={handleKlick("0")}
-				style={{ gridArea: "11 / 16 / 13 / 17", ...MRT_BUTTON_STYLES }}
-			/>
-			<MrtButton
-				onHold={handleHold("end-call")}
-				onClick={handleKlick("end-call")}
-				style={{ gridArea: "13 / 16 / 15 / 17", ...MRT_BUTTON_STYLES }}
-			/>
-		</>
-	);
-};

apps/dispatch/app/(app)/pilot/_components/mrt/MrtDisplay.css

@@ -1,16 +0,0 @@
-.transition-image {
-	clip-path: inset(0 0 100% 0);
-}
-
-.transition-image.animate-reveal {
-	animation: revealFromTop 0.6s linear forwards;
-}
-
-@keyframes revealFromTop {
-	from {
-		clip-path: inset(0 0 100% 0);
-	}
-	to {
-		clip-path: inset(0 0 0 0);
-	}
-}

apps/dispatch/app/(app)/pilot/_components/mrt/MrtDisplay.tsx

@@ -1,266 +0,0 @@
-"use client";
-
-import { SetPageParams, useMrtStore } from "_store/pilot/MrtStore";
-import Image, { StaticImageData } from "next/image";
-import PAGE_HOME from "./images/PAGE_Home.png";
-import PAGE_Call from "./images/PAGE_Call.png";
-import PAGE_Off from "./images/PAGE_Off.png";
-import PAGE_STARTUP from "./images/PAGE_Startup.png";
-import { useEffect, useRef, useState } from "react";
-import { cn, useDebounce } from "@repo/shared-components";
-import "./MrtDisplay.css";
-import { useSession } from "next-auth/react";
-import { usePilotConnectionStore } from "_store/pilot/connectionStore";
-import { fmsStatusDescriptionShort } from "_data/fmsStatusDescription";
-import { useAudioStore } from "_store/audioStore";
-import { ROOMS } from "_data/livekitRooms";
-
-export const MrtDisplay = () => {
-	const { page, setPage, popup, setPopup, setStringifiedData, stringifiedData } = useMrtStore(
-		(state) => state,
-	);
-	const callEstablishedRef = useRef(false);
-	const session = useSession();
-	const { connectedAircraft, selectedStation } = usePilotConnectionStore((state) => state);
-	const { room, speakingParticipants, isTalking } = useAudioStore((state) => state);
-	const [pageImage, setPageImage] = useState<{
-		src: StaticImageData;
-		name: SetPageParams["page"];
-	}>({
-		src: PAGE_Off,
-		name: "off",
-	});
-	const [nextImage, setNextImage] = useState<
-		| {
-				src: StaticImageData;
-				name: SetPageParams["page"];
-		  }
-		| undefined
-	>(undefined);
-
-	useDebounce(
-		() => {
-			if (!nextImage) return;
-			setPageImage(nextImage);
-			setNextImage(undefined);
-		},
-		1000,
-		[nextImage],
-	);
-
-	useEffect(() => {
-		console.log("speakingParticipants", speakingParticipants, isTalking, page);
-		if ((speakingParticipants.length > 0 || isTalking) && page === "home") {
-			setPage({
-				page: "voice-call",
-			});
-		}
-	}, [speakingParticipants, isTalking, page, setPage]);
-
-	useDebounce(
-		() => {
-			if (page === "startup") {
-				setPage({
-					page: "home",
-				});
-			}
-		},
-		6000,
-		[page, setPage],
-	);
-
-	useDebounce(
-		() => {
-			if (page === "startup") {
-				setPopup({
-					popup: "login",
-				});
-			}
-		},
-		7500,
-		[page, setPage],
-	);
-
-	useDebounce(
-		() => {
-			if (page === "voice-call" && speakingParticipants.length === 0 && !isTalking) {
-				setPage({
-					page: "home",
-				});
-			}
-		},
-		4000,
-		[page, setPage, speakingParticipants, isTalking],
-	);
-
-	useEffect(() => {
-		const timeouts: NodeJS.Timeout[] = [];
-		if (page === "voice-call") {
-			setStringifiedData({
-				callTextHeader: "Wählen",
-			});
-			timeouts.push(
-				setTimeout(() => {
-					setStringifiedData({
-						callTextHeader: "Anruf...",
-					});
-				}, 500),
-
-				setTimeout(() => {
-					setStringifiedData({
-						callTextHeader: "Gruppenruf",
-					});
-				}, 800),
-				setTimeout(() => {
-					callEstablishedRef.current = true;
-				}, 1500),
-			);
-		}
-		return () => {
-			timeouts.forEach((t) => clearTimeout(t));
-		};
-	}, [page, setStringifiedData]);
-
-	useDebounce(
-		() => {
-			if (isTalking && page === "voice-call") {
-				setStringifiedData({
-					callTextHeader: "Sprechen",
-				});
-			}
-		},
-		1500,
-		[page, isTalking],
-	);
-
-	useEffect(() => {
-		if (isTalking && page === "voice-call" && callEstablishedRef.current) {
-			console.log("SET TO SPRECHEN", stringifiedData.callTextHeader);
-			setStringifiedData({
-				callTextHeader: "Sprechen",
-			});
-		} else if (
-			!isTalking &&
-			page === "voice-call" &&
-			stringifiedData.callTextHeader === "Sprechen"
-		) {
-			setStringifiedData({
-				callTextHeader: "Gruppenruf",
-			});
-		}
-	}, [page, stringifiedData.callTextHeader, isTalking, setStringifiedData]);
-
-	useEffect(() => {
-		if (page !== "voice-call") {
-			callEstablishedRef.current = false;
-		}
-
-		switch (page) {
-			case "home":
-				setNextImage({ src: PAGE_HOME, name: "home" });
-				break;
-			case "voice-call":
-				setNextImage({ src: PAGE_Call, name: "voice-call" });
-				break;
-			case "off":
-				setNextImage({ src: PAGE_Off, name: "off" });
-				break;
-			case "startup":
-				setNextImage({ src: PAGE_STARTUP, name: "startup" });
-				break;
-		}
-	}, [page]);
-
-	const DisplayText = ({ pageName }: { pageName: SetPageParams["page"] }) => {
-		return (
-			<div
-				className={cn("font-semibold text-[#000d60]", !!popup && "filter")}
-				style={{
-					fontFamily: "Bahnschrift",
-				}}
-			>
-				{pageName == "startup" && (
-					<p className="absolute left-[17%] top-[65%] h-[10%] w-[39%] text-center">
-						Bediengerät #{session.data?.user?.publicId}
-					</p>
-				)}
-				{pageName == "home" && (
-					<>
-						<p className="absolute left-[24%] top-[21%] h-[4%] w-[1%] text-xs">
-							{(room?.numParticipants || 1) - 1}
-						</p>
-						<p
-							className={cn(
-								"absolute left-[17%] top-[25%] h-[8%] w-[39%] text-center",
-								!connectedAircraft && "text-red-600",
-							)}
-						>
-							{connectedAircraft && (
-								<>
-									Status {connectedAircraft.fmsStatus} -{" "}
-									{fmsStatusDescriptionShort[connectedAircraft?.fmsStatus || "0"]}
-								</>
-							)}
-							{!connectedAircraft && <>Keine Verbindung</>}
-						</p>
-						<p className="absolute left-[22.7%] top-[37.8%] flex h-[5%] w-[34%] items-center text-xs">
-							{room?.name || "Keine RG gefunden"}
-						</p>
-						<p className="absolute left-[28%] top-[44.5%] h-[8%] w-[34%] text-xs">
-							{ROOMS.find((r) => r.name === room?.name)?.id}
-						</p>
-					</>
-				)}
-				{pageName == "voice-call" && (
-					<div>
-						<p className="absolute left-[18%] top-[18.8%] flex h-[10%] w-[37%] items-center">
-							{stringifiedData.callTextHeader}
-						</p>
-						<p className="absolute left-[18%] top-[35%] h-[8%] w-[38%]">
-							{isTalking && selectedStation?.bosCallsignShort}
-							{speakingParticipants.length > 0 &&
-								speakingParticipants.map((p) => p.attributes.role).join(", ")}
-						</p>
-						<p className="absolute left-[18%] top-[53.5%] h-[8%] w-[38%]">
-							{room?.name || "Keine RG gefunden"}
-						</p>
-						<p className="absolute left-[18%] top-[60%] h-[8%] w-[36.7%] text-right">
-							{ROOMS.find((r) => r.name === room?.name)?.id}
-						</p>
-					</div>
-				)}
-			</div>
-		);
-	};
-
-	return (
-		<>
-			<Image
-				src={pageImage.src}
-				alt=""
-				width={1000}
-				height={1000}
-				className={cn(popup && "brightness-75 filter", "z-10 col-span-full row-span-full")}
-			/>
-			{nextImage && (
-				<div
-					className={cn(
-						popup && "brightness-75 filter",
-						"transition-image animate-reveal relative z-20 col-span-full row-span-full",
-					)}
-				>
-					<Image src={nextImage.src} alt="" width={1000} height={1000} className="h-full w-full" />
-					<DisplayText pageName={nextImage.name} />
-				</div>
-			)}
-			<div
-				className={cn(
-					popup && "brightness-75 filter",
-					"relative z-10 col-span-full row-span-full overflow-hidden",
-				)}
-			>
-				<DisplayText pageName={pageImage.name} />
-			</div>
-		</>
-	);
-};

apps/dispatch/app/(app)/pilot/_components/mrt/MrtPopups.tsx

@@ -1,152 +0,0 @@
-import { SetPopupParams, useMrtStore } from "_store/pilot/MrtStore";
-import Image, { StaticImageData } from "next/image";
-import { useEffect, useState } from "react";
-import IAMGE_POPUP_LOGIN from "./images/POPUP_login.png";
-import GROUP_SELECTION_POPUP_LOGIN from "./images/POPUP_group_selection.png";
-import IAMGE_POPUP_SDS_RECEIVED from "./images/POPUP_SDS_incomming.png";
-import IAMGE_POPUP_SDS_SENT from "./images/POPUP_SDS_sent.png";
-import IAMGE_POPUP_STATUS_SENT from "./images/POPUP_Status_sent.png";
-import { ROOMS } from "_data/livekitRooms";
-import { cn, useDebounce } from "@repo/shared-components";
-import { usePilotConnectionStore } from "_store/pilot/connectionStore";
-import { fmsStatusDescription, fmsStatusDescriptionShort } from "_data/fmsStatusDescription";
-import { pilotSocket } from "(app)/pilot/socket";
-import { StationStatus } from "@repo/db";
-import { useSounds } from "./useSounds";
-import { useButtons } from "./useButtons";
-import { useAudioStore } from "_store/audioStore";
-
-export const MrtPopups = () => {
-	const { sdsReceivedSoundRef } = useSounds();
-	const { handleKlick } = useButtons();
-	const { selectedRoom } = useAudioStore();
-	const { popup, page, setPopup, setStringifiedData, stringifiedData } = useMrtStore(
-		(state) => state,
-	);
-	const { connectedAircraft, status } = usePilotConnectionStore((state) => state);
-	const [popupImage, setPopupImage] = useState<StaticImageData | null>(null);
-
-	useEffect(() => {
-		switch (popup) {
-			case "status-sent":
-				setPopupImage(IAMGE_POPUP_STATUS_SENT);
-				break;
-			case "sds-sent":
-				setPopupImage(IAMGE_POPUP_SDS_SENT);
-				break;
-			case "sds-received":
-				setPopupImage(IAMGE_POPUP_SDS_RECEIVED);
-				break;
-			case "login":
-				setPopupImage(IAMGE_POPUP_LOGIN);
-				break;
-			case "group-selection":
-				setPopupImage(GROUP_SELECTION_POPUP_LOGIN);
-				break;
-			case undefined:
-			case null:
-				setPopupImage(null);
-				break;
-		}
-	}, [popup]);
-
-	useDebounce(
-		() => {
-			if (popup == "login") return;
-			if (popup == "sds-received") return;
-			if (popup == "group-selection") return;
-			setPopup(null);
-		},
-		3000,
-		[popup],
-	);
-
-	useDebounce(
-		() => {
-			if (popup == "group-selection") {
-				if (selectedRoom?.id === stringifiedData.groupSelectionGroupId) {
-					setPopup(null);
-				} else {
-					handleKlick("3l")();
-				}
-			}
-		},
-		5000,
-		[page, stringifiedData.groupSelectionGroupId, selectedRoom],
-	);
-
-	useEffect(() => {
-		if (status === "connecting" && page !== "off" && page !== "startup") {
-			setPopup({ popup: "login" });
-		}
-	}, [status, setPopup, page]);
-
-	useDebounce(
-		() => {
-			if (status === "connected") {
-				setPopup(null);
-			}
-		},
-		5000,
-		[status],
-	);
-
-	useEffect(() => {
-		pilotSocket.on("sds-status", (data: StationStatus) => {
-			setStringifiedData({ sdsText: data.status + " - " + fmsStatusDescriptionShort[data.status] });
-			setPopup({ popup: "sds-received" });
-			if (sdsReceivedSoundRef.current) {
-				sdsReceivedSoundRef.current.currentTime = 0;
-				sdsReceivedSoundRef.current.play();
-			}
-		});
-	}, [setPopup, setStringifiedData, sdsReceivedSoundRef]);
-
-	if (!popupImage || !popup) return null;
-
-	const DisplayText = ({ pageName }: { pageName: SetPopupParams["popup"] }) => {
-		const group = ROOMS.find((r) => r.id === stringifiedData.groupSelectionGroupId);
-
-		return (
-			<div
-				className={cn("font-semibold text-[#000d60]", !!popup && "filter")}
-				style={{
-					fontFamily: "Bahnschrift",
-				}}
-			>
-				{pageName == "status-sent" && (
-					<p className="absolute left-[17.5%] top-[44%] h-[10%] w-[39%] text-lg">
-						{fmsStatusDescription[connectedAircraft?.fmsStatus || "0"]}
-					</p>
-				)}
-				{pageName == "sds-sent" && (
-					<p className="absolute left-[17.5%] top-[44%] h-[10%] w-[39%] text-lg">
-						{fmsStatusDescription[stringifiedData.sentSdsText || "0"]}
-					</p>
-				)}
-				{pageName == "sds-received" && (
-					<p className="absolute left-[17.5%] top-[39%] h-[24%] w-[60%] whitespace-normal break-words">
-						{stringifiedData.sdsText}
-					</p>
-				)}
-				{pageName == "group-selection" && (
-					<>
-						<p className="absolute left-[24%] top-[39%] h-[5%] w-[30%]">{group?.name}</p>
-						<p className="absolute left-[24%] top-[50%] flex h-[9%] w-[31%] items-end justify-end">
-							{stringifiedData.groupSelectionGroupId}
-						</p>
-					</>
-				)}
-			</div>
-		);
-	};
-
-	return (
-		<>
-			<Image src={popupImage} alt="" className="z-30 col-span-full row-span-full" />
-			<div className="relative z-30 col-span-full row-span-full overflow-hidden">
-				<DisplayText pageName={popup} />
-			</div>
-		</>
-	);
-};

apps/dispatch/app/(app)/pilot/_components/mrt/useButtons.ts

@@ -1,58 +1,15 @@
-import { getPublicUser, MissionSdsStatusLog, Prisma } from "@repo/db";
+import { Prisma } from "@repo/db";
 import { usePilotConnectionStore } from "_store/pilot/connectionStore";
 import { useMrtStore } from "_store/pilot/MrtStore";
 import { pilotSocket } from "(app)/pilot/socket";
 import { editConnectedAircraftAPI } from "_querys/aircrafts";
 import { useEffect } from "react";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useSounds } from "./useSounds";
-import { sendSdsStatusMessageAPI } from "_querys/missions";
-import { useSession } from "next-auth/react";
-import { ROOMS } from "_data/livekitRooms";
-import { useAudioStore } from "_store/audioStore";
-
-type ButtonTypes =
-	| "1"
-	| "2"
-	| "3"
-	| "4"
-	| "5"
-	| "6"
-	| "7"
-	| "8"
-	| "9"
-	| "0"
-	| "home"
-	| "3l"
-	| "3r"
-	| "wheel-knob"
-	| "arrow-up"
-	| "arrow-down"
-	| "arrow-left"
-	| "arrow-right"
-	| "end-call";
+import { useMutation } from "@tanstack/react-query";
 
 export const useButtons = () => {
-	const session = useSession();
-	const { connect, setSelectedRoom, selectedRoom } = useAudioStore((state) => state);
-
-	const { longBtnPressSoundRef, statusSentSoundRef } = useSounds();
-	const queryClient = useQueryClient();
-	const {
-		status: pilotState,
-		selectedStation,
-		connectedAircraft,
-	} = usePilotConnectionStore((state) => state);
-
-	const sendSdsStatusMutation = useMutation({
-		mutationFn: async ({ sdsMessage }: { sdsMessage: MissionSdsStatusLog }) => {
-			if (!connectedAircraft?.id) throw new Error("No connected aircraft");
-			await sendSdsStatusMessageAPI({ sdsMessage, aircraftId: connectedAircraft?.id });
-			queryClient.invalidateQueries({
-				queryKey: ["missions"],
-			});
-		},
-	});
+	const station = usePilotConnectionStore((state) => state.selectedStation);
+	const connectedAircraft = usePilotConnectionStore((state) => state.connectedAircraft);
+	const connectionStatus = usePilotConnectionStore((state) => state.status);
 	const updateAircraftMutation = useMutation({
 		mutationKey: ["edit-pilot-connected-aircraft"],
 		mutationFn: ({
@@ -64,161 +21,56 @@ export const useButtons = () => {
 		}) => editConnectedAircraftAPI(aircraftId, data),
 	});
 
-	const { setPage, setPopup, page, popup, setStringifiedData, stringifiedData } = useMrtStore(
-		(state) => state,
-	);
+	const { setPage } = useMrtStore((state) => state);
 
-	const role =
-		(pilotState == "connected" && selectedStation?.bosCallsignShort) ||
-		session.data?.user?.publicId;
+	const handleButton =
+		(button: "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "0" | "home") => () => {
+			if (connectionStatus !== "connected") return;
+			if (!station) return;
+			if (!connectedAircraft?.id) return;
+			if (
+				button === "1" ||
+				button === "2" ||
+				button === "3" ||
+				button === "4" ||
+				button === "5" ||
+				button === "6" ||
+				button === "7" ||
+				button === "8" ||
+				button === "9" ||
+				button === "0"
+			) {
+				setPage({ page: "sending-status", station });
 
-	const handleHold = (button: ButtonTypes) => async () => {
-		/* if (connectionStatus !== "connected") return; */
-		if (button === "end-call") {
-			setPage({ page: "off" });
-			setPopup(null);
-		}
-		if (button === "1" && page === "off") {
-			setPage({ page: "startup" });
-			return;
-		}
-		if (!selectedStation) return;
-		if (!session.data?.user) return;
-		if (!connectedAircraft?.id) return;
-		if (
-			button === "1" ||
-			button === "2" ||
-			button === "3" ||
-			button === "4" ||
-			button === "6" ||
-			button === "7" ||
-			button === "8"
-		) {
-			longBtnPressSoundRef.current?.play();
-			const delay = Math.random() * 1500 + 500;
-			setTimeout(async () => {
-				await updateAircraftMutation.mutateAsync({
-					aircraftId: connectedAircraft.id,
-					data: {
-						fmsStatus: button,
-					},
-				});
-				setPopup({ popup: "status-sent" });
-				statusSentSoundRef.current?.play();
-			}, delay);
-		} else if (button === "5" || button === "9" || button === "0") {
-			longBtnPressSoundRef.current?.play();
-			const delay = Math.random() * 1500 + 500;
-			setTimeout(async () => {
-				await sendSdsStatusMutation.mutateAsync({
-					sdsMessage: {
-						type: "sds-status-log",
-						auto: false,
-						timeStamp: new Date().toISOString(),
+				setTimeout(async () => {
+					await updateAircraftMutation.mutateAsync({
+						aircraftId: connectedAircraft.id,
 						data: {
-							direction: "to-lst",
-							stationId: selectedStation.id,
-							station: selectedStation,
-							user: getPublicUser(session.data?.user),
-							status: button,
+							fmsStatus: button,
 						},
-					},
-				});
-				setStringifiedData({ sentSdsText: button });
-				statusSentSoundRef.current?.play();
-				setPopup({ popup: "sds-sent" });
-			}, delay);
-		}
-	};
-
-	const handleKlick = (button: ButtonTypes) => async () => {
-		console.log("Button clicked:", button);
-		//implement Kurzwahl when button is clicked short to dial
-
-		switch (button) {
-			case "0":
-			case "1":
-			case "2":
-			case "3":
-			case "4":
-			case "5":
-			case "6":
-			case "7":
-			case "8":
-			case "9":
-				//handle short press number buttons for kurzwahl
-				if (popup === "group-selection") {
-					if (stringifiedData.groupSelectionGroupId?.length === 4) {
-						setStringifiedData({ groupSelectionGroupId: button });
-					} else {
-						setStringifiedData({
-							groupSelectionGroupId: (stringifiedData.groupSelectionGroupId || "") + button,
-						});
-					}
-				}
-				if (page === "home" && !popup) {
-					setPopup({ popup: "group-selection" });
-					setStringifiedData({ groupSelectionGroupId: button });
-				}
-				break;
-			case "3r":
-				if (popup === "sds-received" || popup === "group-selection") {
-					setPopup(null);
-				} else if (page === "home") {
-					setPopup({ popup: "group-selection" });
-					setStringifiedData({ groupSelectionGroupId: selectedRoom?.id || ROOMS[0]!.id });
-				} else if (page === "voice-call") {
-					setPage({ page: "home" });
-				}
-				break;
-			case "wheel-knob":
-				setPopup(popup === "group-selection" ? null : { popup: "group-selection" });
-				setStringifiedData({ groupSelectionGroupId: selectedRoom?.id || ROOMS[0]!.id });
-				break;
-			case "arrow-right":
-				if (popup === "group-selection") {
-					let currentGroupIndex = ROOMS.findIndex(
-						(r) => r.id === stringifiedData.groupSelectionGroupId,
-					);
-					if (currentGroupIndex === ROOMS.length - 1) currentGroupIndex = -1;
-					const nextGroup = ROOMS[currentGroupIndex + 1];
-					if (nextGroup) {
-						setStringifiedData({ groupSelectionGroupId: nextGroup.id });
-					}
-				}
-				break;
-			case "arrow-left":
-				if (popup === "group-selection") {
-					let currentGroupIndex = ROOMS.findIndex(
-						(r) => r.id === stringifiedData.groupSelectionGroupId,
-					);
-					if (currentGroupIndex === 0) currentGroupIndex = ROOMS.length;
-					const previousGroup = ROOMS[currentGroupIndex - 1];
-					if (previousGroup) {
-						setStringifiedData({ groupSelectionGroupId: previousGroup.id });
-					}
-				}
-				break;
-			case "3l":
-				if (popup === "group-selection") {
-					const group = ROOMS.find((r) => r.id === stringifiedData.groupSelectionGroupId);
-					if (group && role) {
-						setSelectedRoom(group);
-						connect(group, role);
-						setPopup(null);
-					}
-				}
-		}
-		return false;
-	};
+					});
+					setPage({
+						page: "home",
+						station,
+						fmsStatus: button,
+					});
+				}, 1000);
+			} else {
+				setPage({ page: "home", fmsStatus: connectedAircraft.fmsStatus || "6", station });
+			}
+		};
 
 	useEffect(() => {
 		pilotSocket.on("connect", () => {
-			const { page } = useMrtStore.getState();
-			if (!selectedStation || page !== "off") return;
-			setPage({ page: "startup" });
+			if (!station) return;
+			setPage({ page: "home", fmsStatus: "6", station });
 		});
-	}, [setPage, selectedStation, setPopup]);
 
-	return { handleKlick, handleHold };
+		pilotSocket.on("aircraft-update", () => {
+			if (!station) return;
+			setPage({ page: "new-status", station });
+		});
+	}, [setPage, station]);
+
+	return { handleButton };
 };

apps/dispatch/app/(app)/pilot/_components/mrt/useSounds.ts

@@ -1,22 +1,52 @@
 "use client";
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
+import { useMrtStore } from "_store/pilot/MrtStore";
 import { useEffect, useRef } from "react";
 
 export const useSounds = () => {
-	const longBtnPressSoundRef = useRef<HTMLAudioElement>(null);
-	const statusSentSoundRef = useRef<HTMLAudioElement>(null);
-	const sdsReceivedSoundRef = useRef<HTMLAudioElement>(null);
+	const mrtState = useMrtStore((state) => state);
+	const { connectedAircraft, selectedStation } = usePilotConnectionStore((state) => state);
+
+	const setPage = useMrtStore((state) => state.setPage);
+	const MRTstatusSoundRef = useRef<HTMLAudioElement>(null);
+	const MrtMessageReceivedSoundRef = useRef<HTMLAudioElement>(null);
 
 	useEffect(() => {
 		if (typeof window !== "undefined") {
-			longBtnPressSoundRef.current = new Audio("/sounds/1504.wav");
-			statusSentSoundRef.current = new Audio("/sounds/403.wav");
-			sdsReceivedSoundRef.current = new Audio("/sounds/775.wav");
+			MRTstatusSoundRef.current = new Audio("/sounds/MRT-status.mp3");
+			MrtMessageReceivedSoundRef.current = new Audio("/sounds/MRT-message-received.mp3");
+			MRTstatusSoundRef.current.onended = () => {
+				if (!selectedStation || !connectedAircraft?.fmsStatus) return;
+				setPage({
+					page: "home",
+					station: selectedStation,
+					fmsStatus: connectedAircraft?.fmsStatus,
+				});
+			};
+			MrtMessageReceivedSoundRef.current.onended = () => {
+				if (!selectedStation || !connectedAircraft?.fmsStatus) return;
+				if (mrtState.page === "sds") return;
+				setPage({
+					page: "home",
+					station: selectedStation,
+					fmsStatus: connectedAircraft?.fmsStatus,
+				});
+			};
 		}
-	}, []);
+	}, [connectedAircraft?.fmsStatus, selectedStation, setPage, mrtState.page]);
 
-	return {
-		longBtnPressSoundRef,
-		statusSentSoundRef,
-		sdsReceivedSoundRef,
-	};
+	const fmsStatus = connectedAircraft?.fmsStatus || "NaN";
+
+	useEffect(() => {
+		if (!connectedAircraft) return;
+		if (mrtState.page === "new-status") {
+			if (fmsStatus === "J" || fmsStatus === "c") {
+				MrtMessageReceivedSoundRef.current?.play();
+			} else {
+				MRTstatusSoundRef.current?.play();
+			}
+		} else if (mrtState.page === "sds") {
+			MrtMessageReceivedSoundRef.current?.play();
+		}
+	}, [mrtState, fmsStatus, connectedAircraft, selectedStation]);
 };

apps/dispatch/app/(app)/pilot/_components/navbar/_components/Settings.tsx

@@ -3,17 +3,15 @@ import { useEffect, useRef, useState } from "react";
 import { GearIcon } from "@radix-ui/react-icons";
 import { Bell, SettingsIcon, Volume2 } from "lucide-react";
 import MicVolumeBar from "_components/MicVolumeIndication";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import { editUserAPI, getUserAPI } from "_querys/user";
 import { useSession } from "next-auth/react";
 import { useAudioStore } from "_store/audioStore";
 import toast from "react-hot-toast";
 import Link from "next/link";
-import { Button } from "@repo/shared-components";
 
 export const SettingsBtn = () => {
 	const session = useSession();
-	const queryClient = useQueryClient();
 
 	const [inputDevices, setInputDevices] = useState<MediaDeviceInfo[]>([]);
 	const { data: user } = useQuery({
@@ -24,10 +22,6 @@ export const SettingsBtn = () => {
 
 	const editUserMutation = useMutation({
 		mutationFn: editUserAPI,
-		mutationKey: ["user", session.data?.user.id],
-		onSuccess: async () => {
-			await queryClient.invalidateQueries({ queryKey: ["user", session.data?.user.id] });
-		},
 	});
 
 	useEffect(() => {
@@ -254,7 +248,7 @@ export const SettingsBtn = () => {
 						>
 							Schließen
 						</button>
-						<Button
+						<button
 							className="btn btn-soft btn-success"
 							type="submit"
 							onSubmit={() => false}
@@ -281,7 +275,7 @@ export const SettingsBtn = () => {
 							}}
 						>
 							Speichern
-						</Button>
+						</button>
 					</div>
 				</div>
 			</dialog>

apps/dispatch/app/(app)/pilot/page.tsx

@@ -94,20 +94,10 @@ const PilotPage = () => {
 						</div>
 					</div>
 				</div>
-				<div className="flex h-full w-1/3 min-w-[500px]">
+				<div className="flex h-full w-1/3">
 					<div className="bg-base-300 flex h-full w-full flex-col p-4">
 						<div className="flex justify-between">
-							<div className="mb-2 flex items-center justify-end gap-2">
-								<h2 className="card-title">MRT & DME</h2>
-								<a
-									href="https://docs.virtualairrescue.com/allgemein/var-systeme/leitstelle/pilot.html"
-									target="_blank"
-									rel="noopener noreferrer"
-									className="link text-xs text-gray-500 hover:underline"
-								>
-									Hilfe
-								</a>
-							</div>
+							<h2 className="card-title mb-2">MRT & DME</h2>
 							<div
 								className="tooltip tooltip-left mb-4"
 								data-tip="Dadurch wird der Einsatz erneut an den Desktop-Client gesendet."

apps/dispatch/app/(auth)/logout/page.tsx

@@ -10,7 +10,7 @@ export default () => {
 	}, []);
 	return (
 		<div className="card-body">
-			<h1 className="text-5xl">ausloggen...</h1>
+			<h1 className="text-5xl">logging out...</h1>
 		</div>
 	);
 };

apps/dispatch/app/_components/Audio/Audio.tsx

@@ -24,7 +24,6 @@ import { useSounds } from "_components/Audio/useSounds";
 
 export const Audio = () => {
 	const {
-		selectedRoom,
 		speakingParticipants,
 		resetSpeakingParticipants,
 		isTalking,
@@ -38,8 +37,8 @@ export const Audio = () => {
 		room,
 		message,
 		removeMessage,
-		setSelectedRoom,
 	} = useAudioStore();
+	const [selectedRoom, setSelectedRoom] = useState<string>("LST_01");
 
 	useSounds({
 		isReceiving: speakingParticipants.length > 0,
@@ -49,7 +48,7 @@ export const Audio = () => {
 	});
 
 	const { selectedStation, status: pilotState } = usePilotConnectionStore((state) => state);
-	const { status: dispatcherState } = useDispatchConnectionStore((state) => state);
+	const { selectedZone, status: dispatcherState } = useDispatchConnectionStore((state) => state);
 	const session = useSession();
 	const [isReceivingBlick, setIsReceivingBlick] = useState(false);
 	const [recentSpeakers, setRecentSpeakers] = useState<typeof speakingParticipants>([]);
@@ -94,7 +93,7 @@ export const Audio = () => {
 	const canStopOtherSpeakers = dispatcherState === "connected";
 
 	const role =
-		(dispatcherState === "connected" && "VAR LST") ||
+		(dispatcherState === "connected" && selectedZone) ||
 		(pilotState == "connected" && selectedStation?.bosCallsignShort) ||
 		session.data?.user?.publicId;
 
@@ -186,20 +185,20 @@ export const Audio = () => {
 						</summary>
 						<ul className="menu dropdown-content bg-base-200 rounded-box z-[1050] w-52 p-2 shadow-sm">
 							{ROOMS.map((r) => (
-								<li key={r.id}>
+								<li key={r}>
 									<button
 										className="btn btn-sm btn-ghost relative flex items-center justify-start gap-2 text-left"
 										onClick={() => {
 											if (!role) return;
-											if (selectedRoom?.name === r.name) return;
+											if (selectedRoom === r) return;
 											setSelectedRoom(r);
 											connect(r, role);
 										}}
 									>
-										{room?.name === r.name && (
+										{room?.name === r && (
 											<Disc className="text-success absolute left-2 text-sm" width={15} />
 										)}
-										<span className="flex-1 text-center">{r.name}</span>
+										<span className="flex-1 text-center">{r}</span>
 									</button>
 								</li>
 							))}

apps/dispatch/app/_components/QueryProvider.tsx

@@ -3,7 +3,7 @@
 
 import { toast } from "react-hot-toast";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { ReactNode, useEffect, useRef, useState } from "react";
+import { ReactNode, useEffect, useState } from "react";
 import { dispatchSocket } from "(app)/dispatch/socket";
 import { NotificationPayload } from "@repo/db";
 import { HPGnotificationToast } from "_components/customToasts/HPGnotification";
@@ -15,7 +15,6 @@ import { MissionAutoCloseToast } from "_components/customToasts/MissionAutoClose
 
 export function QueryProvider({ children }: { children: ReactNode }) {
 	const mapStore = useMapStore((s) => s);
-	const notificationSound = useRef<HTMLAudioElement | null>(null);
 
 	const [queryClient] = useState(
 		() =>
@@ -23,7 +22,7 @@ export function QueryProvider({ children }: { children: ReactNode }) {
 				defaultOptions: {
 					mutations: {
 						onError: (error) => {
-							toast.error("Ein Fehler ist aufgetreten: " + (error as Error).message, {
+							toast.error("An error occurred: " + (error as Error).message, {
 								position: "top-right",
 							});
 						},
@@ -31,9 +30,6 @@ export function QueryProvider({ children }: { children: ReactNode }) {
 				},
 			}),
 	);
-	useEffect(() => {
-		notificationSound.current = new Audio("/sounds/notification.mp3");
-	}, []);
 	useEffect(() => {
 		const invalidateMission = () => {
 			queryClient.invalidateQueries({
@@ -63,19 +59,8 @@ export function QueryProvider({ children }: { children: ReactNode }) {
 		};
 
 		const handleNotification = (notification: NotificationPayload) => {
-			console.log("Received notification:", notification);
-			const playNotificationSound = () => {
-				if (notificationSound.current) {
-					notificationSound.current.currentTime = 0;
-					notificationSound.current
-						.play()
-						.catch((e) => console.error("Notification sound error:", e));
-				}
-			};
-
 			switch (notification.type) {
 				case "hpg-validation":
-					playNotificationSound();
 					toast.custom(
 						(t) => <HPGnotificationToast event={notification} mapStore={mapStore} t={t} />,
 						{
@@ -85,30 +70,23 @@ export function QueryProvider({ children }: { children: ReactNode }) {
 
 					break;
 				case "admin-message":
-					playNotificationSound();
 					toast.custom((t) => <AdminMessageToast event={notification} t={t} />, {
 						duration: 999999,
 					});
 					break;
 				case "station-status":
-					console.log("station Status", QUICK_RESPONSE[notification.status]);
 					if (!QUICK_RESPONSE[notification.status]) return;
 					toast.custom((e) => <StatusToast event={notification} t={e} />, {
 						duration: 60000,
 					});
 					break;
 				case "mission-auto-close":
-					playNotificationSound();
 					toast.custom(
 						(t) => <MissionAutoCloseToast event={notification} t={t} mapStore={mapStore} />,
 						{
 							duration: 60000,
 						},
 					);
-					break;
-				case "mission-closed":
-					toast("Dein aktueller Einsatz wurde geschlossen.");
-
 					break;
 				default:
 					toast("unbekanntes Notification-Event");

apps/dispatch/app/_components/customToasts/HPGnotValidated.tsx

@@ -1,24 +0,0 @@
-import { BaseNotification } from "_components/customToasts/BaseNotification"
-import { TriangleAlert } from "lucide-react"
-import toast, { Toast } from "react-hot-toast"
-
-
-export const HPGnotValidatedToast = ({_toast}: {_toast: Toast}) => {
-    return <BaseNotification icon={<TriangleAlert />} className="flex flex-row">
-				<div className="flex-1">
-					<h1 className="font-bold text-red-600">Einsatz nicht HPG-validiert</h1>
-					<p className="text-sm">Vergleiche die Position des Einsatzes mit der HPG-Position in Hubschrauber</p>
-				</div>
-				<div className="ml-11">
-					<button className="btn" onClick={() => toast.dismiss(_toast.id)}>
-						schließen
-					</button>
-				</div>
-			</BaseNotification>
-}
-
-export const showToast = () => {
-    toast.custom((t) => {
-        return (<HPGnotValidatedToast _toast={t} />);
-    }, {duration: 1000 * 60 * 10}); // 10 minutes
-}

apps/dispatch/app/_components/customToasts/StationStatusToast.tsx

@@ -1,16 +1,14 @@
-import { getPublicUser, MissionSdsStatusLog, StationStatus } from "@repo/db";
+import { Prisma, StationStatus } from "@repo/db";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { BaseNotification } from "_components/customToasts/BaseNotification";
 import { FMS_STATUS_COLORS } from "_helpers/fmsStatusColors";
-import { getConnectedAircraftsAPI } from "_querys/aircrafts";
+import { editConnectedAircraftAPI, getConnectedAircraftsAPI } from "_querys/aircrafts";
 import { getLivekitRooms } from "_querys/livekit";
-import { sendSdsStatusMessageAPI } from "_querys/missions";
 import { getStationsAPI } from "_querys/stations";
 import { useAudioStore } from "_store/audioStore";
 import { useMapStore } from "_store/mapStore";
 import { X } from "lucide-react";
-import { useSession } from "next-auth/react";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Toast, toast } from "react-hot-toast";
 
 export const QUICK_RESPONSE: Record<string, string[]> = {
@@ -24,8 +22,6 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 	const status5Sounds = useRef<HTMLAudioElement | null>(null);
 	const status9Sounds = useRef<HTMLAudioElement | null>(null);
 
-	const session = useSession();
-
 	const { data: livekitRooms } = useQuery({
 		queryKey: ["livekit-rooms"],
 		queryFn: () => getLivekitRooms(),
@@ -50,7 +46,7 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 			status9Sounds.current = new Audio("/sounds/status-9.mp3");
 		}
 	}, []);
-
+	const [aircraftDataAcurate, setAircraftDataAccurate] = useState(false);
 	//const mapStore = useMapStore((s) => s);
 	const { setOpenAircraftMarker, setMap } = useMapStore((store) => store);
 
@@ -69,16 +65,29 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 	const station = stations?.find((s) => s.id === event.data?.stationId);
 
 	const queryClient = useQueryClient();
-	const sendSdsStatusMutation = useMutation({
-		mutationFn: async ({ sdsMessage }: { sdsMessage: MissionSdsStatusLog }) => {
-			if (!connectedAircraft?.id) throw new Error("No connected aircraft");
-			await sendSdsStatusMessageAPI({ sdsMessage, aircraftId: connectedAircraft?.id });
+	const changeAircraftMutation = useMutation({
+		mutationFn: async ({
+			id,
+			update,
+		}: {
+			id: number;
+			update: Prisma.ConnectedAircraftUpdateInput;
+		}) => {
+			await editConnectedAircraftAPI(id, update);
 			queryClient.invalidateQueries({
-				queryKey: ["missions"],
+				queryKey: ["aircrafts"],
 			});
 		},
 	});
 
+	useEffect(() => {
+		if (event.status !== connectedAircraft?.fmsStatus && aircraftDataAcurate) {
+			toast.remove(t.id);
+		} else if (event.status == connectedAircraft?.fmsStatus && !aircraftDataAcurate) {
+			setAircraftDataAccurate(true);
+		}
+	}, [aircraftDataAcurate, connectedAircraft, event.status, t.id]);
+
 	useEffect(() => {
 		let soundRef: React.RefObject<HTMLAudioElement | null> | null = null;
 		switch (event.status) {
@@ -94,8 +103,7 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 			default:
 				soundRef = null;
 		}
-
-		if (audioRoom && livekitUser?.roomName && audioRoom !== livekitUser?.roomName) {
+		if (audioRoom !== livekitUser?.roomName) {
 			toast.remove(t.id);
 			return;
 		}
@@ -113,8 +121,7 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 		};
 	}, [event.status, livekitUser?.roomName, audioRoom, t.id]);
 
-	console.log(connectedAircraft, station);
-	if (!connectedAircraft || !station || !session.data) return null;
+	if (!connectedAircraft || !station) return null;
 	return (
 		<BaseNotification>
 			<div className="flex flex-row items-center gap-14">
@@ -155,18 +162,10 @@ export const StatusToast = ({ event, t }: { event: StationStatus; t: Toast }) =>
 									toast.error("Keine Flugzeug-ID gefunden");
 									return;
 								}
-								await sendSdsStatusMutation.mutateAsync({
-									sdsMessage: {
-										type: "sds-status-log",
-										auto: false,
-										data: {
-											direction: "to-aircraft",
-											stationId: event.data.stationId!,
-											station: station,
-											user: getPublicUser(session.data?.user),
-											status,
-										},
-										timeStamp: new Date().toISOString(),
+								await changeAircraftMutation.mutateAsync({
+									id: event.data?.aircraftId,
+									update: {
+										fmsStatus: status,
 									},
 								});
 								toast.remove(t.id);

apps/dispatch/app/_components/map/AircraftMarker.tsx

@@ -397,9 +397,9 @@ const AircraftMarker = ({ aircraft }: { aircraft: ConnectedAircraft & { Station:
 
 export const AircraftLayer = () => {
 	const { data: aircrafts } = useQuery({
-		queryKey: ["connected-aircrafts", "map"],
+		queryKey: ["aircrafts"],
 		queryFn: () => getConnectedAircraftsAPI(),
-		refetchInterval: 15000,
+		refetchInterval: 10_000,
 	});
 	const { setMap } = useMapStore((state) => state);
 	const map = useMap();
@@ -434,10 +434,8 @@ export const AircraftLayer = () => {
 		}
 	}, [pilotConnectionStatus, followOwnAircraft, ownAircraft, setMap, map]);
 
-	console.debug("Hubschrauber auf Karte:", {
-		total: aircrafts?.length,
-		displayed: filteredAircrafts.length,
-	});
+	console.debug("Hubschrauber auf Karte:", filteredAircrafts.length, filteredAircrafts);
+	console.debug("Daten vom Server:", aircrafts?.length, aircrafts);
 
 	return (
 		<>

apps/dispatch/app/_components/map/ContextMenu.tsx

@@ -3,22 +3,15 @@ import { OSMWay } from "@repo/db";
 import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
 import { useMapStore } from "_store/mapStore";
 import { usePannelStore } from "_store/pannelStore";
-import { MapPin, MapPinned, Search, Car, Ambulance, Siren, Flame } from "lucide-react";
+import { MapPin, MapPinned, Radius, Ruler, Search, RulerDimensionLine, Scan } from "lucide-react";
 import { getOsmAddress } from "_querys/osm";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { Popup, useMap } from "react-leaflet";
 import { findClosestPolygon } from "_helpers/findClosestPolygon";
-import { xPlaneObjectsAvailable } from "_helpers/xPlaneObjectsAvailable";
-import { useQuery } from "@tanstack/react-query";
-import { getConnectedAircraftsAPI } from "_querys/aircrafts";
 
 export const ContextMenu = () => {
 	const map = useMap();
-	const { data: aircrafts } = useQuery({
-		queryKey: ["connectedAircrafts"],
-		queryFn: getConnectedAircraftsAPI,
-	});
 	const {
 		contextMenu,
 		searchElements,
@@ -33,16 +26,15 @@ export const ContextMenu = () => {
 		setOpen,
 		isOpen: isPannelOpen,
 	} = usePannelStore((state) => state);
-	const [showObjectOptions, setShowObjectOptions] = useState(false);
+	const [showRulerOptions, setShowRulerOptions] = useState(false);
 	const [rulerHover, setRulerHover] = useState(false);
 	const [rulerOptionsHover, setRulerOptionsHover] = useState(false);
 
 	const dispatcherConnected = useDispatchConnectionStore((s) => s.status) === "connected";
 
 	useEffect(() => {
-		const showObjectOptions = rulerHover || rulerOptionsHover;
-		setShowObjectOptions(showObjectOptions);
-	}, [isPannelOpen, rulerHover, rulerOptionsHover, setOpen]);
+		setShowRulerOptions(rulerHover || rulerOptionsHover);
+	}, [rulerHover, rulerOptionsHover]);
 
 	useEffect(() => {
 		const handleContextMenu = (e: any) => {
@@ -158,12 +150,9 @@ export const ContextMenu = () => {
 						style={{ transform: "translateY(-50%)" }}
 						onMouseEnter={() => setRulerHover(true)}
 						onMouseLeave={() => setRulerHover(false)}
-						disabled={
-							!isPannelOpen ||
-							!xPlaneObjectsAvailable(missionFormValues?.missionStationIds, aircrafts)
-						}
+						disabled
 					>
-						<Car size={20} />
+						<Ruler size={20} />
 					</button>
 					{/* Bottom Button */}
 					<button
@@ -189,75 +178,64 @@ export const ContextMenu = () => {
 					>
 						<Search size={20} />
 					</button>
-					{/* XPlane Object Options - shown when Ruler button is hovered or options are hovered */}
-					{showObjectOptions && (
+					{/* Ruler Options - shown when Ruler button is hovered or options are hovered */}
+					{showRulerOptions && (
 						<div
-							className="pointer-events-auto absolute -left-[100px] top-1/2 z-10 flex h-[200px] w-[120px] -translate-y-1/2 flex-col items-center justify-center py-5"
+							className="pointer-events-auto absolute flex flex-col items-center"
+							style={{
+								left: "-100px", // position to the right of the left button
+								top: "50%",
+								transform: "translateY(-50%)",
+								zIndex: 10,
+								width: "120px", // Make the hover area wider
+								height: "200px", // Make the hover area taller
+								padding: "20px 0", // Add vertical padding
+								display: "flex",
+								justifyContent: "center",
+								pointerEvents: "auto",
+							}}
 							onMouseEnter={() => setRulerOptionsHover(true)}
 							onMouseLeave={() => setRulerOptionsHover(false)}
 						>
-							<div className="flex w-full flex-col">
+							<div
+								style={{
+									display: "flex",
+									flexDirection: "column",
+									width: "100%",
+								}}
+							>
 								<button
-									className="btn btn-circle bg-rescuetrack tooltip tooltip-left tooltip-accent mb-2 ml-[30px] h-10 w-10 opacity-80"
-									data-tip="Rettungswagen platzieren"
+									className="btn btn-circle bg-rescuetrack tooltip tooltip-left tooltip-accent mb-2 h-10 w-10 opacity-80"
+									data-tip="Strecke Messen"
+									style={{
+										transform: "translateX(100%)",
+									}}
 									onClick={() => {
-										setMissionFormValues({
-											...missionFormValues,
-											xPlaneObjects: [
-												...(missionFormValues?.xPlaneObjects ?? []),
-												{
-													objectName: "ambulance",
-													alt: 0,
-													lat: contextMenu.lat,
-													lon: contextMenu.lng,
-												},
-											],
-										});
+										/* ... */
 									}}
 								>
-									<Ambulance size={20} />
+									<RulerDimensionLine size={20} />
 								</button>
 								<button
 									className="btn btn-circle bg-rescuetrack tooltip tooltip-left tooltip-accent mb-2 h-10 w-10 opacity-80"
-									data-tip="LF platzieren"
+									data-tip="Radius Messen"
 									onClick={() => {
-										console.log("Add fire engine");
-										setMissionFormValues({
-											...missionFormValues,
-											xPlaneObjects: [
-												...(missionFormValues?.xPlaneObjects ?? []),
-												{
-													objectName: "fire_engine",
-													alt: 0,
-													lat: contextMenu.lat,
-													lon: contextMenu.lng,
-												},
-											],
-										});
+										/* ... */
 									}}
 								>
-									<Flame size={20} />
+									<Radius size={20} />
 								</button>
 								<button
-									className="btn btn-circle bg-rescuetrack tooltip tooltip-left tooltip-accent ml-[30px] h-10 w-10 opacity-80"
-									data-tip="Streifenwagen platzieren"
+									className="btn btn-circle bg-rescuetrack tooltip tooltip-left tooltip-accent h-10 w-10 opacity-80"
+									data-tip="Fläche Messen"
+									style={{
+										transform: "translateX(100%)",
+									}}
 									onClick={() => {
-										console.log("Add police");
-										setMissionFormValues({
-											...missionFormValues,
-											xPlaneObjects: [
-												...(missionFormValues?.xPlaneObjects ?? []),
-												{
-													objectName: "police",
-													alt: 0,
-													lat: contextMenu.lat,
-													lon: contextMenu.lng,
-												},
-											],
-										});
+										/* ... */
 									}}
 								>
-									<Siren size={20} />
+									<Scan size={20} />
 								</button>
 							</div>
 						</div>

apps/dispatch/app/_components/map/MapAdditionals.tsx

@@ -1,6 +1,6 @@
 "use client";
 import { usePannelStore } from "_store/pannelStore";
-import { Marker, useMap } from "react-leaflet";
+import { Marker } from "react-leaflet";
 import L from "leaflet";
 import { useQuery } from "@tanstack/react-query";
 import { getMissionsAPI } from "_querys/missions";
@@ -8,13 +8,10 @@ import { HPGValidationRequired } from "_helpers/hpgValidationRequired";
 import { getConnectedAircraftsAPI } from "_querys/aircrafts";
 import { useMapStore } from "_store/mapStore";
 import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
-import { XplaneObject } from "@repo/db";
-import { useEffect, useState } from "react";
 
 export const MapAdditionals = () => {
-	const { isOpen, missionFormValues, setMissionFormValues } = usePannelStore((state) => state);
+	const { isOpen, missionFormValues } = usePannelStore((state) => state);
 	const dispatcherConnectionState = useDispatchConnectionStore((state) => state.status);
-	const { openMissionMarker } = useMapStore((state) => state);
 
 	const { data: missions = [] } = useQuery({
 		queryKey: ["missions"],
@@ -24,28 +21,13 @@ export const MapAdditionals = () => {
 			}),
 		refetchInterval: 10_000,
 	});
-	const { setOpenMissionMarker } = useMapStore((state) => state);
-	const [showDetailedAdditionals, setShowDetailedAdditionals] = useState(false);
+	const mapStore = useMapStore((state) => state);
 
 	const { data: aircrafts } = useQuery({
 		queryKey: ["aircrafts"],
 		queryFn: () => getConnectedAircraftsAPI(),
 		refetchInterval: 10000,
 	});
-	const leafletMap = useMap();
-
-	useEffect(() => {
-		const handleZoomEnd = () => {
-			const currentZoom = leafletMap.getZoom();
-			setShowDetailedAdditionals(currentZoom > 10);
-		};
-
-		leafletMap.on("zoomend", handleZoomEnd);
-
-		return () => {
-			leafletMap.off("zoomend", handleZoomEnd);
-		};
-	}, [leafletMap]);
 
 	const markersNeedingAttention = missions.filter(
 		(m) =>
@@ -55,7 +37,7 @@ export const MapAdditionals = () => {
 			m.hpgLocationLat &&
 			dispatcherConnectionState === "connected" &&
 			m.hpgLocationLng &&
-			openMissionMarker.find((openMission) => openMission.id === m.id),
+			mapStore.openMissionMarker.find((openMission) => openMission.id === m.id),
 	);
 
 	return (
@@ -68,78 +50,9 @@ export const MapAdditionals = () => {
 						iconSize: [40, 40],
 						iconAnchor: [20, 35],
 					})}
-					draggable={true}
-					eventHandlers={{
-						dragend: (e) => {
-							const marker = e.target;
-							const position = marker.getLatLng();
-							setMissionFormValues({
-								...missionFormValues,
-								addressLat: position.lat,
-								addressLng: position.lng,
-							});
-						},
-					}}
+					interactive={false}
 				/>
 			)}
-			{showDetailedAdditionals &&
-				openMissionMarker.map((mission) => {
-					if (missionFormValues?.id === mission.id) return null;
-					const missionData = missions.find((m) => m.id === mission.id);
-					if (!missionData?.addressLat || !missionData?.addressLng) return null;
-					return (missionData.xPlaneObjects as unknown as XplaneObject[]).map((obj, index) => (
-						<Marker
-							key={`${mission.id}-additional-${index}`}
-							position={[obj.lat, obj.lon]}
-							icon={L.icon({
-								iconUrl: `/icons/${obj.objectName}.png`,
-								iconSize: [40, 40],
-								iconAnchor: [20, 35],
-							})}
-							interactive={false}
-						/>
-					));
-				})}
-			{isOpen &&
-				missionFormValues?.xPlaneObjects &&
-				(missionFormValues.xPlaneObjects as unknown as XplaneObject[]).map((obj, index) => (
-					<Marker
-						key={index}
-						position={[obj.lat, obj.lon]}
-						icon={L.icon({
-							iconUrl: `/icons/${obj.objectName}.png`,
-							iconSize: [40, 40],
-							iconAnchor: [20, 35],
-						})}
-						draggable={true}
-						eventHandlers={{
-							dragend: (e) => {
-								const marker = e.target;
-								const position = marker.getLatLng();
-								console.log("Marker dragged to:", position);
-								setMissionFormValues({
-									...missionFormValues,
-									xPlaneObjects: (missionFormValues.xPlaneObjects as unknown as XplaneObject[]).map(
-										(obj, objIndex) =>
-											objIndex === index ? { ...obj, lat: position.lat, lon: position.lng } : obj,
-									),
-								});
-							},
-
-							contextmenu: (e) => {
-								e.originalEvent.preventDefault();
-								const updatedObjects = (
-									missionFormValues.xPlaneObjects as unknown as XplaneObject[]
-								).filter((_, objIndex) => objIndex !== index);
-								setMissionFormValues({
-									...missionFormValues,
-									// eslint-disable-next-line @typescript-eslint/no-explicit-any
-									xPlaneObjects: updatedObjects as unknown as any[],
-								});
-							},
-						}}
-					/>
-				))}
 			{markersNeedingAttention.map((mission) => (
 				<Marker
 					key={mission.id}
@@ -151,7 +64,7 @@ export const MapAdditionals = () => {
 					})}
 					eventHandlers={{
 						click: () =>
-							setOpenMissionMarker({
+							mapStore.setOpenMissionMarker({
 								open: [
 									{
 										id: mission.id,

apps/dispatch/app/_components/map/XPlaneObject.tsx

@@ -1,3 +0,0 @@
-export const XPlaneObjects = () => {
-	return <div>XPlaneObjects</div>;
-};

apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx

@@ -9,7 +9,6 @@ import {
 	Mission,
 	MissionLog,
 	MissionSdsLog,
-	MissionSdsStatusLog,
 	MissionStationLog,
 	Prisma,
 	PublicUser,
@@ -41,7 +40,7 @@ import {
 	TextSearch,
 } from "lucide-react";
 import { useSession } from "next-auth/react";
-import { sendSdsMessageAPI, sendSdsStatusMessageAPI } from "_querys/missions";
+import { sendSdsMessageAPI } from "_querys/missions";
 import { getLivekitRooms } from "_querys/livekit";
 import { findLeitstelleForPosition } from "_helpers/findLeitstelleinPoint";
 import { formatDistance } from "date-fns";
@@ -55,13 +54,9 @@ const FMSStatusHistory = ({
 	mission?: Mission;
 }) => {
 	const log = ((mission?.missionLog as unknown as MissionLog[]) || [])
-		.filter(
-			(entry) =>
-				(entry.type === "station-log" || entry.type == "sds-status-log") &&
-				entry.data.stationId === aircraft.Station.id,
-		)
+		.filter((entry) => entry.type === "station-log" && entry.data.stationId === aircraft.Station.id)
 		.reverse()
-		.splice(0, 6) as (MissionStationLog | MissionSdsStatusLog)[];
+		.splice(0, 6) as MissionStationLog[];
 
 	const aircraftUser: PublicUser =
 		typeof aircraft.publicUser === "string" ? JSON.parse(aircraft.publicUser) : aircraft.publicUser;
@@ -108,13 +103,10 @@ const FMSStatusHistory = ({
 						<span
 							className="text-base font-bold"
 							style={{
-								color:
-									FMS_STATUS_TEXT_COLORS[
-										entry.type === "sds-status-log" ? entry.data.status : entry.data.newFMSstatus
-									],
+								color: FMS_STATUS_TEXT_COLORS[entry.data.newFMSstatus],
 							}}
 						>
-							{entry.type === "sds-status-log" ? entry.data.status : entry.data.newFMSstatus}
+							{entry.data.newFMSstatus}
 						</span>
 						<span className="text-base-content">
 							{new Date(entry.timeStamp).toLocaleTimeString([], {
@@ -134,7 +126,6 @@ const FMSStatusSelector = ({
 }: {
 	aircraft: ConnectedAircraft & { Station: Station };
 }) => {
-	const session = useSession();
 	const dispatcherConnected = useDispatchConnectionStore((s) => s.status) === "connected";
 	const [hoveredStatus, setHoveredStatus] = useState<string | null>(null);
 	const queryClient = useQueryClient();
@@ -153,20 +144,6 @@ const FMSStatusSelector = ({
 		},
 	});
 
-	const sendSdsStatusMutation = useMutation({
-		mutationFn: async ({ sdsMessage }: { sdsMessage: MissionSdsStatusLog }) => {
-			if (!aircraft?.id) throw new Error("No connected aircraft");
-			await sendSdsStatusMessageAPI({ sdsMessage, aircraftId: aircraft?.id });
-			queryClient.invalidateQueries({
-				queryKey: ["missions"],
-			});
-		},
-	});
-
-	if (!session.data?.user) {
-		return null;
-	}
-
 	return (
 		<div className="text-base-content mt-2 flex flex-col gap-2 p-4">
 			<div className="flex h-full items-center justify-center gap-2">
@@ -236,21 +213,12 @@ const FMSStatusSelector = ({
 						onMouseEnter={() => setHoveredStatus(status)}
 						onMouseLeave={() => setHoveredStatus(null)}
 						onClick={async () => {
-							await sendSdsStatusMutation.mutateAsync({
-								sdsMessage: {
-									type: "sds-status-log",
-									auto: false,
-									timeStamp: new Date().toISOString(),
-									data: {
-										status: status,
-										direction: "to-aircraft",
-										stationId: aircraft.Station.id,
-										station: aircraft.Station,
-										user: getPublicUser(session.data?.user),
-									},
+							await changeAircraftMutation.mutateAsync({
+								id: aircraft.id,
+								update: {
+									fmsStatus: status,
 								},
 							});
-							toast.success(`SDS Status ${status} gesendet`);
 						}}
 					>
 						{status}
@@ -328,12 +296,6 @@ const StationTab = ({ aircraft }: { aircraft: ConnectedAircraft & { Station: Sta
 						{aircraft.posH145active ? "H145 Aktiv" : "H145 Inaktiv"}
 					</span>
 				</span>
-				<span className="flex items-center gap-2">
-					<Lollipop size={16} />{" "}
-					<span className={cn(aircraft.posXplanePluginActive && "text-green-500")}>
-						{aircraft.posXplanePluginActive ? "X-Plane Plugin Aktiv" : "X-Plane Plugin Inaktiv"}
-					</span>
-				</span>
 			</div>
 		</div>
 	);
@@ -410,9 +372,7 @@ const SDSTab = ({
 				?.slice()
 				.reverse()
 				.filter(
-					(entry) =>
-						(entry.type === "sds-log" || entry.type == "sds-status-log") &&
-						entry.data.stationId === aircraft.Station.id,
+					(entry) => entry.type === "sds-log" && entry.data.stationId === aircraft.Station.id,
 				) || [],
 		[mission?.missionLog, aircraft.Station.id],
 	);
@@ -505,7 +465,7 @@ const SDSTab = ({
 			)}
 			<ul className="max-h-[300px] space-y-2 overflow-x-auto overflow-y-auto">
 				{log.map((entry, index) => {
-					const sdsEntry = entry as MissionSdsLog | MissionSdsStatusLog;
+					const sdsEntry = entry as MissionSdsLog;
 					return (
 						<li key={index} className="flex items-center gap-2">
 							<span className="text-base-content">
@@ -523,9 +483,7 @@ const SDSTab = ({
 								{sdsEntry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}
 								{sdsEntry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}
 							</span>
-							<span className="text-base-content">
-								{sdsEntry.type == "sds-log" ? sdsEntry.data.message : sdsEntry.data.status}
-							</span>
+							<span className="text-base-content">{sdsEntry.data.message}</span>
 						</li>
 					);
 				})}

apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx

@@ -726,11 +726,7 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
 									<span className="text-base-content">{entry.data.station.bosCallsign}</span>
 								</li>
 							);
-						if (
-							entry.type === "message-log" ||
-							entry.type === "sds-log" ||
-							entry.type === "sds-status-log"
-						)
+						if (entry.type === "message-log" || entry.type === "sds-log")
 							return (
 								<li key={index} className="flex items-center gap-2">
 									<span className="text-base-content">
@@ -745,10 +741,9 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
 											color: FMS_STATUS_TEXT_COLORS[6],
 										}}
 									>
-										{entry.type == "sds-status-log" && entry.data.direction == "to-lst"
-											? entry.data.station.bosCallsignShort
-											: `${entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}${entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}`}
-										{(entry.type === "sds-log" || entry.type === "sds-status-log") && (
+										{entry.data.user.firstname?.[0]?.toUpperCase() ?? "?"}
+										{entry.data.user.lastname?.[0]?.toUpperCase() ?? "?"}
+										{entry.type === "sds-log" && (
 											<>
 												<svg
 													xmlns="http://www.w3.org/2000/svg"
@@ -765,17 +760,11 @@ const FMSStatusHistory = ({ mission }: { mission: Mission }) => {
 													/>
 												</svg>
 
-												{entry.type == "sds-status-log" && entry.data.direction == "to-aircraft"
-													? entry.data.station.bosCallsignShort
-													: "LST"}
+												{entry.data.station.bosCallsignShort}
 											</>
 										)}
 									</span>
-									<span className="text-base-content">
-										{entry.type === "sds-log" || entry.type === "message-log"
-											? entry.data.message
-											: entry.data.status}
-									</span>
+									<span className="text-base-content">{entry.data.message}</span>
 								</li>
 							);
 						if (

apps/dispatch/app/_data/fmsStatusDescription.ts

@@ -24,30 +24,3 @@ export const fmsStatusDescription: { [key: string]: string } = {
 	o: "Warten, alle Abfrageplätze belegt",
 	u: "Verstanden",
 };
-
-export const fmsStatusDescriptionShort: { [key: string]: string } = {
-	NaN: "Keine D.",
-	"0": "Prio. Sprechen",
-	"1": "E.-bereit Funk",
-	"2": "E.-bereit Wache",
-	"3": "E.-übernahme",
-	"4": "Einsatzort",
-	"5": "Sprechwunsch",
-	"6": "Nicht e.-bereit",
-	"7": "Einsatzgeb.",
-	"8": "Bed. Verfügbar",
-	"9": "F-anmeldung",
-	E: "Einsatzabbruch",
-	C: "Melden Sie Einsatzübernahme",
-	F: "Kommen Sie über Draht",
-	H: "Fahren Sie Wache an",
-	J: "Sprechen Sie",
-	L: "Geben Sie Lagemeldung",
-	P: "Einsatz mit Polizei",
-	U: "Ungültige Statusfolge",
-	c: "Status korrigieren",
-	d: "Nennen Sie Transportziel",
-	h: "Zielklinik verständigt",
-	o: "Warten, alle Abfrageplätze belegt",
-	u: "Verstanden",
-};

apps/dispatch/app/_data/livekitRooms.ts

@@ -1,7 +1 @@
-export const ROOMS = [
-	{ name: "VAR_LST_RD_01", id: "2201" },
-	{ name: "VAR_LST_RD_02", id: "2202" },
-	{ name: "VAR_LST_RD_03", id: "2203" },
-	{ name: "VAR_LST_RD_04", id: "2204" },
-	{ name: "VAR_LST_RD_05", id: "2205" },
-];
+export const ROOMS = ["LST_01", "LST_02", "LST_03", "LST_04", "LST_05"];

apps/dispatch/app/_helpers/xPlaneObjectsAvailable.ts

@@ -1,11 +0,0 @@
-import { ConnectedAircraft } from "@repo/db";
-
-export const xPlaneObjectsAvailable = (
-	missionStationIds?: number[],
-	aircrafts?: ConnectedAircraft[],
-) => {
-	return missionStationIds?.some((id) => {
-		const aircraft = aircrafts?.find((a) => a.stationId === id);
-		return aircraft?.posXplanePluginActive;
-	});
-};

apps/dispatch/app/_querys/dispatcher.ts

@@ -14,14 +14,11 @@ export const changeDispatcherAPI = async (
 };
 
 export const getConnectedDispatcherAPI = async (filter?: Prisma.ConnectedDispatcherWhereInput) => {
-	const res = await axios.get<(ConnectedDispatcher & { settingsUseHPGAsDispatcher: boolean })[]>(
-		"/api/dispatcher",
-		{
-			params: {
-				filter: JSON.stringify(filter),
-			},
+	const res = await axios.get<ConnectedDispatcher[]>("/api/dispatcher", {
+		params: {
+			filter: JSON.stringify(filter),
 		},
-	);
+	});
 	if (res.status !== 200) {
 		throw new Error("Failed to fetch Connected Dispatcher");
 	}

apps/dispatch/app/_querys/missions.ts

@@ -1,4 +1,4 @@
-import { Mission, MissionSdsLog, MissionSdsStatusLog, Prisma } from "@repo/db";
+import { Mission, MissionSdsLog, Prisma } from "@repo/db";
 import axios from "axios";
 import { serverApi } from "_helpers/axios";
 
@@ -29,20 +29,6 @@ export const editMissionAPI = async (id: number, mission: Prisma.MissionUpdateIn
 	const respone = await serverApi.patch<Mission>(`/mission/${id}`, mission);
 	return respone.data;
 };
-
-export const sendSdsStatusMessageAPI = async ({
-	sdsMessage,
-	aircraftId,
-}: {
-	aircraftId: number;
-	sdsMessage: MissionSdsStatusLog;
-}) => {
-	const respone = await serverApi.post<Mission>(`/aircrafts/${aircraftId}/send-sds-message`, {
-		sdsMessage,
-	});
-	return respone.data;
-};
-
 export const sendSdsMessageAPI = async ({
 	missionId,
 	sdsMessage,

apps/dispatch/app/_store/audioStore.ts

@@ -21,15 +21,12 @@ import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
 import { changeDispatcherAPI } from "_querys/dispatcher";
 import { getRadioStream } from "_helpers/radioEffect";
 import { usePilotConnectionStore } from "_store/pilot/connectionStore";
-import { ROOMS } from "_data/livekitRooms";
 
 let interval: NodeJS.Timeout;
 
-const connectedSound = new Audio("/sounds/403.wav");
-
 type TalkState = {
 	addSpeakingParticipant: (participant: Participant) => void;
-	connect: (room: (typeof ROOMS)[number] | undefined, role: string) => void;
+	connect: (roomName: string, role: string) => void;
 	connectionQuality: ConnectionQuality;
 	disconnect: () => void;
 	isTalking: boolean;
@@ -47,8 +44,6 @@ type TalkState = {
 		radioVolume: number;
 		dmeVolume: number;
 	};
-	selectedRoom?: (typeof ROOMS)[number];
-	setSelectedRoom: (room: (typeof ROOMS)[number]) => void;
 	speakingParticipants: Participant[];
 	state: "connecting" | "connected" | "disconnected" | "error";
 	toggleTalking: () => void;
@@ -77,10 +72,6 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 	remoteParticipants: 0,
 	connectionQuality: ConnectionQuality.Unknown,
 	room: null,
-	selectedRoom: ROOMS[0],
-	setSelectedRoom: (room) => {
-		set({ selectedRoom: room });
-	},
 	resetSpeakingParticipants: (source: string) => {
 		set({
 			speakingParticipants: [],
@@ -126,11 +117,11 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 			(oldSettings.micDeviceId !== newSettings.micDeviceId ||
 				oldSettings.micVolume !== newSettings.micVolume)
 		) {
-			const { room, disconnect, connect, selectedRoom } = get();
+			const { room, disconnect, connect } = get();
 			const role = room?.localParticipant.attributes.role;
-			if (selectedRoom || role) {
+			if (room?.name || role) {
 				disconnect();
-				connect(selectedRoom, role || "user");
+				connect(room?.name || "", role || "user");
 			}
 		}
 	},
@@ -169,7 +160,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 
 		set((state) => ({ isTalking: !state.isTalking, transmitBlocked: false }));
 	},
-	connect: async (_room, role) => {
+	connect: async (roomName, role) => {
 		set({ state: "connecting" });
 
 		try {
@@ -181,12 +172,10 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 				connectedRoom.removeAllListeners();
 			}
 
-			const { selectedRoom } = get();
-
 			const url = process.env.NEXT_PUBLIC_LIVEKIT_URL;
 			if (!url) return console.error("NEXT_PUBLIC_LIVEKIT_URL not set");
 
-			const token = await getToken(_room?.name || selectedRoom?.name || "VAR_LST_RD_01");
+			const token = await getToken(roomName);
 			if (!token) throw new Error("Fehlende Berechtigung");
 			const room = new Room({});
 			await room.prepareConnection(url, token);
@@ -197,7 +186,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 
 					if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
 						changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
-							zone: _room?.name || selectedRoom?.name || "VAR_LST_RD_01",
+							zone: roomName,
 							ghostMode: dispatchState.ghostMode,
 						});
 					}
@@ -219,7 +208,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 						source: Track.Source.Microphone,
 					});
 					await publishedTrack.mute();
-					connectedSound.play().catch((e) => console.error("Fehler beim Abspielen des Sounds", e));
+
 					set({ localRadioTrack: publishedTrack });
 
 					set({ state: "connected", room, isTalking: false, message: null });

apps/dispatch/app/_store/dispatch/connectionStore.ts

@@ -27,7 +27,7 @@ export const useDispatchConnectionStore = create<ConnectionStore>((set) => ({
 	setHideDraftMissions: (hide) => set({ hideDraftMissions: hide }),
 	connectedDispatcher: null,
 	message: "",
-	selectedZone: "VAR_LST_RD_01",
+	selectedZone: "LST_01",
 	logoffTime: "",
 	ghostMode: false,
 	connect: async (uid, selectedZone, logoffTime, ghostMode) =>
@@ -48,7 +48,7 @@ export const useDispatchConnectionStore = create<ConnectionStore>((set) => ({
 
 dispatchSocket.on("connect", () => {
 	const { logoffTime, selectedZone, ghostMode } = useDispatchConnectionStore.getState();
-	useAudioStore.getState().connect(undefined, selectedZone || "Leitstelle");
+	useAudioStore.getState().connect("LST_01", selectedZone || "Leitstelle");
 	dispatchSocket.emit("connect-dispatch", {
 		logoffTime,
 		selectedZone,

apps/dispatch/app/_store/pilot/MrtStore.ts

@@ -1,92 +1,173 @@
+import { MissionSdsLog, Station } from "@repo/db";
+import { fmsStatusDescription } from "_data/fmsStatusDescription";
+import { DisplayLineProps } from "(app)/pilot/_components/mrt/Mrt";
 import { create } from "zustand";
+import { syncTabs } from "zustand-sync-tabs";
 
-interface SetOffPageParams {
-	page: "off";
-}
-
-interface SetStartupPageParams {
-	page: "startup";
+interface SetSdsPageParams {
+	page: "sds";
+	station: Station;
+	sdsMessage: MissionSdsLog;
 }
 
 interface SetHomePageParams {
 	page: "home";
+	station: Station;
+	fmsStatus: string;
 }
 
-interface SetVoicecallPageParams {
-	page: "voice-call";
-}
-interface SetSdsReceivedPopupParams {
-	popup: "sds-received";
+interface SetSendingStatusPageParams {
+	page: "sending-status";
+	station: Station;
 }
 
-interface SetGroupSelectionPopupParams {
-	popup: "group-selection";
+interface SetNewStatusPageParams {
+	page: "new-status";
+	station: Station;
 }
 
-interface SetStatusSentPopupParams {
-	popup: "status-sent";
-}
-
-interface SetLoginPopupParams {
-	popup: "login";
-}
-
-interface SetSdsSentPopupParams {
-	popup: "sds-sent";
-}
-
-export type SetPageParams =
+type SetPageParams =
 	| SetHomePageParams
-	| SetOffPageParams
-	| SetStartupPageParams
-	| SetVoicecallPageParams;
-
-export type SetPopupParams =
-	| SetStatusSentPopupParams
-	| SetSdsSentPopupParams
-	| SetGroupSelectionPopupParams
-	| SetSdsReceivedPopupParams
-	| SetLoginPopupParams;
-
-interface StringifiedData {
-	sdsText?: string;
-	sentSdsText?: string;
-
-	groupSelectionGroupId?: string;
-	callTextHeader?: string;
-}
+	| SetSendingStatusPageParams
+	| SetSdsPageParams
+	| SetNewStatusPageParams;
 
 interface MrtStore {
 	page: SetPageParams["page"];
-	popup?: SetPopupParams["popup"];
 
-	stringifiedData: StringifiedData;
-	setStringifiedData: (data: Partial<StringifiedData>) => void;
+	lines: DisplayLineProps[];
 
 	setPage: (pageData: SetPageParams) => void;
-	setPopup: (popupData: SetPopupParams | null) => void;
-
-	// internal
-	updateIntervall?: number;
-	nightMode: boolean;
-	setNightMode: (nightMode: boolean) => void;
+	setLines: (lines: MrtStore["lines"]) => void;
 }
 
-export const useMrtStore = create<MrtStore>((set) => ({
-	page: "off",
-	nightMode: false,
-	stringifiedData: {
-		groupSelectionGroupId: "2201",
-	},
-	setNightMode: (nightMode) => set({ nightMode }),
-	setStringifiedData: (data) =>
-		set((state) => ({
-			stringifiedData: { ...state.stringifiedData, ...data },
-		})),
-	setPopup: (popupData) => {
-		set({ popup: popupData ? popupData.popup : undefined });
-	},
-	setPage: (pageData) => {
-		set({ page: pageData.page });
-	},
-}));
+export const useMrtStore = create<MrtStore>(
+	syncTabs(
+		(set) => ({
+			page: "home",
+			pageData: {
+				message: "",
+			},
+			lines: [
+				{
+					textLeft: "VAR.#",
+					textSize: "2",
+				},
+				{
+					textLeft: "No Data",
+					textSize: "3",
+				},
+			],
+			setLines: (lines) => set({ lines }),
+			setPage: (pageData) => {
+				switch (pageData.page) {
+					case "home": {
+						const { station, fmsStatus } = pageData as SetHomePageParams;
+						set({
+							page: "home",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textLeft: fmsStatus,
+									style: { fontWeight: "extrabold" },
+									textSize: "4",
+								},
+								{
+									textLeft: fmsStatusDescription[fmsStatus],
+									textSize: "1",
+								},
+							],
+						});
+						break;
+					}
+
+					case "sending-status": {
+						const { station } = pageData as SetSendingStatusPageParams;
+						set({
+							page: "sending-status",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textMid: "sending...",
+									style: { fontWeight: "bold" },
+									textSize: "4",
+								},
+								{
+									textLeft: "Status wird gesendet...",
+									textSize: "1",
+								},
+							],
+						});
+						break;
+					}
+					case "new-status": {
+						const { station } = pageData as SetNewStatusPageParams;
+						set({
+							page: "new-status",
+							lines: [
+								{
+									textLeft: `${station?.bosCallsign}`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{ textLeft: "ILS VAR#", textSize: "3" },
+								{
+									textLeft: "empfangen",
+									style: { fontWeight: "bold" },
+									textSize: "4",
+								},
+							],
+						});
+						break;
+					}
+					case "sds": {
+						const { sdsMessage } = pageData as SetSdsPageParams;
+						const msg = sdsMessage.data.message;
+						set({
+							page: "sds",
+							lines: [
+								{
+									textLeft: `SDS-Nachricht`,
+									style: { fontWeight: "bold" },
+									textSize: "2",
+								},
+								{
+									textLeft: msg,
+									style: {
+										whiteSpace: "normal",
+										overflowWrap: "break-word",
+										wordBreak: "break-word",
+										display: "block",
+										maxWidth: "100%",
+										maxHeight: "100%",
+										overflow: "auto",
+										textOverflow: "ellipsis",
+										lineHeight: "1.2em",
+									},
+									textSize: "2",
+								},
+							],
+						});
+						break;
+					}
+					default:
+						set({ page: "home" });
+						break;
+				}
+			},
+		}),
+		{
+			name: "mrt-store", // unique name
+		},
+	),
+);

apps/dispatch/app/_store/pilot/connectionStore.ts

@@ -1,7 +1,6 @@
 import { create } from "zustand";
 import { dispatchSocket } from "../../(app)/dispatch/socket";
 import { ConnectedAircraft, Mission, MissionSdsLog, Station, User } from "@repo/db";
-import { showToast } from "../../_components/customToasts/HPGnotValidated";
 import { pilotSocket } from "(app)/pilot/socket";
 import { useDmeStore } from "_store/pilot/dmeStore";
 import { useMrtStore } from "_store/pilot/MrtStore";
@@ -86,7 +85,7 @@ pilotSocket.on("connect", () => {
 	usePilotConnectionStore.setState({ status: "connected", message: "" });
 	const { logoffTime, selectedStation, debug } = usePilotConnectionStore.getState();
 	dispatchSocket.disconnect();
-	useAudioStore.getState().connect(undefined, selectedStation?.bosCallsignShort || "pilot");
+	useAudioStore.getState().connect("LST_01", selectedStation?.bosCallsignShort || "pilot");
 
 	pilotSocket.emit("connect-pilot", {
 		logoffTime,
@@ -109,7 +108,7 @@ pilotSocket.on("connect-message", (data) => {
 });
 
 pilotSocket.on("disconnect", () => {
-	usePilotConnectionStore.setState({ status: "disconnected", connectedAircraft: null });
+	usePilotConnectionStore.setState({ status: "disconnected" });
 	useAudioStore.getState().disconnect();
 });
 
@@ -133,22 +132,14 @@ pilotSocket.on("mission-alert", (data: Mission & { Stations: Station[] }) => {
 	useDmeStore.getState().setPage({
 		page: "new-mission",
 	});
-	if (
-		data.hpgValidationState === "NOT_VALIDATED" &&
-		usePilotConnectionStore.getState().connectedAircraft?.posH145active
-	) {
-		showToast();
-	}
 });
 
 pilotSocket.on("sds-message", (sdsMessage: MissionSdsLog) => {
-	console.log("Received sds-message via socket:", sdsMessage);
 	const station = usePilotConnectionStore.getState().selectedStation;
 	if (!station) return;
-	useMrtStore.getState().setPopup({
-		popup: "sds-received",
-	});
-	useMrtStore.getState().setStringifiedData({
-		sdsText: sdsMessage.data.message,
+	useMrtStore.getState().setPage({
+		page: "sds",
+		station,
+		sdsMessage,
 	});
 });

apps/dispatch/app/_store/pilot/dmeStore.ts

@@ -1,6 +1,7 @@
 import { Mission, Station, User } from "@repo/db";
 import { DisplayLineProps } from "(app)/pilot/_components/dme/Dme";
 import { create } from "zustand";
+import { syncTabs } from "zustand-sync-tabs";
 
 interface SetHomePageParams {
 	page: "home";
@@ -44,190 +45,197 @@ interface MrtStore {
 
 let interval: NodeJS.Timeout | null = null;
 
-export const useDmeStore = create<MrtStore>((set) => ({
-	page: "home",
-	pageData: {
-		message: "",
-	},
-	lines: [
-		{
-			textLeft: "",
-		},
-		{
-			textMid: "VAR . DME# No Data",
-			textSize: "2",
-		},
-		{
-			textLeft: "",
-		},
-	],
-	setLines: (lines) => set({ lines }),
-	latestMission: null,
-	setPage: (pageData) => {
-		if (interval) clearInterval(interval);
-		switch (pageData.page) {
-			case "home": {
-				const setHomePage = () =>
-					set({
-						page: "home",
-						lines: [
-							{
-								textMid: pageData.station.bosCallsign
-									? `${pageData.station.bosCallsign}`
-									: "no Data",
-								style: { fontWeight: "bold" },
-							},
-							{ textMid: "⠀" },
-							{
-								textMid: new Date().toLocaleDateString("de-DE", {
-									year: "numeric",
-									month: "2-digit",
-									day: "2-digit",
-								}),
-							},
-							{
-								textMid: new Date().toLocaleTimeString(),
-								style: { fontWeight: "bold" },
-							},
-							{ textMid: "⠀" },
-							{
-								textMid: `${pageData.user.lastname} ${pageData.user.firstname}`,
-							},
-							{ textMid: "⠀" },
-						],
-					});
-				setHomePage();
+export const useDmeStore = create<MrtStore>(
+	syncTabs(
+		(set) => ({
+			page: "home",
+			pageData: {
+				message: "",
+			},
+			lines: [
+				{
+					textLeft: "",
+				},
+				{
+					textMid: "VAR . DME# No Data",
+					textSize: "2",
+				},
+				{
+					textLeft: "",
+				},
+			],
+			setLines: (lines) => set({ lines }),
+			latestMission: null,
+			setPage: (pageData) => {
+				if (interval) clearInterval(interval);
+				switch (pageData.page) {
+					case "home": {
+						const setHomePage = () =>
+							set({
+								page: "home",
+								lines: [
+									{
+										textMid: pageData.station.bosCallsign
+											? `${pageData.station.bosCallsign}`
+											: "no Data",
+										style: { fontWeight: "bold" },
+									},
+									{ textMid: "⠀" },
+									{
+										textMid: new Date().toLocaleDateString("de-DE", {
+											year: "numeric",
+											month: "2-digit",
+											day: "2-digit",
+										}),
+									},
+									{
+										textMid: new Date().toLocaleTimeString(),
+										style: { fontWeight: "bold" },
+									},
+									{ textMid: "⠀" },
+									{
+										textMid: `${pageData.user.lastname} ${pageData.user.firstname}`,
+									},
+									{ textMid: "⠀" },
+								],
+							});
+						setHomePage();
 
-				interval = setInterval(() => {
-					setHomePage();
-				}, 1000);
-				break;
-			}
+						interval = setInterval(() => {
+							setHomePage();
+						}, 1000);
+						break;
+					}
 
-			case "new-mission": {
-				set({
-					page: "new-mission",
-					lines: [
-						{ textMid: "⠀" },
-						{
-							textMid: "new mission received",
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			case "mission": {
-				set({
-					latestMission: pageData.mission,
-					page: "mission",
-					lines: [
-						{
-							textLeft: `${pageData.mission.missionKeywordAbbreviation}`,
-							textRight: pageData.mission.Stations.map((s) => s.bosCallsignShort).join(","),
-							style: { fontWeight: "bold" },
-						},
-						...(pageData.mission.type == "primär"
-							? [
-									{
-										textMid: `${pageData.mission.missionKeywordName}`,
-										style: { fontWeight: "bold" },
-									},
-								]
-							: []),
+					case "new-mission": {
+						set({
+							page: "new-mission",
+							lines: [
+								{ textMid: "⠀" },
+								{
+									textMid: "new mission received",
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					case "mission": {
+						set({
+							latestMission: pageData.mission,
+							page: "mission",
+							lines: [
+								{
+									textLeft: `${pageData.mission.missionKeywordAbbreviation}`,
+									textRight: pageData.mission.Stations.map((s) => s.bosCallsignShort).join(","),
+									style: { fontWeight: "bold" },
+								},
+								...(pageData.mission.type == "primär"
+									? [
+											{
+												textMid: `${pageData.mission.missionKeywordName}`,
+												style: { fontWeight: "bold" },
+											},
+										]
+									: []),
 
-						{ textLeft: `${pageData.mission.addressStreet}` },
-						{
-							textLeft: `${pageData.mission.addressZip} ${pageData.mission.addressCity}`,
-						},
-						{
-							textMid: "Weitere Standortinformationen:",
-							style: { fontWeight: "bold" },
-						},
-						{
-							textLeft: pageData.mission.addressAdditionalInfo || "keine Daten",
-						},
-						...(pageData.mission.type === "sekundär"
-							? [
-									{
-										textMid: "Zielort:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.addressMissionDestination || "keine Daten",
-									},
-								]
-							: []),
-						...(pageData.mission.missionPatientInfo &&
-						pageData.mission.missionPatientInfo.length > 0
-							? [
-									{
-										textMid: "Patienteninfos:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.missionPatientInfo,
-									},
-								]
-							: []),
-						...(pageData.mission.missionAdditionalInfo &&
-						pageData.mission.missionAdditionalInfo.length > 0
-							? [
-									{
-										textMid: "Weitere Infos:",
-										style: { fontWeight: "bold" },
-									},
-									{
-										textLeft: pageData.mission.missionAdditionalInfo,
-									},
-								]
-							: []),
-					],
-				});
-				break;
-			}
-			case "error": {
-				set({
-					page: "error",
-					lines: [
-						{ textMid: "Fehler:" },
-						{
-							textMid: pageData.error,
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			case "acknowledge": {
-				set({
-					page: "acknowledge",
-					lines: [
-						{ textMid: "⠀" },
-						{
-							textMid: "Einsatz angenommen",
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-			}
-			default:
-				set({
-					page: "error",
-					lines: [
-						{ textMid: "Fehler:" },
-						{
-							textMid: `Unbekannte Seite`,
-							style: { fontWeight: "bold" },
-						},
-						{ textMid: "⠀" },
-					],
-				});
-				break;
-		}
-	},
-}));
+								{ textLeft: `${pageData.mission.addressStreet}` },
+								{
+									textLeft: `${pageData.mission.addressZip} ${pageData.mission.addressCity}`,
+								},
+								{
+									textMid: "Weitere Standortinformationen:",
+									style: { fontWeight: "bold" },
+								},
+								{
+									textLeft: pageData.mission.addressAdditionalInfo || "keine Daten",
+								},
+								...(pageData.mission.type === "sekundär"
+									? [
+											{
+												textMid: "Zielort:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.addressMissionDestination || "keine Daten",
+											},
+										]
+									: []),
+								...(pageData.mission.missionPatientInfo &&
+								pageData.mission.missionPatientInfo.length > 0
+									? [
+											{
+												textMid: "Patienteninfos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionPatientInfo,
+											},
+										]
+									: []),
+								...(pageData.mission.missionAdditionalInfo &&
+								pageData.mission.missionAdditionalInfo.length > 0
+									? [
+											{
+												textMid: "Weitere Infos:",
+												style: { fontWeight: "bold" },
+											},
+											{
+												textLeft: pageData.mission.missionAdditionalInfo,
+											},
+										]
+									: []),
+							],
+						});
+						break;
+					}
+					case "error": {
+						set({
+							page: "error",
+							lines: [
+								{ textMid: "Fehler:" },
+								{
+									textMid: pageData.error,
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					case "acknowledge": {
+						set({
+							page: "acknowledge",
+							lines: [
+								{ textMid: "⠀" },
+								{
+									textMid: "Einsatz angenommen",
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+					}
+					default:
+						set({
+							page: "error",
+							lines: [
+								{ textMid: "Fehler:" },
+								{
+									textMid: `Unbekannte Seite`,
+									style: { fontWeight: "bold" },
+								},
+								{ textMid: "⠀" },
+							],
+						});
+						break;
+				}
+			},
+		}),
+		{
+			name: "dme-store", // unique name
+		},
+	),
+);

apps/dispatch/app/api/dispatcher/route.ts

@@ -24,7 +24,6 @@ export async function GET(request: Request): Promise<NextResponse> {
 					...d,
 					user: undefined,
 					publicUser: getPublicUser(d.user),
-					settingsUseHPGAsDispatcher: d.user.settingsUseHPGAsDispatcher,
 				};
 			}),
 			{

apps/dispatch/app/api/position-log/route.ts

@@ -21,10 +21,9 @@ export const PUT = async (req: Request) => {
 		if (!session && !payload) return Response.json({ message: "Unauthorized" }, { status: 401 });
 
 		const userId = session?.user.id || payload.id;
-		const { position, h145, xPlanePluginActive } = (await req.json()) as {
+		const { position, h145 } = (await req.json()) as {
 			position: PositionLog;
 			h145: boolean;
-			xPlanePluginActive: boolean;
 		};
 		if (!position) {
 			return Response.json({ message: "Missing id or position" });
@@ -62,7 +61,6 @@ export const PUT = async (req: Request) => {
 				posHeading: position.heading,
 				posSpeed: position.speed,
 				posH145active: h145,
-				posXplanePluginActive: xPlanePluginActive,
 			},
 		});
 

apps/dispatch/app/globals.css

@@ -9,11 +9,6 @@
 	src: url("/fonts/MelderV2.ttf") format("truetype"); /* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
 }
 
-@font-face {
-	font-family: "Bahnschrift";
-	src: url("/fonts/bahnschrift.ttf") format("truetype"); /* Chrome 4+, Firefox 3.5, Opera 10+, Safari 3—5 */
-}
-
 @theme {
 	--color-rescuetrack: #46b7a3;
 	--color-rescuetrack-highlight: #ff4500;

apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx

@@ -78,15 +78,6 @@ export const ConnectedDispatcher = () => {
 										<div>{asPublicUser(d.publicUser).fullName}</div>
 										<div className="text-xs font-semibold uppercase opacity-60">{d.zone}</div>
 									</div>
-									<div className="mr-2 flex flex-col justify-center">
-										{d.settingsUseHPGAsDispatcher ? (
-											<span className="badge badge-sm badge-success badge-outline">HPG aktiv</span>
-										) : (
-											<span className="badge badge-sm badge-info badge-outline">
-												HPG deaktiviert
-											</span>
-										)}
-									</div>
 									<div>
 										{(() => {
 											const badges = (d.publicUser as unknown as PublicUser).badges

apps/dispatch/next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/dispatch/next.config.js

@@ -1,6 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-	output: "standalone",
-};
+const nextConfig = {};
 
 export default nextConfig;

apps/dispatch/package.json

@@ -44,7 +44,7 @@
 		"livekit-client": "^2.15.3",
 		"livekit-server-sdk": "^2.13.1",
 		"lucide-react": "^0.525.0",
-		"next": "^15.4.8",
+		"next": "^15.4.2",
 		"next-auth": "^4.24.11",
 		"npm": "^11.4.2",
 		"postcss": "^8.5.6",
@@ -60,6 +60,7 @@
 		"tailwindcss": "^4.1.11",
 		"typescript": "^5.8.3",
 		"zod": "^3.25.67",
-		"zustand": "^5.0.6"
+		"zustand": "^5.0.6",
+		"zustand-sync-tabs": "^0.2.2"
 	}
 }

apps/hub-server/routes/event.ts

@@ -20,7 +20,7 @@ router.post("/handle-participant-finished", async (req, res) => {
 			Event: true,
 			User: {
 				include: {
-					DiscordAccount: true,
+					discordAccounts: true,
 				},
 			},
 		},
@@ -94,7 +94,7 @@ router.post("/handle-participant-enrolled", async (req, res) => {
 			Event: true,
 			User: {
 				include: {
-					DiscordAccount: true,
+					discordAccounts: true,
 				},
 			},
 		},

apps/hub/Dockerfile

@@ -1,5 +1,9 @@
 FROM node:22-alpine AS base
 
+
+ENV PNPM_HOME="/usr/local/pnpm"
+ENV PATH="${PNPM_HOME}:${PATH}"
+
 ARG NEXT_PUBLIC_HUB_URL
 ARG NEXT_PUBLIC_HUB_SERVER_URL
 ARG NEXT_PUBLIC_DISCORD_URL
@@ -12,13 +16,13 @@ ENV NEXT_PUBLIC_DISCORD_URL=${NEXT_PUBLIC_DISCORD_URL}
 ENV NEXT_PUBLIC_MOODLE_URL=${NEXT_PUBLIC_MOODLE_URL}
 ENV NEXT_PUBLIC_DISPATCH_URL=${NEXT_PUBLIC_DISPATCH_URL}
 
-FROM base AS builder
-
-ENV PNPM_HOME="/usr/local/pnpm"
-ENV PATH="${PNPM_HOME}:${PATH}"
-
 RUN corepack enable && corepack prepare pnpm@latest --activate
+
+
+RUN echo "NEXT_PUBLIC_DISCORD_URL=${NEXT_PUBLIC_DISCORD_URL}"
 RUN pnpm add -g turbo@^2.5
+
+FROM base AS builder
 RUN apk update
 RUN apk add --no-cache libc6-compat
 
@@ -29,13 +33,6 @@ COPY . .
 RUN turbo prune hub --docker
 
 FROM base AS installer
-
-ENV PNPM_HOME="/usr/local/pnpm"
-ENV PATH="${PNPM_HOME}:${PATH}"
-
-RUN corepack enable && corepack prepare pnpm@latest --activate
-RUN pnpm add -g turbo@^2.5
-
 RUN apk update
 RUN apk add --no-cache libc6-compat
 
@@ -47,24 +44,21 @@ RUN pnpm install
 # Build the project
 COPY --from=builder /usr/app/out/full/ .
 
-RUN turbo run build --filter=hub...
+RUN turbo run build
 
-FROM node:22-alpine AS runner
+FROM base AS runner
 WORKDIR /usr/app
 
 # Don't run production as root
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
+USER nextjs
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/hub/.next/standalone ./
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/hub/.next/static ./apps/hub/.next/static
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/hub/public ./apps/hub/public
-
-USER nextjs
+COPY --from=installer --chown=nextjs:nodejs /usr/app/ ./
 
 # Expose the application port
 EXPOSE 3000
 
-CMD ["node", "apps/hub/server.js"]
+CMD ["pnpm", "--dir", "apps/hub", "run", "start"]

apps/hub/app/(app)/_components/Bookings.tsx

@@ -1,5 +1,6 @@
 import { Calendar } from "lucide-react";
 import { getServerSession } from "../../api/auth/[...nextauth]/auth";
+import { Badge } from "@repo/shared-components";
 import { JSX } from "react";
 import { getPublicUser, prisma } from "@repo/db";
 import { formatTimeRange } from "../../../helper/timerange";
@@ -8,9 +9,9 @@ export const Bookings: () => Promise<JSX.Element> = async () => {
 	const session = await getServerSession();
 	const futureBookings = await prisma.booking.findMany({
 		where: {
+			userId: session?.user.id,
 			startTime: {
 				gte: new Date(),
-				lte: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
 			},
 		},
 		orderBy: {

apps/hub/app/(app)/_components/RecentFlights.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { Mission, MissionAlertLog, MissionLog, Prisma, Station } from "@repo/db";
+import { Mission, MissionAlertLog, MissionLog, Station } from "@repo/db";
 import { ColumnDef } from "@tanstack/react-table";
 import { PaginatedTable } from "_components/PaginatedTable";
 import { ArrowRight, NotebookText } from "lucide-react";
@@ -12,22 +12,20 @@ export const RecentFlights = () => {
 		<div className="card-body">
 			<h2 className="card-title justify-between">
 				<span className="card-title">
-					<NotebookText className="h-4 w-4" /> Logbook
+					<NotebookText className="w-4 h-4" /> Logbook
 				</span>
 				<Link className="badge badge-sm badge-info badge-outline" href="/logbook">
-					Zum vollständigen Logbook <ArrowRight className="h-4 w-4" />
+					Zum vollständigen Logbook <ArrowRight className="w-4 h-4" />
 				</Link>
 			</h2>
 			<PaginatedTable
 				prismaModel={"missionOnStationUsers"}
-				getFilter={() =>
-					({
-						User: { id: session.data?.user.id },
-						Mission: {
-							state: { in: ["finished"] },
-						},
-					}) as Prisma.MissionOnStationUsersWhereInput
-				}
+				filter={{
+					userId: session.data?.user?.id ?? "",
+					Mission: {
+						state: "finished",
+					},
+				}}
 				include={{
 					Station: true,
 					User: true,

apps/hub/app/(app)/admin/changelog/_components/Form.tsx

@@ -23,7 +23,6 @@ export const ChangelogForm = ({ changelog }: { changelog?: Changelog }) => {
 			title: changelog?.title || "",
 			text: changelog?.text || "",
 			previewImage: changelog?.previewImage || "", // Changed to accept a URL as a string
-			showOnChangelogPage: changelog?.showOnChangelogPage || true,
 		},
 	});
 	const [skipUserUpdate, setSkipUserUpdate] = useState(false);
@@ -85,7 +84,6 @@ export const ChangelogForm = ({ changelog }: { changelog?: Changelog }) => {
 							placeholder="Titel (vX.X.X)"
 							className="input-sm"
 						/>
-
 						<Input
 							form={form}
 							label="Bild-URL"
@@ -148,16 +146,6 @@ export const ChangelogForm = ({ changelog }: { changelog?: Changelog }) => {
 							</span>
 						</label>
 					)}
-					<label className="label mx-6 mt-6 w-full cursor-pointer">
-						<input
-							type="checkbox"
-							className={cn("toggle")}
-							{...form.register("showOnChangelogPage", {})}
-						/>
-						<span className={cn("label-text w-full text-left")}>
-							Auf der Changelog-Seite anzeigen
-						</span>
-					</label>
 					<div className="card-body">
 						<div className="flex w-full gap-4">
 							<Button

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

@@ -1,42 +1,24 @@
 "use client";
-import { Check, Cross, DatabaseBackupIcon } from "lucide-react";
+import { DatabaseBackupIcon } from "lucide-react";
 import { PaginatedTable } from "../../../_components/PaginatedTable";
 import Link from "next/link";
 import { ColumnDef } from "@tanstack/react-table";
-import { Changelog, Keyword, Prisma } from "@repo/db";
+import { Keyword } from "@repo/db";
 
 export default () => {
 	return (
 		<>
 			<PaginatedTable
 				stickyHeaders
-				initialOrderBy={[{ id: "createdAt", desc: true }]}
+				initialOrderBy={[{ id: "title", desc: true }]}
 				prismaModel="changelog"
-				showSearch
-				getFilter={(search) =>
-					({
-						OR: [
-							{ title: { contains: search, mode: "insensitive" } },
-							{ text: { contains: search, mode: "insensitive" } },
-						],
-					}) as Prisma.ChangelogWhereInput
-				}
+				searchFields={["title"]}
 				columns={
 					[
 						{
 							header: "Title",
 							accessorKey: "title",
 						},
-						{
-							header: "Auf Changelog Seite anzeigen",
-							accessorKey: "showOnChangelogPage",
-							cell: ({ row }) => (row.original.showOnChangelogPage ? <Check /> : <Cross />),
-						},
-						{
-							header: "Erstellt am",
-							accessorKey: "createdAt",
-							cell: ({ row }) => new Date(row.original.createdAt).toLocaleDateString(),
-						},
 						{
 							header: "Aktionen",
 							cell: ({ row }) => (
@@ -47,7 +29,7 @@ export default () => {
 								</div>
 							),
 						},
-					] as ColumnDef<Changelog>[]
+					] as ColumnDef<Keyword>[]
 				}
 				leftOfSearch={
 					<span className="flex items-center gap-2">

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

@@ -1,4 +1,4 @@
-import { Event, Participant, Prisma } from "@repo/db";
+import { Event, Participant } from "@repo/db";
 import { EventAppointmentOptionalDefaults, InputJsonValueType } from "@repo/db/zod";
 import { ColumnDef } from "@tanstack/react-table";
 import { useSession } from "next-auth/react";
@@ -64,7 +64,7 @@ export const AppointmentModal = ({
 					</div>
 					<div>
 						<PaginatedTable
-							supressQuery={appointmentForm.watch("id") === undefined}
+							hide={appointmentForm.watch("id") === undefined}
 							ref={participantTableRef}
 							columns={
 								[
@@ -167,11 +167,9 @@ export const AppointmentModal = ({
 								] as ColumnDef<Participant>[]
 							}
 							prismaModel={"participant"}
-							getFilter={() =>
-								({
-									eventAppointmentId: appointmentForm.watch("id")!,
-								}) as Prisma.ParticipantWhereInput
-							}
+							filter={{
+								eventAppointmentId: appointmentForm.watch("id"),
+							}}
 							include={{ User: true }}
 							leftOfPagination={
 								<div className="flex gap-2">

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

@@ -1,6 +1,6 @@
 "use client";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { BADGES, Event, EVENT_TYPE, Participant, PERMISSION, Prisma, User } from "@repo/db";
+import { BADGES, Event, EVENT_TYPE, Participant, PERMISSION, User } from "@repo/db";
 import {
 	EventAppointmentOptionalDefaults,
 	EventAppointmentOptionalDefaultsSchema,
@@ -159,11 +159,9 @@ export const Form = ({ event }: { event?: Event }) => {
 							<PaginatedTable
 								ref={appointmentsTableRef}
 								prismaModel={"eventAppointment"}
-								getFilter={() =>
-									({
-										eventId: event?.id,
-									}) as Prisma.EventAppointmentWhereInput
-								}
+								filter={{
+									eventId: event?.id,
+								}}
 								include={{
 									Presenter: true,
 									Participants: true,
@@ -252,108 +250,92 @@ export const Form = ({ event }: { event?: Event }) => {
 				{!form.watch("hasPresenceEvents") ? (
 					<div className="card bg-base-200 col-span-6 shadow-xl">
 						<div className="card-body">
-							{
-								<PaginatedTable
-									leftOfSearch={
-										<h2 className="card-title">
-											<UserIcon className="h-5 w-5" /> Teilnehmer
-										</h2>
-									}
-									ref={appointmentsTableRef}
-									prismaModel={"participant"}
-									showSearch
-									getFilter={(searchTerm) =>
-										({
-											AND: [{ eventId: event?.id }],
-											OR: [
-												{
-													User: {
-														OR: [
-															{ firstname: { contains: searchTerm, mode: "insensitive" } },
-															{ lastname: { contains: searchTerm, mode: "insensitive" } },
-															{ publicId: { contains: searchTerm, mode: "insensitive" } },
-														],
-													},
-												},
-											],
-										}) as Prisma.ParticipantWhereInput
-									}
-									include={{
-										User: true,
-									}}
-									supressQuery={!event}
-									columns={
-										[
-											{
-												header: "Vorname",
-												accessorKey: "User.firstname",
-												cell: ({ row }) => {
-													return (
-														<Link
-															className="hover:underline"
-															href={`/admin/user/${row.original.User.id}`}
+							<PaginatedTable
+								leftOfSearch={
+									<h2 className="card-title">
+										<UserIcon className="h-5 w-5" /> Teilnehmer
+									</h2>
+								}
+								searchFields={["User.firstname", "User.lastname", "User.publicId"]}
+								ref={appointmentsTableRef}
+								prismaModel={"participant"}
+								filter={{
+									eventId: event?.id,
+								}}
+								include={{
+									User: true,
+								}}
+								columns={
+									[
+										{
+											header: "Vorname",
+											accessorKey: "User.firstname",
+											cell: ({ row }) => {
+												return (
+													<Link
+														className="hover:underline"
+														href={`/admin/user/${row.original.User.id}`}
+													>
+														{row.original.User.firstname}
+													</Link>
+												);
+											},
+										},
+										{
+											header: "Nachname",
+											accessorKey: "User.lastname",
+											cell: ({ row }) => {
+												return (
+													<Link
+														className="hover:underline"
+														href={`/admin/user/${row.original.User.id}`}
+													>
+														{row.original.User.lastname}
+													</Link>
+												);
+											},
+										},
+										{
+											header: "VAR-Nummer",
+											accessorKey: "User.publicId",
+											cell: ({ row }) => {
+												return (
+													<Link
+														className="hover:underline"
+														href={`/admin/user/${row.original.User.id}`}
+													>
+														{row.original.User.publicId}
+													</Link>
+												);
+											},
+										},
+										{
+											header: "Moodle Kurs abgeschlossen",
+											accessorKey: "finisherMoodleCurseCompleted",
+										},
+										{
+											header: "Aktionen",
+											cell: ({ row }) => {
+												return (
+													<div className="flex gap-2">
+														<button
+															onSubmit={() => false}
+															type="button"
+															onClick={() => {
+																participantForm.reset(row.original);
+																participantModal.current?.showModal();
+															}}
+															className="btn btn-sm btn-outline"
 														>
-															{row.original.User.firstname}
-														</Link>
-													);
-												},
+															Bearbeiten
+														</button>
+													</div>
+												);
 											},
-											{
-												header: "Nachname",
-												accessorKey: "User.lastname",
-												cell: ({ row }) => {
-													return (
-														<Link
-															className="hover:underline"
-															href={`/admin/user/${row.original.User.id}`}
-														>
-															{row.original.User.lastname}
-														</Link>
-													);
-												},
-											},
-											{
-												header: "VAR-Nummer",
-												accessorKey: "User.publicId",
-												cell: ({ row }) => {
-													return (
-														<Link
-															className="hover:underline"
-															href={`/admin/user/${row.original.User.id}`}
-														>
-															{row.original.User.publicId}
-														</Link>
-													);
-												},
-											},
-											{
-												header: "Moodle Kurs abgeschlossen",
-												accessorKey: "finisherMoodleCurseCompleted",
-											},
-											{
-												header: "Aktionen",
-												cell: ({ row }) => {
-													return (
-														<div className="flex gap-2">
-															<button
-																onSubmit={() => false}
-																type="button"
-																onClick={() => {
-																	participantForm.reset(row.original);
-																	participantModal.current?.showModal();
-																}}
-																className="btn btn-sm btn-outline"
-															>
-																Bearbeiten
-															</button>
-														</div>
-													);
-												},
-											},
-										] as ColumnDef<Participant & { User: User }>[]
-									}
-								/>
-							}
+										},
+									] as ColumnDef<Participant & { User: User }>[]
+								}
+							/>
 						</div>
 					</div>
 				) : null}

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

@@ -3,7 +3,7 @@ import { DatabaseBackupIcon } from "lucide-react";
 import { PaginatedTable } from "../../../_components/PaginatedTable";
 import Link from "next/link";
 import { ColumnDef } from "@tanstack/react-table";
-import { Heliport, Prisma } from "@repo/db";
+import { Heliport } from "@repo/db";
 
 const page = () => {
 	return (
@@ -11,17 +11,7 @@ const page = () => {
 			<PaginatedTable
 				stickyHeaders
 				prismaModel="heliport"
-				getFilter={(searchTerm) =>
-					({
-						OR: [
-							{ siteName: { contains: searchTerm, mode: "insensitive" } },
-							{ info: { contains: searchTerm, mode: "insensitive" } },
-							{ hospital: { contains: searchTerm, mode: "insensitive" } },
-							{ designator: { contains: searchTerm, mode: "insensitive" } },
-						],
-					}) as Prisma.HeliportWhereInput
-				}
-				showSearch
+				searchFields={["siteName", "info", "hospital", "designator"]}
 				columns={
 					[
 						{

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

@@ -3,7 +3,7 @@ import { DatabaseBackupIcon } from "lucide-react";
 import { PaginatedTable } from "../../../_components/PaginatedTable";
 import Link from "next/link";
 import { ColumnDef } from "@tanstack/react-table";
-import { Keyword, Prisma } from "@repo/db";
+import { Keyword } from "@repo/db";
 
 export default () => {
 	return (
@@ -12,16 +12,7 @@ export default () => {
 				stickyHeaders
 				initialOrderBy={[{ id: "category", desc: true }]}
 				prismaModel="keyword"
-				showSearch
-				getFilter={(searchTerm) =>
-					({
-						OR: [
-							{ name: { contains: searchTerm, mode: "insensitive" } },
-							{ abreviation: { contains: searchTerm, mode: "insensitive" } },
-							{ category: { contains: searchTerm, mode: "insensitive" } },
-						],
-					}) as Prisma.KeywordWhereInput
-				}
+				searchFields={["name", "abreviation", "description"]}
 				columns={
 					[
 						{
@@ -50,11 +41,11 @@ export default () => {
 				}
 				leftOfSearch={
 					<span className="flex items-center gap-2">
-						<DatabaseBackupIcon className="h-5 w-5" /> Stichwörter
+						<DatabaseBackupIcon className="w-5 h-5" /> Stichwörter
 					</span>
 				}
 				rightOfSearch={
-					<p className="flex items-center justify-between gap-2 text-left text-2xl font-semibold">
+					<p className="text-2xl font-semibold text-left flex items-center gap-2 justify-between">
 						<Link href={"/admin/keyword/new"}>
 							<button className="btn btn-sm btn-outline btn-primary">Erstellen</button>
 						</Link>

apps/hub/app/(app)/admin/report/_components/form.tsx

@@ -2,7 +2,7 @@
 import { penaltyColumns as penaltyColumns } from "(app)/admin/penalty/columns";
 import { editReport } from "(app)/admin/report/actions";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Report as IReport, Prisma, User } from "@repo/db";
+import { Report as IReport, User } from "@repo/db";
 import { ReportSchema, Report as IReportZod } from "@repo/db/zod";
 import { PaginatedTable } from "_components/PaginatedTable";
 import { Button } from "_components/ui/Button";
@@ -149,11 +149,9 @@ export const ReportPenalties = ({
 					CreatedUser: true,
 					Report: true,
 				}}
-				getFilter={() =>
-					({
-						reportId: report.id,
-					}) as Prisma.PenaltyWhereInput
-				}
+				filter={{
+					reportId: report.id,
+				}}
 				columns={penaltyColumns}
 			/>
 		</div>

apps/hub/app/(app)/admin/station/_components/Form.tsx

@@ -2,7 +2,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { StationOptionalDefaultsSchema } from "@repo/db/zod";
 import { useForm } from "react-hook-form";
-import { BosUse, ConnectedAircraft, Country, Prisma, Station, User } from "@repo/db";
+import { BosUse, ConnectedAircraft, Country, Station, User } from "@repo/db";
 import { FileText, LocateIcon, PlaneIcon, UserIcon } from "lucide-react";
 import { Input } from "../../../../_components/ui/Input";
 import { deleteStation, upsertStation } from "../action";
@@ -198,17 +198,10 @@ export const StationForm = ({ station }: { station?: Station }) => {
 								Verbundene Piloten
 							</div>
 						}
-						getFilter={(searchField) =>
-							({
-								stationId: station?.id,
-								OR: [
-									{ User: { firstname: { contains: searchField, mode: "insensitive" } } },
-									{ User: { lastname: { contains: searchField, mode: "insensitive" } } },
-									{ User: { publicId: { contains: searchField, mode: "insensitive" } } },
-								],
-							}) as Prisma.ConnectedAircraftWhereInput
-						}
-						showSearch
+						filter={{
+							stationId: station?.id,
+						}}
+						searchFields={["User.firstname", "User.lastname", "User.publicId"]}
 						prismaModel={"connectedAircraft"}
 						include={{ Station: true, User: true }}
 						columns={

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

@@ -3,22 +3,14 @@ import { DatabaseBackupIcon } from "lucide-react";
 import { PaginatedTable } from "../../../_components/PaginatedTable";
 import Link from "next/link";
 import { ColumnDef } from "@tanstack/react-table";
-import { Prisma, Station } from "@repo/db";
+import { Station } from "@repo/db";
 
 const page = () => {
 	return (
 		<>
 			<PaginatedTable
 				prismaModel="station"
-				showSearch
-				getFilter={(searchField) =>
-					({
-						OR: [
-							{ bosCallsign: { contains: searchField, mode: "insensitive" } },
-							{ operator: { contains: searchField, mode: "insensitive" } },
-						],
-					}) as Prisma.StationWhereInput
-				}
+				searchFields={["bosCallsign", "operator"]}
 				stickyHeaders
 				columns={
 					[
@@ -52,11 +44,11 @@ const page = () => {
 				}
 				leftOfSearch={
 					<span className="flex items-center gap-2">
-						<DatabaseBackupIcon className="h-5 w-5" /> Stationen
+						<DatabaseBackupIcon className="w-5 h-5" /> Stationen
 					</span>
 				}
 				rightOfSearch={
-					<p className="flex items-center justify-between gap-2 text-left text-2xl font-semibold">
+					<p className="text-2xl font-semibold text-left flex items-center gap-2 justify-between">
 						<Link href={"/admin/station/new"}>
 							<button className="btn btn-sm btn-outline btn-primary">Erstellen</button>
 						</Link>

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

@@ -6,10 +6,8 @@ import {
 	ConnectedAircraft,
 	ConnectedDispatcher,
 	DiscordAccount,
-	FormerDiscordAccount,
 	Penalty,
 	PERMISSION,
-	Prisma,
 	Station,
 	User,
 } from "@repo/db";
@@ -61,7 +59,6 @@ import { penaltyColumns } from "(app)/admin/penalty/columns";
 import { addPenalty, editPenaltys } from "(app)/admin/penalty/actions";
 import { reportColumns } from "(app)/admin/report/columns";
 import { sendMailByTemplate } from "../../../../../../helper/mail";
-import Image from "next/image";
 
 interface ProfileFormProps {
 	user: User;
@@ -79,21 +76,6 @@ export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormPro
 			className="card-body"
 			onSubmit={form.handleSubmit(async (values) => {
 				if (!values.id) return;
-				if (values.id === session.data?.user.id && values.permissions !== user.permissions) {
-					toast.error("Du kannst deine eigenen Berechtigungen nicht ändern.");
-					return;
-				}
-				if (values.permissions?.some((perm) => !session.data?.user.permissions.includes(perm))) {
-					toast.error("Du kannst Berechtigungen nicht hinzufügen, die du selbst nicht besitzt.");
-					return;
-				}
-				const removedPermissions =
-					user.permissions?.filter((perm) => !values.permissions?.includes(perm)) || [];
-				if (removedPermissions.some((perm) => !session.data?.user.permissions.includes(perm))) {
-					toast.error("Du kannst Berechtigungen nicht entfernen, die du selbst nicht besitzt.");
-					return;
-				}
-
 				await editUser(values.id, {
 					...values,
 					email: values.email.toLowerCase(),
@@ -284,18 +266,10 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 				</h2>
 				<PaginatedTable
 					ref={dispoTableRef}
-					getFilter={() =>
-						({
-							userId: user.id,
-						}) as Prisma.ConnectedDispatcherWhereInput
-					}
+					filter={{
+						userId: user.id,
+					}}
 					prismaModel={"connectedDispatcher"}
-					initialOrderBy={[
-						{
-							id: "loginTime",
-							desc: true,
-						},
-					]}
 					columns={
 						[
 							{
@@ -354,19 +328,11 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 				</h2>
 				<PaginatedTable
 					ref={pilotTableRef}
-					getFilter={() =>
-						({
-							userId: user.id,
-						}) as Prisma.ConnectedAircraftWhereInput
-					}
+					filter={{
+						userId: user.id,
+					}}
 					prismaModel={"connectedAircraft"}
 					include={{ Station: true }}
-					initialOrderBy={[
-						{
-							id: "loginTime",
-							desc: true,
-						},
-					]}
 					columns={
 						[
 							{
@@ -512,7 +478,9 @@ export const UserPenalties = ({ user }: { user: User }) => {
 					CreatedUser: true,
 					Report: true,
 				}}
-				getFilter={() => ({ userId: user.id }) as Prisma.PenaltyWhereInput}
+				filter={{
+					userId: user.id,
+				}}
 				columns={penaltyColumns}
 			/>
 		</div>
@@ -534,17 +502,9 @@ export const UserReports = ({ user }: { user: User }) => {
 			</div>
 			<PaginatedTable
 				prismaModel="report"
-				getFilter={() =>
-					({
-						reportedUserId: user.id,
-					}) as Prisma.ReportWhereInput
-				}
-				initialOrderBy={[
-					{
-						id: "timestamp",
-						desc: true,
-					},
-				]}
+				filter={{
+					reportedUserId: user.id,
+				}}
 				include={{
 					Sender: true,
 					Reported: true,
@@ -557,7 +517,7 @@ export const UserReports = ({ user }: { user: User }) => {
 
 interface AdminFormProps {
 	discordAccount?: DiscordAccount;
-	user: User & { CanonicalUser?: User | null; Duplicates?: User[] | null };
+	user: User;
 	dispoTime: {
 		hours: number;
 		minutes: number;
@@ -568,7 +528,6 @@ interface AdminFormProps {
 		minutes: number;
 		lastLogin?: Date;
 	};
-	formerDiscordAccounts: (FormerDiscordAccount & { DiscordAccount: DiscordAccount | null })[];
 	reports: {
 		total: number;
 		open: number;
@@ -588,7 +547,6 @@ export const AdminForm = ({
 	pilotTime,
 	reports,
 	discordAccount,
-	formerDiscordAccounts,
 	openBans,
 	openTimebans,
 }: AdminFormProps) => {
@@ -681,57 +639,7 @@ export const AdminForm = ({
 						</div>
 					)}
 				</div>
-				{session?.user.permissions.includes("ADMIN_USER_ADVANCED") && (
-					<div className="mt-2 space-y-1">
-						<Link href={`/admin/user/${user.id}/duplicate`}>
-							<Button className="btn-sm btn-outline w-full">
-								<LockKeyhole className="h-4 w-4" /> Duplikat markieren & sperren
-							</Button>
-						</Link>
-					</div>
-				)}
 			</div>
-			{(user.CanonicalUser || (user.Duplicates && user.Duplicates.length > 0)) && (
-				<div role="alert" className="alert alert-error alert-outline flex flex-col">
-					<div className="flex items-center gap-2">
-						<TriangleAlert />
-						<div>
-							{user.CanonicalUser && (
-								<div>
-									<h3 className="text-lg font-semibold">Als Duplikat markiert</h3>
-									<p>
-										Dieser Account wurde als Duplikat von{" "}
-										<Link
-											href={`/admin/user/${user.CanonicalUser.id}`}
-											className="link link-hover font-semibold"
-										>
-											{user.CanonicalUser.firstname} {user.CanonicalUser.lastname} (
-											{user.CanonicalUser.publicId})
-										</Link>{" "}
-										markiert.
-									</p>
-								</div>
-							)}
-							{user.Duplicates && user.Duplicates.length > 0 && (
-								<div className="mt-2">
-									<h3 className="text-lg font-semibold">Duplikate erkannt</h3>
-									<p>Folgende Accounts wurden als Duplikate dieses Accounts markiert:</p>
-									<ul className="ml-4 mt-1 list-inside list-disc">
-										{user.Duplicates.map((duplicate) => (
-											<li key={duplicate.id}>
-												<Link href={`/admin/user/${duplicate.id}`} className="link link-hover">
-													{duplicate.firstname} {duplicate.lastname} ({duplicate.publicId})
-												</Link>
-											</li>
-										))}
-									</ul>
-								</div>
-							)}
-						</div>
-					</div>
-					<p className="text-sm text-gray-400">{user.duplicateReason || "Keine Grund angegeben"}</p>
-				</div>
-			)}
 			{(!!openBans.length || !!openTimebans.length) && (
 				<div role="alert" className="alert alert-warning alert-outline flex flex-col">
 					<div className="flex items-center gap-2">
@@ -759,76 +667,6 @@ export const AdminForm = ({
 					</p>
 				</div>
 			)}
-			<h2 className="card-title mt-2">
-				<DiscordLogoIcon className="h-5 w-5" /> Frühere Discord Accounts
-			</h2>
-			<div className="overflow-x-auto">
-				<table className="table-sm table">
-					<thead>
-						<tr>
-							<th>Avatar</th>
-							<th>Benutzername</th>
-							<th>Discord ID</th>
-							<th>getrennt am</th>
-						</tr>
-					</thead>
-					<tbody>
-						{discordAccount && (
-							<tr>
-								<td>
-									{discordAccount.avatar ? (
-										<Image
-											src={`https://cdn.discordapp.com/avatars/${discordAccount.discordId}/${discordAccount.avatar}.png`}
-											alt="Discord Avatar"
-											width={40}
-											height={40}
-											className="h-10 w-10 rounded-full"
-										/>
-									) : (
-										<div className="flex h-10 w-10 items-center justify-center rounded-full bg-gray-500 text-white">
-											N/A
-										</div>
-									)}
-								</td>
-								<td>{discordAccount.username}</td>
-								<td>{discordAccount.discordId}</td>
-								<td>N/A (Aktuell verbunden)</td>
-							</tr>
-						)}
-						{formerDiscordAccounts.map((account) => (
-							<tr key={account.discordId}>
-								<td>
-									{account.DiscordAccount &&
-										(account.DiscordAccount.avatar ? (
-											<Image
-												src={`https://cdn.discordapp.com/avatars/${account.DiscordAccount.discordId}/${account.DiscordAccount.avatar}.png`}
-												alt="Discord Avatar"
-												width={40}
-												height={40}
-												className="h-10 w-10 rounded-full"
-											/>
-										) : (
-											<div className="flex h-10 w-10 items-center justify-center rounded-full bg-gray-500 text-white">
-												N/A
-											</div>
-										))}
-								</td>
-								<td>{account.DiscordAccount?.username || "Unbekannt"}</td>
-								<td>{account.DiscordAccount?.discordId || "Unbekannt"}</td>
-								<td>{new Date(account.removedAt).toLocaleDateString()}</td>
-							</tr>
-						))}
-						{!discordAccount && formerDiscordAccounts.length === 0 && (
-							<tr>
-								<td colSpan={3} className="text-center text-gray-400">
-									Keine Discord Accounts verknüpft
-								</td>
-							</tr>
-						)}
-					</tbody>
-				</table>
-			</div>
-
 			<h2 className="card-title">
 				<ChartBarBigIcon className="h-5 w-5" /> Aktivität
 			</h2>

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

@@ -1,109 +0,0 @@
-"use client";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
-import { useQuery } from "@tanstack/react-query";
-import { getUser, markDuplicate } from "(app)/admin/user/action";
-import { Button } from "@repo/shared-components";
-import { Select } from "_components/ui/Select";
-import toast from "react-hot-toast";
-import { TriangleAlert } from "lucide-react";
-import { useState } from "react";
-
-const DuplicateSchema = z.object({
-	canonicalUserId: z.string().min(1, "Bitte Nutzer auswählen"),
-	reason: z.string().max(500).optional(),
-});
-
-export const DuplicateForm = ({ duplicateUserId }: { duplicateUserId: string }) => {
-	const form = useForm<z.infer<typeof DuplicateSchema>>({
-		resolver: zodResolver(DuplicateSchema),
-		defaultValues: { canonicalUserId: "", reason: "" },
-	});
-
-	const [search, setSearch] = useState("");
-	const { data: users } = useQuery({
-		queryKey: ["duplicate-search"],
-		queryFn: async () =>
-			getUser({
-				OR: [
-					{ firstname: { contains: search, mode: "insensitive" } },
-					{ lastname: { contains: search, mode: "insensitive" } },
-					{ publicId: { contains: search, mode: "insensitive" } },
-					{ email: { contains: search, mode: "insensitive" } },
-				],
-			}),
-		enabled: search.length > 0,
-		refetchOnWindowFocus: false,
-	});
-
-	return (
-		<form
-			className="flex flex-wrap gap-3"
-			onSubmit={form.handleSubmit(async (values) => {
-				try {
-					// find selected canonical user by id to obtain publicId
-					const canonical = (users || []).find((u) => u.id === values.canonicalUserId);
-					if (!canonical) {
-						toast.error("Bitte wähle einen Original-Account aus.");
-						return;
-					}
-					await markDuplicate({
-						duplicateUserId,
-						canonicalPublicId: canonical.publicId,
-						reason: values.reason,
-					});
-					toast.success("Duplikat verknüpft und Nutzer gesperrt.");
-				} catch (e: unknown) {
-					const message =
-						typeof e === "object" && e && "message" in e
-							? (e as { message?: string }).message || "Fehler beim Verknüpfen"
-							: "Fehler beim Verknüpfen";
-					toast.error(message);
-				}
-			})}
-		>
-			<div className="card bg-base-200 flex-1 basis-[800px] shadow-xl">
-				<div className="card-body">
-					<h2 className="card-title">
-						<TriangleAlert /> Duplikat markieren & sperren
-					</h2>
-					<Select
-						form={form}
-						name="canonicalUserId"
-						label="Original-Nutzer suchen & auswählen"
-						onInputChange={(v) => setSearch(String(v))}
-						options={
-							users?.map((u) => ({
-								label: `${u.firstname} ${u.lastname} (${u.publicId})`,
-								value: u.id,
-							})) || [{ label: "Kein Nutzer gefunden", value: "", disabled: true }]
-						}
-					/>
-					<label className="floating-label w-full">
-						<span className="flex items-center gap-2 text-lg">Grund (optional)</span>
-						<input
-							{...form.register("reason")}
-							type="text"
-							className="input input-bordered w-full"
-							placeholder="Begründung/Audit-Hinweis"
-						/>
-					</label>
-				</div>
-			</div>
-			<div className="card bg-base-200 flex-1 basis-[800px] shadow-xl">
-				<div className="card-body">
-					<div className="flex w-full gap-4">
-						<Button
-							isLoading={form.formState.isSubmitting}
-							type="submit"
-							className="btn btn-primary flex-1"
-						>
-							Als Duplikat verknüpfen & sperren
-						</Button>
-					</div>
-				</div>
-			</div>
-		</form>
-	);
-};

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

@@ -1,37 +0,0 @@
-import { prisma } from "@repo/db";
-import { DuplicateForm } from "./_components/DuplicateForm";
-import { PersonIcon } from "@radix-ui/react-icons";
-import Link from "next/link";
-import { ArrowLeft } from "lucide-react";
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-	const { id } = await params;
-	const user = await prisma.user.findUnique({
-		where: { id },
-		select: { id: true, firstname: true, lastname: true, publicId: true },
-	});
-	if (!user) {
-		return (
-			<div className="card bg-base-200 shadow-xl">
-				<div className="card-body">Nutzer nicht gefunden</div>
-			</div>
-		);
-	}
-	return (
-		<>
-			<div className="my-3">
-				<div className="text-left">
-					<Link href={`/admin/user/${user.id}`} className="link-hover l-0 text-gray-500">
-						<ArrowLeft className="mb-1 mr-1 inline h-4 w-4" />
-						Zurück zum Nutzer
-					</Link>
-				</div>
-				<p className="text-left text-2xl font-semibold">
-					<PersonIcon className="mr-2 inline h-5 w-5" /> Duplikat für {user.firstname}{" "}
-					{user.lastname} #{user.publicId}
-				</p>
-			</div>
-			<DuplicateForm duplicateUserId={user.id} />
-		</>
-	);
-}

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

@@ -12,35 +12,12 @@ import { getUserPenaltys } from "@repo/shared-components";
 
 export default async function Page({ params }: { params: Promise<{ id: string }> }) {
 	const { id } = await params;
-	let user = await prisma.user.findUnique({
+	const user = await prisma.user.findUnique({
 		where: {
 			id: id,
 		},
 		include: {
-			DiscordAccount: true,
-			CanonicalUser: true,
-			Duplicates: true,
-		},
-	});
-	if (!user) {
-		user = await prisma.user.findFirst({
-			where: {
-				publicId: id,
-			},
-			include: {
-				DiscordAccount: true,
-				CanonicalUser: true,
-				Duplicates: true,
-			},
-		});
-	}
-
-	const formerDiscordAccounts = await prisma.formerDiscordAccount.findMany({
-		where: {
-			userId: user?.id,
-		},
-		include: {
-			DiscordAccount: true,
+			discordAccounts: true,
 		},
 	});
 	if (!user) return <Error statusCode={404} title="User not found" />;
@@ -142,12 +119,11 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
 			</div>
 			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-3">
 				<AdminForm
-					formerDiscordAccounts={formerDiscordAccounts}
 					user={user}
 					dispoTime={dispoTime}
 					pilotTime={pilotTime}
 					reports={reports}
-					discordAccount={user.DiscordAccount ?? undefined}
+					discordAccount={user.discordAccounts[0]}
 					openBans={openBans}
 					openTimebans={openTimeban}
 				/>

apps/hub/app/(app)/admin/user/action.ts

@@ -2,7 +2,6 @@
 import { prisma, Prisma } from "@repo/db";
 import bcrypt from "bcryptjs";
 import { sendMailByTemplate } from "../../../../helper/mail";
-import { getServerSession } from "api/auth/[...nextauth]/auth";
 
 export const getUser = async (where: Prisma.UserWhereInput) => {
 	return await prisma.user.findMany({
@@ -83,52 +82,3 @@ export const sendVerificationLink = async (userId: string) => {
 		code,
 	});
 };
-
-export const markDuplicate = async (params: {
-	duplicateUserId: string;
-	canonicalPublicId: string;
-	reason?: string;
-}) => {
-	// Then in your function:
-	const session = await getServerSession();
-	if (!session?.user) throw new Error("Nicht authentifiziert");
-	const canonical = await prisma.user.findUnique({
-		where: { publicId: params.canonicalPublicId },
-		select: { id: true },
-	});
-	if (!canonical) throw new Error("Original-Account (canonical) nicht gefunden");
-	if (canonical.id === params.duplicateUserId)
-		throw new Error("Duplikat und Original dürfen nicht identisch sein");
-
-	const updated = await prisma.user.update({
-		where: { id: params.duplicateUserId },
-		data: {
-			canonicalUserId: canonical.id,
-			isBanned: true,
-			duplicateDetectedAt: new Date(),
-			duplicateReason: params.reason ?? undefined,
-		},
-	});
-
-	await prisma.penalty.create({
-		data: {
-			userId: params.duplicateUserId,
-			type: "BAN",
-			reason: `Account als Duplikat von #${params.canonicalPublicId} markiert.`,
-			createdUserId: session.user.id,
-		},
-	});
-	return updated;
-};
-
-export const clearDuplicateLink = async (duplicateUserId: string) => {
-	const updated = await prisma.user.update({
-		where: { id: duplicateUserId },
-		data: {
-			canonicalUserId: null,
-			duplicateDetectedAt: null,
-			duplicateReason: null,
-		},
-	});
-	return updated;
-};

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

@@ -3,34 +3,17 @@ import { User2 } from "lucide-react";
 import { PaginatedTable } from "../../../_components/PaginatedTable";
 import Link from "next/link";
 import { ColumnDef } from "@tanstack/react-table";
-import { DiscordAccount, Penalty, Prisma, User } from "@repo/db";
+import { User } from "@repo/db";
 import { useSession } from "next-auth/react";
 
 const AdminUserPage = () => {
 	const { data: session } = useSession();
-
 	return (
 		<>
 			<PaginatedTable
 				stickyHeaders
 				prismaModel="user"
-				showSearch
-				getFilter={(searchTerm) => {
-					return {
-						OR: [
-							{ firstname: { contains: searchTerm, mode: "insensitive" } },
-							{ lastname: { contains: searchTerm, mode: "insensitive" } },
-							{ email: { contains: searchTerm, mode: "insensitive" } },
-							{ publicId: { contains: searchTerm, mode: "insensitive" } },
-							{ DiscordAccount: { username: { contains: searchTerm, mode: "insensitive" } } },
-						],
-					} as Prisma.UserWhereInput;
-				}}
-				include={{
-					DiscordAccount: true,
-					ReceivedReports: true,
-					Penaltys: true,
-				}}
+				searchFields={["publicId", "firstname", "lastname", "email"]}
 				initialOrderBy={[
 					{
 						id: "publicId",
@@ -54,15 +37,6 @@ const AdminUserPage = () => {
 						{
 							header: "Berechtigungen",
 							cell(props) {
-								const activePenaltys = props.row.original.Penaltys.filter(
-									(penalty) =>
-										!penalty.suspended &&
-										(penalty.type === "BAN" ||
-											(penalty.type === "TIME_BAN" && penalty!.until! > new Date())),
-								);
-								if (activePenaltys.length > 0) {
-									return <span className="font-bold text-red-600">AKTIVE STRAFE</span>;
-								}
 								if (props.row.original.permissions.length === 0) {
 									return <span className="text-gray-700">Keine</span>;
 								} else if (props.row.original.permissions.includes("ADMIN_USER_ADVANCED")) {
@@ -77,28 +51,6 @@ const AdminUserPage = () => {
 								);
 							},
 						},
-						{
-							header: "Strafen / Reports",
-							cell(props) {
-								const penaltyCount = props.row.original.Penaltys.length;
-								const reportCount = props.row.original.ReceivedReports.length;
-								return (
-									<span className="w-full text-center">
-										{penaltyCount} / {reportCount}
-									</span>
-								);
-							},
-						},
-						{
-							header: "Discord",
-							cell(props) {
-								const discord = props.row.original.DiscordAccount;
-								if (!discord) {
-									return <span className="text-gray-700">Nicht verbunden</span>;
-								}
-								return <span>{discord.username}</span>;
-							},
-						},
 						...(session?.user.permissions.includes("ADMIN_USER_ADVANCED")
 							? [
 									{
@@ -117,13 +69,7 @@ const AdminUserPage = () => {
 								</div>
 							),
 						},
-					] as ColumnDef<
-						User & {
-							DiscordAccount: DiscordAccount;
-							ReceivedReports: Report[];
-							Penaltys: Penalty[];
-						}
-					>[]
+					] as ColumnDef<User>[]
 				} // Define the columns for the user table
 				leftOfSearch={
 					<p className="flex items-center gap-2 text-left text-2xl font-semibold">

apps/hub/app/(app)/changelog/_components/Timeline.tsx

@@ -1,68 +0,0 @@
-"use client";
-
-import MDEditor from "@uiw/react-md-editor";
-import Image from "next/image";
-
-export type TimelineEntry = {
-	id: number;
-	title: string;
-	text: string;
-	previewImage?: string | null;
-	createdAt: string;
-};
-
-const formatReleaseDate = (value: string) =>
-	new Intl.DateTimeFormat("en-GB", {
-		day: "2-digit",
-		month: "short",
-		year: "numeric",
-	}).format(new Date(value));
-
-export const ChangelogTimeline = ({ entries }: { entries: TimelineEntry[] }) => {
-	if (!entries.length)
-		return <p className="text-base-content/70">Es sind noch keine Changelog-Einträge vorhanden.</p>;
-
-	return (
-		<div className="relative mt-6 pl-6">
-			<div className="bg-base-300 absolute bottom-0 left-2 top-0 w-px" aria-hidden />
-			<div className="space-y-8">
-				{entries.map((entry, idx) => (
-					<article key={entry.id ?? `${entry.title}-${idx}`} className="relative pl-4">
-						<div className="bg-primary ring-base-100 absolute -left-[9px] top-3 h-4 w-4 rounded-full ring-4" />
-						<div className="bg-base-200/80 rounded-xl p-5 shadow">
-							<div className="flex flex-col gap-1 text-left md:flex-row md:justify-between">
-								<div>
-									<h3 className="text-lg font-semibold leading-tight">{entry.title}</h3>
-									<p className="text-base-content/60 text-sm">
-										Release Date: {formatReleaseDate(entry.createdAt)}
-									</p>
-								</div>
-								{entry.previewImage && (
-									<div className="absolute right-5 top-5 md:pl-4">
-										<Image
-											src={entry.previewImage}
-											width={300}
-											height={300}
-											alt={`${entry.title} preview`}
-											className="mt-3 max-w-[300px] rounded-lg object-cover md:mt-0"
-										/>
-									</div>
-								)}
-							</div>
-
-							<div className="text-base-content/80 text-left" data-color-mode="dark">
-								<MDEditor.Markdown
-									source={entry.text}
-									style={{
-										backgroundColor: "transparent",
-										fontSize: "0.95rem",
-									}}
-								/>
-							</div>
-						</div>
-					</article>
-				))}
-			</div>
-		</div>
-	);
-};

apps/hub/app/(app)/changelog/page.tsx

@@ -1,26 +0,0 @@
-import { prisma } from "@repo/db";
-import { ChangelogTimeline } from "./_components/Timeline";
-import { ActivityLogIcon } from "@radix-ui/react-icons";
-
-export default async function Page() {
-	const changelog = await prisma.changelog.findMany({
-		where: { showOnChangelogPage: true },
-		orderBy: { createdAt: "desc" },
-	});
-
-	const entries = changelog.map((entry) => ({
-		...entry,
-		createdAt: entry.createdAt.toISOString(),
-	}));
-
-	return (
-		<>
-			<div className="w-full px-4">
-				<p className="flex items-center gap-2 text-left text-2xl font-semibold">
-					<ActivityLogIcon className="h-5 w-5" /> Changelog
-				</p>
-			</div>
-			<ChangelogTimeline entries={entries} />
-		</>
-	);
-}