[Update] Starting Up: Add loading animation when the software preparing, until backend is ready.

This commit is contained in:
Sakamoto Shiina
2024-11-14 15:48:38 +09:00
parent 2d77f15c41
commit 2c7bb53b64
10 changed files with 61 additions and 5 deletions

View File

@@ -39,8 +39,9 @@
"windows": [ "windows": [
{ {
"title": "VRCT", "title": "VRCT",
"width": 870, "center": true,
"height": 654, "width": 400,
"height": 400,
"minWidth": 400, "minWidth": 400,
"minHeight": 200, "minHeight": 200,
"transparent": true, "transparent": true,

View File

@@ -3,11 +3,15 @@ import { useStartPython } from "@logics/useStartPython";
import { WindowTitleBar } from "./window_title_bar/WindowTitleBar"; import { WindowTitleBar } from "./window_title_bar/WindowTitleBar";
import { MainPage } from "./main_page/MainPage"; import { MainPage } from "./main_page/MainPage";
import { ConfigPage } from "./config_page/ConfigPage"; import { ConfigPage } from "./config_page/ConfigPage";
import { SplashComponent } from "./splash_component/SplashComponent";
import { ModalController } from "./modal_controller/ModalController"; import { ModalController } from "./modal_controller/ModalController";
import styles from "./App.module.scss"; import styles from "./App.module.scss";
import { useIsBackendReady } from "@logics_common";
export const App = () => { export const App = () => {
const { currentIsBackendReady } = useIsBackendReady();
const { WindowGeometryController } = useWindow(); const { WindowGeometryController } = useWindow();
return ( return (
<div className={styles.container}> <div className={styles.container}>
<StartPythonFacadeComponent /> <StartPythonFacadeComponent />
@@ -18,13 +22,24 @@ export const App = () => {
<TransparencyController /> <TransparencyController />
<WindowGeometryController /> <WindowGeometryController />
{currentIsBackendReady.data === false
? <SplashComponent />
: <Contents />
}
</div>
);
};
const Contents = () => {
return (
<>
<WindowTitleBar /> <WindowTitleBar />
<div className={styles.pages_wrapper}> <div className={styles.pages_wrapper}>
<ConfigPage /> <ConfigPage />
<MainPage /> <MainPage />
<ModalController /> <ModalController />
</div> </div>
</div> </>
); );
}; };

View File

@@ -1,10 +1,12 @@
.container { .container {
// position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center;
background-color: var(--dark_888_color);
align-items: center;
} }

View File

@@ -1,6 +1,6 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import clsx from "clsx"; import clsx from "clsx";
import CircularProgress from '@mui/material/CircularProgress'; import CircularProgress from "@mui/material/CircularProgress";
import styles from "./DownloadModels.module.scss"; import styles from "./DownloadModels.module.scss";
import { import {
RadioButton, RadioButton,

View File

@@ -0,0 +1,18 @@
import { useState, useEffect } from "react";
import CircularProgress from '@mui/material/CircularProgress';
import styles from "./SplashComponent.module.scss";
export const SplashComponent = () => {
const [circular_color, setCircularColor] = useState("");
useEffect(() => {
const circular_color = getComputedStyle(document.documentElement).getPropertyValue("--primary_300_color");
setCircularColor(circular_color.trim());
}, []);
return (
<div>
<CircularProgress size="14rem" sx={{ color: circular_color }}/>
</div>
);
};

View File

@@ -1,3 +1,4 @@
export { useIsBackendReady } from "./useIsBackendReady";
export { useWindow } from "./useWindow"; export { useWindow } from "./useWindow";
export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage"; export { useIsOpenedConfigPage } from "./useIsOpenedConfigPage";
export { useIsSoftwareUpdateAvailable } from "./useIsSoftwareUpdateAvailable"; export { useIsSoftwareUpdateAvailable } from "./useIsSoftwareUpdateAvailable";

View File

@@ -0,0 +1,15 @@
import { useStore_IsBackendReady } from "@store";
export const useIsBackendReady = () => {
const { currentIsBackendReady, updateIsBackendReady } = useStore_IsBackendReady();
const setIsBackendReady = (is_ready) => {
updateIsBackendReady(is_ready);
};
return {
currentIsBackendReady,
setIsBackendReady,
updateIsBackendReady,
};
};

View File

@@ -2,6 +2,7 @@ import { translator_status } from "@ui_configs";
import { arrayToObject } from "@utils"; import { arrayToObject } from "@utils";
import { import {
useIsBackendReady,
useWindow, useWindow,
useMessage, useMessage,
useVolume, useVolume,
@@ -61,6 +62,7 @@ import {
} from "@logics_configs"; } from "@logics_configs";
export const useReceiveRoutes = () => { export const useReceiveRoutes = () => {
const { updateIsBackendReady } = useIsBackendReady();
const { restoreWindowGeometry } = useWindow(); const { restoreWindowGeometry } = useWindow();
const { updateIsMainPageCompactMode } = useIsMainPageCompactMode(); const { updateIsMainPageCompactMode } = useIsMainPageCompactMode();
const { const {
@@ -438,6 +440,7 @@ export const useReceiveRoutes = () => {
case 200: case 200:
if (parsed_data.endpoint === "/run/initialization_complete") { if (parsed_data.endpoint === "/run/initialization_complete") {
initDataSyncProcess(parsed_data.result); initDataSyncProcess(parsed_data.result);
updateIsBackendReady(true);
break; break;
}; };
const route = routes[parsed_data.endpoint]; const route = routes[parsed_data.endpoint];

View File

@@ -102,6 +102,7 @@ const createAtomWithHook = (initialValue, base_name, options) => {
// Common // Common
export const { atomInstance: Atom_IsBackendReady, useHook: useStore_IsBackendReady } = createAtomWithHook(false, "IsBackendReady");
export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage"); export const { atomInstance: Atom_IsOpenedConfigPage, useHook: useStore_IsOpenedConfigPage } = createAtomWithHook(false, "IsOpenedConfigPage");
export const { atomInstance: Atom_MainFunctionsStateMemory, useHook: useStore_MainFunctionsStateMemory } = createAtomWithHook({ export const { atomInstance: Atom_MainFunctionsStateMemory, useHook: useStore_MainFunctionsStateMemory } = createAtomWithHook({
transcription_send: false, transcription_send: false,