From 56291927601b69a9f17bd302b24774ba930b5680 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sun, 13 Oct 2024 08:16:24 +0900 Subject: [PATCH] [Refactor] Organize file structures. --- .../_atoms/_entry/_Entry.jsx | 0 .../_atoms/_entry/_Entry.module.scss | 0 .../action_button/ActionButton.jsx | 0 .../action_button/ActionButton.module.scss | 0 .../checkbox/Checkbox.jsx | 0 .../checkbox/Checkbox.module.scss | 0 .../deepl_auth_key/DeeplAuthKey.jsx | 0 .../deepl_auth_key/DeeplAuthKey.module.scss | 0 .../dropdown_menu/DropdownMenu.jsx | 0 .../dropdown_menu/DropdownMenu.module.scss | 0 .../entry/Entry.jsx | 0 .../entry/Entry.module.scss | 0 .../setting_box/_components/index.js | 11 ++ .../label_component/LabelComponent.jsx | 0 .../LabelComponent.module.scss | 0 .../radio_button/RadioButton.jsx | 0 .../radio_button/RadioButton.module.scss | 0 .../slider/Slider.jsx | 0 .../slider/Slider.module.scss | 0 .../switch_box/SwitchBox.jsx} | 4 +- .../switch_box/SwitchBox.module.scss} | 0 .../ThresholdComponent.jsx | 0 .../ThresholdComponent.module.scss | 0 .../slider_and_meter/SliderAndMeter.jsx | 0 .../SliderAndMeter.module.scss | 0 .../threshold_entry/ThresholdEntry.jsx | 0 .../ThresholdEntry.module.scss | 0 .../volume_check_button/VolumeCheckButton.jsx | 0 .../VolumeCheckButton.module.scss | 0 .../word_filter/WordFilter.jsx | 0 .../word_filter/WordFilter.module.scss | 0 .../setting_box/_templates/Templates.jsx | 121 ++++++++++++++++ .../Templates.module.scss} | 20 --- .../setting_box/appearance/Appearance.jsx | 14 +- .../setting_box/components/useSettingBox.jsx | 132 ------------------ .../setting_box/device/Device.jsx | 23 +-- .../setting_box/others/Others.jsx | 2 +- 37 files changed, 157 insertions(+), 170 deletions(-) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/_atoms/_entry/_Entry.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/_atoms/_entry/_Entry.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/action_button/ActionButton.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/action_button/ActionButton.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/checkbox/Checkbox.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/checkbox/Checkbox.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/deepl_auth_key/DeeplAuthKey.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/deepl_auth_key/DeeplAuthKey.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/dropdown_menu/DropdownMenu.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/dropdown_menu/DropdownMenu.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/entry/Entry.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/entry/Entry.module.scss (100%) create mode 100644 src-ui/app/config_page/setting_section/setting_box/_components/index.js rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/label_component/LabelComponent.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/label_component/LabelComponent.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/radio_button/RadioButton.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/radio_button/RadioButton.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/slider/Slider.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/slider/Slider.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components/switchbox/Switchbox.jsx => _components/switch_box/SwitchBox.jsx} (91%) rename src-ui/app/config_page/setting_section/setting_box/{components/switchbox/Switchbox.module.scss => _components/switch_box/SwitchBox.module.scss} (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/ThresholdComponent.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/ThresholdComponent.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/slider_and_meter/SliderAndMeter.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/slider_and_meter/SliderAndMeter.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/threshold_entry/ThresholdEntry.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/threshold_entry/ThresholdEntry.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/volume_check_button/VolumeCheckButton.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/threshold_component/volume_check_button/VolumeCheckButton.module.scss (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/word_filter/WordFilter.jsx (100%) rename src-ui/app/config_page/setting_section/setting_box/{components => _components}/word_filter/WordFilter.module.scss (100%) create mode 100644 src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx rename src-ui/app/config_page/setting_section/setting_box/{components/useSettingBox.module.scss => _templates/Templates.module.scss} (67%) delete mode 100644 src-ui/app/config_page/setting_section/setting_box/components/useSettingBox.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/_atoms/_entry/_Entry.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/_atoms/_entry/_Entry.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/_atoms/_entry/_Entry.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/_atoms/_entry/_Entry.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/action_button/ActionButton.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/action_button/ActionButton.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/action_button/ActionButton.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/action_button/ActionButton.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/action_button/ActionButton.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/action_button/ActionButton.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/action_button/ActionButton.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/action_button/ActionButton.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/checkbox/Checkbox.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/checkbox/Checkbox.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/checkbox/Checkbox.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/checkbox/Checkbox.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/checkbox/Checkbox.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/checkbox/Checkbox.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/checkbox/Checkbox.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/checkbox/Checkbox.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/deepl_auth_key/DeeplAuthKey.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/deepl_auth_key/DeeplAuthKey.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/deepl_auth_key/DeeplAuthKey.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/deepl_auth_key/DeeplAuthKey.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.module.scss 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 similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/dropdown_menu/DropdownMenu.jsx 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 similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/dropdown_menu/DropdownMenu.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/dropdown_menu/DropdownMenu.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/entry/Entry.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/entry/Entry.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/entry/Entry.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/entry/Entry.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/entry/Entry.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/entry/Entry.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/entry/Entry.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/entry/Entry.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/index.js b/src-ui/app/config_page/setting_section/setting_box/_components/index.js new file mode 100644 index 00000000..41c044b4 --- /dev/null +++ b/src-ui/app/config_page/setting_section/setting_box/_components/index.js @@ -0,0 +1,11 @@ +export { ActionButton } from "./action_button/ActionButton"; +export { Checkbox } from "./checkbox/Checkbox"; +export { DeeplAuthKey, OpenWebpage_DeeplAuthKey } from "./deepl_auth_key/DeeplAuthKey"; +export { DropdownMenu } from "./dropdown_menu/DropdownMenu"; +export { Entry } from "./entry/Entry"; +export { LabelComponent } from "./label_component/LabelComponent"; +export { RadioButton } from "./radio_button/RadioButton"; +export { Slider } from "./slider/Slider"; +export { SwitchBox } from "./switch_box/SwitchBox"; +export { ThresholdComponent } from "./threshold_component/ThresholdComponent"; +export { WordFilter, WordFilterListToggleComponent } from "./word_filter/WordFilter"; \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/components/label_component/LabelComponent.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/label_component/LabelComponent.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/label_component/LabelComponent.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/label_component/LabelComponent.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/radio_button/RadioButton.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/slider/Slider.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/slider/Slider.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/slider/Slider.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/slider/Slider.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/switchbox/Switchbox.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx similarity index 91% rename from src-ui/app/config_page/setting_section/setting_box/components/switchbox/Switchbox.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx index ba19dfd9..2d77a673 100644 --- a/src-ui/app/config_page/setting_section/setting_box/components/switchbox/Switchbox.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx @@ -1,8 +1,8 @@ import clsx from "clsx"; import { useState } from "react"; -import styles from "./Switchbox.module.scss"; +import styles from "./SwitchBox.module.scss"; -export const Switchbox = (props) => { +export const SwitchBox = (props) => { const [is_hovered, setIsHovered] = useState(false); const [is_mouse_down, setIsMouseDown] = useState(false); diff --git a/src-ui/app/config_page/setting_section/setting_box/components/switchbox/Switchbox.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/switchbox/Switchbox.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/ThresholdComponent.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/ThresholdComponent.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/ThresholdComponent.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/ThresholdComponent.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/ThresholdComponent.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/slider_and_meter/SliderAndMeter.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/slider_and_meter/SliderAndMeter.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/slider_and_meter/SliderAndMeter.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/slider_and_meter/SliderAndMeter.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/slider_and_meter/SliderAndMeter.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/threshold_entry/ThresholdEntry.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/threshold_entry/ThresholdEntry.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/threshold_entry/ThresholdEntry.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/threshold_entry/ThresholdEntry.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/threshold_entry/ThresholdEntry.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/threshold_entry/ThresholdEntry.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/threshold_entry/ThresholdEntry.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/threshold_entry/ThresholdEntry.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/volume_check_button/VolumeCheckButton.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/volume_check_button/VolumeCheckButton.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/volume_check_button/VolumeCheckButton.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/volume_check_button/VolumeCheckButton.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/threshold_component/volume_check_button/VolumeCheckButton.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/volume_check_button/VolumeCheckButton.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/threshold_component/volume_check_button/VolumeCheckButton.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/volume_check_button/VolumeCheckButton.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx b/src-ui/app/config_page/setting_section/setting_box/_components/word_filter/WordFilter.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.jsx rename to src-ui/app/config_page/setting_section/setting_box/_components/word_filter/WordFilter.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.module.scss b/src-ui/app/config_page/setting_section/setting_box/_components/word_filter/WordFilter.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/components/word_filter/WordFilter.module.scss rename to src-ui/app/config_page/setting_section/setting_box/_components/word_filter/WordFilter.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx b/src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx new file mode 100644 index 00000000..7cbbae33 --- /dev/null +++ b/src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx @@ -0,0 +1,121 @@ +import styles from "./Templates.module.scss"; +import { useStore_IsOpenedDropdownMenu } from "@store"; + +import { + LabelComponent, + DropdownMenu, + Slider, + Checkbox, + SwitchBox, + Entry, + RadioButton, + OpenWebpage_DeeplAuthKey, + DeeplAuthKey, + ActionButton, + WordFilter, + WordFilterListToggleComponent, +} from "../_components/"; + +export const useOnMouseLeaveDropdownMenu = () => { + const { updateIsOpenedDropdownMenu } = useStore_IsOpenedDropdownMenu(); + + const onMouseLeaveFunction = () => { + updateIsOpenedDropdownMenu(""); + }; + + return { onMouseLeaveFunction }; +}; + +export const DropdownMenuContainer = (props) => { + const { onMouseLeaveFunction } = useOnMouseLeaveDropdownMenu(); + + return ( +
{t("config_page.mic_host_device.label_auto_select")}
-{t("config_page.speaker_device.label_auto_select")}
-