diff --git a/src-ui/app/App.jsx b/src-ui/app/App.jsx index 7dc99689..ac9159e1 100644 --- a/src-ui/app/App.jsx +++ b/src-ui/app/App.jsx @@ -11,18 +11,23 @@ import { TransparencyController, CornerRadiusController, PluginsController, -} from "./_app_controllers/index.js"; +} from "./_app_controllers"; + +import styles from "./App.module.scss"; -import { WindowTitleBar } from "./window_title_bar/WindowTitleBar"; import { MainPage } from "./main_page/MainPage"; import { ConfigPage } from "./config_page/ConfigPage"; -import { SplashComponent } from "./splash_component/SplashComponent"; -import { UpdatingComponent } from "./updating_component/UpdatingComponent"; -import { ModalController } from "./modal_controller/ModalController"; -import { SnackbarController } from "./snackbar_controller/SnackbarController"; -import styles from "./App.module.scss"; + +import { + WindowTitleBar, + SplashComponent, + UpdatingComponent, + ModalController, + SnackbarController, + AppErrorBoundary, +} from "./others"; + import { useIsBackendReady, useIsSoftwareUpdating, useIsVrctAvailable, useWindow } from "@logics_common"; -import { AppErrorBoundary } from "./error_boundary/AppErrorBoundary"; export const App = () => { const { currentIsVrctAvailable } = useIsVrctAvailable(); diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/index.js b/src-ui/app/config_page/setting_section/setting_box/_components/index.js index 178dbcec..7b695b35 100644 --- a/src-ui/app/config_page/setting_section/setting_box/_components/index.js +++ b/src-ui/app/config_page/setting_section/setting_box/_components/index.js @@ -12,5 +12,4 @@ export { Slider } from "./slider/Slider"; export { SwitchBox } from "./switch_box/SwitchBox"; export { ThresholdComponent } from "./threshold_component/ThresholdComponent"; export { WordFilter, WordFilterListToggleComponent } from "./word_filter/WordFilter"; -export { DownloadModels } from "./download_models/DownloadModels"; -export { PluginsControlComponent } from "./plugins_control_component/PluginsControlComponent"; \ No newline at end of file +export { DownloadModels } from "./download_models/DownloadModels"; \ No newline at end of file diff --git a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx b/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx index 0d7f8693..9928fad1 100644 --- a/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/plugins/Plugins.jsx @@ -2,7 +2,7 @@ import { useEffect, useRef, useState, useCallback } from "react"; import { useTranslation } from "react-i18next"; import { usePlugins } from "@logics_configs"; import styles from "./Plugins.module.scss"; -import { PluginsControlComponent } from "../_components/plugins_control_component/PluginsControlComponent"; +import { PluginsControlComponent } from "./plugins_control_component/PluginsControlComponent"; import { useNotificationStatus } from "@logics_common"; import ExternalLink from "@images/external_link.svg?react"; diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/plugins_control_component/PluginsControlComponent.jsx b/src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx similarity index 94% rename from src-ui/app/config_page/setting_section/setting_box/_components/plugins_control_component/PluginsControlComponent.jsx rename to src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx index c7c6ace0..94a90b50 100644 --- a/src-ui/app/config_page/setting_section/setting_box/_components/plugins_control_component/PluginsControlComponent.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.jsx @@ -1,6 +1,5 @@ -import React from "react"; -import { SwitchBox } from "../index"; -import { _DownloadButton } from "../_atoms/_download_button/_DownloadButton"; +import { SwitchBox } from "../../_components"; +import { _DownloadButton } from "../../_components/_atoms/_download_button/_DownloadButton"; import styles from "./PluginsControlComponent.module.scss"; import { useTranslation } from "react-i18next"; diff --git a/src-ui/app/config_page/setting_section/setting_box/_components/plugins_control_component/PluginsControlComponent.module.scss b/src-ui/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/_components/plugins_control_component/PluginsControlComponent.module.scss rename to src-ui/app/config_page/setting_section/setting_box/plugins/plugins_control_component/PluginsControlComponent.module.scss diff --git a/src-ui/app/error_boundary/AppErrorBoundary.jsx b/src-ui/app/others/error_boundary/AppErrorBoundary.jsx similarity index 100% rename from src-ui/app/error_boundary/AppErrorBoundary.jsx rename to src-ui/app/others/error_boundary/AppErrorBoundary.jsx diff --git a/src-ui/app/error_boundary/AppErrorBoundary.module.scss b/src-ui/app/others/error_boundary/AppErrorBoundary.module.scss similarity index 100% rename from src-ui/app/error_boundary/AppErrorBoundary.module.scss rename to src-ui/app/others/error_boundary/AppErrorBoundary.module.scss diff --git a/src-ui/app/error_boundary/contacts_container/ContactsContainer.jsx b/src-ui/app/others/error_boundary/contacts_container/ContactsContainer.jsx similarity index 100% rename from src-ui/app/error_boundary/contacts_container/ContactsContainer.jsx rename to src-ui/app/others/error_boundary/contacts_container/ContactsContainer.jsx diff --git a/src-ui/app/error_boundary/contacts_container/ContactsContainer.module.scss b/src-ui/app/others/error_boundary/contacts_container/ContactsContainer.module.scss similarity index 100% rename from src-ui/app/error_boundary/contacts_container/ContactsContainer.module.scss rename to src-ui/app/others/error_boundary/contacts_container/ContactsContainer.module.scss diff --git a/src-ui/app/others/index.js b/src-ui/app/others/index.js new file mode 100644 index 00000000..80d702e7 --- /dev/null +++ b/src-ui/app/others/index.js @@ -0,0 +1,6 @@ +export { WindowTitleBar } from "./window_title_bar/WindowTitleBar.jsx"; +export { SplashComponent } from "./splash_component/SplashComponent.jsx"; +export { UpdatingComponent } from "./updating_component/UpdatingComponent.jsx"; +export { ModalController } from "./modal_controller/ModalController.jsx"; +export { SnackbarController } from "./snackbar_controller/SnackbarController.jsx"; +export { AppErrorBoundary } from "./error_boundary/AppErrorBoundary.jsx"; \ No newline at end of file diff --git a/src-ui/app/modal_controller/ModalController.jsx b/src-ui/app/others/modal_controller/ModalController.jsx similarity index 100% rename from src-ui/app/modal_controller/ModalController.jsx rename to src-ui/app/others/modal_controller/ModalController.jsx diff --git a/src-ui/app/modal_controller/ModalController.module.scss b/src-ui/app/others/modal_controller/ModalController.module.scss similarity index 100% rename from src-ui/app/modal_controller/ModalController.module.scss rename to src-ui/app/others/modal_controller/ModalController.module.scss diff --git a/src-ui/app/modal_controller/update_modal/UpdateModal.jsx b/src-ui/app/others/modal_controller/update_modal/UpdateModal.jsx similarity index 100% rename from src-ui/app/modal_controller/update_modal/UpdateModal.jsx rename to src-ui/app/others/modal_controller/update_modal/UpdateModal.jsx diff --git a/src-ui/app/modal_controller/update_modal/UpdateModal.module.scss b/src-ui/app/others/modal_controller/update_modal/UpdateModal.module.scss similarity index 100% rename from src-ui/app/modal_controller/update_modal/UpdateModal.module.scss rename to src-ui/app/others/modal_controller/update_modal/UpdateModal.module.scss diff --git a/src-ui/app/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx b/src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx similarity index 100% rename from src-ui/app/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx rename to src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.jsx diff --git a/src-ui/app/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss b/src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss similarity index 100% rename from src-ui/app/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss rename to src-ui/app/others/modal_controller/update_modal/plugins_compatibility_list/PluginCompatibilityList.module.scss diff --git a/src-ui/app/snackbar_controller/ReactToastifyOverrideClass.scss b/src-ui/app/others/snackbar_controller/ReactToastifyOverrideClass.scss similarity index 100% rename from src-ui/app/snackbar_controller/ReactToastifyOverrideClass.scss rename to src-ui/app/others/snackbar_controller/ReactToastifyOverrideClass.scss diff --git a/src-ui/app/snackbar_controller/SnackbarController.jsx b/src-ui/app/others/snackbar_controller/SnackbarController.jsx similarity index 100% rename from src-ui/app/snackbar_controller/SnackbarController.jsx rename to src-ui/app/others/snackbar_controller/SnackbarController.jsx diff --git a/src-ui/app/snackbar_controller/SnackbarController.module.scss b/src-ui/app/others/snackbar_controller/SnackbarController.module.scss similarity index 100% rename from src-ui/app/snackbar_controller/SnackbarController.module.scss rename to src-ui/app/others/snackbar_controller/SnackbarController.module.scss diff --git a/src-ui/app/splash_component/SplashComponent.jsx b/src-ui/app/others/splash_component/SplashComponent.jsx similarity index 94% rename from src-ui/app/splash_component/SplashComponent.jsx rename to src-ui/app/others/splash_component/SplashComponent.jsx index 809f917c..a9ac4aeb 100644 --- a/src-ui/app/splash_component/SplashComponent.jsx +++ b/src-ui/app/others/splash_component/SplashComponent.jsx @@ -1,7 +1,7 @@ import { useState, useEffect } from "react"; import styles from "./SplashComponent.module.scss"; -import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer/"; -import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer/"; +import { StartUpProgressContainer } from "./start_up_progress_container/StartUpProgressContainer"; +import { DownloadModelsContainer } from "./download_models_container/DownloadModelsContainer"; import MegaphoneSvg from "@images/megaphone.svg?react"; import XMarkSvg from "@images/cancel.svg?react"; import { useWindow } from "@logics_common"; diff --git a/src-ui/app/splash_component/SplashComponent.module.scss b/src-ui/app/others/splash_component/SplashComponent.module.scss similarity index 100% rename from src-ui/app/splash_component/SplashComponent.module.scss rename to src-ui/app/others/splash_component/SplashComponent.module.scss diff --git a/src-ui/app/splash_component/download_models_container/DownloadModelsContainer.jsx b/src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx similarity index 100% rename from src-ui/app/splash_component/download_models_container/DownloadModelsContainer.jsx rename to src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.jsx diff --git a/src-ui/app/splash_component/download_models_container/DownloadModelsContainer.module.scss b/src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss similarity index 100% rename from src-ui/app/splash_component/download_models_container/DownloadModelsContainer.module.scss rename to src-ui/app/others/splash_component/download_models_container/DownloadModelsContainer.module.scss diff --git a/src-ui/app/splash_component/start_up_progress_container/StartUpProgressContainer.jsx b/src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx similarity index 100% rename from src-ui/app/splash_component/start_up_progress_container/StartUpProgressContainer.jsx rename to src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.jsx diff --git a/src-ui/app/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss b/src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss similarity index 100% rename from src-ui/app/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss rename to src-ui/app/others/splash_component/start_up_progress_container/StartUpProgressContainer.module.scss diff --git a/src-ui/app/updating_component/UpdatingComponent.jsx b/src-ui/app/others/updating_component/UpdatingComponent.jsx similarity index 100% rename from src-ui/app/updating_component/UpdatingComponent.jsx rename to src-ui/app/others/updating_component/UpdatingComponent.jsx diff --git a/src-ui/app/updating_component/UpdatingComponent.module.scss b/src-ui/app/others/updating_component/UpdatingComponent.module.scss similarity index 100% rename from src-ui/app/updating_component/UpdatingComponent.module.scss rename to src-ui/app/others/updating_component/UpdatingComponent.module.scss diff --git a/src-ui/app/window_title_bar/WindowTitleBar.jsx b/src-ui/app/others/window_title_bar/WindowTitleBar.jsx similarity index 100% rename from src-ui/app/window_title_bar/WindowTitleBar.jsx rename to src-ui/app/others/window_title_bar/WindowTitleBar.jsx diff --git a/src-ui/app/window_title_bar/WindowTitleBar.module.scss b/src-ui/app/others/window_title_bar/WindowTitleBar.module.scss similarity index 100% rename from src-ui/app/window_title_bar/WindowTitleBar.module.scss rename to src-ui/app/others/window_title_bar/WindowTitleBar.module.scss