Merge pull request #1293 from pixelfed/frontend-ui-refactor

Frontend ui refactor

public/mix-manifest.json

@@ -11,5 +11,5 @@
     "/js/profile.js": "/js/profile.js?id=374b0a3f3fec1282aa55",
     "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
     "/js/status.js": "/js/status.js?id=2c1a0fafcf34f573f537",
-    "/js/timeline.js": "/js/timeline.js?id=3827e28049de5e28988b"
+    "/js/timeline.js": "/js/timeline.js?id=2ae0450ee62c22f3839f"
 }

resources/assets/js/components/Timeline.vue

@@ -471,10 +471,10 @@
 			axios.get('/api/v2/config')
 			.then(res => {
 				this.config = res.data;
-				this.fetchTimelineApi();
 				if(window.outerWidth > 767) {
 					this.fetchProfile();
 				}
+				this.fetchTimelineApi();
 			});
 		},
 
@@ -489,7 +489,6 @@
 				this.showSuggestions = true;
 			}
 
-
 			if(localStorage.getItem('pf_metro_ui.exp.rm') == 'false') {
 				this.showReadMore = false;
 			} else {
@@ -523,6 +522,7 @@
 					$('.profile-card .loader').addClass('d-none');
 					$('.profile-card .contents').removeClass('d-none');
 					$('.profile-card .card-footer').removeClass('d-none');
+					this.expRec();
 				}).catch(err => {
 					swal(
 						'Oops, something went wrong',
@@ -561,7 +561,6 @@
 					this.max_id = Math.min(...ids);
 					$('.timeline .pagination').removeClass('d-none');
 					this.loading = false;
-					this.expRec();
 				}).catch(err => {
 				});
 			},