From 9b4dea199813b63518bce45585c4d1d8dad841de Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 25 Feb 2019 23:41:57 -0700 Subject: [PATCH 1/3] Update site view --- resources/views/site/fediverse.blade.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php index 91b21fed2..b2a84fe0e 100644 --- a/resources/views/site/fediverse.blade.php +++ b/resources/views/site/fediverse.blade.php @@ -8,10 +8,13 @@

Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.

-

Supported Fediverse Projects

+

Supported Fediverse Projects

+

This is a partial list of well known supported projects

@endsection From 2c0d240c8a46904092e35e6267b8627103eb328c Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 26 Feb 2019 00:16:28 -0700 Subject: [PATCH 2/3] Update Timeline component, add infinite scroll notifications --- resources/assets/js/components/Timeline.vue | 41 +++++++++++++++++++-- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 76e6abc76..a518ce327 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -227,12 +227,12 @@ See All

-
+
-
+
@@ -262,7 +262,12 @@

- +
+
+ +
+
+

@@ -318,6 +323,7 @@ min_id: 0, max_id: 0, notifications: {}, + notificationCursor: 2, stories: {}, suggestions: {}, loading: true, @@ -438,17 +444,44 @@ fetchNotifications() { axios.get('/api/v1/notifications') .then(res => { - this.notifications = res.data.filter(n => { + let data = res.data.filter(n => { if(n.type == 'share' && !status) { return false; } return true; }); + this.notifications = data; $('.notification-card .loader').addClass('d-none'); $('.notification-card .contents').removeClass('d-none'); }); }, + infiniteNotifications($state) { + if(this.notificationCursor > 10) { + $state.complete(); + return; + } + axios.get('/api/v1/notifications', { + params: { + page: this.notificationCursor + } + }).then(res => { + if(res.data.length) { + let data = res.data.filter(n => { + if(n.type == 'share' && !status) { + return false; + } + return true; + }); + this.notifications.push(...data); + this.notificationCursor++; + $state.loaded(); + } else { + $state.complete(); + } + }); + }, + reportUrl(status) { let type = status.in_reply_to ? 'comment' : 'post'; let id = status.id; From b4f0d1586d2c6a85b04ab240ac57126ded78bab2 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 26 Feb 2019 00:16:46 -0700 Subject: [PATCH 3/3] Update compiled assets --- public/js/timeline.js | Bin 33858 -> 34539 bytes public/mix-manifest.json | Bin 641 -> 641 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index 9a82de4324cecb8965c3d378764a849b969051a2..5e409d7fdacacb04bd4004efc1b9cd8d3e6b6b55 100644 GIT binary patch delta 2484 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 delta 32 ncmZo