diff --git a/apps/dispatch-server/index.ts b/apps/dispatch-server/index.ts index bbb08eba..184746de 100644 --- a/apps/dispatch-server/index.ts +++ b/apps/dispatch-server/index.ts @@ -13,16 +13,6 @@ import { handleConnectDesktop } from "socket-events/connect-desktop"; import cookieParser from "cookie-parser"; import cors from "cors"; import { authMiddleware } from "modules/expressMiddleware"; -import { prisma, User } from "@repo/db"; -import { Request, Response, NextFunction } from "express"; - -declare global { - namespace Express { - interface Request { - user?: User | null; - } - } -} const app = express(); const server = createServer(app); diff --git a/apps/dispatch-server/modules/chron.ts b/apps/dispatch-server/modules/chron.ts new file mode 100644 index 00000000..e69de29b diff --git a/apps/dispatch/app/_components/navbar/Settings.tsx b/apps/dispatch/app/_components/navbar/Settings.tsx index 1bb6f4be..5d72b0be 100644 --- a/apps/dispatch/app/_components/navbar/Settings.tsx +++ b/apps/dispatch/app/_components/navbar/Settings.tsx @@ -37,7 +37,7 @@ export const SettingsBtn = () => { ); const [showIndication, setShowIndication] = useState(false); const [micVol, setMicVol] = useState(1); - const [dmeVolume, setDmeVol] = useState(1); + const [dmeVolume, setDmeVol] = useState(0.8); const setMic = useAudioStore((state) => state.setMic); @@ -46,7 +46,7 @@ export const SettingsBtn = () => { setSelectedDevice(user.settingsMicDevice); setMic(user.settingsMicDevice, user.settingsMicVolume || 1); setMicVol(user.settingsMicVolume || 1); - setDmeVol(user.settingsDmeVolume || 1); + setDmeVol(user.settingsDmeVolume || 0.8); } }, [user, setMic]); @@ -175,7 +175,6 @@ export const SettingsBtn = () => { settingsDmeVolume: dmeVolume, }, }); - console.log("res", res); setMic(selectedDevice, micVol); modalRef.current?.close(); toast.success("Einstellungen gespeichert"); diff --git a/apps/dispatch/app/pilot/_components/dme/useSounds.ts b/apps/dispatch/app/pilot/_components/dme/useSounds.ts index 7864f060..64a1ff4d 100644 --- a/apps/dispatch/app/pilot/_components/dme/useSounds.ts +++ b/apps/dispatch/app/pilot/_components/dme/useSounds.ts @@ -24,6 +24,16 @@ export const useSounds = () => { } }, []); + useEffect(() => { + if (user?.settingsDmeVolume) { + if (newMissionSound.current) { + newMissionSound.current.volume = user.settingsDmeVolume; + } + } else if (newMissionSound.current) { + newMissionSound.current.volume = 0.8; // Default volume + } + }, [user?.settingsDmeVolume]); + useEffect(() => { const timeouts: NodeJS.Timeout[] = [];