From 24461be7031ec50002ae59ae1169f162451c07ed Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 12 Jan 2021 16:31:09 +0100 Subject: [PATCH] Fix events not showing on homepage Signed-off-by: Thomas Citharel --- js/src/i18n/en_US.json | 3 ++- js/src/i18n/fr_FR.json | 3 ++- js/src/views/Home.vue | 19 +++++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index 24f6c7b79..2bca14ff1 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -823,5 +823,6 @@ "Do you wish to {create_group} or {explore_groups}?": "Do you wish to {create_group} or {explore_groups}?", "Type or select a date…": "Type or select a date…", "Getting there": "Getting there", - "Groups are not enabled on this instance.": "Groups are not enabled on this instance." + "Groups are not enabled on this instance.": "Groups are not enabled on this instance.", + "The events you created are not shown here.": "The events you created are not shown here." } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index f3a5e6570..6245bfcfd 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -917,5 +917,6 @@ "Do you wish to {create_group} or {explore_groups}?": "Voulez-vous {create_group} ou {explore_groups} ?", "Type or select a date…": "Entrez ou sélectionnez une date…", "Getting there": "S'y rendre", - "Groups are not enabled on this instance.": "Les groupes ne sont pas activés sur cette instance." + "Groups are not enabled on this instance.": "Les groupes ne sont pas activés sur cette instance.", + "The events you created are not shown here.": "Les événements que vous avez créé ne s'affichent pas ici." } diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue index 993501e50..482172935 100644 --- a/js/src/views/Home.vue +++ b/js/src/views/Home.vue @@ -259,9 +259,13 @@ - {{ - $t("No events found") - }} + {{ $t("No events found") }}
+ + {{ + $t("The events you created are not shown here.") + }} +
@@ -444,7 +448,7 @@ export default class Home extends Vue { ); } - get goingToEvents(): Map> { + get thisWeekGoingToEvents(): IParticipant[] { const res = this.currentUserParticipations.filter( ({ event, role }) => event.beginsOn != null && @@ -456,8 +460,11 @@ export default class Home extends Vue { (a: IParticipant, b: IParticipant) => a.event.beginsOn.getTime() - b.event.beginsOn.getTime() ); + return res; + } - return res.reduce( + get goingToEvents(): Map> { + return this.thisWeekGoingToEvents.reduce( ( acc: Map>, participation: IParticipant @@ -496,7 +503,7 @@ export default class Home extends Vue { get filteredFeaturedEvents(): IEvent[] { return this.events.elements.filter( ({ id }) => - !this.currentUserParticipations + !this.thisWeekGoingToEvents .filter( (participation) => participation.role === ParticipantRole.CREATOR )