diff --git a/index.html b/index.html index 9cb2796..aa9ab22 100644 --- a/index.html +++ b/index.html @@ -218,18 +218,18 @@ #splash__error-message { font-family: monospace; + background-color: var(--background-error); + padding: 1rem 1.5rem; + border-radius: var(--border-radius); + margin-bottom: 1rem; } #splash__error[aria-hidden=true] { opacity: 0; } - #splash__error-attempt:not(:empty):before { - content:' ('; - } - - #splash__error-attempt:not(:empty):after { - content:')'; + #app { + height: 100%; } @@ -264,9 +264,8 @@
diff --git a/src/App.vue b/src/App.vue index 29a0345..1724553 100644 --- a/src/App.vue +++ b/src/App.vue @@ -57,7 +57,7 @@ export default defineComponent({ requestAnimationFrame(() => window.hideSplash()); }).catch(e => { console.error('Failed to load server configuration: ', e); - window.showSplashError(e, false, ++configAttempts.value); + window.showSplashError('Failed to load server configuration\n' + e, false, ++configAttempts.value); setTimeout(() => loadConfiguration(), 1000); }); }, diff --git a/src/main.ts b/src/main.ts index 0527253..9926929 100644 --- a/src/main.ts +++ b/src/main.ts @@ -29,7 +29,6 @@ const splash = document.getElementById('splash'), splashError = document.getElementById('splash__error'), splashErrorMessage = document.getElementById('splash__error-message'), splashRetry = document.getElementById('splash__error-retry'), - splashAttempt = document.getElementById('splash__error-attempt'), svgs = import.meta.globEager('/assets/icons/*.svg'); window.showSplash = function() { @@ -74,12 +73,12 @@ window.showSplashError = function(message: string, fatal: boolean, attempts: num splashSpinner.style.visibility = 'hidden'; } - if(splashAttempt && splashRetry) { + if(splashRetry) { if(fatal) { - splashAttempt.hidden = splashRetry.hidden = true; + splashRetry.hidden = true; } else if(attempts) { - splashAttempt.hidden = splashRetry.hidden = false; - splashAttempt.textContent = attempts.toString(); + splashRetry.hidden = false; + splashRetry.textContent = `Retrying... (${attempts.toString()})`; } } }; @@ -107,4 +106,7 @@ API.validateConfiguration().then((config) => { // app.config.performance = true; app.mount('#app'); +}).catch(e => { + console.error('LiveAtlas configuration is invalid: ', e); + window.showSplashError('LiveAtlas configuration is invalid\n' + e, true); });