Merge remote-tracking branch 'origin/develop' into bookmark-folders

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

1 files changed, 67 insertions, 47 deletions

diff --git a/src/main.js b/src/main.js
index 60f4d06f..bcfc80b0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -58,56 +58,76 @@ const persistedStateOptions = {
 };
 
 (async () => {
-  let storageError = false
-  const plugins = [pushNotifications]
-  try {
-    const persistedState = await createPersistedState(persistedStateOptions)
-    plugins.push(persistedState)
-  } catch (e) {
-    console.error(e)
-    storageError = true
+  const isFox = Math.floor(Math.random() * 2) > 0 ? '_fox' : ''
+
+  const splashError = (i18n, e) => {
+    const throbber = document.querySelector('#throbber')
+    throbber.addEventListener('animationend', () => {
+      document.querySelector('#mascot').src = `/static/pleromatan_orz${isFox}.png`
+    })
+    throbber.classList.add('dead')
+    document.querySelector('#status').textContent = i18n.global.t('splash.error')
+    console.error('PleromaFE failed to initialize: ', e)
   }
-  const store = createStore({
-    modules: {
-      i18n: {
-        getters: {
-          i18n: () => i18n.global
-        }
+
+  try {
+    let storageError
+    const plugins = [pushNotifications]
+    try {
+      const persistedState = await createPersistedState(persistedStateOptions)
+      plugins.push(persistedState)
+    } catch (e) {
+      console.error('Storage error', e)
+      storageError = e
+    }
+    document.querySelector('#mascot').src = `/static/pleromatan_apology${isFox}.png`
+    document.querySelector('#status').removeAttribute('class')
+    document.querySelector('#status').textContent = i18n.global.t('splash.loading')
+    document.querySelector('#splash-credit').textContent = i18n.global.t('update.art_by', { linkToArtist: 'pipivovott' })
+    const store = createStore({
+      modules: {
+        i18n: {
+          getters: {
+            i18n: () => i18n.global
+          }
+        },
+        interface: interfaceModule,
+        instance: instanceModule,
+        // TODO refactor users/statuses modules, they depend on each other
+        users: usersModule,
+        statuses: statusesModule,
+        notifications: notificationsModule,
+        lists: listsModule,
+        api: apiModule,
+        config: configModule,
+        profileConfig: profileConfigModule,
+        serverSideStorage: serverSideStorageModule,
+        adminSettings: adminSettingsModule,
+        shout: shoutModule,
+        oauth: oauthModule,
+        authFlow: authFlowModule,
+        mediaViewer: mediaViewerModule,
+        oauthTokens: oauthTokensModule,
+        reports: reportsModule,
+        polls: pollsModule,
+        postStatus: postStatusModule,
+        editStatus: editStatusModule,
+        statusHistory: statusHistoryModule,
+        chats: chatsModule,
+        announcements: announcementsModule,
+        bookmarkFolders: bookmarkFoldersModule
       },
-      interface: interfaceModule,
-      instance: instanceModule,
-      // TODO refactor users/statuses modules, they depend on each other
-      users: usersModule,
-      statuses: statusesModule,
-      notifications: notificationsModule,
-      lists: listsModule,
-      api: apiModule,
-      config: configModule,
-      profileConfig: profileConfigModule,
-      serverSideStorage: serverSideStorageModule,
-      adminSettings: adminSettingsModule,
-      shout: shoutModule,
-      oauth: oauthModule,
-      authFlow: authFlowModule,
-      mediaViewer: mediaViewerModule,
-      oauthTokens: oauthTokensModule,
-      reports: reportsModule,
-      polls: pollsModule,
-      postStatus: postStatusModule,
-      editStatus: editStatusModule,
-      statusHistory: statusHistoryModule,
-      chats: chatsModule,
-      announcements: announcementsModule,
-      bookmarkFolders: bookmarkFoldersModule
-    },
-    plugins,
-    strict: false // Socket modifies itself, let's ignore this for now.
-    // strict: process.env.NODE_ENV !== 'production'
-  })
-  if (storageError) {
-    store.dispatch('pushGlobalNotice', { messageKey: 'errors.storage_unavailable', level: 'error' })
+      plugins,
+      strict: false // Socket modifies itself, let's ignore this for now.
+      // strict: process.env.NODE_ENV !== 'production'
+    })
+    if (storageError) {
+      store.dispatch('pushGlobalNotice', { messageKey: 'errors.storage_unavailable', level: 'error' })
+    }
+    return await afterStoreSetup({ store, i18n })
+  } catch (e) {
+    splashError(i18n, e)
   }
-  afterStoreSetup({ store, i18n })
 })()
 
 // These are inlined by webpack's DefinePlugin