Wait for state from /now before rendering (#649)

* Wait for state from /now before rendering * Move initialization code from index.html → app.js * fixup! Move initialization code from index.html → app.js
u-wave · May 25, 2017 · 2421a7a · 2421a7a
1 parent 3de7d0a
commit 2421a7a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Uwave.js b/src/Uwave.js
@@ -32,6 +32,9 @@ export default class Uwave {
   constructor(options = {}, session = readSession()) {
     this.options = options;
     this.jwt = session;
+    this.ready = new Promise((resolve) => {
+      this.resolveReady = resolve;
+    });
 
     Object.assign(this, api.constants);
     Object.assign(this, api.components);
@@ -91,7 +94,9 @@ export default class Uwave {
     }
 
     this.store.dispatch(socketConnect());
-    this.store.dispatch(initState());
+    return this.store.dispatch(initState()).then(() => {
+      this.resolveReady();
+    });
   }
 
   getComponent() {

diff --git a/src/app.js b/src/app.js
@@ -17,3 +17,10 @@ uw.source('youtube', youTubeSource);
 uw.source('soundcloud', soundCloudSource);
 
 window.uw = uw;
+
+uw.build().then(() => {
+  uw.renderToDOM(document.querySelector('#app'));
+  document.querySelector('#app-loading').innerHTML = '';
+}).catch((err) => {
+  document.querySelector('.LoadingScreen-notice').textContent = `Error: ${err.message}`;
+});
diff --git a/src/index.html b/src/index.html
@@ -30,9 +30,5 @@
     <% for (const chunk in htmlWebpackPlugin.files.chunks) { %>
       <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
-    <script>
-      uw.renderToDOM(document.querySelector('#app'));
-      document.querySelector('#app-loading').innerHTML = '';
-    </script>
   </body>
 </html>