diff --git a/index.html b/index.html index 15162d79..04242333 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,6 @@
- + diff --git a/src-ui/_test_data.js b/src-ui/logics/_test_data.js similarity index 100% rename from src-ui/_test_data.js rename to src-ui/logics/_test_data.js diff --git a/src-ui/logics/_useBackendErrorHandling.js b/src-ui/logics/_useBackendErrorHandling.js index 3af72764..f224686c 100644 --- a/src-ui/logics/_useBackendErrorHandling.js +++ b/src-ui/logics/_useBackendErrorHandling.js @@ -17,7 +17,7 @@ import { useAdvancedSettings, } from "@logics_configs"; -import { ui_configs } from "../ui_configs"; +import { ui_configs } from "./ui_configs"; export const _useBackendErrorHandling = () => { const { t } = useI18n(); diff --git a/src-ui/logics/useStdoutToPython.js b/src-ui/logics/common/useStdoutToPython.js similarity index 100% rename from src-ui/logics/useStdoutToPython.js rename to src-ui/logics/common/useStdoutToPython.js diff --git a/src-ui/logics/configs/useSettingBoxScrollPosition.js b/src-ui/logics/configs/config_page_setter/_aux/useSettingBoxScrollPosition.js similarity index 100% rename from src-ui/logics/configs/useSettingBoxScrollPosition.js rename to src-ui/logics/configs/config_page_setter/_aux/useSettingBoxScrollPosition.js diff --git a/src-ui/logics/configs/hotkeys/useHotkeys.js b/src-ui/logics/configs/config_page_setter/hotkeys/useHotkeys.js similarity index 100% rename from src-ui/logics/configs/hotkeys/useHotkeys.js rename to src-ui/logics/configs/config_page_setter/hotkeys/useHotkeys.js diff --git a/src-ui/logics/configs/plugins/usePlugins.js b/src-ui/logics/configs/config_page_setter/plugins/usePlugins.js similarity index 100% rename from src-ui/logics/configs/plugins/usePlugins.js rename to src-ui/logics/configs/config_page_setter/plugins/usePlugins.js diff --git a/src-ui/logics/configs/supporters/useSupporters.js b/src-ui/logics/configs/config_page_setter/supporters/useSupporters.js similarity index 100% rename from src-ui/logics/configs/supporters/useSupporters.js rename to src-ui/logics/configs/config_page_setter/supporters/useSupporters.js diff --git a/src-ui/ui_config_setter.js b/src-ui/logics/configs/config_page_setter/ui_config_setter.js similarity index 90% rename from src-ui/ui_config_setter.js rename to src-ui/logics/configs/config_page_setter/ui_config_setter.js index 889bce48..3aa90274 100644 --- a/src-ui/ui_config_setter.js +++ b/src-ui/logics/configs/config_page_setter/ui_config_setter.js @@ -595,40 +595,11 @@ const buildCategoryApiFromSettings = (settings, settingsArray, Category, extraFu return { ...api, ...extraFunctions }; }; -const createCategoryHook = (Category) => { +export const createCategoryHook = (Category) => { return () => { const { settings } = useSettingsLogics(SETTINGS_ARRAY, Category); const extraFunctions = useConfigFunctions(Category); const autoApi = buildCategoryApiFromSettings(settings, SETTINGS_ARRAY, Category, extraFunctions); return { ...autoApi }; }; -}; - - - -// --- 自動エクスポート: SETTINGS_ARRAY に含まれるユニークな Category ごとに use を作って export --- -// 例: Category === "Appearance" -> export const useAppearance = createCategoryHook("Appearance"); - -// const uniqueCategories = Array.from(new Set(SETTINGS_ARRAY.map((s) => s.Category))); - -// 動的に named export を作る(静的解析を壊さないために明示的に定義) -/* eslint-disable import/prefer-default-export */ -export const useAppearance = createCategoryHook("Appearance"); -export const useDevice = createCategoryHook("Device"); -export const useTranslation = createCategoryHook("Translation"); -export const useTranscription = createCategoryHook("Transcription"); -export const useVr = createCategoryHook("Vr"); -export const useOthers = createCategoryHook("Others"); -// export const useHotkeys = createCategoryHook("Hotkeys"); -export const useAdvancedSettings = createCategoryHook("AdvancedSettings"); -// If you later add other categories, you can either manually add: -// export const useDevice = createCategoryHook("Device"); -// or uncomment the code below to auto-attach to module.exports (less ideal for tree-shaking). -// -// Auto-attach (not recommended for tree-shaking in bundlers): -// uniqueCategories.forEach((Category) => { -// const hookName = `use${Category}`; -// module.exports[hookName] = createCategoryHook(Category); -// }); - -/* eslint-enable import/prefer-default-export */ +}; \ No newline at end of file diff --git a/src-ui/useSettingsLogics.js b/src-ui/logics/configs/config_page_setter/useSettingsLogics.js similarity index 69% rename from src-ui/useSettingsLogics.js rename to src-ui/logics/configs/config_page_setter/useSettingsLogics.js index 613c17d4..a00d816b 100644 --- a/src-ui/useSettingsLogics.js +++ b/src-ui/logics/configs/config_page_setter/useSettingsLogics.js @@ -200,4 +200,103 @@ export const useConfigFunctions = (Category) => { default: return {}; } +}; + + +import { useState, useEffect, useCallback, useMemo } from "react"; + +export const useSliderLogic = ({ + variable, + setterFunction, + postUpdateAction, + min, + max, + step = 1, + show_label_values = null, + marks_step, + setter_timing = "on_change_committed", +}) => { + if (marks_step === undefined) { + marks_step = step; + } + + const [ui_value, setUiValue] = useState(variable); + + const decimalPlaces = marks_step.toString().includes('.') + ? marks_step.toString().split('.')[1].length + : 0; + + const labelFormatter = useCallback((value) => { + if (show_label_values && show_label_values.length > 0) { + return show_label_values.includes(value) ? value : ""; + } + + return value.toFixed(decimalPlaces); + }, [show_label_values, decimalPlaces]); + + const marks = useMemo(() => { + if (show_label_values === null) { + return null; + } + return createMarks(min, max, marks_step, labelFormatter); + }, [min, max, marks_step, labelFormatter, show_label_values]); + + let onchangeFunction; + let onchangeCommittedFunction; + + if (setter_timing === "on_change") { + onchangeFunction = useCallback((value) => { + setUiValue(value); + setterFunction(value); + }, [setterFunction]); + + onchangeCommittedFunction = null; + + } else if (setter_timing === "on_change_committed") { + onchangeFunction = useCallback((value) => { + setUiValue(value); + }, []); + + onchangeCommittedFunction = useCallback((value) => { + setterFunction(value); + }, [setterFunction]); + } else { + console.error(`Invalid 'setter_timing' value provided to useSliderLogic. Expected 'on_change' or 'on_change_committed'. Received: ${setter_timing}`); + } + + useEffect(() => { + if (variable !== ui_value) { + setUiValue(variable); + } + if (postUpdateAction) { + postUpdateAction(); + } + }, [variable]); + + return { + ui_value, + onchangeFunction, + onchangeCommittedFunction, + marks, + }; +}; + +const createMarks = (min, max, marks_step = 1, labelFormatter = (value) => value) => { + const marks = []; + let variable = min; + + for (let i = 0; variable <= max; i++) { + const fixedValue = parseFloat(variable.toFixed(10)); + + marks.push({ value: fixedValue, label: `${labelFormatter(fixedValue)}` }); + + variable += marks_step; + variable = parseFloat(variable.toFixed(10)); + + if (i > 1000) { + console.error("Loop limit exceeded (1000 iterations). createMarks()"); + break; + } + } + return marks; }; \ No newline at end of file diff --git a/src-ui/logics/configs/index.js b/src-ui/logics/configs/index.js index 50e01b55..1b20c3c6 100644 --- a/src-ui/logics/configs/index.js +++ b/src-ui/logics/configs/index.js @@ -1,25 +1,21 @@ -// export { useDevice } from "./device/useDevice"; -// export { useAppearance } from "./appearance/useAppearance"; +import { createCategoryHook } from "./config_page_setter/ui_config_setter.js"; + +export const useAppearance = createCategoryHook("Appearance"); +export const useDevice = createCategoryHook("Device"); +export const useTranslation = createCategoryHook("Translation"); +export const useTranscription = createCategoryHook("Transcription"); +export const useVr = createCategoryHook("Vr"); +export const useOthers = createCategoryHook("Others"); +export const useAdvancedSettings = createCategoryHook("AdvancedSettings"); + +// Exceptional exports that are not part of SETTINGS_ARRAY or have custom logic. +export { useHotkeys } from "./config_page_setter/hotkeys/useHotkeys.js"; +export { useSupporters } from "./config_page_setter/supporters/useSupporters.js"; +export { usePlugins } from "./config_page_setter/plugins/usePlugins.js"; + +export { useSettingBoxScrollPosition } from "./config_page_setter/_aux/useSettingBoxScrollPosition.js"; + export { - useAppearance, - useDevice, - useOthers, - useTranscription, - useTranslation, - useVr, - // useHotkeys, - useAdvancedSettings, -} from "../../ui_config_setter.js"; - -// export { useOthers } from "./others/useOthers"; -// export { useTranscription } from "./transcription/useTranscription"; -// export { useTranslation } from "./translation/useTranslation"; -// export { useVr } from "./vr/useVr"; -export { useHotkeys } from "./hotkeys/useHotkeys"; -// export { useAdvancedSettings } from "./advanced_settings/useAdvancedSettings"; - -export { useSupporters } from "./supporters/useSupporters"; -export { usePlugins } from "./plugins/usePlugins"; - -export { useSettingBoxScrollPosition } from "./useSettingBoxScrollPosition"; \ No newline at end of file + useSliderLogic, +} from "./config_page_setter/useSettingsLogics.js"; \ No newline at end of file diff --git a/src-ui/store.js b/src-ui/logics/store.js similarity index 100% rename from src-ui/store.js rename to src-ui/logics/store.js diff --git a/src-ui/ui_configs.js b/src-ui/logics/ui_configs.js similarity index 100% rename from src-ui/ui_configs.js rename to src-ui/logics/ui_configs.js diff --git a/src-ui/logics/useReceiveRoutes.js b/src-ui/logics/useReceiveRoutes.js index 239c0e13..7cbc1fc6 100644 --- a/src-ui/logics/useReceiveRoutes.js +++ b/src-ui/logics/useReceiveRoutes.js @@ -2,7 +2,7 @@ import * as common from "@logics_common"; import * as main from "@logics_main"; import * as configs from "@logics_configs"; import { _useBackendErrorHandling } from "./_useBackendErrorHandling"; -import { SETTINGS_ARRAY } from "../ui_config_setter"; +import { SETTINGS_ARRAY } from "./configs/config_page_setter/ui_config_setter"; export const STATIC_ROUTE_META_LIST = [ // Common diff --git a/src-ui/utils.js b/src-ui/logics/utils.js similarity index 100% rename from src-ui/utils.js rename to src-ui/logics/utils.js diff --git a/src-ui/app/App.jsx b/src-ui/views/app/App.jsx similarity index 100% rename from src-ui/app/App.jsx rename to src-ui/views/app/App.jsx diff --git a/src-ui/app/App.module.scss b/src-ui/views/app/App.module.scss similarity index 100% rename from src-ui/app/App.module.scss rename to src-ui/views/app/App.module.scss diff --git a/src-ui/app/_app_controllers/ConfigPageCloseTriggerController.jsx b/src-ui/views/app/_app_controllers/ConfigPageCloseTriggerController.jsx similarity index 100% rename from src-ui/app/_app_controllers/ConfigPageCloseTriggerController.jsx rename to src-ui/views/app/_app_controllers/ConfigPageCloseTriggerController.jsx diff --git a/src-ui/app/_app_controllers/CornerRadiusController.jsx b/src-ui/views/app/_app_controllers/CornerRadiusController.jsx similarity index 100% rename from src-ui/app/_app_controllers/CornerRadiusController.jsx rename to src-ui/views/app/_app_controllers/CornerRadiusController.jsx diff --git a/src-ui/app/_app_controllers/FontFamilyController.jsx b/src-ui/views/app/_app_controllers/FontFamilyController.jsx similarity index 100% rename from src-ui/app/_app_controllers/FontFamilyController.jsx rename to src-ui/views/app/_app_controllers/FontFamilyController.jsx diff --git a/src-ui/app/_app_controllers/GlobalHotKeyController.jsx b/src-ui/views/app/_app_controllers/GlobalHotKeyController.jsx similarity index 100% rename from src-ui/app/_app_controllers/GlobalHotKeyController.jsx rename to src-ui/views/app/_app_controllers/GlobalHotKeyController.jsx diff --git a/src-ui/app/_app_controllers/KeyEventController.jsx b/src-ui/views/app/_app_controllers/KeyEventController.jsx similarity index 100% rename from src-ui/app/_app_controllers/KeyEventController.jsx rename to src-ui/views/app/_app_controllers/KeyEventController.jsx diff --git a/src-ui/app/_app_controllers/PluginsController.jsx b/src-ui/views/app/_app_controllers/PluginsController.jsx similarity index 100% rename from src-ui/app/_app_controllers/PluginsController.jsx rename to src-ui/views/app/_app_controllers/PluginsController.jsx diff --git a/src-ui/app/_app_controllers/StartPythonController.jsx b/src-ui/views/app/_app_controllers/StartPythonController.jsx similarity index 100% rename from src-ui/app/_app_controllers/StartPythonController.jsx rename to src-ui/views/app/_app_controllers/StartPythonController.jsx diff --git a/src-ui/app/_app_controllers/TransparencyController.jsx b/src-ui/views/app/_app_controllers/TransparencyController.jsx similarity index 100% rename from src-ui/app/_app_controllers/TransparencyController.jsx rename to src-ui/views/app/_app_controllers/TransparencyController.jsx diff --git a/src-ui/app/_app_controllers/UiLanguageController.jsx b/src-ui/views/app/_app_controllers/UiLanguageController.jsx similarity index 100% rename from src-ui/app/_app_controllers/UiLanguageController.jsx rename to src-ui/views/app/_app_controllers/UiLanguageController.jsx diff --git a/src-ui/app/_app_controllers/UiSizeController.jsx b/src-ui/views/app/_app_controllers/UiSizeController.jsx similarity index 100% rename from src-ui/app/_app_controllers/UiSizeController.jsx rename to src-ui/views/app/_app_controllers/UiSizeController.jsx diff --git a/src-ui/app/_app_controllers/index.js b/src-ui/views/app/_app_controllers/index.js similarity index 100% rename from src-ui/app/_app_controllers/index.js rename to src-ui/views/app/_app_controllers/index.js diff --git a/src-ui/app/_app_controllers/plugins_controllers/FetchLatestPluginsDataController.jsx b/src-ui/views/app/_app_controllers/plugins_controllers/FetchLatestPluginsDataController.jsx similarity index 100% rename from src-ui/app/_app_controllers/plugins_controllers/FetchLatestPluginsDataController.jsx rename to src-ui/views/app/_app_controllers/plugins_controllers/FetchLatestPluginsDataController.jsx diff --git a/src-ui/app/_app_controllers/plugins_controllers/LoadPluginsController.jsx b/src-ui/views/app/_app_controllers/plugins_controllers/LoadPluginsController.jsx similarity index 100% rename from src-ui/app/_app_controllers/plugins_controllers/LoadPluginsController.jsx rename to src-ui/views/app/_app_controllers/plugins_controllers/LoadPluginsController.jsx diff --git a/src-ui/app/_app_controllers/plugins_controllers/MergePluginsController.jsx b/src-ui/views/app/_app_controllers/plugins_controllers/MergePluginsController.jsx similarity index 100% rename from src-ui/app/_app_controllers/plugins_controllers/MergePluginsController.jsx rename to src-ui/views/app/_app_controllers/plugins_controllers/MergePluginsController.jsx diff --git a/src-ui/app/_index_css/reset.css b/src-ui/views/app/_index_css/reset.css similarity index 100% rename from src-ui/app/_index_css/reset.css rename to src-ui/views/app/_index_css/reset.css diff --git a/src-ui/app/_index_css/root.css b/src-ui/views/app/_index_css/root.css similarity index 100% rename from src-ui/app/_index_css/root.css rename to src-ui/views/app/_index_css/root.css diff --git a/src-ui/app/_index_css/variables.css b/src-ui/views/app/_index_css/variables.css similarity index 100% rename from src-ui/app/_index_css/variables.css rename to src-ui/views/app/_index_css/variables.css diff --git a/src-ui/app/config_page/ConfigPage.jsx b/src-ui/views/app/config_page/ConfigPage.jsx similarity index 100% rename from src-ui/app/config_page/ConfigPage.jsx rename to src-ui/views/app/config_page/ConfigPage.jsx diff --git a/src-ui/app/config_page/ConfigPage.module.scss b/src-ui/views/app/config_page/ConfigPage.module.scss similarity index 100% rename from src-ui/app/config_page/ConfigPage.module.scss rename to src-ui/views/app/config_page/ConfigPage.module.scss diff --git a/src-ui/app/config_page/setting_section/SettingSection.jsx b/src-ui/views/app/config_page/setting_section/SettingSection.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/SettingSection.jsx rename to src-ui/views/app/config_page/setting_section/SettingSection.jsx diff --git a/src-ui/app/config_page/setting_section/SettingSection.module.scss b/src-ui/views/app/config_page/setting_section/SettingSection.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/SettingSection.module.scss rename to src-ui/views/app/config_page/setting_section/SettingSection.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx b/src-ui/views/app/config_page/setting_section/setting_box/SettingBox.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/SettingBox.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/SettingBox.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/_atoms/_download_button/_DownloadButton.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.jsx b/src-ui/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/compute_device/ComputeDevice.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/compute_device/ComputeDevice.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.jsx b/src-ui/views/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/views/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/views/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/views/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/download_models/DownloadModels.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/dropdown_menu/DropdownMenu.jsx b/src-ui/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/entry_with_save_button/EntryWithSaveButton.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/entry_with_save_button/EntryWithSaveButton.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/hotkeys_entry/HotkeysEntry.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/index.js b/src-ui/views/app/config_page/setting_section/setting_box/_components/index.js similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/index.js rename to src-ui/views/app/config_page/setting_section/setting_box/_components/index.js diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.jsx b/src-ui/views/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/views/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/views/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/views/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/message_format/MessageFormat.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/message_format/MessageFormat.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.jsx b/src-ui/views/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/views/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/views/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/views/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/section_label_component/SectionLabelComponent.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_components/section_label_component/SectionLabelComponent.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx similarity index 78% rename from src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx index 827c0253..5cd7fe68 100644 --- a/src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx @@ -3,8 +3,27 @@ import styles from "./Slider.module.scss"; import MUI_Slider from "@mui/material/Slider"; import clsx from "clsx"; +import { useSliderLogic } from "@logics_configs"; + export const Slider = (props) => { const location = props.valueLabelDisplayLocation || "top"; + const { + ui_value, + onchangeFunction, + onchangeCommittedFunction, + marks + } = useSliderLogic({ + variable: props.variable, + setterFunction: props.setterFunction, + setter_timing: props.setter_timing, + postUpdateAction: props.postUpdateAction, + min: props.min, + max: props.max, + step: props.step, + show_label_values: props.show_label_values, + marks_step: props.marks_step, + }); + const sliderSx = { color: "var(--dark_700_color)", @@ -86,13 +105,13 @@ export const Slider = (props) => { aria-label="Default" // valueLabelDisplay="on" valueLabelDisplay={props.valueLabelDisplay ? props.valueLabelDisplay : "auto"} - value={props.variable} - step={props.step} + value={ui_value} + step={props.step == null ? null : Number(props.step)} min={Number(props.min)} max={Number(props.max)} - onChange={(_e, value) => props.onchangeFunction(value)} + onChange={(_e, value) => onchangeFunction(value)} onChangeCommitted={(_e, value) => - props.onchangeCommittedFunction ? props.onchangeCommittedFunction(value) : null + onchangeCommittedFunction ? onchangeCommittedFunction(value) : null } onMouseEnter={(event) => props.onMouseEnterFunction ? props.onMouseEnterFunction(event) : null @@ -100,10 +119,10 @@ export const Slider = (props) => { onMouseLeave={(event) => props.onMouseLeaveFunction ? props.onMouseLeaveFunction(event) : null } - marks={props.marks} - track={props.track} + marks={marks} + track={props.track === undefined ? false : props.track} orientation={props.orientation} - valueLabelFormat={`${props.valueLabelFormat ? props.valueLabelFormat : props.variable}`} + valueLabelFormat={`${props.valueLabelFormat ? props.valueLabelFormat : ui_value}`} sx={sliderSx} /> diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.module.scss b/src-ui/views/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/views/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/switch_box/SwitchBox.jsx b/src-ui/views/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/switch_box/SwitchBox.module.scss b/src-ui/views/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/switch_box/SwitchBox.module.scss rename to src-ui/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/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/views/app/config_page/setting_section/setting_box/_templates/Templates.jsx similarity index 96% rename from src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/_templates/Templates.jsx index b23f8043..6faf882c 100644 --- a/src-ui/app/config_page/setting_section/setting_box/_templates/Templates.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/_templates/Templates.jsx @@ -19,7 +19,7 @@ import { WordFilterListToggleComponent, DownloadModels, MessageFormat, -} from "../_components/"; +} from "../_components"; import { Checkbox } from "@common_components"; const LabeledContainer = ({ children, label, desc, custom_class_name }) => ( diff --git a/src-ui/app/config_page/setting_section/setting_box/_templates/Templates.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/_templates/Templates.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/_templates/Templates.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/_templates/Templates.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/AboutVrct.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.jsx b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/PosterShowcaseContents.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/PosterShowcaseWorldsContents.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/poster_showcase_worlds_settings.js b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/poster_showcase_worlds_settings.js similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/poster_showcase_worlds_settings.js rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/poster_showcase_worlds_contents/poster_showcase_worlds_settings.js diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/about_vrct/poster_showcase_contents/posters_contents/PostersContents.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx b/src-ui/views/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx similarity index 96% rename from src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx index df6f012a..4a7ab21c 100644 --- a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.jsx @@ -15,7 +15,7 @@ import { import { SectionLabelComponent, -} from "../_components/"; +} from "../_components"; import OpenFolderSvg from "@images/open_folder.svg?react"; import HelpSvg from "@images/help.svg?react"; diff --git a/src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/advanced_settings/AdvancedSettings.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx b/src-ui/views/app/config_page/setting_section/setting_box/appearance/Appearance.jsx similarity index 57% rename from src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/appearance/Appearance.jsx index cc7e730f..a35f0941 100644 --- a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/appearance/Appearance.jsx @@ -56,42 +56,16 @@ const UiScalingContainer = () => { const { currentUiScaling, setUiScaling } = useAppearance(); const { asyncUpdateBreakPoint } = useWindow(); - const [ui_ui_scaling, setUiUiScaling] = useState(currentUiScaling.data); - - const onchangeFunction = (value) => { - setUiUiScaling(value); - }; - const onchangeCommittedFunction = (value) => { - setUiScaling(value); - }; - useEffect(() => { - setUiUiScaling(currentUiScaling.data); - asyncUpdateBreakPoint(); - }, [currentUiScaling.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 10) { - const label = ([50,70,90,110,130,150,170,190].includes(value)) ? "" : value; - marks.push({ value, label: `${label}` }); - } - return marks; - }; - - const marks = createMarks(40, 200); - return ( ); }; @@ -100,41 +74,16 @@ const UiScalingContainer = () => { export const MessageLogUiScalingContainer = () => { const { t } = useI18n(); const { currentMessageLogUiScaling, setMessageLogUiScaling } = useAppearance(); - const [ui_message_log_ui_scaling, setUiMessageLogUiScaling] = useState(currentMessageLogUiScaling.data); - - const onchangeFunction = (value) => { - setUiMessageLogUiScaling(value); - }; - const onchangeCommittedFunction = (value) => { - setMessageLogUiScaling(value); - }; - useEffect(() => { - setUiMessageLogUiScaling(currentMessageLogUiScaling.data); - }, [currentMessageLogUiScaling.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 10) { - const label = ([50,70,90,110,130,150,170,190].includes(value)) ? "" : value; - marks.push({ value, label: `${label}` }); - } - return marks; - }; - - const marks = createMarks(40, 200); return ( ); }; @@ -197,40 +146,15 @@ const FontFamilyContainer = () => { const TransparencyContainer = () => { const { t } = useI18n(); const { currentTransparency, setTransparency } = useAppearance(); - const [ui_message_log_ui_scaling, setUiTransparency] = useState(currentTransparency.data); - - const onchangeFunction = (value) => { - setUiTransparency(value); - }; - const onchangeCommittedFunction = (value) => { - setTransparency(value); - }; - useEffect(() => { - setUiTransparency(currentTransparency.data); - }, [currentTransparency.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 10) { - marks.push({ value, label: `${value}` }); - } - return marks; - }; - - const marks = createMarks(40, 100); return ( ); }; \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/appearance/Appearance.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/appearance/Appearance.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx b/src-ui/views/app/config_page/setting_section/setting_box/device/Device.jsx similarity index 97% rename from src-ui/app/config_page/setting_section/setting_box/device/Device.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/device/Device.jsx index ab5bff02..9211bf37 100644 --- a/src-ui/app/config_page/setting_section/setting_box/device/Device.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/device/Device.jsx @@ -16,7 +16,7 @@ import { DropdownMenu, ThresholdComponent, SwitchBox, -} from "../_components/"; +} from "../_components"; export const Device = () => { return ( diff --git a/src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/device/Device.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/device/Device.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.jsx b/src-ui/views/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/hotkeys/Hotkeys.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/index.js b/src-ui/views/app/config_page/setting_section/setting_box/index.js similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/index.js rename to src-ui/views/app/config_page/setting_section/setting_box/index.js diff --git a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx b/src-ui/views/app/config_page/setting_section/setting_box/others/Others.jsx similarity index 96% rename from src-ui/app/config_page/setting_section/setting_box/others/Others.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/others/Others.jsx index e64c5b47..3b32746a 100644 --- a/src-ui/app/config_page/setting_section/setting_box/others/Others.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/others/Others.jsx @@ -15,7 +15,7 @@ import { LabelComponent, ActionButton, SectionLabelComponent, -} from "../_components/"; +} from "../_components"; import { Checkbox } from "@common_components"; import OpenFolderSvg from "@images/open_folder.svg?react"; diff --git a/src-ui/app/config_page/setting_section/setting_box/others/Others.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/others/Others.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/others/Others.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/others/Others.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx b/src-ui/views/app/config_page/setting_section/setting_box/plugins/Plugins.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/plugins/Plugins.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/plugins/Plugins.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx b/src-ui/views/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.jsx b/src-ui/views/app/config_page/setting_section/setting_box/supporters/Supporters.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/Supporters.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx b/src-ui/views/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx b/src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx b/src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/transcription/Transcription.jsx b/src-ui/views/app/config_page/setting_section/setting_box/transcription/Transcription.jsx similarity index 77% rename from src-ui/app/config_page/setting_section/setting_box/transcription/Transcription.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/transcription/Transcription.jsx index e4a7aea2..255183a8 100644 --- a/src-ui/app/config_page/setting_section/setting_box/transcription/Transcription.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/transcription/Transcription.jsx @@ -22,7 +22,7 @@ import { DropdownMenu, LabelComponent, SectionLabelComponent, -} from "../_components/"; +} from "../_components"; export const Transcription = () => { return ( @@ -460,7 +460,7 @@ const Advanced_Container = () => { return (
- {/* */} + @@ -472,42 +472,16 @@ const Advanced_Container = () => { export const MicAvgLogprobContainer = () => { const { t } = useI18n(); const { currentMicAvgLogprob, setMicAvgLogprob } = useTranscription(); - const [ui_mic_avg_logprob, setUiMicAvgLogprob] = useState(currentMicAvgLogprob.data); - - const onchangeFunction = (value) => { - setUiMicAvgLogprob(value); - }; - const onchangeCommittedFunction = (value) => { - setMicAvgLogprob(value); - }; - useEffect(() => { - setUiMicAvgLogprob(currentMicAvgLogprob.data); - }, [currentMicAvgLogprob.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 0.2) { - value = parseFloat(value.toFixed(1)); - marks.push({ value, label: `${value}` }); - } - return marks; - }; - - const marks = createMarks(-2, 0); - return ( ); }; @@ -515,42 +489,16 @@ export const MicAvgLogprobContainer = () => { export const MicNoSpeechProbContainer = () => { const { t } = useI18n(); const { currentMicNoSpeechProb, setMicNoSpeechProb } = useTranscription(); - const [ui_mic_no_speech_prob, setUiMicNoSpeechProb] = useState(currentMicNoSpeechProb.data); - - const onchangeFunction = (value) => { - setUiMicNoSpeechProb(value); - }; - const onchangeCommittedFunction = (value) => { - setMicNoSpeechProb(value); - }; - useEffect(() => { - setUiMicNoSpeechProb(currentMicNoSpeechProb.data); - }, [currentMicNoSpeechProb.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 0.1) { - value = parseFloat(value.toFixed(1)); - marks.push({ value, label: `${value}` }); - } - return marks; - }; - - const marks = createMarks(0, 1); return ( ); }; @@ -558,42 +506,17 @@ export const MicNoSpeechProbContainer = () => { export const SpeakerAvgLogprobContainer = () => { const { t } = useI18n(); const { currentSpeakerAvgLogprob, setSpeakerAvgLogprob } = useTranscription(); - const [ui_speaker_avg_logprob, setUiSpeakerAvgLogprob] = useState(currentSpeakerAvgLogprob.data); - - const onchangeFunction = (value) => { - setUiSpeakerAvgLogprob(value); - }; - const onchangeCommittedFunction = (value) => { - setSpeakerAvgLogprob(value); - }; - useEffect(() => { - setUiSpeakerAvgLogprob(currentSpeakerAvgLogprob.data); - }, [currentSpeakerAvgLogprob.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 0.2) { - value = parseFloat(value.toFixed(1)); - marks.push({ value, label: `${value}` }); - } - return marks; - }; - - const marks = createMarks(-2, 0); return ( ); }; @@ -601,42 +524,16 @@ export const SpeakerAvgLogprobContainer = () => { export const SpeakerNoSpeechProbContainer = () => { const { t } = useI18n(); const { currentSpeakerNoSpeechProb, setSpeakerNoSpeechProb } = useTranscription(); - const [ui_speaker_no_speech_prob, setUiSpeakerNoSpeechProb] = useState(currentSpeakerNoSpeechProb.data); - - const onchangeFunction = (value) => { - setUiSpeakerNoSpeechProb(value); - }; - const onchangeCommittedFunction = (value) => { - setSpeakerNoSpeechProb(value); - }; - useEffect(() => { - setUiSpeakerNoSpeechProb(currentSpeakerNoSpeechProb.data); - }, [currentSpeakerNoSpeechProb.data]); - - // [Duplicated] - const createMarks = (min, max) => { - const marks = []; - for (let value = min; value <= max; value += 0.1) { - value = parseFloat(value.toFixed(1)); - marks.push({ value, label: `${value}` }); - } - return marks; - }; - - const marks = createMarks(0, 1); return ( ); }; \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/transcription/Transcription.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/transcription/Transcription.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/transcription/Transcription.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/transcription/Transcription.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/translation/Translation.jsx b/src-ui/views/app/config_page/setting_section/setting_box/translation/Translation.jsx similarity index 96% rename from src-ui/app/config_page/setting_section/setting_box/translation/Translation.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/translation/Translation.jsx index ead351d6..459b4e10 100644 --- a/src-ui/app/config_page/setting_section/setting_box/translation/Translation.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/translation/Translation.jsx @@ -18,7 +18,7 @@ import { import { DropdownMenu, LabelComponent, -} from "../_components/"; +} from "../_components"; export const Translation = () => { return ( diff --git a/src-ui/app/config_page/setting_section/setting_box/translation/Translation.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/translation/Translation.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/translation/Translation.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/translation/Translation.module.scss diff --git a/src-ui/app/config_page/setting_section/setting_box/vr/Vr.jsx b/src-ui/views/app/config_page/setting_section/setting_box/vr/Vr.jsx similarity index 90% rename from src-ui/app/config_page/setting_section/setting_box/vr/Vr.jsx rename to src-ui/views/app/config_page/setting_section/setting_box/vr/Vr.jsx index 4bd9b6f5..f8e6173c 100644 --- a/src-ui/app/config_page/setting_section/setting_box/vr/Vr.jsx +++ b/src-ui/views/app/config_page/setting_section/setting_box/vr/Vr.jsx @@ -3,7 +3,7 @@ import { useI18n } from "@useI18n"; import clsx from "clsx"; import styles from "./Vr.module.scss"; import { ui_configs } from "@ui_configs"; -import { Slider } from "../_components/"; +import { Slider } from "../_components"; import { RadioButtonContainer, SwitchBoxContainer, @@ -12,7 +12,7 @@ import { import { SectionLabelComponent, -} from "../_components/"; +} from "../_components"; import { ResetButton } from "@common_components"; @@ -63,7 +63,7 @@ export const Vr = () => { ui_configs={ui_configs.overlay_small_log} default_ui_configs={ui_configs.overlay_small_log_default_settings} current_overlay_settings={currentOverlaySmallLogSettings.data} - set_overlay_settings={setOverlaySmallLogSettings} + setOverlaySettings={setOverlaySmallLogSettings} current_is_enabled_overlay={currentIsEnabledOverlaySmallLog} toggle_is_enabled_overlay={toggleIsEnabledOverlaySmallLog} /> @@ -73,7 +73,7 @@ export const Vr = () => { ui_configs={ui_configs.overlay_large_log} default_ui_configs={ui_configs.overlay_large_log_default_settings} current_overlay_settings={currentOverlayLargeLogSettings.data} - set_overlay_settings={setOverlayLargeLogSettings} + setOverlaySettings={setOverlayLargeLogSettings} current_is_enabled_overlay={currentIsEnabledOverlayLargeLog} toggle_is_enabled_overlay={toggleIsEnabledOverlayLargeLog} /> @@ -92,21 +92,21 @@ export const Vr = () => { const OverlaySettingsContainer = ({ current_overlay_settings, - set_overlay_settings, + setOverlaySettings, current_is_enabled_overlay, toggle_is_enabled_overlay, ui_configs, default_ui_configs, id }) => { - const { t } = useI18n(); + const [settings, setSettings] = useState(current_overlay_settings); + const [timeout_id, setTimeoutId] = useState(null); + useEffect(() => { setSettings(current_overlay_settings); }, [current_overlay_settings]); - const [settings, setSettings] = useState(current_overlay_settings); - const [timeout_id, setTimeoutId] = useState(null); const [is_opened_position_controller, setIsOpenedPositionController] = useState(true); const togglePositionRotationController = () => { @@ -118,17 +118,17 @@ const OverlaySettingsContainer = ({ if (timeout_id) clearTimeout(timeout_id); - const newTimeoutId = setTimeout(() => { + const new_timeout_id = setTimeout(() => { const new_data = { ...settings, [key]: value }; - set_overlay_settings(new_data); + setOverlaySettings(new_data); }, 50); - setTimeoutId(newTimeoutId); + setTimeoutId(new_timeout_id); }; const selectFunction = (key, value) => { const new_data = { ...settings, [key]: value }; - set_overlay_settings(new_data); + setOverlaySettings(new_data); }; @@ -234,7 +234,8 @@ export const PositionControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.x_pos.step} min={ui_configs.x_pos.min} max={ui_configs.x_pos.max} - onchangeFunction={(value) => onchangeFunction("x_pos", value)} + setterFunction={(value) => onchangeFunction("x_pos", value)} + setter_timing="on_change" valueLabelDisplay={x_variable_display} valueLabelDisplayLocation="top" /> @@ -259,7 +260,8 @@ export const PositionControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.y_pos.step} min={ui_configs.y_pos.min} max={ui_configs.y_pos.max} - onchangeFunction={(value) => onchangeFunction("y_pos", value)} + setterFunction={(value) => onchangeFunction("y_pos", value)} + setter_timing="on_change" orientation="vertical" valueLabelDisplay={y_variable_display} valueLabelDisplayLocation="right" @@ -285,7 +287,8 @@ export const PositionControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.z_pos.step} min={ui_configs.z_pos.min} max={ui_configs.z_pos.max} - onchangeFunction={(value) => onchangeFunction("z_pos", value)} + setterFunction={(value) => onchangeFunction("z_pos", value)} + setter_timing="on_change" orientation="vertical" valueLabelDisplay={z_variable_display} valueLabelDisplayLocation="left" @@ -344,7 +347,8 @@ export const RotationControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.x_rotation.step} min={ui_configs.x_rotation.min} max={ui_configs.x_rotation.max} - onchangeFunction={(value) => onchangeFunction("x_rotation", -value)} + setterFunction={(value) => onchangeFunction("x_rotation", -value)} + setter_timing="on_change" orientation="vertical" valueLabelDisplay={x_variable_display} valueLabelDisplayLocation="right" @@ -370,7 +374,8 @@ export const RotationControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.y_rotation.step} min={ui_configs.y_rotation.min} max={ui_configs.y_rotation.max} - onchangeFunction={(value) => onchangeFunction("y_rotation", value)} + setterFunction={(value) => onchangeFunction("y_rotation", value)} + setter_timing="on_change" valueLabelDisplay={y_variable_display} valueLabelDisplayLocation="top" /> @@ -395,7 +400,8 @@ export const RotationControls = ({ settings, onchangeFunction, selectFunction, u step={ui_configs.z_rotation.step} min={ui_configs.z_rotation.min} max={ui_configs.z_rotation.max} - onchangeFunction={(value) => onchangeFunction("z_rotation", value)} + setterFunction={(value) => onchangeFunction("z_rotation", value)} + setter_timing="on_change" orientation="vertical" valueLabelDisplay={z_variable_display} valueLabelDisplayLocation="left" @@ -463,7 +469,8 @@ const OtherControls = ({settings, onchangeFunction, ui_configs}) => { step={5} min={10} max={100} - onchangeFunction={(value) => onchangeFunction("opacity", value / 100)} + setterFunction={(value) => onchangeFunction("opacity", value / 100)} + setter_timing="on_change" />
@@ -478,7 +485,8 @@ const OtherControls = ({settings, onchangeFunction, ui_configs}) => { step={ui_configs.ui_scaling.step} min={ui_configs.ui_scaling.min} max={ui_configs.ui_scaling.max} - onchangeFunction={(value) => onchangeFunction("ui_scaling", value / 100)} + setterFunction={(value) => onchangeFunction("ui_scaling", value / 100)} + setter_timing="on_change" />
@@ -491,7 +499,8 @@ const OtherControls = ({settings, onchangeFunction, ui_configs}) => { step={1} min={1} max={60} - onchangeFunction={(value) => onchangeFunction("display_duration", value)} + setterFunction={(value) => onchangeFunction("display_duration", value)} + setter_timing="on_change" />
@@ -504,7 +513,8 @@ const OtherControls = ({settings, onchangeFunction, ui_configs}) => { step={1} min={0} max={5} - onchangeFunction={(value) => onchangeFunction("fadeout_duration", value)} + setterFunction={(value) => onchangeFunction("fadeout_duration", value)} + setter_timing="on_change" />
diff --git a/src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss b/src-ui/views/app/config_page/setting_section/setting_box/vr/Vr.module.scss similarity index 100% rename from src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss rename to src-ui/views/app/config_page/setting_section/setting_box/vr/Vr.module.scss diff --git a/src-ui/app/config_page/sidebar_section/SidebarSection.jsx b/src-ui/views/app/config_page/sidebar_section/SidebarSection.jsx similarity index 100% rename from src-ui/app/config_page/sidebar_section/SidebarSection.jsx rename to src-ui/views/app/config_page/sidebar_section/SidebarSection.jsx diff --git a/src-ui/app/config_page/sidebar_section/SidebarSection.module.scss b/src-ui/views/app/config_page/sidebar_section/SidebarSection.module.scss similarity index 100% rename from src-ui/app/config_page/sidebar_section/SidebarSection.module.scss rename to src-ui/views/app/config_page/sidebar_section/SidebarSection.module.scss diff --git a/src-ui/app/config_page/topbar/Topbar.jsx b/src-ui/views/app/config_page/topbar/Topbar.jsx similarity index 100% rename from src-ui/app/config_page/topbar/Topbar.jsx rename to src-ui/views/app/config_page/topbar/Topbar.jsx diff --git a/src-ui/app/config_page/topbar/Topbar.module.scss b/src-ui/views/app/config_page/topbar/Topbar.module.scss similarity index 100% rename from src-ui/app/config_page/topbar/Topbar.module.scss rename to src-ui/views/app/config_page/topbar/Topbar.module.scss diff --git a/src-ui/app/config_page/topbar/compact_switch_box/CompactSwitchBox.jsx b/src-ui/views/app/config_page/topbar/compact_switch_box/CompactSwitchBox.jsx similarity index 100% rename from src-ui/app/config_page/topbar/compact_switch_box/CompactSwitchBox.jsx rename to src-ui/views/app/config_page/topbar/compact_switch_box/CompactSwitchBox.jsx diff --git a/src-ui/app/config_page/topbar/compact_switch_box/CompactSwitchBox.module.scss b/src-ui/views/app/config_page/topbar/compact_switch_box/CompactSwitchBox.module.scss similarity index 100% rename from src-ui/app/config_page/topbar/compact_switch_box/CompactSwitchBox.module.scss rename to src-ui/views/app/config_page/topbar/compact_switch_box/CompactSwitchBox.module.scss diff --git a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx b/src-ui/views/app/config_page/topbar/section_title_box/SectionTitleBox.jsx similarity index 100% rename from src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.jsx rename to src-ui/views/app/config_page/topbar/section_title_box/SectionTitleBox.jsx diff --git a/src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.module.scss b/src-ui/views/app/config_page/topbar/section_title_box/SectionTitleBox.module.scss similarity index 100% rename from src-ui/app/config_page/topbar/section_title_box/SectionTitleBox.module.scss rename to src-ui/views/app/config_page/topbar/section_title_box/SectionTitleBox.module.scss diff --git a/src-ui/app/config_page/topbar/title_box/TitleBox.jsx b/src-ui/views/app/config_page/topbar/title_box/TitleBox.jsx similarity index 100% rename from src-ui/app/config_page/topbar/title_box/TitleBox.jsx rename to src-ui/views/app/config_page/topbar/title_box/TitleBox.jsx diff --git a/src-ui/app/config_page/topbar/title_box/TitleBox.module.scss b/src-ui/views/app/config_page/topbar/title_box/TitleBox.module.scss similarity index 100% rename from src-ui/app/config_page/topbar/title_box/TitleBox.module.scss rename to src-ui/views/app/config_page/topbar/title_box/TitleBox.module.scss diff --git a/src-ui/app/config_page/version_label/VersionLabel.jsx b/src-ui/views/app/config_page/version_label/VersionLabel.jsx similarity index 100% rename from src-ui/app/config_page/version_label/VersionLabel.jsx rename to src-ui/views/app/config_page/version_label/VersionLabel.jsx diff --git a/src-ui/app/config_page/version_label/VersionLabel.module.scss b/src-ui/views/app/config_page/version_label/VersionLabel.module.scss similarity index 100% rename from src-ui/app/config_page/version_label/VersionLabel.module.scss rename to src-ui/views/app/config_page/version_label/VersionLabel.module.scss diff --git a/src-ui/app/index.jsx b/src-ui/views/app/index.jsx similarity index 100% rename from src-ui/app/index.jsx rename to src-ui/views/app/index.jsx diff --git a/src-ui/app/main_page/MainPage.jsx b/src-ui/views/app/main_page/MainPage.jsx similarity index 100% rename from src-ui/app/main_page/MainPage.jsx rename to src-ui/views/app/main_page/MainPage.jsx diff --git a/src-ui/app/main_page/MainPage.module.scss b/src-ui/views/app/main_page/MainPage.module.scss similarity index 100% rename from src-ui/app/main_page/MainPage.module.scss rename to src-ui/views/app/main_page/MainPage.module.scss diff --git a/src-ui/app/main_page/main_section/MainSection.jsx b/src-ui/views/app/main_page/main_section/MainSection.jsx similarity index 100% rename from src-ui/app/main_page/main_section/MainSection.jsx rename to src-ui/views/app/main_page/main_section/MainSection.jsx diff --git a/src-ui/app/main_page/main_section/MainSection.module.scss b/src-ui/views/app/main_page/main_section/MainSection.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/MainSection.module.scss rename to src-ui/views/app/main_page/main_section/MainSection.module.scss diff --git a/src-ui/app/main_page/main_section/PluginHost.jsx b/src-ui/views/app/main_page/main_section/PluginHost.jsx similarity index 100% rename from src-ui/app/main_page/main_section/PluginHost.jsx rename to src-ui/views/app/main_page/main_section/PluginHost.jsx diff --git a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx b/src-ui/views/app/main_page/main_section/language_selector/LanguageSelector.jsx similarity index 100% rename from src-ui/app/main_page/main_section/language_selector/LanguageSelector.jsx rename to src-ui/views/app/main_page/main_section/language_selector/LanguageSelector.jsx diff --git a/src-ui/app/main_page/main_section/language_selector/LanguageSelector.module.scss b/src-ui/views/app/main_page/main_section/language_selector/LanguageSelector.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/language_selector/LanguageSelector.module.scss rename to src-ui/views/app/main_page/main_section/language_selector/LanguageSelector.module.scss diff --git a/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx b/src-ui/views/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx similarity index 100% rename from src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx rename to src-ui/views/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.jsx diff --git a/src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.module.scss b/src-ui/views/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.module.scss rename to src-ui/views/app/main_page/main_section/language_selector/language_selector_top_bar/LanguageSelectorTopBar.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/MessageContainer.jsx b/src-ui/views/app/main_page/main_section/message_container/MessageContainer.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/MessageContainer.jsx rename to src-ui/views/app/main_page/main_section/message_container/MessageContainer.jsx diff --git a/src-ui/app/main_page/main_section/message_container/MessageContainer.module.scss b/src-ui/views/app/main_page/main_section/message_container/MessageContainer.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/MessageContainer.module.scss rename to src-ui/views/app/main_page/main_section/message_container/MessageContainer.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx b/src-ui/views/app/main_page/main_section/message_container/log_box/LogBox.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/LogBox.jsx rename to src-ui/views/app/main_page/main_section/message_container/log_box/LogBox.jsx diff --git a/src-ui/app/main_page/main_section/message_container/log_box/LogBox.module.scss b/src-ui/views/app/main_page/main_section/message_container/log_box/LogBox.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/LogBox.module.scss rename to src-ui/views/app/main_page/main_section/message_container/log_box/LogBox.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx b/src-ui/views/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx rename to src-ui/views/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.jsx diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss b/src-ui/views/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss rename to src-ui/views/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.jsx b/src-ui/views/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.jsx rename to src-ui/views/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.jsx diff --git a/src-ui/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.module.scss b/src-ui/views/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.module.scss rename to src-ui/views/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx b/src-ui/views/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx rename to src-ui/views/app/main_page/main_section/message_container/message_input_box/MessageInputBox.jsx diff --git a/src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.module.scss b/src-ui/views/app/main_page/main_section/message_container/message_input_box/MessageInputBox.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/message_input_box/MessageInputBox.module.scss rename to src-ui/views/app/main_page/main_section/message_container/message_input_box/MessageInputBox.module.scss diff --git a/src-ui/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.jsx b/src-ui/views/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.jsx similarity index 100% rename from src-ui/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.jsx rename to src-ui/views/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.jsx diff --git a/src-ui/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.module.scss b/src-ui/views/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.module.scss rename to src-ui/views/app/main_page/main_section/message_container/message_log_settings_container/MessageLogSettingsContainer.module.scss diff --git a/src-ui/app/main_page/main_section/top_bar/TopBar.jsx b/src-ui/views/app/main_page/main_section/top_bar/TopBar.jsx similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/TopBar.jsx rename to src-ui/views/app/main_page/main_section/top_bar/TopBar.jsx diff --git a/src-ui/app/main_page/main_section/top_bar/TopBar.module.scss b/src-ui/views/app/main_page/main_section/top_bar/TopBar.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/TopBar.module.scss rename to src-ui/views/app/main_page/main_section/top_bar/TopBar.module.scss diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx b/src-ui/views/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx rename to src-ui/views/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.jsx diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.module.scss b/src-ui/views/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.module.scss rename to src-ui/views/app/main_page/main_section/top_bar/right_side_components/RightSideComponents.module.scss diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx b/src-ui/views/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx rename to src-ui/views/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.jsx diff --git a/src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss b/src-ui/views/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss rename to src-ui/views/app/main_page/main_section/top_bar/right_side_components/_buttons/OpenQuickSettingButton.module.scss diff --git a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx b/src-ui/views/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx rename to src-ui/views/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.jsx diff --git a/src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.module.scss b/src-ui/views/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.module.scss similarity index 100% rename from src-ui/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.module.scss rename to src-ui/views/app/main_page/main_section/top_bar/sidebar_compact_mode_button/SidebarCompactModeButton.module.scss diff --git a/src-ui/app/main_page/sidebar_section/SidebarSection.jsx b/src-ui/views/app/main_page/sidebar_section/SidebarSection.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/SidebarSection.jsx rename to src-ui/views/app/main_page/sidebar_section/SidebarSection.jsx diff --git a/src-ui/app/main_page/sidebar_section/SidebarSection.module.scss b/src-ui/views/app/main_page/sidebar_section/SidebarSection.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/SidebarSection.module.scss rename to src-ui/views/app/main_page/sidebar_section/SidebarSection.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/LanguageSettings.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/LanguageSettings.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/LanguageSettings.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/LanguageSettings.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/add_remove_target_language_buttons/AddRemoveTargetLanguageButtons.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.module.scss diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx b/src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx rename to src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.jsx diff --git a/src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.module.scss b/src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.module.scss rename to src-ui/views/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.module.scss diff --git a/src-ui/app/main_page/sidebar_section/logo/Logo.jsx b/src-ui/views/app/main_page/sidebar_section/logo/Logo.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/logo/Logo.jsx rename to src-ui/views/app/main_page/sidebar_section/logo/Logo.jsx diff --git a/src-ui/app/main_page/sidebar_section/logo/Logo.module.scss b/src-ui/views/app/main_page/sidebar_section/logo/Logo.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/logo/Logo.module.scss rename to src-ui/views/app/main_page/sidebar_section/logo/Logo.module.scss diff --git a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx b/src-ui/views/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx rename to src-ui/views/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.jsx diff --git a/src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.module.scss b/src-ui/views/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.module.scss rename to src-ui/views/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.module.scss diff --git a/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx b/src-ui/views/app/main_page/sidebar_section/open_settings/OpenSettings.jsx similarity index 100% rename from src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.jsx rename to src-ui/views/app/main_page/sidebar_section/open_settings/OpenSettings.jsx diff --git a/src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.module.scss b/src-ui/views/app/main_page/sidebar_section/open_settings/OpenSettings.module.scss similarity index 100% rename from src-ui/app/main_page/sidebar_section/open_settings/OpenSettings.module.scss rename to src-ui/views/app/main_page/sidebar_section/open_settings/OpenSettings.module.scss diff --git a/src-ui/app/others/error_boundary/AppErrorBoundary.jsx b/src-ui/views/app/others/error_boundary/AppErrorBoundary.jsx similarity index 100% rename from src-ui/app/others/error_boundary/AppErrorBoundary.jsx rename to src-ui/views/app/others/error_boundary/AppErrorBoundary.jsx diff --git a/src-ui/app/others/error_boundary/AppErrorBoundary.module.scss b/src-ui/views/app/others/error_boundary/AppErrorBoundary.module.scss similarity index 100% rename from src-ui/app/others/error_boundary/AppErrorBoundary.module.scss rename to src-ui/views/app/others/error_boundary/AppErrorBoundary.module.scss diff --git a/src-ui/app/others/error_boundary/contacts_container/ContactsContainer.jsx b/src-ui/views/app/others/error_boundary/contacts_container/ContactsContainer.jsx similarity index 100% rename from src-ui/app/others/error_boundary/contacts_container/ContactsContainer.jsx rename to src-ui/views/app/others/error_boundary/contacts_container/ContactsContainer.jsx diff --git a/src-ui/app/others/error_boundary/contacts_container/ContactsContainer.module.scss b/src-ui/views/app/others/error_boundary/contacts_container/ContactsContainer.module.scss similarity index 100% rename from src-ui/app/others/error_boundary/contacts_container/ContactsContainer.module.scss rename to src-ui/views/app/others/error_boundary/contacts_container/ContactsContainer.module.scss diff --git a/src-ui/app/others/index.js b/src-ui/views/app/others/index.js similarity index 100% rename from src-ui/app/others/index.js rename to src-ui/views/app/others/index.js diff --git a/src-ui/app/others/modal_controller/ModalController.jsx b/src-ui/views/app/others/modal_controller/ModalController.jsx similarity index 100% rename from src-ui/app/others/modal_controller/ModalController.jsx rename to src-ui/views/app/others/modal_controller/ModalController.jsx diff --git a/src-ui/app/others/modal_controller/ModalController.module.scss b/src-ui/views/app/others/modal_controller/ModalController.module.scss similarity index 100% rename from src-ui/app/others/modal_controller/ModalController.module.scss rename to src-ui/views/app/others/modal_controller/ModalController.module.scss diff --git a/src-ui/app/others/modal_controller/update_modal/UpdateModal.jsx b/src-ui/views/app/others/modal_controller/update_modal/UpdateModal.jsx similarity index 100% rename from src-ui/app/others/modal_controller/update_modal/UpdateModal.jsx rename to src-ui/views/app/others/modal_controller/update_modal/UpdateModal.jsx diff --git a/src-ui/app/others/modal_controller/update_modal/UpdateModal.module.scss b/src-ui/views/app/others/modal_controller/update_modal/UpdateModal.module.scss similarity index 100% rename from src-ui/app/others/modal_controller/update_modal/UpdateModal.module.scss rename to src-ui/views/app/others/modal_controller/update_modal/UpdateModal.module.scss diff --git a/src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx b/src-ui/views/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx similarity index 100% rename from src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx rename to src-ui/views/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx diff --git a/src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss b/src-ui/views/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss similarity index 100% rename from src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss rename to src-ui/views/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss diff --git a/src-ui/app/others/snackbar_controller/ReactToastifyOverrideClass.scss b/src-ui/views/app/others/snackbar_controller/ReactToastifyOverrideClass.scss similarity index 100% rename from src-ui/app/others/snackbar_controller/ReactToastifyOverrideClass.scss rename to src-ui/views/app/others/snackbar_controller/ReactToastifyOverrideClass.scss diff --git a/src-ui/app/others/snackbar_controller/SnackbarController.jsx b/src-ui/views/app/others/snackbar_controller/SnackbarController.jsx similarity index 100% rename from src-ui/app/others/snackbar_controller/SnackbarController.jsx rename to src-ui/views/app/others/snackbar_controller/SnackbarController.jsx diff --git a/src-ui/app/others/snackbar_controller/SnackbarController.module.scss b/src-ui/views/app/others/snackbar_controller/SnackbarController.module.scss similarity index 100% rename from src-ui/app/others/snackbar_controller/SnackbarController.module.scss rename to src-ui/views/app/others/snackbar_controller/SnackbarController.module.scss diff --git a/src-ui/app/others/splash_component/SplashComponent.jsx b/src-ui/views/app/others/splash_component/SplashComponent.jsx similarity index 100% rename from src-ui/app/others/splash_component/SplashComponent.jsx rename to src-ui/views/app/others/splash_component/SplashComponent.jsx diff --git a/src-ui/app/others/splash_component/SplashComponent.module.scss b/src-ui/views/app/others/splash_component/SplashComponent.module.scss similarity index 100% rename from src-ui/app/others/splash_component/SplashComponent.module.scss rename to src-ui/views/app/others/splash_component/SplashComponent.module.scss diff --git a/src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx b/src-ui/views/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx similarity index 100% rename from src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx rename to src-ui/views/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx diff --git a/src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss b/src-ui/views/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss similarity index 100% rename from src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss rename to src-ui/views/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss diff --git a/src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx b/src-ui/views/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx similarity index 100% rename from src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx rename to src-ui/views/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx diff --git a/src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss b/src-ui/views/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss similarity index 100% rename from src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss rename to src-ui/views/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss diff --git a/src-ui/app/others/updating_component/UpdatingComponent.jsx b/src-ui/views/app/others/updating_component/UpdatingComponent.jsx similarity index 100% rename from src-ui/app/others/updating_component/UpdatingComponent.jsx rename to src-ui/views/app/others/updating_component/UpdatingComponent.jsx diff --git a/src-ui/app/others/updating_component/UpdatingComponent.module.scss b/src-ui/views/app/others/updating_component/UpdatingComponent.module.scss similarity index 100% rename from src-ui/app/others/updating_component/UpdatingComponent.module.scss rename to src-ui/views/app/others/updating_component/UpdatingComponent.module.scss diff --git a/src-ui/app/others/window_title_bar/WindowTitleBar.jsx b/src-ui/views/app/others/window_title_bar/WindowTitleBar.jsx similarity index 100% rename from src-ui/app/others/window_title_bar/WindowTitleBar.jsx rename to src-ui/views/app/others/window_title_bar/WindowTitleBar.jsx diff --git a/src-ui/app/others/window_title_bar/WindowTitleBar.module.scss b/src-ui/views/app/others/window_title_bar/WindowTitleBar.module.scss similarity index 100% rename from src-ui/app/others/window_title_bar/WindowTitleBar.module.scss rename to src-ui/views/app/others/window_title_bar/WindowTitleBar.module.scss diff --git a/src-ui/assets/VRCT.svg b/src-ui/views/assets/VRCT.svg similarity index 100% rename from src-ui/assets/VRCT.svg rename to src-ui/views/assets/VRCT.svg diff --git a/src-ui/assets/VRCT_now_downloading.png b/src-ui/views/assets/VRCT_now_downloading.png similarity index 100% rename from src-ui/assets/VRCT_now_downloading.png rename to src-ui/views/assets/VRCT_now_downloading.png diff --git a/src-ui/assets/about_vrct/contributor_done.png b/src-ui/views/assets/about_vrct/contributor_done.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_done.png rename to src-ui/views/assets/about_vrct/contributor_done.png diff --git a/src-ui/assets/about_vrct/contributor_iya.png b/src-ui/views/assets/about_vrct/contributor_iya.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_iya.png rename to src-ui/views/assets/about_vrct/contributor_iya.png diff --git a/src-ui/assets/about_vrct/contributor_kumaguma.png b/src-ui/views/assets/about_vrct/contributor_kumaguma.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_kumaguma.png rename to src-ui/views/assets/about_vrct/contributor_kumaguma.png diff --git a/src-ui/assets/about_vrct/contributor_poposuke.png b/src-ui/views/assets/about_vrct/contributor_poposuke.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_poposuke.png rename to src-ui/views/assets/about_vrct/contributor_poposuke.png diff --git a/src-ui/assets/about_vrct/contributor_rera.png b/src-ui/views/assets/about_vrct/contributor_rera.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_rera.png rename to src-ui/views/assets/about_vrct/contributor_rera.png diff --git a/src-ui/assets/about_vrct/contributor_riku.png b/src-ui/views/assets/about_vrct/contributor_riku.png similarity index 100% rename from src-ui/assets/about_vrct/contributor_riku.png rename to src-ui/views/assets/about_vrct/contributor_riku.png diff --git a/src-ui/assets/about_vrct/contributors_github_icon.png b/src-ui/views/assets/about_vrct/contributors_github_icon.png similarity index 100% rename from src-ui/assets/about_vrct/contributors_github_icon.png rename to src-ui/views/assets/about_vrct/contributors_github_icon.png diff --git a/src-ui/assets/about_vrct/contributors_section_title.png b/src-ui/views/assets/about_vrct/contributors_section_title.png similarity index 100% rename from src-ui/assets/about_vrct/contributors_section_title.png rename to src-ui/views/assets/about_vrct/contributors_section_title.png diff --git a/src-ui/assets/about_vrct/contributors_x_icon.png b/src-ui/views/assets/about_vrct/contributors_x_icon.png similarity index 100% rename from src-ui/assets/about_vrct/contributors_x_icon.png rename to src-ui/views/assets/about_vrct/contributors_x_icon.png diff --git a/src-ui/assets/about_vrct/dev_github_icon.png b/src-ui/views/assets/about_vrct/dev_github_icon.png similarity index 100% rename from src-ui/assets/about_vrct/dev_github_icon.png rename to src-ui/views/assets/about_vrct/dev_github_icon.png diff --git a/src-ui/assets/about_vrct/dev_misya.png b/src-ui/views/assets/about_vrct/dev_misya.png similarity index 100% rename from src-ui/assets/about_vrct/dev_misya.png rename to src-ui/views/assets/about_vrct/dev_misya.png diff --git a/src-ui/assets/about_vrct/dev_section_title.png b/src-ui/views/assets/about_vrct/dev_section_title.png similarity index 100% rename from src-ui/assets/about_vrct/dev_section_title.png rename to src-ui/views/assets/about_vrct/dev_section_title.png diff --git a/src-ui/assets/about_vrct/dev_shiina.png b/src-ui/views/assets/about_vrct/dev_shiina.png similarity index 100% rename from src-ui/assets/about_vrct/dev_shiina.png rename to src-ui/views/assets/about_vrct/dev_shiina.png diff --git a/src-ui/assets/about_vrct/dev_x_icon.png b/src-ui/views/assets/about_vrct/dev_x_icon.png similarity index 100% rename from src-ui/assets/about_vrct/dev_x_icon.png rename to src-ui/views/assets/about_vrct/dev_x_icon.png diff --git a/src-ui/assets/about_vrct/localization_1.png b/src-ui/views/assets/about_vrct/localization_1.png similarity index 100% rename from src-ui/assets/about_vrct/localization_1.png rename to src-ui/views/assets/about_vrct/localization_1.png diff --git a/src-ui/assets/about_vrct/localization_2.png b/src-ui/views/assets/about_vrct/localization_2.png similarity index 100% rename from src-ui/assets/about_vrct/localization_2.png rename to src-ui/views/assets/about_vrct/localization_2.png diff --git a/src-ui/assets/about_vrct/localization_3.png b/src-ui/views/assets/about_vrct/localization_3.png similarity index 100% rename from src-ui/assets/about_vrct/localization_3.png rename to src-ui/views/assets/about_vrct/localization_3.png diff --git a/src-ui/assets/about_vrct/localization_4.png b/src-ui/views/assets/about_vrct/localization_4.png similarity index 100% rename from src-ui/assets/about_vrct/localization_4.png rename to src-ui/views/assets/about_vrct/localization_4.png diff --git a/src-ui/assets/about_vrct/localization_5.png b/src-ui/views/assets/about_vrct/localization_5.png similarity index 100% rename from src-ui/assets/about_vrct/localization_5.png rename to src-ui/views/assets/about_vrct/localization_5.png diff --git a/src-ui/assets/about_vrct/localization_section_title.png b/src-ui/views/assets/about_vrct/localization_section_title.png similarity index 100% rename from src-ui/assets/about_vrct/localization_section_title.png rename to src-ui/views/assets/about_vrct/localization_section_title.png diff --git a/src-ui/assets/about_vrct/poster_showcase_section_title.png b/src-ui/views/assets/about_vrct/poster_showcase_section_title.png similarity index 100% rename from src-ui/assets/about_vrct/poster_showcase_section_title.png rename to src-ui/views/assets/about_vrct/poster_showcase_section_title.png diff --git a/src-ui/assets/about_vrct/project_link_booth.png b/src-ui/views/assets/about_vrct/project_link_booth.png similarity index 100% rename from src-ui/assets/about_vrct/project_link_booth.png rename to src-ui/views/assets/about_vrct/project_link_booth.png diff --git a/src-ui/assets/about_vrct/project_link_contact_us.png b/src-ui/views/assets/about_vrct/project_link_contact_us.png similarity index 100% rename from src-ui/assets/about_vrct/project_link_contact_us.png rename to src-ui/views/assets/about_vrct/project_link_contact_us.png diff --git a/src-ui/assets/about_vrct/project_link_documents.png b/src-ui/views/assets/about_vrct/project_link_documents.png similarity index 100% rename from src-ui/assets/about_vrct/project_link_documents.png rename to src-ui/views/assets/about_vrct/project_link_documents.png diff --git a/src-ui/assets/about_vrct/project_link_vrct_github.png b/src-ui/views/assets/about_vrct/project_link_vrct_github.png similarity index 100% rename from src-ui/assets/about_vrct/project_link_vrct_github.png rename to src-ui/views/assets/about_vrct/project_link_vrct_github.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/bar_asagao.png b/src-ui/views/assets/about_vrct/showcased_worlds/bar_asagao.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/bar_asagao.png rename to src-ui/views/assets/about_vrct/showcased_worlds/bar_asagao.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/cafe_cian.png b/src-ui/views/assets/about_vrct/showcased_worlds/cafe_cian.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/cafe_cian.png rename to src-ui/views/assets/about_vrct/showcased_worlds/cafe_cian.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/cam.png b/src-ui/views/assets/about_vrct/showcased_worlds/cam.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/cam.png rename to src-ui/views/assets/about_vrct/showcased_worlds/cam.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/celestial_blooms.png b/src-ui/views/assets/about_vrct/showcased_worlds/celestial_blooms.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/celestial_blooms.png rename to src-ui/views/assets/about_vrct/showcased_worlds/celestial_blooms.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png b/src-ui/views/assets/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png rename to src-ui/views/assets/about_vrct/showcased_worlds/chakachaka_multipurpose_room.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/chill_sleep_room_03.png b/src-ui/views/assets/about_vrct/showcased_worlds/chill_sleep_room_03.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/chill_sleep_room_03.png rename to src-ui/views/assets/about_vrct/showcased_worlds/chill_sleep_room_03.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/chill_sleep_room_04.png b/src-ui/views/assets/about_vrct/showcased_worlds/chill_sleep_room_04.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/chill_sleep_room_04.png rename to src-ui/views/assets/about_vrct/showcased_worlds/chill_sleep_room_04.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai.png b/src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai.png rename to src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_1st_anniv.png b/src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_1st_anniv.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_1st_anniv.png rename to src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_1st_anniv.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_jimusho.png b/src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_jimusho.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_jimusho.png rename to src-ui/views/assets/about_vrct/showcased_worlds/ehon_no_heikousekai_jimusho.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/ikoiba.png b/src-ui/views/assets/about_vrct/showcased_worlds/ikoiba.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/ikoiba.png rename to src-ui/views/assets/about_vrct/showcased_worlds/ikoiba.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/ippaidou.png b/src-ui/views/assets/about_vrct/showcased_worlds/ippaidou.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/ippaidou.png rename to src-ui/views/assets/about_vrct/showcased_worlds/ippaidou.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/japan_street.png b/src-ui/views/assets/about_vrct/showcased_worlds/japan_street.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/japan_street.png rename to src-ui/views/assets/about_vrct/showcased_worlds/japan_street.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/japanese_culture_osenbeito.png b/src-ui/views/assets/about_vrct/showcased_worlds/japanese_culture_osenbeito.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/japanese_culture_osenbeito.png rename to src-ui/views/assets/about_vrct/showcased_worlds/japanese_culture_osenbeito.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/kimodameshi.png b/src-ui/views/assets/about_vrct/showcased_worlds/kimodameshi.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/kimodameshi.png rename to src-ui/views/assets/about_vrct/showcased_worlds/kimodameshi.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/kokekkopiyopiyo.png b/src-ui/views/assets/about_vrct/showcased_worlds/kokekkopiyopiyo.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/kokekkopiyopiyo.png rename to src-ui/views/assets/about_vrct/showcased_worlds/kokekkopiyopiyo.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/kr_jp_exchange.png b/src-ui/views/assets/about_vrct/showcased_worlds/kr_jp_exchange.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/kr_jp_exchange.png rename to src-ui/views/assets/about_vrct/showcased_worlds/kr_jp_exchange.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/kuroinu_work_room.png b/src-ui/views/assets/about_vrct/showcased_worlds/kuroinu_work_room.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/kuroinu_work_room.png rename to src-ui/views/assets/about_vrct/showcased_worlds/kuroinu_work_room.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/language_exchange_park.png b/src-ui/views/assets/about_vrct/showcased_worlds/language_exchange_park.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/language_exchange_park.png rename to src-ui/views/assets/about_vrct/showcased_worlds/language_exchange_park.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/language_exchange_tervern.png b/src-ui/views/assets/about_vrct/showcased_worlds/language_exchange_tervern.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/language_exchange_tervern.png rename to src-ui/views/assets/about_vrct/showcased_worlds/language_exchange_tervern.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/mamehinata_dogrun.png b/src-ui/views/assets/about_vrct/showcased_worlds/mamehinata_dogrun.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/mamehinata_dogrun.png rename to src-ui/views/assets/about_vrct/showcased_worlds/mamehinata_dogrun.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/monogatari_meetup.png b/src-ui/views/assets/about_vrct/showcased_worlds/monogatari_meetup.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/monogatari_meetup.png rename to src-ui/views/assets/about_vrct/showcased_worlds/monogatari_meetup.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/nihongokurabu.png b/src-ui/views/assets/about_vrct/showcased_worlds/nihongokurabu.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/nihongokurabu.png rename to src-ui/views/assets/about_vrct/showcased_worlds/nihongokurabu.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png b/src-ui/views/assets/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png rename to src-ui/views/assets/about_vrct/showcased_worlds/omoshiro_kotoba_asobi_game.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/oto_no_shitatei.png b/src-ui/views/assets/about_vrct/showcased_worlds/oto_no_shitatei.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/oto_no_shitatei.png rename to src-ui/views/assets/about_vrct/showcased_worlds/oto_no_shitatei.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/parallel_collar.png b/src-ui/views/assets/about_vrct/showcased_worlds/parallel_collar.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/parallel_collar.png rename to src-ui/views/assets/about_vrct/showcased_worlds/parallel_collar.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/poker_room_elysion.png b/src-ui/views/assets/about_vrct/showcased_worlds/poker_room_elysion.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/poker_room_elysion.png rename to src-ui/views/assets/about_vrct/showcased_worlds/poker_room_elysion.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/re_yatuha_room.png b/src-ui/views/assets/about_vrct/showcased_worlds/re_yatuha_room.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/re_yatuha_room.png rename to src-ui/views/assets/about_vrct/showcased_worlds/re_yatuha_room.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/saya_town.png b/src-ui/views/assets/about_vrct/showcased_worlds/saya_town.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/saya_town.png rename to src-ui/views/assets/about_vrct/showcased_worlds/saya_town.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/sayasuke_hotel.png b/src-ui/views/assets/about_vrct/showcased_worlds/sayasuke_hotel.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/sayasuke_hotel.png rename to src-ui/views/assets/about_vrct/showcased_worlds/sayasuke_hotel.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/silakan_datang_ke_rumahku.png b/src-ui/views/assets/about_vrct/showcased_worlds/silakan_datang_ke_rumahku.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/silakan_datang_ke_rumahku.png rename to src-ui/views/assets/about_vrct/showcased_worlds/silakan_datang_ke_rumahku.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/smokerz_guild_v2.png b/src-ui/views/assets/about_vrct/showcased_worlds/smokerz_guild_v2.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/smokerz_guild_v2.png rename to src-ui/views/assets/about_vrct/showcased_worlds/smokerz_guild_v2.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/stretch_club_starting_from_minus.png b/src-ui/views/assets/about_vrct/showcased_worlds/stretch_club_starting_from_minus.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/stretch_club_starting_from_minus.png rename to src-ui/views/assets/about_vrct/showcased_worlds/stretch_club_starting_from_minus.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/study_japanese_world_japanichijou.png b/src-ui/views/assets/about_vrct/showcased_worlds/study_japanese_world_japanichijou.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/study_japanese_world_japanichijou.png rename to src-ui/views/assets/about_vrct/showcased_worlds/study_japanese_world_japanichijou.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/su.png b/src-ui/views/assets/about_vrct/showcased_worlds/su.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/su.png rename to src-ui/views/assets/about_vrct/showcased_worlds/su.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/sushi_guru_annex.png b/src-ui/views/assets/about_vrct/showcased_worlds/sushi_guru_annex.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/sushi_guru_annex.png rename to src-ui/views/assets/about_vrct/showcased_worlds/sushi_guru_annex.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/sushi_stand_guruguru.png b/src-ui/views/assets/about_vrct/showcased_worlds/sushi_stand_guruguru.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/sushi_stand_guruguru.png rename to src-ui/views/assets/about_vrct/showcased_worlds/sushi_stand_guruguru.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png b/src-ui/views/assets/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png rename to src-ui/views/assets/about_vrct/showcased_worlds/tyuuniti_kouryuukai.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/uj_club.png b/src-ui/views/assets/about_vrct/showcased_worlds/uj_club.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/uj_club.png rename to src-ui/views/assets/about_vrct/showcased_worlds/uj_club.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/una_yosh.png b/src-ui/views/assets/about_vrct/showcased_worlds/una_yosh.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/una_yosh.png rename to src-ui/views/assets/about_vrct/showcased_worlds/una_yosh.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/usanezumi_shrine2.png b/src-ui/views/assets/about_vrct/showcased_worlds/usanezumi_shrine2.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/usanezumi_shrine2.png rename to src-ui/views/assets/about_vrct/showcased_worlds/usanezumi_shrine2.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/yoru_color.png b/src-ui/views/assets/about_vrct/showcased_worlds/yoru_color.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/yoru_color.png rename to src-ui/views/assets/about_vrct/showcased_worlds/yoru_color.png diff --git a/src-ui/assets/about_vrct/showcased_worlds/yuttari_eikaiwa.png b/src-ui/views/assets/about_vrct/showcased_worlds/yuttari_eikaiwa.png similarity index 100% rename from src-ui/assets/about_vrct/showcased_worlds/yuttari_eikaiwa.png rename to src-ui/views/assets/about_vrct/showcased_worlds/yuttari_eikaiwa.png diff --git a/src-ui/assets/about_vrct/special_thanks_members.png b/src-ui/views/assets/about_vrct/special_thanks_members.png similarity index 100% rename from src-ui/assets/about_vrct/special_thanks_members.png rename to src-ui/views/assets/about_vrct/special_thanks_members.png diff --git a/src-ui/assets/about_vrct/special_thanks_message_en.png b/src-ui/views/assets/about_vrct/special_thanks_message_en.png similarity index 100% rename from src-ui/assets/about_vrct/special_thanks_message_en.png rename to src-ui/views/assets/about_vrct/special_thanks_message_en.png diff --git a/src-ui/assets/about_vrct/special_thanks_message_ja.png b/src-ui/views/assets/about_vrct/special_thanks_message_ja.png similarity index 100% rename from src-ui/assets/about_vrct/special_thanks_message_ja.png rename to src-ui/views/assets/about_vrct/special_thanks_message_ja.png diff --git a/src-ui/assets/about_vrct/special_thanks_section_title.png b/src-ui/views/assets/about_vrct/special_thanks_section_title.png similarity index 100% rename from src-ui/assets/about_vrct/special_thanks_section_title.png rename to src-ui/views/assets/about_vrct/special_thanks_section_title.png diff --git a/src-ui/assets/about_vrct/vrct_logo_for_about_vrct.png b/src-ui/views/assets/about_vrct/vrct_logo_for_about_vrct.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_logo_for_about_vrct.png rename to src-ui/views/assets/about_vrct/vrct_logo_for_about_vrct.png diff --git a/src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_en.png b/src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_en.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_en.png rename to src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_en.png diff --git a/src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_ja.png b/src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_ja.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_ja.png rename to src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_ja.png diff --git a/src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_en.png b/src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_en.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_en.png rename to src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_en.png diff --git a/src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_ja.png b/src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_ja.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_ja.png rename to src-ui/views/assets/about_vrct/vrct_posters/authors/poster_images_authors_m_ja.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_en.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_en.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_en.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_en.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_ja.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_ja.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_ja.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_ja.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_ko.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_ko.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_manga_ko.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_manga_ko.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_cn.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_cn.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_cn.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_cn.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_en.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_en.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_en.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_en.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_ja.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_ja.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_ja.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_ja.png diff --git a/src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_ko.png b/src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_ko.png similarity index 100% rename from src-ui/assets/about_vrct/vrct_posters/iya_vrct_poster_ko.png rename to src-ui/views/assets/about_vrct/vrct_posters/iya_vrct_poster_ko.png diff --git a/src-ui/assets/add.svg b/src-ui/views/assets/add.svg similarity index 100% rename from src-ui/assets/add.svg rename to src-ui/views/assets/add.svg diff --git a/src-ui/assets/arrow_left.svg b/src-ui/views/assets/arrow_left.svg similarity index 100% rename from src-ui/assets/arrow_left.svg rename to src-ui/views/assets/arrow_left.svg diff --git a/src-ui/assets/cancel.svg b/src-ui/views/assets/cancel.svg similarity index 100% rename from src-ui/assets/cancel.svg rename to src-ui/views/assets/cancel.svg diff --git a/src-ui/assets/chato_icon_fill.png b/src-ui/views/assets/chato_icon_fill.png similarity index 100% rename from src-ui/assets/chato_icon_fill.png rename to src-ui/views/assets/chato_icon_fill.png diff --git a/src-ui/assets/chato_white.png b/src-ui/views/assets/chato_white.png similarity index 100% rename from src-ui/assets/chato_white.png rename to src-ui/views/assets/chato_white.png diff --git a/src-ui/assets/chato_white_square.png b/src-ui/views/assets/chato_white_square.png similarity index 100% rename from src-ui/assets/chato_white_square.png rename to src-ui/views/assets/chato_white_square.png diff --git a/src-ui/assets/check_mark.svg b/src-ui/views/assets/check_mark.svg similarity index 100% rename from src-ui/assets/check_mark.svg rename to src-ui/views/assets/check_mark.svg diff --git a/src-ui/assets/configuration.svg b/src-ui/views/assets/configuration.svg similarity index 100% rename from src-ui/assets/configuration.svg rename to src-ui/views/assets/configuration.svg diff --git a/src-ui/assets/copy.svg b/src-ui/views/assets/copy.svg similarity index 100% rename from src-ui/assets/copy.svg rename to src-ui/views/assets/copy.svg diff --git a/src-ui/assets/document.png b/src-ui/views/assets/document.png similarity index 100% rename from src-ui/assets/document.png rename to src-ui/views/assets/document.png diff --git a/src-ui/assets/error.svg b/src-ui/views/assets/error.svg similarity index 100% rename from src-ui/assets/error.svg rename to src-ui/views/assets/error.svg diff --git a/src-ui/assets/external_link.svg b/src-ui/views/assets/external_link.svg similarity index 100% rename from src-ui/assets/external_link.svg rename to src-ui/views/assets/external_link.svg diff --git a/src-ui/assets/foreground.svg b/src-ui/views/assets/foreground.svg similarity index 100% rename from src-ui/assets/foreground.svg rename to src-ui/views/assets/foreground.svg diff --git a/src-ui/assets/headphones.svg b/src-ui/views/assets/headphones.svg similarity index 100% rename from src-ui/assets/headphones.svg rename to src-ui/views/assets/headphones.svg diff --git a/src-ui/assets/help.svg b/src-ui/views/assets/help.svg similarity index 100% rename from src-ui/assets/help.svg rename to src-ui/views/assets/help.svg diff --git a/src-ui/assets/line.svg b/src-ui/views/assets/line.svg similarity index 100% rename from src-ui/assets/line.svg rename to src-ui/views/assets/line.svg diff --git a/src-ui/assets/megaphone.svg b/src-ui/views/assets/megaphone.svg similarity index 100% rename from src-ui/assets/megaphone.svg rename to src-ui/views/assets/megaphone.svg diff --git a/src-ui/assets/mic.svg b/src-ui/views/assets/mic.svg similarity index 100% rename from src-ui/assets/mic.svg rename to src-ui/views/assets/mic.svg diff --git a/src-ui/assets/narrow_arrow_down.svg b/src-ui/views/assets/narrow_arrow_down.svg similarity index 100% rename from src-ui/assets/narrow_arrow_down.svg rename to src-ui/views/assets/narrow_arrow_down.svg diff --git a/src-ui/assets/open_folder.svg b/src-ui/views/assets/open_folder.svg similarity index 100% rename from src-ui/assets/open_folder.svg rename to src-ui/views/assets/open_folder.svg diff --git a/src-ui/assets/redo.svg b/src-ui/views/assets/redo.svg similarity index 100% rename from src-ui/assets/redo.svg rename to src-ui/views/assets/redo.svg diff --git a/src-ui/assets/refresh.svg b/src-ui/views/assets/refresh.svg similarity index 100% rename from src-ui/assets/refresh.svg rename to src-ui/views/assets/refresh.svg diff --git a/src-ui/assets/refresh_2.svg b/src-ui/views/assets/refresh_2.svg similarity index 100% rename from src-ui/assets/refresh_2.svg rename to src-ui/views/assets/refresh_2.svg diff --git a/src-ui/assets/remove.svg b/src-ui/views/assets/remove.svg similarity index 100% rename from src-ui/assets/remove.svg rename to src-ui/views/assets/remove.svg diff --git a/src-ui/assets/send_message.svg b/src-ui/views/assets/send_message.svg similarity index 100% rename from src-ui/assets/send_message.svg rename to src-ui/views/assets/send_message.svg diff --git a/src-ui/assets/square.svg b/src-ui/views/assets/square.svg similarity index 100% rename from src-ui/assets/square.svg rename to src-ui/views/assets/square.svg diff --git a/src-ui/assets/supporters/fanbox_logo.png b/src-ui/views/assets/supporters/fanbox_logo.png similarity index 100% rename from src-ui/assets/supporters/fanbox_logo.png rename to src-ui/views/assets/supporters/fanbox_logo.png diff --git a/src-ui/assets/supporters/kofi_logo.png b/src-ui/views/assets/supporters/kofi_logo.png similarity index 100% rename from src-ui/assets/supporters/kofi_logo.png rename to src-ui/views/assets/supporters/kofi_logo.png diff --git a/src-ui/assets/supporters/patreon_1600x400px.png b/src-ui/views/assets/supporters/patreon_1600x400px.png similarity index 100% rename from src-ui/assets/supporters/patreon_1600x400px.png rename to src-ui/views/assets/supporters/patreon_1600x400px.png diff --git a/src-ui/assets/supporters/patreon_logo.png b/src-ui/views/assets/supporters/patreon_logo.png similarity index 100% rename from src-ui/assets/supporters/patreon_logo.png rename to src-ui/views/assets/supporters/patreon_logo.png diff --git a/src-ui/assets/supporters/vrct_supporters_title.png b/src-ui/views/assets/supporters/vrct_supporters_title.png similarity index 100% rename from src-ui/assets/supporters/vrct_supporters_title.png rename to src-ui/views/assets/supporters/vrct_supporters_title.png diff --git a/src-ui/assets/swap_icon.png b/src-ui/views/assets/swap_icon.png similarity index 100% rename from src-ui/assets/swap_icon.png rename to src-ui/views/assets/swap_icon.png diff --git a/src-ui/assets/translation.svg b/src-ui/views/assets/translation.svg similarity index 100% rename from src-ui/assets/translation.svg rename to src-ui/views/assets/translation.svg diff --git a/src-ui/assets/triangle.svg b/src-ui/views/assets/triangle.svg similarity index 100% rename from src-ui/assets/triangle.svg rename to src-ui/views/assets/triangle.svg diff --git a/src-ui/assets/vrchat_chatbox_trasnlator_transcription.png b/src-ui/views/assets/vrchat_chatbox_trasnlator_transcription.png similarity index 100% rename from src-ui/assets/vrchat_chatbox_trasnlator_transcription.png rename to src-ui/views/assets/vrchat_chatbox_trasnlator_transcription.png diff --git a/src-ui/assets/vrct_logo_for_dark_mode.png b/src-ui/views/assets/vrct_logo_for_dark_mode.png similarity index 100% rename from src-ui/assets/vrct_logo_for_dark_mode.png rename to src-ui/views/assets/vrct_logo_for_dark_mode.png diff --git a/src-ui/assets/vrct_starting_up.png b/src-ui/views/assets/vrct_starting_up.png similarity index 100% rename from src-ui/assets/vrct_starting_up.png rename to src-ui/views/assets/vrct_starting_up.png diff --git a/src-ui/assets/warning.svg b/src-ui/views/assets/warning.svg similarity index 100% rename from src-ui/assets/warning.svg rename to src-ui/views/assets/warning.svg diff --git a/src-ui/assets/x_mark.svg b/src-ui/views/assets/x_mark.svg similarity index 100% rename from src-ui/assets/x_mark.svg rename to src-ui/views/assets/x_mark.svg diff --git a/src-ui/common_components/checkbox/Checkbox.jsx b/src-ui/views/common_components/checkbox/Checkbox.jsx similarity index 100% rename from src-ui/common_components/checkbox/Checkbox.jsx rename to src-ui/views/common_components/checkbox/Checkbox.jsx diff --git a/src-ui/common_components/checkbox/Checkbox.module.scss b/src-ui/views/common_components/checkbox/Checkbox.module.scss similarity index 100% rename from src-ui/common_components/checkbox/Checkbox.module.scss rename to src-ui/views/common_components/checkbox/Checkbox.module.scss diff --git a/src-ui/common_components/homepage_link_button/HomepageLinkButton.jsx b/src-ui/views/common_components/homepage_link_button/HomepageLinkButton.jsx similarity index 100% rename from src-ui/common_components/homepage_link_button/HomepageLinkButton.jsx rename to src-ui/views/common_components/homepage_link_button/HomepageLinkButton.jsx diff --git a/src-ui/common_components/homepage_link_button/HomepageLinkButton.module.scss b/src-ui/views/common_components/homepage_link_button/HomepageLinkButton.module.scss similarity index 100% rename from src-ui/common_components/homepage_link_button/HomepageLinkButton.module.scss rename to src-ui/views/common_components/homepage_link_button/HomepageLinkButton.module.scss diff --git a/src-ui/common_components/index.js b/src-ui/views/common_components/index.js similarity index 100% rename from src-ui/common_components/index.js rename to src-ui/views/common_components/index.js diff --git a/src-ui/common_components/reset_button/ResetButton.jsx b/src-ui/views/common_components/reset_button/ResetButton.jsx similarity index 100% rename from src-ui/common_components/reset_button/ResetButton.jsx rename to src-ui/views/common_components/reset_button/ResetButton.jsx diff --git a/src-ui/common_components/reset_button/ResetButton.module.scss b/src-ui/views/common_components/reset_button/ResetButton.module.scss similarity index 100% rename from src-ui/common_components/reset_button/ResetButton.module.scss rename to src-ui/views/common_components/reset_button/ResetButton.module.scss diff --git a/src-ui/common_css/mixins.scss b/src-ui/views/common_css/mixins.scss similarity index 100% rename from src-ui/common_css/mixins.scss rename to src-ui/views/common_css/mixins.scss diff --git a/vite.config.js b/vite.config.js index b678f171..43a34840 100644 --- a/vite.config.js +++ b/vite.config.js @@ -60,20 +60,20 @@ export default defineConfig(async () => { "@useI18n": path.resolve(__dirname, "locales/useI18n.js"), "@useReceiveRoutes": path.resolve(__dirname, "src-ui/logics/useReceiveRoutes.js"), - "@useStdoutToPython": path.resolve(__dirname, "src-ui/logics/useStdoutToPython.js"), + "@useStdoutToPython": path.resolve(__dirname, "src-ui/logics/common/useStdoutToPython.js"), - "@ui_configs": path.resolve(__dirname, "src-ui/ui_configs.js"), - "@scss_mixins": path.resolve(__dirname, "src-ui/common_css/mixins.scss"), - "@store": path.resolve(__dirname, "src-ui/store.js"), - "@images": path.resolve(__dirname, "src-ui/assets"), - "@utils": path.resolve(__dirname, "src-ui/utils.js"), + "@ui_configs": path.resolve(__dirname, "src-ui/logics/ui_configs.js"), + "@scss_mixins": path.resolve(__dirname, "src-ui/views/common_css/mixins.scss"), + "@store": path.resolve(__dirname, "src-ui/logics/store.js"), + "@images": path.resolve(__dirname, "src-ui/views/assets"), + "@utils": path.resolve(__dirname, "src-ui/logics/utils.js"), "@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"), - "@setting_box": path.resolve(__dirname, "src-ui/app/config_page/setting_section/setting_box/index.js"), - "@common_components": path.resolve(__dirname, "src-ui/common_components/index.js"), + "@setting_box": path.resolve(__dirname, "src-ui/views/app/config_page/setting_section/setting_box/index.js"), + "@common_components": path.resolve(__dirname, "src-ui/views/common_components/index.js"), // Plugins "@plugins_path": path.resolve(__dirname, "src-ui/plugins"),