From 81a1ca1c6b2ac394cc746a8dcad7a2491304e859 Mon Sep 17 00:00:00 2001
From: johndoe4 <jonher@riseup.net>
Date: Wed, 17 May 2023 00:33:37 +0200
Subject: [PATCH] Adding UpcomingEvents.vue & include it to HomeView.vue - Will
 show all upcoming Events sorted by Date on the Startpage

---
 js/src/components/Local/UpcomingEvents.vue | 78 ++++++++++++++++++++++
 js/src/views/HomeView.vue                  |  2 +
 2 files changed, 80 insertions(+)
 create mode 100755 js/src/components/Local/UpcomingEvents.vue

diff --git a/js/src/components/Local/UpcomingEvents.vue b/js/src/components/Local/UpcomingEvents.vue
new file mode 100755
index 000000000..d319a300c
--- /dev/null
+++ b/js/src/components/Local/UpcomingEvents.vue
@@ -0,0 +1,78 @@
+<template>
+  <close-content
+    class="container mx-auto px-2"
+    v-show="loadingEvents || (events && events.total > 0)"
+    :suggestGeoloc="false"
+    v-on="attrs"
+  >
+    <template #title>
+      {{ t("Upcoming events") }}
+    </template>
+    <template #subtitle>
+      <i18n-t
+        class="text-slate-700 dark:text-slate-300"
+        tag="p"
+        keypath="On {instance} and other federated instances"
+      >
+        <template #instance>
+          <b>{{ instanceName }}</b>
+        </template>
+      </i18n-t>
+    </template>
+    <template #content>
+      <skeleton-event-result
+        v-for="i in 6"
+        class="scroll-ml-6 snap-center shrink-0 w-[18rem] my-4"
+        :key="i"
+        v-show="loadingEvents"
+      />
+      <event-card
+        v-for="event in events.elements"
+        :event="event"
+        :key="event.uuid"
+      />
+      <more-content
+        :to="{
+          name: RouteName.SEARCH,
+          query: {
+            contentType: 'EVENTS',
+          },
+        }"
+      >
+        {{ t("View more events") }}
+      </more-content>
+    </template>
+  </close-content>
+</template>
+
+<script lang="ts" setup>
+import MoreContent from "./MoreContent.vue";
+import CloseContent from "./CloseContent.vue";
+import { computed, useAttrs } from "vue";
+import { IEvent } from "@/types/event.model";
+import { useQuery } from "@vue/apollo-composable";
+import EventCard from "../Event/EventCard.vue";
+import { Paginate } from "@/types/paginate";
+import SkeletonEventResult from "../Event/SkeletonEventResult.vue";
+import { EventSortField, SortDirection } from "@/types/enums";
+import { FETCH_EVENTS } from "@/graphql/event";
+import { useI18n } from "vue-i18n";
+import RouteName from "@/router/name";
+
+defineProps<{
+  instanceName: string;
+}>();
+
+const { t } = useI18n({ useScope: "global" });
+const attrs = useAttrs();
+
+const { result: resultEvents, loading: loadingEvents } = useQuery<{
+  events: Paginate<IEvent>;
+}>(FETCH_EVENTS, {
+  orderBy: EventSortField.BEGINS_ON,
+  direction: SortDirection.ASC,
+});
+const events = computed(
+  () => resultEvents.value?.events ?? { total: 0, elements: [] }
+);
+</script>
diff --git a/js/src/views/HomeView.vue b/js/src/views/HomeView.vue
index b82ae1a0b..de0556afe 100644
--- a/js/src/views/HomeView.vue
+++ b/js/src/views/HomeView.vue
@@ -143,6 +143,7 @@
   />
   <CloseGroups :userLocation="userLocation" @doGeoLoc="performGeoLocation()" />
   <OnlineEvents />
+  <UpcomingEvents v-if="instanceName" :instanceName="instanceName" />
   <LastEvents v-if="instanceName" :instanceName="instanceName" />
   <!-- Unlogged content section -->
   <picture v-if="!currentUser?.isLoggedIn">
@@ -196,6 +197,7 @@ import { IEvent } from "../types/event.model";
 import CloseEvents from "@/components/Local/CloseEvents.vue";
 import CloseGroups from "@/components/Local/CloseGroups.vue";
 import LastEvents from "@/components/Local/LastEvents.vue";
+import LastEvents from "@/components/Local/UpcomingEvents.vue";
 import OnlineEvents from "@/components/Local/OnlineEvents.vue";
 import {
   computed,