Comunic/ComunicWeb
1
0
Fork 0
mirror of https://github.com/pierre42100/ComunicWeb synced 2024-11-29 15:26:27 +00:00
Code Issues Projects Releases Wiki Activity

Update startup sequence

Browse Source
This commit is contained in:
Pierre HUBERT 2021-02-20 10:58:28 +01:00
parent 69092db808
commit 3f8dbb3f36
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assets/js/common/system.js
View File

@ -34,14 +34,12 @@ const System = {
Page.location_updated(e); Page.location_updated(e);
} }
/**
* Prepare login
*/
//Clean current page content //Clean current page content
Page.emptyPage(); Page.emptyPage();
//Show a wait splash screen //Show a wait splash screen
Page.showWaitSplashScreen("Starting up..."); Page.showWaitSplashScreen(tr("Starting up..."));
/** /**
* Language initator * Language initator
@ -58,13 +56,26 @@ const System = {
*/ */
ComunicWeb.components.darkTheme.refresh(); ComunicWeb.components.darkTheme.refresh();
/**
* Initialize server configuration
*/
Page.showWaitSplashScreen(tr("Loading server configuration"));
try {
ServerConfig.ensureLoaded();
} catch(e) {
console.error(e)
Page.showTransparentWaitSplashScreen(tr("Failed to load server configuration! Please try again by refreshing the page!"));
}
/** /**
* Get login state * Get login state
*/ */
Page.showWaitSplashScreen(tr("Refreshing login state"));
await UserLogin.refreshLoginState(); await UserLogin.refreshLoginState();
// Initialize Websocket if user is connected // Initialize Websocket if user is connected
if(signed_in()) { if(signed_in()) {
Page.showWaitSplashScreen(tr("Connecting to server"));
await UserWebSocket.Connect(); await UserWebSocket.Connect();
await UserWebSocket.WaitForConnected(); await UserWebSocket.WaitForConnected();
} }