forked from potsda.mn/mobilizon
Hide promoted events on overview only if we already have them through
participations Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
6646e3398a
commit
d0541e3741
|
@ -37,10 +37,10 @@
|
||||||
<h3 class="title">
|
<h3 class="title">
|
||||||
{{ $t("Upcoming") }}
|
{{ $t("Upcoming") }}
|
||||||
</h3>
|
</h3>
|
||||||
<b-loading :active.sync="$apollo.loading"></b-loading>
|
<b-loading :active.sync="$apollo.loading" />
|
||||||
<div v-for="row of goingToEvents" class="upcoming-events" :key="row[0]">
|
<div v-for="row of goingToEvents" class="upcoming-events" :key="row[0]">
|
||||||
<span class="date-component-container" v-if="isInLessThanSevenDays(row[0])">
|
<span class="date-component-container" v-if="isInLessThanSevenDays(row[0])">
|
||||||
<date-component :date="row[0]"></date-component>
|
<date-component :date="row[0]" />
|
||||||
<h3 class="subtitle"
|
<h3 class="subtitle"
|
||||||
v-if="isToday(row[0])">
|
v-if="isToday(row[0])">
|
||||||
{{ $tc('You have one event today.', row[1].length, {count: row[1].length}) }}
|
{{ $tc('You have one event today.', row[1].length, {count: row[1].length}) }}
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
<h3 class="title">
|
<h3 class="title">
|
||||||
{{ $t("Last week") }}
|
{{ $t("Last week") }}
|
||||||
</h3>
|
</h3>
|
||||||
<b-loading :active.sync="$apollo.loading"></b-loading>
|
<b-loading :active.sync="$apollo.loading" />
|
||||||
<div>
|
<div>
|
||||||
<EventListCard
|
<EventListCard
|
||||||
v-for="participation in lastWeekEvents"
|
v-for="participation in lastWeekEvents"
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
</section>
|
</section>
|
||||||
<section class="events-featured">
|
<section class="events-featured">
|
||||||
<h3 class="title">{{ $t('Featured events') }}</h3>
|
<h3 class="title">{{ $t('Featured events') }}</h3>
|
||||||
<b-loading :active.sync="$apollo.loading"></b-loading>
|
<b-loading :active.sync="$apollo.loading" />
|
||||||
<div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
|
<div v-if="filteredFeaturedEvents.length > 0" class="columns is-multiline">
|
||||||
<div class="column is-one-third-desktop" v-for="event in filteredFeaturedEvents.slice(0, 6)" :key="event.uuid">
|
<div class="column is-one-third-desktop" v-for="event in filteredFeaturedEvents.slice(0, 6)" :key="event.uuid">
|
||||||
<EventCard
|
<EventCard
|
||||||
|
@ -261,9 +261,11 @@ export default class Home extends Vue {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return all events from server excluding the ones shown as participating
|
||||||
|
*/
|
||||||
get filteredFeaturedEvents() {
|
get filteredFeaturedEvents() {
|
||||||
if (!this.currentUser.isLoggedIn || !this.currentActor.id) return this.events;
|
return this.events.filter(({ id }) => !this.currentUserParticipations.map(({ event: { id } }) => id).includes(id));
|
||||||
return this.events.filter(event => event.organizerActor && event.organizerActor.id !== this.currentActor.id);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
geoLocalize() {
|
geoLocalize() {
|
||||||
|
|
Loading…
Reference in a new issue