added footer links, added email alias check

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

@@ -27,15 +27,12 @@ export const SearchElements = () => {
 	useEffect(() => {
 		if (pannelOpen) {
 			const missionEdited = missions?.find((m) => m.id === editingMissionId);
-			console.log("Mission Edited", missionEdited, editingMissionId, missions);
 			if (missionEdited) {
 				const elements = missionEdited.addressOSMways.map((e) => ({
 					...(e as unknown as OSMWay),
 					isSelected: true,
 				}));
 				setSearchElements(elements);
-			} else {
-				setSearchElements([]);
 			}
 		} else {
 			const openMissions = openMissionMarker.map((m) => {

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

@@ -338,12 +338,12 @@ export const MissionForm = () => {
 								{...form.register("hpgMissionString")}
 								onChange={(e) => {
 									form.setValue("hpgMissionString", e.target.value);
+									const [name] = e.target.value.split(":");
 									if (
-										form.watch("missionAdditionalInfo").length === 0 ||
+										!form.watch("missionAdditionalInfo") ||
-										form.watch("missionAdditionalInfo").startsWith("HPG-Szenario:")
+										form.watch("missionAdditionalInfo") === name
 									) {
-										const [name] = e.target.value.split(":");
+										form.setValue("missionAdditionalInfo", name || "");
-										form.setValue("missionAdditionalInfo", `HPG-Szenario: ${name}`);
 									}
 								}}
 								className="select select-primary select-bordered w-full mb-2"

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

@@ -1,14 +1,25 @@
-import { ConnectedAircraft } from "@repo/db";
+import { ConnectedAircraft, Prisma } from "@repo/db";
 import { usePilotConnectionStore } from "_store/pilot/connectionStore";
 import { useMrtStore } from "_store/pilot/MrtStore";
 import { pilotSocket } from "pilot/socket";
 import { editConnectedAircraftAPI } from "_querys/aircrafts";
 import { useEffect } from "react";
+import { useMutation } from "@tanstack/react-query";
 
 export const useButtons = () => {
 	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: ({
+			aircraftId,
+			data,
+		}: {
+			aircraftId: number;
+			data: Prisma.ConnectedAircraftUpdateInput;
+		}) => editConnectedAircraftAPI(aircraftId, data),
+	});
 
 	const { page, setPage } = useMrtStore((state) => state);
 
@@ -33,8 +44,11 @@ export const useButtons = () => {
 				setPage({ page: "sending-status", station });
 
 				setTimeout(async () => {
-					await editConnectedAircraftAPI(connectedAircraft!.id, {
+					await updateAircraftMutation.mutateAsync({
-						fmsStatus: button,
+						aircraftId: connectedAircraft.id,
+						data: {
+							fmsStatus: button,
+						},
 					});
 					setPage({
 						page: "home",

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

@@ -129,7 +129,7 @@ const Template = ({ user, code }: { user: User; code: string }) => (
 									<tr>
 										<td style={{ textAlign: "center", padding: "10px 0" }}>
 											<a
-												href={`${process.env.NEXT_PUBLIC_HUB_URL}/settings/email-verification?code=${code}`}
+												href={`${process.env.NEXT_PUBLIC_HUB_URL}/email-verification?code=${code}`}
 												style={{
 													display: "inline-block",
 													backgroundColor: "#011936",
@@ -162,9 +162,7 @@ const Template = ({ user, code }: { user: User; code: string }) => (
 													margin: 0,
 												}}
 											>
-												<strong>
+												<strong>{process.env.NEXT_PUBLIC_HUB_URL}/email-verification</strong>
-													{process.env.NEXT_PUBLIC_HUB_URL}/settings/email-verification
-												</strong>
 											</p>
 											<br />
 											und gib dort deinen Code ein.

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

@@ -51,29 +51,30 @@ export const deletePilotHistory = async (id: number) => {
 	});
 };
 
-export const CheckEmailCode = async (userId: string, code: string) => {
+export const CheckEmailCode = async (code: string) => {
-	const user = await prisma.user.findUnique({
+	const users = await prisma.user.findMany({
 		where: {
-			id: userId,
+			emailVerificationToken: code,
 		},
 		select: {
+			id: true,
 			emailVerificationToken: true,
 			emailVerificationExpiresAt: true,
 		},
 	});
-	if (!user) {
+	const user = users[0];
-		return { error: "Nutzer nicht gefunden" };
+
-	}
+	if (!user || !user.emailVerificationExpiresAt) {
-	if (user.emailVerificationToken !== code || !user.emailVerificationExpiresAt) {
+		return { error: "Code ist ungültig" };
-		return { error: "Falscher Code" };
 	}
+
 	if (user.emailVerificationExpiresAt < new Date()) {
 		return { error: "Code ist nicht mehr gültig" };
 	}
 
 	await prisma.user.update({
 		where: {
-			id: userId,
+			id: user.id,
 		},
 		data: {
 			emailVerified: true,

apps/hub/app/(app)/layout.tsx

@@ -1,7 +1,6 @@
 import type { Metadata } from "next";
 import { DiscordLogoIcon, InstagramLogoIcon, ReaderIcon } from "@radix-ui/react-icons";
 import { HorizontalNav, VerticalNav } from "../_components/Nav";
-import { Toaster } from "react-hot-toast";
 import { redirect } from "next/navigation";
 import { getServerSession } from "../api/auth/[...nextauth]/auth";
 import { Error } from "_components/Error";
@@ -20,7 +19,7 @@ export default async function RootLayout({
 	const session = await getServerSession();
 
 	if (session?.user.isBanned)
-		return <Error title="You are banned from using this service" statusCode={403} />;
+		return <Error title="Dein Account wurde gesperrt!" statusCode={403} />;
 
 	if (!session) redirect(`/login`);
 
@@ -32,13 +31,6 @@ export default async function RootLayout({
 			}}
 		>
 			<div className="hero-overlay bg-opacity-30"></div>
-			<div>
-				<Toaster
-					containerStyle={{ zIndex: "999999999" }}
-					position="top-center"
-					reverseOrder={false}
-				/>
-			</div>
 			{/* Card */}
 			<div className="hero-content text-neutral-content text-center w-full max-w-full h-full m-10">
 				<div className="card bg-base-100 shadow-2xl w-full min-h-full h-full max-h-[calc(100vh-13rem)] p-4 flex flex-col mr-24 ml-24">
@@ -65,10 +57,10 @@ export default async function RootLayout({
 					<footer className="footer flex justify-between items-center p-4 bg-base-200 mt-4 rounded-lg shadow-md">
 						{/* Left: Impressum & Datenschutz */}
 						<div className="flex gap-4 text-sm">
-							<a href="/impressum" className="hover:text-primary">
+							<a href="https://virtualairrescue.com/impressum/" className="hover:text-primary">
 								Impressum
 							</a>
-							<a href="/datenschutz" className="hover:text-primary">
+							<a href="https://virtualairrescue.com/datenschutz/" className="hover:text-primary">
 								Datenschutzerklärung
 							</a>
 						</div>
@@ -80,7 +72,7 @@ export default async function RootLayout({
 						<div className="flex gap-4">
 							<div className="tooltip tooltip-top" data-tip="Discord">
 								<a
-									href="https://discord.com"
+									href="https://discord.gg/yn7uXmmNnG"
 									target="_blank"
 									rel="noopener noreferrer"
 									className="hover:text-primary"
@@ -90,7 +82,7 @@ export default async function RootLayout({
 							</div>
 							<div className="tooltip tooltip-top" data-tip="Instagram">
 								<a
-									href="https://instagram.com"
+									href="https://www.instagram.com/virtualairrescue/"
 									target="_blank"
 									rel="noopener noreferrer"
 									className="hover:text-primary"
@@ -99,7 +91,7 @@ export default async function RootLayout({
 								</a>
 							</div>
 							<div className="tooltip tooltip-top" data-tip="Knowledgebase">
-								<a href="/docs" className="hover:text-primary">
+								<a href="https://docs.virtualairrescue.com/" className="hover:text-primary">
 									<ReaderIcon className="w-5 h-5" />
 								</a>
 							</div>

apps/hub/app/(app)/settings/_components/forms.tsx

@@ -23,16 +23,29 @@ import toast from "react-hot-toast";
 import { UserOptionalDefaults, UserOptionalDefaultsSchema } from "@repo/db/zod";
 import { Bell, Plane } from "lucide-react";
 import Link from "next/link";
+import { sendVerificationLink } from "(app)/admin/user/action";
 
 export const ProfileForm = ({ user }: { user: User }): React.JSX.Element => {
 	const schema = z.object({
 		firstname: z.string().min(2).max(30),
 		lastname: z.string().min(2).max(30),
-		email: z.string().email({
+		email: z
-			message: "Bitte gebe eine gültige E-Mail Adresse ein",
+			.string()
-		}),
+			.email({
+				message: "Bitte gebe eine gültige E-Mail Adresse ein",
+			})
+			.refine(
+				(value) => {
+					// Regex to check for email aliases like + or %
+					const emailAliasRegex = /[+%]/;
+					return !emailAliasRegex.test(value);
+				},
+				{
+					message: "Email-Aliase (wie + oder %) sind nicht erlaubt",
+				},
+			),
 		settingsHideLastname: z.boolean(),
-		emailVerified: z.boolean(),
+		emailVerified: z.boolean().optional(),
 	});
 	const [isLoading, setIsLoading] = useState(false);
 	type IFormInput = z.infer<typeof schema>;
@@ -46,6 +59,7 @@ export const ProfileForm = ({ user }: { user: User }): React.JSX.Element => {
 		},
 		resolver: zodResolver(schema),
 	});
+	console.log(form.formState.errors);
 	return (
 		<form
 			className="card-body"
@@ -53,13 +67,20 @@ export const ProfileForm = ({ user }: { user: User }): React.JSX.Element => {
 				setIsLoading(true);
 				await updateUser(values);
 				form.reset(values);
+				if (user.email !== values.email) {
+					await sendVerificationLink(user.id);
+					toast.success(
+						"Deine E-Mail Addresse hat sich geändert, wir haben die einen Link gesendet!",
+					);
+				} else {
+					toast.success("Deine Änderungen wurden gespeichert!", {
+						style: {
+							background: "var(--color-base-100)",
+							color: "var(--color-base-content)",
+						},
+					});
+				}
 				setIsLoading(false);
-				toast.success("Deine Änderungen wurden gespeichert!", {
-					style: {
-						background: "var(--color-base-100)",
-						color: "var(--color-base-content)",
-					},
-				});
 			})}
 		>
 			<h2 className="card-title">
@@ -105,12 +126,13 @@ export const ProfileForm = ({ user }: { user: User }): React.JSX.Element => {
 						<EnvelopeClosedIcon /> E-Mail
 					</span>
 					<input
-						{...form.register("email")}
+						value={form.watch("email")}
 						type="text"
 						className="input input-bordered w-full"
-						defaultValue={user.email}
 						onChange={(e) => {
-							form.setValue("email", e.target.value.trim());
+							form.setValue("email", e.target.value.trim(), {
+								shouldDirty: true,
+							});
 							form.setValue("emailVerified", false);
 						}}
 						placeholder="E-Mail"

apps/hub/app/(auth)/email-verification/page.tsx

@@ -1,33 +1,37 @@
 "use client";
 import { CheckEmailCode } from "(app)/admin/user/action";
 import { Check } from "lucide-react";
-import { useSession } from "next-auth/react";
 import { useRouter, useSearchParams } from "next/navigation";
-import { useEffect, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import toast from "react-hot-toast";
 
 export default function Page() {
-	const session = useSession();
 	const router = useRouter();
 	const searchParams = useSearchParams();
 	const paramsCode = searchParams.get("code");
 	const [code, setCode] = useState(paramsCode || "");
 
+	const verifyCode = useCallback(
+		async (code: string) => {
+			console.log("Verifying code:", code);
+			if (!code) return;
+			const res = await CheckEmailCode(code);
+			console.log("Verification response:", res);
+			if (res.error) {
+				console.log("Verification error:", res.error);
+				toast.error(res.error);
+			} else {
+				toast.success(res.message || "E-Mail erfolgreich bestätigt!");
+				router.push("/");
+			}
+		},
+		[router],
+	);
+
 	useEffect(() => {
 		if (!paramsCode) return;
 		verifyCode(paramsCode);
-	}, [paramsCode])
+	}, [paramsCode, verifyCode]);
-
-	async function verifyCode(code: string) {
-		if (!session.data?.user.email || !code) return;
-		const res = await CheckEmailCode(session.data?.user.id || "", code);
-		if (res.error) {
-		  toast.error(res.error);
-		} else {
-		  toast.success(res.message || "E-Mail erfolgreich bestätigt!");
-		  router.push("/");
-		}
-	  }
 
 	return (
 		<div className="card bg-base-200 shadow-xl mb-4 ">
@@ -42,11 +46,7 @@ export default function Page() {
 						value={code}
 						onChange={(e) => setCode(e.target.value)}
 					/>
-					<button
+					<button className="btn btn-primary" onClick={() => verifyCode(code)} disabled={!code}>
-						className="btn btn-primary"
-						onClick={() => verifyCode(code)}
-						disabled={!session.data?.user.email || !code}
-					>
 						Bestätigen
 					</button>
 				</div>

apps/hub/app/(auth)/register/_components/Register.tsx

@@ -6,22 +6,29 @@ import { register } from "../action";
 import { signIn } from "next-auth/react";
 import Link from "next/link";
 import { useState } from "react";
-import clsx, { ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge";
 import { Button } from "../../../_components/ui/Button";
-import { useErrorBoundary } from "react-error-boundary";
 import { sendVerificationLink } from "(app)/admin/user/action";
+import toast from "react-hot-toast";
 
 export const Register = () => {
-	const { showBoundary } = useErrorBoundary();
 	const schema = z
 		.object({
-			email: z.string().email({
+			email: z
-				message: "Please enter a valid email",
+				.string()
-			}),
+				.email({ message: "Please enter a valid email" })
+				.refine(
+					(value) => {
+						// Regex to check for email aliases like + or %
+						const emailAliasRegex = /[+%]/;
+						return !emailAliasRegex.test(value);
+					},
+					{
+						message: "Email-Aliase (wie + oder %) sind nicht erlaubt",
+					},
+				),
 			firstname: z.string().min(2).max(30),
 			lastname: z.string().min(2).max(30),
-			password: z.string(),
+			password: z.string().min(12),
 			passwordConfirm: z.string(),
 		})
 		.superRefine(({ password, passwordConfirm }, ctx) => {
@@ -29,7 +36,7 @@ export const Register = () => {
 				ctx.addIssue({
 					code: "custom",
 					message: "Die Passwörter stimmen nicht überein",
-					path: ["confirmPassword"],
+					path: ["passwordConfirm"],
 				});
 			}
 		});
@@ -46,7 +53,7 @@ export const Register = () => {
 			passwordConfirm: "",
 		},
 	});
-
+	console.log("Register form", form.formState.errors);
 	return (
 		<form
 			className="card-body"
@@ -66,9 +73,14 @@ export const Register = () => {
 						email: user.email,
 						password: values.password,
 					});
-					setIsLoading(false);
 				} catch (error) {
-					showBoundary(error);
+					toast.error(
+						error instanceof Error
+							? error.message
+							: "Es ist ein Fehler aufgetreten. Bitte versuche es später erneut.",
+					);
+				} finally {
+					setIsLoading(false);
 				}
 			})}
 		>
@@ -133,12 +145,7 @@ export const Register = () => {
 						<path d="M2.5 3A1.5 1.5 0 0 0 1 4.5v.793c.026.009.051.02.076.032L7.674 8.51c.206.1.446.1.652 0l6.598-3.185A.755.755 0 0 1 15 5.293V4.5A1.5 1.5 0 0 0 13.5 3h-11Z" />
 						<path d="M15 6.954 8.978 9.86a2.25 2.25 0 0 1-1.956 0L1 6.954V11.5A1.5 1.5 0 0 0 2.5 13h11a1.5 1.5 0 0 0 1.5-1.5V6.954Z" />
 					</svg>
-					<input
+					<input type="text" className="grow" {...form.register("email")} placeholder="Email" />
-						type="text"
-						className="grow"
-						{...form.register("email")}
-						placeholder="Email"
-					/>
 				</label>
 
 				<p className="text-error">
@@ -199,11 +206,7 @@ export const Register = () => {
 						: ""}
 				</p>
 				<div className="card-actions mt-6">
-					<Button
+					<Button disabled={isLoading} isLoading={isLoading} className="btn btn-primary btn-block">
-						disabled={isLoading}
-						isLoading={isLoading}
-						className="btn btn-primary btn-block"
-					>
 						Registrieren
 					</Button>
 				</div>

apps/hub/app/(auth)/register/action.ts

@@ -2,10 +2,7 @@
 import { prisma, Prisma } from "@repo/db";
 import bcrypt from "bcryptjs";
 
-export const register = async ({
+export const register = async ({ password, ...user }: Omit<Prisma.UserCreateInput, "publicId">) => {
-	password,
-	...user
-}: Omit<Prisma.UserCreateInput, "publicId">) => {
 	const hashedPassword = await bcrypt.hash(password, 12);
 	const lastUserPublicId = await prisma.user.findFirst({
 		select: {
@@ -21,6 +18,18 @@ export const register = async ({
 		varPublicId = `VAR${(lastUserInt + 1).toString().padStart(4, "0")}`;
 	}
 
+	const existingUser = await prisma.user.findFirst({
+		where: {
+			email: user.email,
+		},
+		select: {
+			id: true,
+		},
+	});
+	if (existingUser) {
+		throw new Error("Ein Nutzer mit dieser E-Mail-Adresse existiert bereits.");
+	}
+
 	const newUser = prisma.user.create({
 		data: {
 			...user,

apps/hub/app/layout.tsx

@@ -3,6 +3,7 @@ import { NextAuthSessionProvider } from "./_components/AuthSessionProvider";
 import { getServerSession } from "./api/auth/[...nextauth]/auth";
 import "./globals.css";
 import { CustomErrorBoundary } from "_components/ErrorBoundary";
+import { Toaster } from "react-hot-toast";
 
 const geistSans = Geist({
 	variable: "--font-geist-sans",
@@ -25,6 +26,13 @@ const RootLayout = async ({
 		<html lang="en">
 			<NextAuthSessionProvider session={session}>
 				<body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
+					<div>
+						<Toaster
+							containerStyle={{ zIndex: "999999999" }}
+							position="top-center"
+							reverseOrder={false}
+						/>
+					</div>
 					<CustomErrorBoundary>{children}</CustomErrorBoundary>
 				</body>
 			</NextAuthSessionProvider>