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

dev

Browse Source
This commit is contained in:
PxlLoewe
2025-04-29 21:35:27 -07:00
parent 0d7f0ad2b8
commit ee49bdde89
12 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/dispatch-server/socket-events/connect-dispatch.ts
View File

@@ -1,3 +1,4 @@
import { prisma } from "@repo/db";
import { pubClient } from "modules/redis";
import { Server, Socket } from "socket.io";
@@ -11,15 +12,20 @@ export const handleConnectDispatch =
selectedZone: string;
}) => {
const userId = socket.data.user.id; // User ID aus dem JWT-Token
const name = `${socket.data.user.firstname} ${socket.data.user.lastname[0]}. - ${socket.data.user.publicId}`;
console.log("User connected to dispatch server");
await pubClient.json.set(`Dispatcher:${userId}`, "$", {
logoffTime,
name,
loginTime: new Date().toISOString(),
lastSeen: new Date().toISOString(),
selectedZone,
socketId: socket.id,
const user = await prisma.user.findUnique({
where: {
id: userId,
},
});
const connectedDispatcherEntry = await prisma.connectedDispatcher.create({
data: {
publicUser: {},
esimatedLogoutTime: logoffTime,
lastHeartbeat: new Date(),
userId: userId,
loginTime: new Date().toISOString(),
},
});
socket.join("dispatchers"); // Dem Dispatcher-Raum beitreten
@@ -31,20 +37,21 @@ export const handleConnectDispatch =
return await pubClient.json.get(key);
}),
); */
io.to("dispatchers").emit("dispatcher-update");
io.to("pilots").emit("dispatcher-update");
socket.on("disconnect", async () => {
console.log("Disconnected from dispatch server");
await pubClient.json.del(`Dispatcher:${userId}`);
await prisma.connectedDispatcher.update({
where: {
id: connectedDispatcherEntry.id,
},
data: {
logoutTime: new Date().toISOString(),
},
});
});
socket.on("reconnect", async () => {
console.log("Reconnected to dispatch server");
await pubClient.json.set(`Dispatcher:${userId}`, "$", {
logoffTime,
loginTime: new Date().toISOString(),
lastSeen: new Date().toISOString(),
name,
selectedZone,
socketId: socket.id,
});
});
};

8
apps/dispatch/app/_store/chatStore.ts → apps/dispatch/app/_store/leftMenuStore.ts
View File

