diff --git a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx index 4194fc15..86f811fd 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx @@ -43,7 +43,7 @@ export const DropdownMenu = (props) => { return (
-
+
{(props.state === "loading") ?

Loading...

:

{getSelectedText()}

diff --git a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.module.scss b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.module.scss index b47b3bac..117f6b2c 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.module.scss @@ -24,14 +24,16 @@ .dropdown_selected_text { font-size: 1.4rem; + padding-right: 2.8rem; } .dropdown_content_wrapper { display: none; position: absolute; top: 100%; // Position it below the toggle button - left: 0; + right: 0; width: 100%; + min-width: 20rem; z-index: 1; &.is_opened { display: block; diff --git a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx index 03df067f..3d26af83 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx @@ -54,9 +54,6 @@ export const ThresholdContainer = (props) => { export const useSettingBox = () => { - console.log("useSettingBox______________"); - - const SliderContainer = (props) => { return (
diff --git a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.module.scss b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.module.scss index 6740a057..61b35bf9 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.module.scss @@ -4,7 +4,6 @@ justify-content: space-between; align-items: center; padding: 2rem; - display: flex; justify-content: space-between; align-items: center; gap: 2rem; diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx index 0354f438..a0d03cae 100644 --- a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx @@ -1,4 +1,5 @@ import { useTranslation } from "react-i18next"; +import styles from "./Device.module.scss"; import { DropdownMenuContainer, ThresholdContainer, @@ -8,7 +9,7 @@ export const Device = () => { return ( <> - + {/* */} @@ -18,53 +19,90 @@ export const Device = () => { import { useMicHostList } from "@logics_configs/useMicHostList"; import { useSelectedMicHost } from "@logics_configs/useSelectedMicHost"; + +import { useMicDeviceList } from "@logics_configs/useMicDeviceList"; +import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice"; + +import { LabelComponent } from "../components/label_component/LabelComponent"; +import { DropdownMenu } from "../components/dropdown_menu/DropdownMenu"; + const DropdownMenuContainer_MicHost = () => { const { t } = useTranslation(); const { currentSelectedMicHost, setSelectedMicHost } = useSelectedMicHost(); const { currentMicHostList, getMicHostList } = useMicHostList(); - const selectFunction = (selected_data) => { + const selectFunction_host = (selected_data) => { setSelectedMicHost(selected_data.selected_id); }; - return ( - - ); -}; - -import { useMicDeviceList } from "@logics_configs/useMicDeviceList"; -import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice"; -const DropdownMenuContainer_MicDevice = () => { - const { t } = useTranslation(); const { currentSelectedMicDevice, setSelectedMicDevice } = useSelectedMicDevice(); const { currentMicDeviceList, getMicDeviceList } = useMicDeviceList(); - const selectFunction = (selected_data) => { + const selectFunction_device = (selected_data) => { setSelectedMicDevice(selected_data.selected_id); }; return ( - +
+ + +
+
+

Host/Driver

+ +
+ +
+

Device

+ +
+
+
); }; +// import { useMicDeviceList } from "@logics_configs/useMicDeviceList"; +// import { useSelectedMicDevice } from "@logics_configs/useSelectedMicDevice"; +// const DropdownMenuContainer_MicDevice = () => { +// const { t } = useTranslation(); +// const { currentSelectedMicDevice, setSelectedMicDevice } = useSelectedMicDevice(); +// const { currentMicDeviceList, getMicDeviceList } = useMicDeviceList(); + +// const selectFunction = (selected_data) => { +// setSelectedMicDevice(selected_data.selected_id); +// }; + + +// return ( +// +// ); +// }; + import { useSpeakerDeviceList } from "@logics_configs/useSpeakerDeviceList"; import { useSelectedSpeakerDevice } from "@logics_configs/useSelectedSpeakerDevice"; const DropdownMenuContainer_SpeakerDevice = () => { diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss b/src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss new file mode 100644 index 00000000..ac5e7bb1 --- /dev/null +++ b/src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss @@ -0,0 +1,24 @@ +.device_container { + display: flex; + width: 100%; + justify-content: space-between; + align-items: center; + padding: 2rem; + justify-content: space-between; + align-items: center; +} + +.device_contents { + display: flex; + gap: 2.8rem; +} + +.device_dropdown_wrapper { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.device_dropdown_label { + font-size: 1.4rem; +} \ No newline at end of file