src/store/modules/albums/actions.js

@@ -32,12 +32,15 @@ export default {
 
   },
   loadAlbums(context, force) {
-    if ((!context.state.eos || force) && !context.state.loading) {
+    return new Promise((resolve) => {
-      context.state.loading = true;
+      if ((!context.state.eos || force) && !context.state.loading) {
-      axios.get(context.rootGetters.server + "/api/albums/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
+        context.state.loading = true;
-        context.commit("setAlbums", res.data);
+        axios.get(context.rootGetters.server + "/api/albums/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
-      });
+          context.commit("setAlbums", res.data);
-    }
+          resolve(res.data);
+        });
+      }
+    });
   },
   loadFavourites(context) {
     axios.get(context.rootGetters.server + "/api/albums/favourites", context.rootGetters.headers).then(res => {
@@ -165,7 +168,7 @@ export default {
       axios.post(context.rootGetters.server + "/api/albums/" + album._id + "/share", {}, context.rootGetters.headers).then(res => {
         album.share = res.data;
         resolve();
-        context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon:"share" }, { root: true });
+        context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon: "share" }, { root: true });
       });
     });
   },

src/store/modules/artists/actions.js

@@ -13,12 +13,15 @@ export default {
     })
   },
   loadArtists(context, force) {
-    if ((!context.state.eos || force) && !context.state.loading) {
+    return new Promise((resolve) => {
-      context.state.loading = true;
+      if ((!context.state.eos || force) && !context.state.loading) {
-      axios.get(context.rootGetters.server + "/api/artists/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
+        context.state.loading = true;
-        context.commit("setArtists", res.data);
+        axios.get(context.rootGetters.server + "/api/artists/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
-      });
+          context.commit("setArtists", res.data);
-    }
+          resolve(res.data);
+        });
+      }
+    });
   },
   loadArtist(context, id) {
     context.state.loading = true;

src/store/modules/boxes/actions.js

@@ -13,12 +13,15 @@ export default {
     })
   },
   loadBoxes(context, force) {
-    if ((!context.state.eos || force) && !context.state.loading) {
+    return new Promise((resolve) => {
-      context.state.loading = true;
+      if ((!context.state.eos || force) && !context.state.loading) {
-      axios.get(context.rootGetters.server + "/api/boxes/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
+        context.state.loading = true;
-        context.commit("setBoxes", res.data);
+        axios.get(context.rootGetters.server + "/api/boxes/page/" + context.state.page++, context.rootGetters.headers).then((res) => {
-      });
+          context.commit("setBoxes", res.data);
-    }
+          resolve(res.data);
+        });
+      }
+    });
   },
   loadFavourites(context) {
     axios.get(context.rootGetters.server + "/api/boxes/favourites", context.rootGetters.headers).then(res => {

src/views/Home.vue

@@ -106,8 +106,11 @@ export default {
       this.$store.dispatch("videos/loadMostViewed");
       if (this.randomCovers.length == 0) {
         this.$store.dispatch("albums/loadRandomCovers", 60);
-        this.$store.dispatch("albums/loadAlbums", true);
+        this.$store.dispatch("albums/loadAlbums", true).then(() => {
-        this.$store.dispatch("artists/loadArtists", true);
+          this.$store.dispatch("artists/loadArtists", true).then(() => {
+            this.$store.dispatch("boxes/loadBoxes", true);
+          });
+        });
       }
     },
     loadNextPage() {