Merge branch 'main' of https://github.com/VAR-Virtual-Air-Rescue/var-monorepo
This commit is contained in:
@@ -37,6 +37,7 @@ export const SettingsBtn = () => {
|
|||||||
);
|
);
|
||||||
const [showIndication, setShowIndication] = useState<boolean>(false);
|
const [showIndication, setShowIndication] = useState<boolean>(false);
|
||||||
const [micVol, setMicVol] = useState<number>(1);
|
const [micVol, setMicVol] = useState<number>(1);
|
||||||
|
const [funkVolume, setFunkVol] = useState<number>(0.8);
|
||||||
const [dmeVolume, setDmeVol] = useState<number>(0.8);
|
const [dmeVolume, setDmeVol] = useState<number>(0.8);
|
||||||
|
|
||||||
const setMic = useAudioStore((state) => state.setMic);
|
const setMic = useAudioStore((state) => state.setMic);
|
||||||
@@ -46,6 +47,7 @@ export const SettingsBtn = () => {
|
|||||||
setSelectedDevice(user.settingsMicDevice);
|
setSelectedDevice(user.settingsMicDevice);
|
||||||
setMic(user.settingsMicDevice, user.settingsMicVolume || 1);
|
setMic(user.settingsMicDevice, user.settingsMicVolume || 1);
|
||||||
setMicVol(user.settingsMicVolume || 1);
|
setMicVol(user.settingsMicVolume || 1);
|
||||||
|
setFunkVol(user.settingsFunkVolume || 0.8);
|
||||||
setDmeVol(user.settingsDmeVolume || 0.8);
|
setDmeVol(user.settingsDmeVolume || 0.8);
|
||||||
}
|
}
|
||||||
}, [user, setMic]);
|
}, [user, setMic]);
|
||||||
@@ -74,7 +76,7 @@ export const SettingsBtn = () => {
|
|||||||
<SettingsIcon size={20} /> Einstellungen
|
<SettingsIcon size={20} /> Einstellungen
|
||||||
</h3>
|
</h3>
|
||||||
<div className="flex flex-col items-center justify-center">
|
<div className="flex flex-col items-center justify-center">
|
||||||
<fieldset className="fieldset w-full">
|
<fieldset className="fieldset w-full mb-2">
|
||||||
<label className="floating-label w-full text-base">
|
<label className="floating-label w-full text-base">
|
||||||
<span>Eingabegerät</span>
|
<span>Eingabegerät</span>
|
||||||
<select
|
<select
|
||||||
@@ -96,8 +98,8 @@ export const SettingsBtn = () => {
|
|||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<p className="flex items-center gap-2 text-base mb-2">
|
<p className="flex items-center gap-2 text-base mb-2 justify-start w-full">
|
||||||
<Volume2 size={20} /> Microfonlautstärke
|
<Volume2 size={20} /> Eingabelautstärke
|
||||||
</p>
|
</p>
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<input
|
<input
|
||||||
@@ -114,10 +116,11 @@ export const SettingsBtn = () => {
|
|||||||
className="range range-xs range-accent w-full"
|
className="range range-xs range-accent w-full"
|
||||||
/>
|
/>
|
||||||
<div className="flex justify-between px-2.5 mt-2 text-xs">
|
<div className="flex justify-between px-2.5 mt-2 text-xs">
|
||||||
<span>0</span>
|
<span>0%</span>
|
||||||
<span>100</span>
|
<span>25%</span>
|
||||||
<span>200</span>
|
<span>50%</span>
|
||||||
<span>300</span>
|
<span>75%</span>
|
||||||
|
<span>100%</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{showIndication && (
|
{showIndication && (
|
||||||
@@ -125,6 +128,33 @@ export const SettingsBtn = () => {
|
|||||||
)}
|
)}
|
||||||
<div className="divider w-full" />
|
<div className="divider w-full" />
|
||||||
</div>
|
</div>
|
||||||
|
<p className="flex items-center gap-2 text-base mb-2">
|
||||||
|
<Volume2 size={20} /> Funk Lautstärke
|
||||||
|
</p>
|
||||||
|
<div className="w-full mb-2">
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
min={0}
|
||||||
|
max={1}
|
||||||
|
step={0.01}
|
||||||
|
onChange={(e) => {
|
||||||
|
const value = parseFloat(e.target.value);
|
||||||
|
setFunkVol(value);
|
||||||
|
}}
|
||||||
|
value={funkVolume}
|
||||||
|
className="range range-xs range-primary w-full"
|
||||||
|
/>
|
||||||
|
<div className="flex justify-between px-2.5 mt-2 text-xs">
|
||||||
|
<span>0%</span>
|
||||||
|
<span>25%</span>
|
||||||
|
<span>50%</span>
|
||||||
|
<span>75%</span>
|
||||||
|
<span>100%</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-center w-full">
|
||||||
|
<div className="divider w-1/2" />
|
||||||
|
</div>
|
||||||
<p className="flex items-center gap-2 text-base mb-2">
|
<p className="flex items-center gap-2 text-base mb-2">
|
||||||
<Volume2 size={20} /> Melder Lautstärke
|
<Volume2 size={20} /> Melder Lautstärke
|
||||||
</p>
|
</p>
|
||||||
@@ -142,11 +172,14 @@ export const SettingsBtn = () => {
|
|||||||
testSoundRef.current.play();
|
testSoundRef.current.play();
|
||||||
}}
|
}}
|
||||||
value={dmeVolume}
|
value={dmeVolume}
|
||||||
className="range range-xs range-accent w-full"
|
className="range range-xs range-primary w-full"
|
||||||
/>
|
/>
|
||||||
<div className="flex justify-between px-2.5 mt-2 text-xs">
|
<div className="flex justify-between px-2.5 mt-2 text-xs">
|
||||||
<span>0</span>
|
<span>0%</span>
|
||||||
<span>100</span>
|
<span>25%</span>
|
||||||
|
<span>50%</span>
|
||||||
|
<span>75%</span>
|
||||||
|
<span>100%</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -172,6 +205,7 @@ export const SettingsBtn = () => {
|
|||||||
user: {
|
user: {
|
||||||
settingsMicDevice: selectedDevice,
|
settingsMicDevice: selectedDevice,
|
||||||
settingsMicVolume: micVol,
|
settingsMicVolume: micVol,
|
||||||
|
settingsFunkVolume: funkVolume,
|
||||||
settingsDmeVolume: dmeVolume,
|
settingsDmeVolume: dmeVolume,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ model User {
|
|||||||
settingsMicDevice String? @map(name: "settings_mic_device")
|
settingsMicDevice String? @map(name: "settings_mic_device")
|
||||||
settingsMicVolume Float? @map(name: "settings_mic_volume")
|
settingsMicVolume Float? @map(name: "settings_mic_volume")
|
||||||
settingsDmeVolume Float? @map(name: "settings_dme_volume")
|
settingsDmeVolume Float? @map(name: "settings_dme_volume")
|
||||||
|
settingsFunkVolume Float? @map(name: "settings_funk_volume")
|
||||||
settingsHideLastname Boolean @default(false) @map(name: "settings_hide_lastname")
|
settingsHideLastname Boolean @default(false) @map(name: "settings_hide_lastname")
|
||||||
|
|
||||||
// email Verification:
|
// email Verification:
|
||||||
|
|||||||
Reference in New Issue
Block a user