chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update NotificationsCard.vue component

Browse source
This commit is contained in:
Daniel Supernault 2019-07-20 23:29:53 -06:00
parent 3820122af2
commit 1267aca74e
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/assets/js/components/NotificationCard.vue
View file

@ -1,10 +1,10 @@
<template> <template>
<div> <div>
<div class="card notification-card"> <div class="card notification-card shadow-none border">
<div class="card-header bg-white"> <div class="card-header bg-white">
<p class="mb-0 d-flex align-items-center justify-content-between"> <p class="mb-0 d-flex align-items-center justify-content-between">
<span><i class="far fa-bell fa-lg text-muted"></i></span> <span><i class="far fa-bell fa-lg text-white"></i></span>
<span class="small text-dark text-uppercase font-weight-bold">Alerts</span> <span class="small text-dark text-uppercase font-weight-bold">Notifications</span>
<a class="text-decoration-none text-muted" href="/account/activity"><i class="fas fa-inbox fa-lg"></i></a> <a class="text-decoration-none text-muted" href="/account/activity"><i class="fas fa-inbox fa-lg"></i></a>
</p> </p>
</div> </div>
@ -13,8 +13,8 @@
<span class="sr-only">Loading...</span> <span class="sr-only">Loading...</span>
</div> </div>
</div> </div>
<div class="card-body pt-2 px-0 contents" style="max-height: 230px; overflow-y: scroll;"> <div class="card-body pt-2 px-0 py-0 contents" style="max-height: 230px; overflow-y: scroll;">
<div v-if="notifications.length > 0" class="media mb-4 align-items-center px-3" v-for="(n, index) in notifications"> <div v-if="notifications.length > 0" class="media align-items-center px-3 py-2 border-bottom border-light" v-for="(n, index) in notifications">
<img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px"> <img class="mr-2 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px">
<div class="media-body font-weight-light small"> <div class="media-body font-weight-light small">
<div v-if="n.type == 'favourite'"> <div v-if="n.type == 'favourite'">
@ -43,7 +43,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="small text-muted" :title="n.created_at">{{timeAgo(n.created_at)}}</div> <div class="small text-muted font-weight-bold" :title="n.created_at">{{timeAgo(n.created_at)}}</div>
</div> </div>
<div v-if="notifications.length"> <div v-if="notifications.length">
<infinite-loading @infinite="infiniteNotifications"> <infinite-loading @infinite="infiniteNotifications">
@ -90,16 +90,16 @@
return true; return true;
}); });
let ids = res.data.map(n => n.id); let ids = res.data.map(n => n.id);
this.notificationMaxId = Math.max(...ids); this.notificationMaxId = Math.min(...ids);
this.notifications = data; this.notifications = data;
$('.notification-card .loader').addClass('d-none'); $('.notification-card .loader').addClass('d-none');
$('.notification-card .contents').removeClass('d-none'); $('.notification-card .contents').removeClass('d-none');
this.notificationPoll(); //this.notificationPoll();
}); });
}, },
infiniteNotifications($state) { infiniteNotifications($state) {
if(this.notificationCursor > 10) { if(this.notificationCursor > 5) {
$state.complete(); $state.complete();
return; return;
} }
@ -113,6 +113,9 @@
if(n.type == 'share' && !status) { if(n.type == 'share' && !status) {
return false; return false;
} }
if(_.find(this.notifications, {id: n.id})) {
return false;
}
return true; return true;
}); });
this.notifications.push(...data); this.notifications.push(...data);