@@ -3,6 +3,8 @@ import { ChatMessage } from "@repo/db";
import { socket } from "dispatch/socket";
interface ChatStore {
reportTabOpen: boolean;
setReportTabOpen: (open: boolean) => void;
ownId: null | string;
selectedChat: string | null;
chatOpen: boolean;
@@ -19,7 +21,9 @@ interface ChatStore {
addMessage: (userId: string, message: ChatMessage) => void;
}
export const useChatStore = create<ChatStore>((set, get) => ({
export const useLeftMenuStore = create<ChatStore>((set, get) => ({
reportTabOpen: false,
setReportTabOpen: (open: boolean) => set({ reportTabOpen: open }),
ownId: null,
chatOpen: false,
selectedChat: null,
@@ -95,7 +99,7 @@ export const useChatStore = create<ChatStore>((set, get) => ({
socket.on(
"chat-message",
({ userId, message }: { userId: string; message: ChatMessage }) => {
const store = useChatStore.getState();
const store = useLeftMenuStore.getState();
console.log("chat-message", userId, message);
// Update the chat store with the new message
store.addMessage(userId, message);

24
apps/dispatch/app/api/mission/route.ts
View File

@@ -1,24 +0,0 @@
import { Prisma, prisma } from "@repo/db";
import { NextRequest, NextResponse } from "next/server";
export const POST = async (req: NextRequest) => {
console.log(req.body);
const body = await req.json();
console.log(body);
const missions = await prisma.mission.findMany({
where: (body.filter as Prisma.MissionWhereInput) || {},
});
return NextResponse.json(missions);
};
export const PUT = async (req: NextRequest) => {
const body = await req.json();
const newMission = await prisma.mission.create({
data: body,
});
return NextResponse.json(newMission);
};

24
apps/dispatch/app/dispatch/_components/left/Chat.tsx
View File

@@ -1,14 +1,17 @@
"use client";
import { ChatBubbleIcon, PaperPlaneIcon } from "@radix-ui/react-icons";
import { useChatStore } from "_store/chatStore";
import { useLeftMenuStore } from "_store/leftMenuStore";
import { useSession } from "next-auth/react";
import { Fragment, useEffect, useRef, useState } from "react";
import {
Dispatcher,
getDispatcher,
} from "dispatch/_components/navbar/_components/action";
import { Dispatcher } from "dispatch/_components/navbar/_components/action";
import { cn } from "helpers/cn";
import { useReportStore } from "_store/reportStore";
import { serverApi } from "helpers/axios";
export const getDispatcher = async () => {
const res = await serverApi.get<Dispatcher[]>(`/dispatcher`);
return res.data;
};
export const Chat = () => {
const { setReportOpen } = useReportStore();
@@ -22,7 +25,7 @@ export const Chat = () => {
selectedChat,
setSelectedChat,
setChatNotification,
} = useChatStore();
} = useLeftMenuStore();
const [sending, setSending] = useState(false);
const session = useSession();
const [addTabValue, setAddTabValue] = useState<string>("");
@@ -33,7 +36,7 @@ export const Chat = () => {
useEffect(() => {
if (!session.data?.user.id) return;
setOwnId(session.data.user.id);
}, [session]);
}, [session, setOwnId]);
useEffect(() => {
const fetchDispatcher = async () => {
@@ -52,7 +55,7 @@ export const Chat = () => {
timeout.current = setInterval(() => {
fetchDispatcher();
}, 1000000);
}, 1000);
fetchDispatcher();
return () => {
@@ -89,6 +92,9 @@ export const Chat = () => {
className="dropdown-content card bg-base-200 w-150 shadow-md z-[1100] ml-2 border-1 border-primary"
>
<div className="card-body">
<h2 className="inline-flex items-center gap-2 text-lg font-bold mb-2">
<ChatBubbleIcon /> Chat
</h2>
<div className="join">
<select
className="select select-sm w-full"
@@ -203,7 +209,7 @@ export const Chat = () => {
}}
disabled={sending}
role="button"
onSubmit={(e) => false}
onSubmit={() => false} // prevent submit event for react hook form
>
{sending ? (
<span className="loading loading-spinner loading-sm"></span>

39
apps/dispatch/app/dispatch/_components/left/Report.tsx
View File

@@ -1,18 +1,16 @@
"use client";
import { ExclamationTriangleIcon, PaperPlaneIcon } from "@radix-ui/react-icons";
import { useReportStore, sendReport } from "_store/reportStore";
import { useSession } from "next-auth/react";
import { useEffect, useRef, useState } from "react";
import {
Dispatcher,
getDispatcher,
} from "dispatch/_components/navbar/_components/action";
import { Dispatcher } from "dispatch/_components/navbar/_components/action";
import { cn } from "helpers/cn";
import { useChatStore } from "_store/chatStore";
import { useLeftMenuStore } from "_store/leftMenuStore";
import { getDispatcher } from "dispatch/_components/left/Chat";
import { serverApi } from "helpers/axios";
export const Report = () => {
const { setChatOpen } = useChatStore();
const { reportOpen, setReportOpen, setOwnId } = useReportStore();
const { setChatOpen, setReportTabOpen, reportTabOpen, setOwnId } =
useLeftMenuStore();
const [sending, setSending] = useState(false);
const session = useSession();
const [selectedPlayer, setSelectedPlayer] = useState<string>("");
@@ -23,7 +21,7 @@ export const Report = () => {
useEffect(() => {
if (!session.data?.user.id) return;
setOwnId(session.data.user.id);
}, [session]);
}, [session, setOwnId]);
useEffect(() => {
const fetchDispatcher = async () => {
@@ -46,32 +44,37 @@ export const Report = () => {
if (timeout.current) {
clearInterval(timeout.current);
timeout.current = null;
console.log("cleared");
}
};
}, [selectedPlayer]);
}, [selectedPlayer, session.data?.user.id]);
return (
<div
className={cn("dropdown dropdown-right", reportOpen && "dropdown-open")}
className={cn(
"dropdown dropdown-right",
reportTabOpen && "dropdown-open",
)}
>
<div className="indicator">
<button
className="btn btn-soft btn-sm btn-error"
onClick={() => {
setChatOpen(false);
setReportOpen(!reportOpen);
setReportTabOpen(!reportTabOpen);
}}
>
<ExclamationTriangleIcon className="w-4 h-4" />
</button>
</div>
{reportOpen && (
{reportTabOpen && (
<div
tabIndex={0}
className="dropdown-content card bg-base-200 w-150 shadow-md z-[1100] ml-2 border-1 border-error"
>
<div className="card-body">
<h2 className="inline-flex items-center gap-2 text-lg font-bold mb-2">
<ExclamationTriangleIcon /> Report senden
</h2>
<div className="join">
<select
className="select select-sm w-full"
@@ -107,7 +110,13 @@ export const Report = () => {
e.preventDefault();
if (message.length < 1 || !selectedPlayer) return;
setSending(true);
sendReport(selectedPlayer, message)
serverApi("/report", {
method: "POST",
data: {
message,
to: selectedPlayer,
},
})
.then(() => {
setMessage("");
setSending(false);

4
apps/dispatch/app/pilot/_components/navbar/Chat.tsx
View File

@@ -1,6 +1,6 @@
"use client";
import { ChatBubbleIcon, PaperPlaneIcon } from "@radix-ui/react-icons";
import { useChatStore } from "_store/chatStore";
import { leftMenuStore } from "_store/leftMenuStore";
import { useSession } from "next-auth/react";
import { Fragment, useEffect, useRef, useState } from "react";
import {
@@ -20,7 +20,7 @@ export const Chat = () => {
selectedChat,
setSelectedChat,
setChatNotification,
} = useChatStore();
} = leftMenuStore();
const [sending, setSending] = useState(false);
const session = useSession();
const [addTabValue, setAddTabValue] = useState<string>("");

1
apps/hub-server/routes/mail.ts
View File

@@ -5,7 +5,6 @@ import { sendPasswordChanged, sendCourseCompletedEmail } from "modules/mail";
const router = Router();
router.post("/send", async (req, res) => {
console.log(req.body);
const { to, subject, html } = req.body;
try {

6
apps/hub/app/(app)/admin/report/actions.ts
View File

@@ -2,7 +2,7 @@
import { prisma } from "@repo/db";
export const markAsResolved = async (id: number) => {
await prisma.reportMessage.update({
await prisma.report.update({
where: { id: id },
data: { erledigt: true },
});
@@ -20,7 +20,7 @@ export const handleMarkAsResolved = async (id: number) => {
};
export const getReports = async () => {
return prisma.reportMessage.findMany({
return prisma.report.findMany({
include: {
sender: true,
reported: true,
@@ -29,7 +29,7 @@ export const getReports = async () => {
};
export const fetchReportDetails = async (id: number) => {
return prisma.reportMessage.findUnique({
return prisma.report.findUnique({
where: { id },
include: { sender: true, reported: true },
});

2
packages/database/prisma/schema/connectedDispatch.prisma → packages/database/prisma/schema/connectedDispatcher.prisma
View File

@@ -1,4 +1,4 @@
model ConnectedDispatch {
model ConnectedDispatcher {
id Int @id @default(autoincrement())
userId String
publicUser Json

14
packages/database/prisma/schema/report.prisma Normal file
View File

@@ -0,0 +1,14 @@
model Report {
id Int @id @default(autoincrement())
text String
senderUserId String
reportedUserId String
timestamp DateTime @default(now())
reviewed Boolean @default(false)
reviewerUserId String?
// relations:
sender User @relation("SentReports", fields: [senderUserId], references: [id])
reported User @relation("ReceivedReports", fields: [reportedUserId], references: [id])
reviewer User? @relation("ReviewedReports", fields: [reviewerUserId], references: [id])
}

12
packages/database/prisma/schema/reportMessage.prisma
View File

@@ -1,12 +0,0 @@
model ReportMessage {
id Int @id @default(autoincrement())
text String
senderId String
reportedId String
timestamp DateTime @default(now())
erledigt Boolean @default(false)
// relations:
sender User @relation("SentReports", fields: [senderId], references: [id])
reported User @relation("ReceivedReports", fields: [reportedId], references: [id])
}

10
packages/database/prisma/schema/user.prisma
View File

@@ -43,14 +43,12 @@ model User {
EventAppointment EventAppointment[]
SentMessages ChatMessage[] @relation("SentMessages")
ReceivedMessages ChatMessage[] @relation("ReceivedMessages")
SentReports ReportMessage[] @relation("SentReports")
ReceivedReports ReportMessage[] @relation("ReceivedReports")
/**
* Missions Mission[]
*/
SentReports Report[] @relation("SentReports")
ReceivedReports Report[] @relation("ReceivedReports")
ReviewedReports Report[] @relation("ReviewedReports")
Mission Mission[]
MissionOnStationUsers MissionOnStationUsers[]
ConnectedDispatch ConnectedDispatch[]
ConnectedDispatcher ConnectedDispatcher[]
connectedAircraft connectedAircraft[]
PositionLog PositionLog[]