From 66e3267798ba26a943f86afa7466dec08bd94867 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:27:31 +0900 Subject: [PATCH 1/4] [bugfix] Add endpoint '/set/disable_speaker_dynamic_energy_threshold' UI will receive. --- src-ui/logics/useReceiveRoutes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index acd5668b..b8d00eb1 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -137,6 +137,7 @@ export const useReceiveRoutes = () => { "/set/disable_mic_dynamic_energy_threshold": updateEnableAutomaticMicThreshold, "/get/speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, "/set/enable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, + "/set/disable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, "/get/ui_language": updateUiLanguage, "/set/ui_language": updateUiLanguage, From 79e4d2817637b5c5e90d4c327d57afde56fded0b Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:40:30 +0900 Subject: [PATCH 2/4] [Refactor] useReceiveRoutes: Add comments and change the order. --- src-ui/logics/useReceiveRoutes.js | 41 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index b8d00eb1..66fcfd45 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -21,14 +21,12 @@ import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonTy import { useUiLanguage } from "@logics_configs/useUiLanguage"; - export const useReceiveRoutes = () => { const { updateTranslationStatus, updateTranscriptionSendStatus, updateTranscriptionReceiveStatus, } = useMainFunction(); - const { updateSelectedPresetTabNumber, updateEnableMultiTranslation, @@ -36,34 +34,25 @@ export const useReceiveRoutes = () => { updateSelectedTargetLanguages } = useLanguageSettings(); const { updateSelectableLanguageList } = useSelectableLanguageList(); - const { updateSentMessageLogById, addSentMessageLog, addReceivedMessageLog, } = useMessage(); - const { updateSoftwareVersion } = useSoftwareVersion(); - const { updateEnableAutoMicSelect } = useEnableAutoMicSelect(); const { updateEnableAutoSpeakerSelect } = useEnableAutoSpeakerSelect(); - const { updateMicHostList } = useMicHostList(); const { updateSelectedMicHost } = useSelectedMicHost(); const { updateMicDeviceList } = useMicDeviceList(); const { updateSelectedMicDevice } = useSelectedMicDevice(); const { updateSpeakerDeviceList } = useSpeakerDeviceList(); const { updateSelectedSpeakerDevice } = useSelectedSpeakerDevice(); - const { updateMicThreshold, updateEnableAutomaticMicThreshold } = useMicThreshold(); const { updateSpeakerThreshold, updateEnableAutomaticSpeakerThreshold } = useSpeakerThreshold(); - const { updateEnableAutoClearMessageBox } = useEnableAutoClearMessageBox(); const { updateSendMessageButtonType } = useSendMessageButtonType(); - const { updateUiLanguage } = useUiLanguage(); - - const { updateVolumeVariable_Mic, updateVolumeVariable_Speaker, @@ -72,6 +61,8 @@ export const useReceiveRoutes = () => { } = useVolume(); const routes = { + // Main Page + // Main Functions "/set/enable_translation": updateTranslationStatus, "/set/disable_translation": updateTranslationStatus, "/set/enable_transcription_send": updateTranscriptionSendStatus, @@ -79,6 +70,7 @@ export const useReceiveRoutes = () => { "/set/enable_transcription_receive": updateTranscriptionReceiveStatus, "/set/disable_transcription_receive": updateTranscriptionReceiveStatus, + // Language Settings "/get/selected_tab_no": updateSelectedPresetTabNumber, "/set/selected_tab_no": updateSelectedPresetTabNumber, "/get/multi_language_translation": updateEnableMultiTranslation, @@ -87,10 +79,20 @@ export const useReceiveRoutes = () => { "/get/selected_target_languages": updateSelectedTargetLanguages, "/set/selected_target_languages": updateSelectedTargetLanguages, + // Language Selector "/get/list_languages": updateSelectableLanguageList, + // Message + "/run/send_message_box": updateSentMessageLogById, + "/action/transcription_send_mic_message": addSentMessageLog, + "/action/transcription_receive_speaker_message": addReceivedMessageLog, + + + // Config Page + // Common "/get/version": updateSoftwareVersion, + // Device Tab "/get/auto_mic_select": updateEnableAutoMicSelect, "/set/enable_auto_mic_select": updateEnableAutoMicSelect, "/set/disable_auto_mic_select": updateEnableAutoMicSelect, @@ -120,13 +122,6 @@ export const useReceiveRoutes = () => { "/set/enable_check_speaker_threshold": updateSpeakerThresholdCheckStatus, "/set/disable_check_speaker_threshold": updateSpeakerThresholdCheckStatus, - "/get/auto_clear_message_box": updateEnableAutoClearMessageBox, - "/set/enable_auto_clear_message_box": updateEnableAutoClearMessageBox, - "/set/disable_auto_clear_message_box": updateEnableAutoClearMessageBox, - - "/get/send_message_button_type": updateSendMessageButtonType, - "/set/send_message_button_type": updateSendMessageButtonType, - "/get/mic_energy_threshold": updateMicThreshold, "/set/mic_energy_threshold": updateMicThreshold, "/get/speaker_energy_threshold": updateSpeakerThreshold, @@ -139,13 +134,17 @@ export const useReceiveRoutes = () => { "/set/enable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, "/set/disable_speaker_dynamic_energy_threshold": updateEnableAutomaticSpeakerThreshold, + // Appearance "/get/ui_language": updateUiLanguage, "/set/ui_language": updateUiLanguage, + // Others Tab + "/get/auto_clear_message_box": updateEnableAutoClearMessageBox, + "/set/enable_auto_clear_message_box": updateEnableAutoClearMessageBox, + "/set/disable_auto_clear_message_box": updateEnableAutoClearMessageBox, - "/run/send_message_box": updateSentMessageLogById, - "/action/transcription_send_mic_message": addSentMessageLog, - "/action/transcription_receive_speaker_message": addReceivedMessageLog + "/get/send_message_button_type": updateSendMessageButtonType, + "/set/send_message_button_type": updateSendMessageButtonType, }; const receiveRoutes = (parsed_data) => { From 7573e99617d46694cf0003b741f6af60fbee5241 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:54:32 +0900 Subject: [PATCH 3/4] [Refactor] Organize logics files. and change import path as well. --- src-ui/app/App.jsx | 6 +++--- .../threshold_component/ThresholdComponent.jsx | 2 +- src-ui/app/main_page/main_section/MainSection.jsx | 2 +- .../language_selector/LanguageSelector.jsx | 2 +- .../main_section/message_container/log_box/LogBox.jsx | 2 +- .../message_input_box/MessageInputBox.jsx | 4 ++-- .../language_settings/LanguageSettings.jsx | 4 ++-- .../preset_tab_selector/PresetTabSelector.jsx | 2 +- .../main_function_switch/MainFunctionSwitch.jsx | 2 +- src-ui/logics/{ => common}/useMessage.js | 0 src-ui/logics/{ => common}/useVolume.js | 0 src-ui/logics/{ => main}/useLanguageSettings.js | 0 src-ui/logics/{ => main}/useMainFunction.js | 0 src-ui/logics/{ => main}/useSelectableLanguageList.js | 0 src-ui/logics/useReceiveRoutes.js | 10 +++++----- src-ui/{logics => utils}/scrollToBottom.js | 0 vite.config.js | 2 ++ 17 files changed, 20 insertions(+), 18 deletions(-) rename src-ui/logics/{ => common}/useMessage.js (100%) rename src-ui/logics/{ => common}/useVolume.js (100%) rename src-ui/logics/{ => main}/useLanguageSettings.js (100%) rename src-ui/logics/{ => main}/useMainFunction.js (100%) rename src-ui/logics/{ => main}/useSelectableLanguageList.js (100%) rename src-ui/{logics => utils}/scrollToBottom.js (100%) diff --git a/src-ui/app/App.jsx b/src-ui/app/App.jsx index 184eee25..eee25022 100644 --- a/src-ui/app/App.jsx +++ b/src-ui/app/App.jsx @@ -31,8 +31,8 @@ import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClear import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType"; import { useUiLanguage } from "@logics_configs/useUiLanguage"; -import { useLanguageSettings } from "@logics/useLanguageSettings"; -import { useSelectableLanguageList } from "@logics/useSelectableLanguageList"; +import { useLanguageSettings } from "@logics_main/useLanguageSettings"; +import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList"; const StartPythonFacadeComponent = () => { const { asyncStartPython } = useStartPython(); @@ -103,7 +103,7 @@ const UiLanguageController = () => { return null; }; -import { useVolume } from "@logics/useVolume"; +import { useVolume } from "@logics_common/useVolume"; import { useStore_IsOpenedConfigPage } from "@store"; const ConfigPageCloseTrigger = () => { const { currentIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); 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 index 5c5d07e2..a9ce4587 100644 --- 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 @@ -3,7 +3,7 @@ import styles from "./ThresholdComponent.module.scss"; import { SliderAndMeter } from "./slider_and_meter/SliderAndMeter"; import { ThresholdEntry } from "./threshold_entry/ThresholdEntry"; import { VolumeCheckButton } from "./volume_check_button/VolumeCheckButton"; -import { useVolume } from "@logics/useVolume"; +import { useVolume } from "@logics_common/useVolume"; export const ThresholdComponent = (props) => { return (
diff --git a/src-ui/app/main_page/main_section/MainSection.jsx b/src-ui/app/main_page/main_section/MainSection.jsx index c1c4b6d1..8ca35c1b 100644 --- a/src-ui/app/main_page/main_section/MainSection.jsx +++ b/src-ui/app/main_page/main_section/MainSection.jsx @@ -18,7 +18,7 @@ export const MainSection = () => { }; -import { useLanguageSettings } from "@logics/useLanguageSettings"; +import { useLanguageSettings } from "@logics_main/useLanguageSettings"; const HandleLanguageSelector = () => { const { currentIsOpenedLanguageSelector } = useStore_IsOpenedLanguageSelector(); const { diff --git a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx index 664587e9..3ee86c84 100644 --- a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx +++ b/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx @@ -1,6 +1,6 @@ import { useTranslation } from "react-i18next"; -import { useSelectableLanguageList } from "@logics/useSelectableLanguageList"; +import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList"; import styles from "./LanguageSelector.module.scss"; import { LanguageSelectorTopBar } from "./language_selector_top_bar/LanguageSelectorTopBar"; diff --git a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx index fb34148c..4c0c6962 100644 --- a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx +++ b/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx @@ -2,7 +2,7 @@ import { useEffect, useLayoutEffect, useRef, useState } from "react"; import styles from "./LogBox.module.scss"; import { useStore_MessageLogs, store } from "@store"; import { MessageContainer } from "./message_container/MessageContainer"; -import { scrollToBottom } from "@logics/scrollToBottom"; +import { scrollToBottom } from "@utils/scrollToBottom"; export const LogBox = () => { const { currentMessageLogs } = useStore_MessageLogs(); diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx index 4e60b266..3419b803 100644 --- a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx +++ b/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx @@ -1,9 +1,9 @@ import { useState } from "react"; import styles from "./MessageInputBox.module.scss"; import SendMessageSvg from "@images/send_message.svg?react"; -import { useMessage } from "@logics/useMessage"; +import { useMessage } from "@logics_common/useMessage"; import { store } from "@store"; -import { scrollToBottom } from "@logics/scrollToBottom"; +import { scrollToBottom } from "@utils/scrollToBottom"; import { useSendMessageButtonType } from "@logics_configs/useSendMessageButtonType"; import { useEnableAutoClearMessageBox } from "@logics_configs/useEnableAutoClearMessageBox"; diff --git a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx b/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx index ea236fae..f0893267 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx @@ -23,8 +23,8 @@ export const LanguageSettings = () => { import MicSvg from "@images/mic.svg?react"; import HeadphonesSvg from "@images/headphones.svg?react"; import { useStore_IsOpenedLanguageSelector } from "@store"; -import { useMainFunction } from "@logics/useMainFunction"; -import { useLanguageSettings } from "@logics/useLanguageSettings"; +import { useMainFunction } from "@logics_main/useMainFunction"; +import { useLanguageSettings } from "@logics_main/useLanguageSettings"; // 言語セレクターをトグルする処理を関数化 const toggleSelector = (selector, currentStatus, updateSelector) => { diff --git a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx b/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx index e5e8f694..2d3b6b06 100644 --- a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx +++ b/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx @@ -12,7 +12,7 @@ export const PresetTabSelector = () => { import clsx from "clsx"; -import { useLanguageSettings } from "@logics/useLanguageSettings"; +import { useLanguageSettings } from "@logics_main/useLanguageSettings"; const Tab = (props) => { const { currentSelectedPresetTabNumber, setSelectedPresetTabNumber } = useLanguageSettings(); diff --git a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx index c39ee167..9505b56d 100644 --- a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx +++ b/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx @@ -7,7 +7,7 @@ import HeadphonesSvg from "@images/headphones.svg?react"; import ForegroundSvg from "@images/foreground.svg?react"; import { useStore_IsMainPageCompactMode } from "@store"; -import { useMainFunction } from "@logics/useMainFunction"; +import { useMainFunction } from "@logics_main/useMainFunction"; export const MainFunctionSwitch = () => { const { t } = useTranslation(); diff --git a/src-ui/logics/useMessage.js b/src-ui/logics/common/useMessage.js similarity index 100% rename from src-ui/logics/useMessage.js rename to src-ui/logics/common/useMessage.js diff --git a/src-ui/logics/useVolume.js b/src-ui/logics/common/useVolume.js similarity index 100% rename from src-ui/logics/useVolume.js rename to src-ui/logics/common/useVolume.js diff --git a/src-ui/logics/useLanguageSettings.js b/src-ui/logics/main/useLanguageSettings.js similarity index 100% rename from src-ui/logics/useLanguageSettings.js rename to src-ui/logics/main/useLanguageSettings.js diff --git a/src-ui/logics/useMainFunction.js b/src-ui/logics/main/useMainFunction.js similarity index 100% rename from src-ui/logics/useMainFunction.js rename to src-ui/logics/main/useMainFunction.js diff --git a/src-ui/logics/useSelectableLanguageList.js b/src-ui/logics/main/useSelectableLanguageList.js similarity index 100% rename from src-ui/logics/useSelectableLanguageList.js rename to src-ui/logics/main/useSelectableLanguageList.js diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 66fcfd45..5f0198ec 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -1,9 +1,9 @@ import { arrayToObject } from "@utils/arrayToObject"; -import { useMainFunction } from "./useMainFunction"; -import { useMessage } from "./useMessage"; -import { useSelectableLanguageList } from "./useSelectableLanguageList"; -import { useLanguageSettings } from "./useLanguageSettings"; -import { useVolume } from "./useVolume"; +import { useMainFunction } from "@logics_main/useMainFunction"; +import { useMessage } from "@logics_common/useMessage"; +import { useSelectableLanguageList } from "@logics_main/useSelectableLanguageList"; +import { useLanguageSettings } from "@logics_main/useLanguageSettings"; +import { useVolume } from "@logics_common/useVolume"; import { useSoftwareVersion } from "@logics_configs/useSoftwareVersion"; import { useEnableAutoMicSelect } from "@logics_configs/useEnableAutoMicSelect"; diff --git a/src-ui/logics/scrollToBottom.js b/src-ui/utils/scrollToBottom.js similarity index 100% rename from src-ui/logics/scrollToBottom.js rename to src-ui/utils/scrollToBottom.js diff --git a/vite.config.js b/vite.config.js index 35329ef6..b45af950 100644 --- a/vite.config.js +++ b/vite.config.js @@ -40,6 +40,8 @@ export default defineConfig(async () => ({ "@images": path.resolve(__dirname, "src-ui/assets"), "@utils": path.resolve(__dirname, "src-ui/utils"), "@logics": path.resolve(__dirname, "src-ui/logics"), + "@logics_common": path.resolve(__dirname, "src-ui/logics/common"), + "@logics_main": path.resolve(__dirname, "src-ui/logics/main"), "@logics_configs": path.resolve(__dirname, "src-ui/logics/configs"), }, }, From e20a4eecd13bb8ee018f1bcbafd2091133fba329 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Sat, 21 Sep 2024 00:57:09 +0900 Subject: [PATCH 4/4] [Remove] useWindow that is no longer in use for now. --- src-ui/logics/useWindow.js | 44 -------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 src-ui/logics/useWindow.js diff --git a/src-ui/logics/useWindow.js b/src-ui/logics/useWindow.js deleted file mode 100644 index 21cee2cf..00000000 --- a/src-ui/logics/useWindow.js +++ /dev/null @@ -1,44 +0,0 @@ -import { WebviewWindow } from "@tauri-apps/api/window"; -import { store, useStore_IsOpenedConfigPage } from "@store"; -import { getCurrent } from "@tauri-apps/api/window"; - -export const useWindow = () => { - const { updateIsOpenedConfigPage } = useStore_IsOpenedConfigPage(); - - const createConfigPage = async () => { - const main_page = getCurrent(); - if (store.config_page === null) { - const config_page = new WebviewWindow("vrct_config_page",{ - url: "./src-ui/windows/config_page/index.html", - center: true, - width: 1080, - height: 700, - title: "Settings" - }); - - config_page.once("tauri://created", function () { - store.config_page = config_page; - updateIsOpenedConfigPage(true); - }); - config_page.once("tauri://error", function (e) { - console.log(e); - }); - - const unlisten_d = config_page.once("tauri://destroyed", (event) => { - store.config_page = null; - updateIsOpenedConfigPage(false); - unlisten_d(); - }); - - main_page.onCloseRequested((event) => { - config_page.close(); - }); - } - }; - - const closeConfigPage = () => { - store.config_page.close(); - }; - - return { createConfigPage, closeConfigPage }; -}; \ No newline at end of file