PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo

Browse Source
This commit is contained in:
PxlLoewe
2025-06-03 13:45:44 -07:00
parent ebb72c6517 ebc86ab9c9
commit 56856664a7
17 changed files with 7025 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dispatch-server/package.json
View File

@@ -10,8 +10,8 @@
}, },
"packageManager": "pnpm@10.11.0", "packageManager": "pnpm@10.11.0",
"devDependencies": { "devDependencies": {
"@repo/db": "*", "@repo/db": "workspace:*",
"@repo/typescript-config": "*", "@repo/typescript-config": "workspace:*",
"@types/cookie-parser": "^1.4.8", "@types/cookie-parser": "^1.4.8",
"@types/cors": "^2.8.18", "@types/cors": "^2.8.18",
"@types/express": "^5.0.2", "@types/express": "^5.0.2",

76
apps/dispatch/app/_components/left/SituationBoard.tsx
View File

@@ -1,13 +1,12 @@
"use client"; "use client";
import { useLeftMenuStore } from "_store/leftMenuStore"; import { useLeftMenuStore } from "_store/leftMenuStore";
import { useSession } from "next-auth/react";
import { cn } from "_helpers/cn"; import { cn } from "_helpers/cn";
import { ListCollapse, Plane } from "lucide-react"; import { ListCollapse, Plane } from "lucide-react";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { getMissionsAPI } from "_querys/missions"; import { getMissionsAPI } from "_querys/missions";
import { MissionsOnStations, Station } from "@repo/db"; import { Station } from "@repo/db";
import { getConnectedAircraftsAPI } from "_querys/aircrafts"; import { getConnectedAircraftsAPI } from "_querys/aircrafts";
import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_components/map/AircraftMarker"; import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
import { useMapStore } from "_store/mapStore"; import { useMapStore } from "_store/mapStore";
import { useDispatchConnectionStore } from "_store/dispatch/connectionStore"; import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
@@ -68,7 +67,7 @@ export const SituationBoard = () => {
{/* head */} {/* head */}
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>E-Nr.</th>
<th>Stichwort</th> <th>Stichwort</th>
<th>Stadt</th> <th>Stadt</th>
<th>Stationen</th> <th>Stationen</th>
@@ -76,39 +75,42 @@ export const SituationBoard = () => {
</thead> </thead>
<tbody> <tbody>
{/* row 1 */} {/* row 1 */}
{missions?.map((mission) => ( {missions?.map(
<tr (mission) =>
onDoubleClick={() => { (dispatcherConnected || mission.state !== "draft") && (
setOpenMissionMarker({ <tr
open: [ onDoubleClick={() => {
{ setOpenMissionMarker({
id: mission.id, open: [
tab: "home", {
}, id: mission.id,
], tab: "home",
close: [], },
}); ],
setMap({ close: [],
center: { });
lat: mission.addressLat, setMap({
lng: mission.addressLng, center: {
}, lat: mission.addressLat,
zoom: 14, lng: mission.addressLng,
}); },
}} zoom: 14,
key={mission.id} });
className={cn(mission.state === "draft" && "bg-base-300")} }}
> key={mission.id}
<td>{mission.publicId}</td> className={cn(mission.state === "draft" && "missionListItem")}
<td>{mission.missionKeywordAbbreviation}</td> >
<td>{mission.addressCity}</td> <td>{mission.publicId}</td>
<td> <td>{mission.missionKeywordAbbreviation}</td>
{(mission as any).MissionsOnStations?.map( <td>{mission.addressCity}</td>
(mos: { Station: Station }) => mos.Station?.bosCallsignShort, <td>
).join(", ")} {(mission as any).MissionsOnStations?.map(
</td> (mos: { Station: Station }) => mos.Station?.bosCallsignShort,
</tr> ).join(", ")}
))} </td>
</tr>
),
)}
</tbody> </tbody>
</table> </table>
</div> </div>

48
apps/dispatch/app/_components/map/AircraftMarker.tsx
View File

@@ -16,53 +16,7 @@ import { useQuery } from "@tanstack/react-query";
import { getConnectedAircraftPositionLogAPI, getConnectedAircraftsAPI } from "_querys/aircrafts"; import { getConnectedAircraftPositionLogAPI, getConnectedAircraftsAPI } from "_querys/aircrafts";
import { getMissionsAPI } from "_querys/missions"; import { getMissionsAPI } from "_querys/missions";
import { checkSimulatorConnected } from "_helpers/simulatorConnected"; import { checkSimulatorConnected } from "_helpers/simulatorConnected";
import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
export const FMS_STATUS_COLORS: { [key: string]: string } = {
"0": "rgb(140,10,10)",
"1": "rgb(10,134,25)",
"2": "rgb(10,134,25)",
"3": "rgb(140,10,10)",
"4": "rgb(140,10,10)",
"5": "rgb(231,77,22)",
"6": "rgb(85,85,85)",
"7": "rgb(140,10,10)",
"8": "rgb(186,105,0)",
"9": "rgb(10,134,25)",
E: "rgb(186,105,0)",
C: "rgb(186,105,0)",
F: "rgb(186,105,0)",
J: "rgb(186,105,0)",
L: "rgb(186,105,0)",
c: "rgb(186,105,0)",
d: "rgb(186,105,0)",
h: "rgb(186,105,0)",
o: "rgb(186,105,0)",
u: "rgb(186,105,0)",
};
export const FMS_STATUS_TEXT_COLORS: { [key: string]: string } = {
"0": "rgb(243,27,25)",
"1": "rgb(9,212,33)",
"2": "rgb(9,212,33)",
"3": "rgb(243,27,25)",
"4": "rgb(243,27,25)",
"5": "rgb(251,176,158)",
"6": "rgb(153,153,153)",
"7": "rgb(243,27,25)",
"8": "rgb(255,143,0)",
"9": "rgb(9,212,33)",
N: "rgb(9,212,33)",
E: "rgb(255,143,0)",
C: "rgb(255,143,0)",
F: "rgb(255,143,0)",
J: "rgb(255,143,0)",
L: "rgb(255,143,0)",
c: "rgb(255,143,0)",
d: "rgb(255,143,0)",
h: "rgb(255,143,0)",
o: "rgb(255,143,0)",
u: "rgb(255,143,0)",
};
const AircraftPopupContent = ({ const AircraftPopupContent = ({
aircraft, aircraft,

2
apps/dispatch/app/_components/map/_components/AircraftMarkerTabs.tsx
View File

@@ -1,6 +1,6 @@
"use client"; "use client";
import React, { useState } from "react"; import React, { useState } from "react";
import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "../AircraftMarker"; import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
import { import {
ConnectedAircraft, ConnectedAircraft,
getPublicUser, getPublicUser,

2
apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
View File

@@ -3,7 +3,7 @@ import { useQuery } from "@tanstack/react-query";
import { SmartPopup, useSmartPopup } from "_components/SmartPopup"; import { SmartPopup, useSmartPopup } from "_components/SmartPopup";
import { useDispatchConnectionStore } from "_store/dispatch/connectionStore"; import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
import { useMapStore } from "_store/mapStore"; import { useMapStore } from "_store/mapStore";
import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_components/map/AircraftMarker"; import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
import { MISSION_STATUS_COLORS, MISSION_STATUS_TEXT_COLORS } from "_components/map/MissionMarkers"; import { MISSION_STATUS_COLORS, MISSION_STATUS_TEXT_COLORS } from "_components/map/MissionMarkers";
import { cn } from "_helpers/cn"; import { cn } from "_helpers/cn";
import { checkSimulatorConnected } from "_helpers/simulatorConnected"; import { checkSimulatorConnected } from "_helpers/simulatorConnected";

2
apps/dispatch/app/_components/map/_components/MissionMarkerTabs.tsx
View File

@@ -1,6 +1,6 @@
"use client"; "use client";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { FMS_STATUS_TEXT_COLORS } from "../AircraftMarker"; import { FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
import { toast } from "react-hot-toast"; import { toast } from "react-hot-toast";
import { import {
Ban, Ban,

13
apps/dispatch/app/_components/navbar/ModeSwitchDropdown.tsx
View File

@@ -8,12 +8,15 @@ export default function ModeSwitchDropdown() {
const path = usePathname(); const path = usePathname();
return ( return (
<details className="dropdown z-[9999]"> <div className="dropdown z-[9999]">
<summary className="btn m-1"> <div tabIndex={0} role="button" className="btn m-1">
<ArrowLeftRight /> {path.includes("pilot") && "Pilot"} <ArrowLeftRight /> {path.includes("pilot") && "Pilot"}
{path.includes("dispatch") && "Leitstelle"} {path.includes("dispatch") && "Leitstelle"}
</summary> </div>
<ul className="menu dropdown-content bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm"> <ul
tabIndex={0}
className="menu dropdown-content bg-base-100 rounded-box z-1 w-52 p-2 shadow-sm"
>
<li> <li>
<Link href={"/dispatch"}> <Link href={"/dispatch"}>
<Workflow /> Leitstelle <Workflow /> Leitstelle
@@ -25,6 +28,6 @@ export default function ModeSwitchDropdown() {
</Link> </Link>
</li> </li>
</ul> </ul>
</details> </div>
); );
} }

46
apps/dispatch/app/_helpers/fmsStatusColors.ts Normal file
View File

@@ -0,0 +1,46 @@
export const FMS_STATUS_COLORS: { [key: string]: string } = {
"0": "rgb(140,10,10)",
"1": "rgb(10,134,25)",
"2": "rgb(10,134,25)",
"3": "rgb(140,10,10)",
"4": "rgb(140,10,10)",
"5": "rgb(231,77,22)",
"6": "rgb(85,85,85)",
"7": "rgb(140,10,10)",
"8": "rgb(186,105,0)",
"9": "rgb(10,134,25)",
E: "rgb(186,105,0)",
C: "rgb(186,105,0)",
F: "rgb(186,105,0)",
J: "rgb(186,105,0)",
L: "rgb(186,105,0)",
c: "rgb(186,105,0)",
d: "rgb(186,105,0)",
h: "rgb(186,105,0)",
o: "rgb(186,105,0)",
u: "rgb(186,105,0)",
};
export const FMS_STATUS_TEXT_COLORS: { [key: string]: string } = {
"0": "rgb(243,27,25)",
"1": "rgb(9,212,33)",
"2": "rgb(9,212,33)",
"3": "rgb(243,27,25)",
"4": "rgb(243,27,25)",
"5": "rgb(251,176,158)",
"6": "rgb(153,153,153)",
"7": "rgb(243,27,25)",
"8": "rgb(255,143,0)",
"9": "rgb(9,212,33)",
N: "rgb(9,212,33)",
E: "rgb(255,143,0)",
C: "rgb(255,143,0)",
F: "rgb(255,143,0)",
J: "rgb(255,143,0)",
L: "rgb(255,143,0)",
c: "rgb(255,143,0)",
d: "rgb(255,143,0)",
h: "rgb(255,143,0)",
o: "rgb(255,143,0)",
u: "rgb(255,143,0)",
};

8
apps/dispatch/app/dispatch/_components/pannel/MissionForm.tsx
View File

@@ -276,7 +276,7 @@ export const MissionForm = () => {
<> <>
<select <select
{...form.register("missionKeywordCategory")} {...form.register("missionKeywordCategory")}
className="select select-primary select-bordered w-full" className="select select-primary select-bordered w-full mb-4"
onChange={(e) => { onChange={(e) => {
const firstKeyword = keywords?.find( const firstKeyword = keywords?.find(
(k) => k.category === form.watch("missionKeywordCategory"), (k) => k.category === form.watch("missionKeywordCategory"),
@@ -305,7 +305,7 @@ export const MissionForm = () => {
)} )}
<select <select
{...form.register("missionKeywordAbbreviation")} {...form.register("missionKeywordAbbreviation")}
className="select select-primary select-bordered w-full" className="select select-primary select-bordered w-full mb-4"
onChange={(e) => { onChange={(e) => {
const keyword = keywords?.find((k) => k.abreviation === e.target.value); const keyword = keywords?.find((k) => k.abreviation === e.target.value);
form.setValue("missionKeywordName", keyword?.name || (null as any)); form.setValue("missionKeywordName", keyword?.name || (null as any));
@@ -332,10 +332,10 @@ export const MissionForm = () => {
<div className="mb-4"> <div className="mb-4">
<select <select
{...form.register("hpgMissionString")} {...form.register("hpgMissionString")}
className="select select-primary select-bordered w-full" className="select select-primary select-bordered w-full mb-2"
value={form.watch("hpgMissionString") || ""} value={form.watch("hpgMissionString") || ""}
> >
<option disabled value=""> <option disabled value="please_select">
Einsatz Szenario auswählen... Einsatz Szenario auswählen...
</option> </option>
{keywords && {keywords &&

5
apps/dispatch/app/globals.css
View File

@@ -56,3 +56,8 @@
.leaflet-popup-close-button { .leaflet-popup-close-button {
display: none; display: none;
} }
.missionListItem {
background-color: color-mix(in oklab, var(--color-info) 8%, var(--color-base-100));
color: var(--color-info, var(--color-base-content));
}

1
apps/dispatch/app/layout.tsx
View File

@@ -43,6 +43,7 @@ export default async function RootLayout({
background: "var(--color-base-100)", background: "var(--color-base-100)",
color: "var(--color-base-content)", color: "var(--color-base-content)",
}, },
duration: 4000,
}} }}
position="top-left" position="top-left"
reverseOrder={false} reverseOrder={false}

2
apps/dispatch/app/tracker/_components/ConnectedDispatcher.tsx
View File

@@ -26,7 +26,7 @@ export const ConnectedDispatcher = () => {
{/* <div className="collapse-title font-semibold">Kein Disponent Online</div> */} {/* <div className="collapse-title font-semibold">Kein Disponent Online</div> */}
<div className="collapse-title font-semibold flex items-center justify-between"> <div className="collapse-title font-semibold flex items-center justify-between">
<span> <span>
{connections} {connections > 1 ? "Verbundene Mitglieder" : "Verbundenes Mitglied"} {connections} {connections == 1 ? "Verbundene Mitglieder" : "Verbundenes Mitglied"}
</span> </span>
<div className="gap-2 flex items-center"> <div className="gap-2 flex items-center">
<div <div

6
apps/dispatch/package.json
View File

@@ -18,9 +18,9 @@
"@livekit/track-processors": "^0.5.7", "@livekit/track-processors": "^0.5.7",
"@next-auth/prisma-adapter": "^1.0.7", "@next-auth/prisma-adapter": "^1.0.7",
"@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-icons": "^1.3.2",
"@repo/db": "*", "@repo/db": "workspace:*",
"@repo/eslint-config": "*", "@repo/eslint-config": "workspace:*",
"@repo/typescript-config": "*", "@repo/typescript-config": "workspace:*",
"@tailwindcss/postcss": "^4.1.8", "@tailwindcss/postcss": "^4.1.8",
"@tanstack/react-query": "^5.79.0", "@tanstack/react-query": "^5.79.0",
"@types/jsonwebtoken": "^9.0.9", "@types/jsonwebtoken": "^9.0.9",

4
apps/hub-server/package.json
View File

@@ -14,8 +14,8 @@
}, },
"dependencies": { "dependencies": {
"@react-email/components": "^0.0.41", "@react-email/components": "^0.0.41",
"@repo/db": "*", "@repo/db": "workspace:*",
"@repo/typescript-config": "*", "@repo/typescript-config": "workspace:*",
"@types/cors": "^2.8.18", "@types/cors": "^2.8.18",
"@types/express": "^5.0.2", "@types/express": "^5.0.2",
"@types/node": "^22.15.29", "@types/node": "^22.15.29",

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

@@ -33,6 +33,7 @@ import { ChartBarBigIcon, Check, Eye, PlaneIcon, Timer, X } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { ColumnDef } from "@tanstack/react-table"; import { ColumnDef } from "@tanstack/react-table";
import { Error } from "_components/Error"; import { Error } from "_components/Error";
import { useSession } from "next-auth/react";
interface ProfileFormProps { interface ProfileFormProps {
user: User; user: User;
@@ -40,6 +41,7 @@ interface ProfileFormProps {
export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormProps) => { export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormProps) => {
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const session = useSession();
const form = useForm<UserOptionalDefaults>({ const form = useForm<UserOptionalDefaults>({
defaultValues: user, defaultValues: user,
resolver: zodResolver(UserOptionalDefaultsSchema), resolver: zodResolver(UserOptionalDefaultsSchema),
@@ -131,6 +133,7 @@ export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormPro
form={form} form={form}
name="permissions" name="permissions"
label="Permissions" label="Permissions"
isDisabled={user.permissions.length > (session.data?.user?.permissions?.length ?? 0)}
options={Object.entries(PERMISSION).map(([key, value]) => ({ options={Object.entries(PERMISSION).map(([key, value]) => ({
label: value, label: value,
value: key, value: key,

6
apps/hub/package.json
View File

@@ -13,9 +13,9 @@
"@hookform/resolvers": "^5.0.1", "@hookform/resolvers": "^5.0.1",
"@next-auth/prisma-adapter": "^1.0.7", "@next-auth/prisma-adapter": "^1.0.7",
"@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-icons": "^1.3.2",
"@repo/db": "*", "@repo/db": "workspace:*",
"@repo/eslint-config": "*", "@repo/eslint-config": "workspace:*",
"@repo/typescript-config": "*", "@repo/typescript-config": "workspace:*",
"@tanstack/react-query": "^5.79.0", "@tanstack/react-query": "^5.79.0",
"@tanstack/react-table": "^8.21.3", "@tanstack/react-table": "^8.21.3",
"@uiw/react-md-editor": "^4.0.7", "@uiw/react-md-editor": "^4.0.7",

6912
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff