Browse Source

Update Timeline.vue, fix load more posts

Daniel Supernault 5 năm trước cách đây
mục cha
commit
45a45c46ef

+ 5 - 5
resources/assets/js/components/StoryTimelineComponent.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div v-if="stories.length != 0">
-			<div id="storyContainer" :class="[list == true ? 'mt-1 mr-3 mb-0 ml-1':'m-3']"></div>
+			<div id="storyContainer" :class="[list == true ? 'mt-1 mr-3 mb-0 ml-1':'mx-3 mt-3 mb-0 pb-0']"></div>
 		</div>
 	</div>
 </template>
@@ -79,17 +79,17 @@
 	#storyContainer .story {
 		margin-right: 2rem;
 		width: 100%;
-		max-width: 64px;
+		max-width: 60px;
 	}
 	.stories.carousel .story > .item-link > .item-preview {
-		height: 64px;
+		height: 60px;
 	}
 	#zuck-modal.with-effects {
 		width: 100%;
 	}
 	.stories.carousel .story > .item-link > .info .name {
-		font-weight: 600;
-		font-size: 12px;
+		font-weight: 500;
+		font-size: 11px;
 	}
 	.stories.carousel .story > .item-link > .info {
 	}

+ 3 - 2
resources/assets/js/components/Timeline.vue

@@ -7,7 +7,7 @@
 			</p>
 		</div>
 		<div :class="[modes.distractionFree ? 'col-md-8 col-lg-8 offset-md-2 px-0 mb-sm-3 timeline order-2 order-md-1':'col-md-8 col-lg-8 px-0 mb-sm-3 timeline order-2 order-md-1']">
-			<div v-if="config.features.stories">
+			<div v-if="config.features.stories" class="card card-body p-0 border mt-4 mb-3 shadow-none">
 				<story-component v-if="config.features.stories"></story-component>
 			</div>
 			<div>
@@ -1533,8 +1533,9 @@
 						}
 					}).then(res => {
 						let self = this;
+						let tids = this.feed.map(status => status.id);
 						let data = res.data.filter(d => {
-							return d.id > self.min_id
+							return d.id > self.min_id && tids.indexOf(d.id) == -1;
 						});
 						let ids = data.map(status => status.id);
 						let max = Math.max(...ids).toString();