remove useless strings, hide loader on eager finish

src/boot/after_store.js

@@ -348,12 +348,11 @@ const afterStoreSetup = async ({ store, i18n }) => {
   const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
   store.dispatch('setInstanceOption', { name: 'server', value: server })
 
-  document.querySelector('#status').textContent = i18n.global.t('splash.settings')
   await setConfig({ store })
-  document.querySelector('#status').textContent = i18n.global.t('splash.theme')
   try {
     await store.dispatch('applyTheme').catch((e) => { console.error('Error setting theme', e) })
   } catch (e) {
+    window.splashError(e)
     return Promise.reject(e)
   }
 
@@ -361,7 +360,6 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   // Now we can try getting the server settings and logging in
   // Most of these are preloaded into the index.html so blocking is minimized
-  document.querySelector('#status').textContent = i18n.global.t('splash.instance')
   await Promise.all([
     checkOAuthToken({ store }),
     getInstancePanel({ store }),
@@ -408,7 +406,6 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   // remove after vue 3.3
   app.config.unwrapInjectedRef = true
-  document.querySelector('#status').textContent = i18n.global.t('splash.almost')
 
   app.mount('#app')
   return app

src/i18n/en.json

@@ -1494,9 +1494,6 @@
   "splash": {
     "loading": "Loading...",
     "theme": "Applying theme, please wait warmly...",
-    "instance": "Getting instance info...",
-    "settings": "Applying settings...",
-    "almost": "Reticulating splines...",
     "fun_1": "Drink more water",
     "fun_2": "Take it easy!",
     "fun_3": "Suya...",

src/main.js

@@ -70,6 +70,11 @@ const persistedStateOptions = {
     console.error('PleromaFE failed to initialize: ', e)
   }
 
+  window.splashError = e => splashError(i18n, e)
+  window.splashUpdate = key => {
+    document.querySelector('#status').textContent = i18n.global.t(key)
+  }
+
   try {
     let storageError
     const plugins = [pushNotifications]

src/modules/interface.js

@@ -563,8 +563,10 @@ const interfaceMod = {
       if (!forceRecompile && !themeDebug && await tryLoadCache()) {
         return commit('setThemeApplied')
       }
+      window.splashUpdate('splash.theme')
       await dispatch('getThemeData')
 
+      try {
         const paletteIss = (() => {
           if (!state.paletteDataUsed) return null
           const result = {
@@ -667,8 +669,12 @@ const interfaceMod = {
         return applyTheme(
           rulesetArray.flat(),
           () => commit('setThemeApplied'),
+          () => {},
           themeDebug
         )
+      } catch (e) {
+        window.splashError(e)
+      }
     }
   }
 }

src/services/style_setter/style_setter.js

@@ -118,7 +118,7 @@ export const tryLoadCache = async () => {
   }
 }
 
-export const applyTheme = (input, onFinish = (data) => {}, debug) => {
+export const applyTheme = (input, onEagerFinish = data => {}, onFinish = data => {}, debug) => {
   const eagerStyles = createStyleSheet(EAGER_STYLE_ID)
   const lazyStyles = createStyleSheet(LAZY_STYLE_ID)
 
@@ -148,6 +148,7 @@ export const applyTheme = (input, onFinish = (data) => {}, debug) => {
       },
       onEagerFinished () {
         adoptStyleSheets([eagerStyles])
+        onEagerFinish()
       },
       onLazyFinished () {
         adoptStyleSheets([eagerStyles, lazyStyles])