From 78f51c0ab3a5172bafc4ac7ab78a6effbfe87a82 Mon Sep 17 00:00:00 2001
From: jona <jona@systemli.org>
Date: Wed, 22 Mar 2023 18:59:38 +0100
Subject: [PATCH 1/2] simplified base structure: startpage shows up to 161
 events sorted by date, "explore" and "view everything" renamed to "filter"

---
 js/src/components/NavBar.vue |  2 +-
 js/src/views/Home.vue        | 29 ++++++++++++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index 8dc071f4d..03617d7c1 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -16,7 +16,7 @@
     </template>
     <template slot="start">
       <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
-        $t("Explore")
+        $t("Filter")
       }}</b-navbar-item>
       <b-navbar-item
         v-if="currentActor.id && currentUser.isLoggedIn"
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 9b4605018..e61ac069c 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -51,18 +51,26 @@
     >
       <section class="events-recent">
         <h2 class="title">
-          {{ $t("Last published events") }}
+          {{ $t("Upcoming events") }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
             <b slot="instance">{{ config.name }}</b>
           </i18n>
         </p>
-        <div v-if="this.events.total > 0">
-          <multi-card :events="events.elements.slice(0, 6)" />
+        <div v-if="events.elements.length > 0">
+          <multi-card class="my-4" :events="events.elements" />
+          <div class="pagination" v-if="events.total > EVENT_PAGE_LIMIT">
+            <b-pagination
+              :total="events.total"
+              v-model="featuredEventPage"
+              :per-page="EVENT_PAGE_LIMIT"
+            >
+            </b-pagination>
+          </div>
           <span class="view-all">
             <router-link :to="{ name: RouteName.SEARCH }"
-              >{{ $t("View everything") }} >></router-link
+              >{{ $t("Filter") }} >></router-link
             >
           </span>
         </div>
@@ -191,7 +199,7 @@
       />
       <section class="events-recent">
         <h2 class="title">
-          {{ $t("Last published events") }}
+          {{ $t("Upcoming events") }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
@@ -200,10 +208,10 @@
         </p>
 
         <div v-if="events.total > 0">
-          <multi-card :events="events.elements.slice(0, 8)" />
+          <multi-card :events="events.elements" />
           <span class="view-all">
             <router-link :to="{ name: RouteName.SEARCH }"
-              >{{ $t("View everything") }} >></router-link
+              >{{ $t("Filter") }} >></router-link
             >
           </span>
         </div>
@@ -247,13 +255,16 @@ import { IConfig } from "../types/config.model";
 import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
 import Subtitle from "../components/Utils/Subtitle.vue";
 
+const EVENT_PAGE_LIMIT = 161;
+
 @Component({
   apollo: {
     events: {
       query: FETCH_EVENTS,
       variables: {
-        orderBy: EventSortField.INSERTED_AT,
-        direction: SortDirection.DESC,
+        orderBy: EventSortField.BEGINS_ON,
+        direction: SortDirection.ASC,
+        limit: EVENT_PAGE_LIMIT,
       },
     },
     currentActor: {

From df7b4fd9120192255d40b3ff5f54aed518edcda6 Mon Sep 17 00:00:00 2001
From: jona <jona@systemli.org>
Date: Wed, 22 Mar 2023 19:41:20 +0100
Subject: [PATCH 2/2] Revert "simplified base structure:"

This reverts commit 78f51c0ab3a5172bafc4ac7ab78a6effbfe87a82.
---
 js/src/components/NavBar.vue |  2 +-
 js/src/views/Home.vue        | 29 +++++++++--------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index 03617d7c1..8dc071f4d 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -16,7 +16,7 @@
     </template>
     <template slot="start">
       <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
-        $t("Filter")
+        $t("Explore")
       }}</b-navbar-item>
       <b-navbar-item
         v-if="currentActor.id && currentUser.isLoggedIn"
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index e61ac069c..9b4605018 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -51,26 +51,18 @@
     >
       <section class="events-recent">
         <h2 class="title">
-          {{ $t("Upcoming events") }}
+          {{ $t("Last published events") }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
             <b slot="instance">{{ config.name }}</b>
           </i18n>
         </p>
-        <div v-if="events.elements.length > 0">
-          <multi-card class="my-4" :events="events.elements" />
-          <div class="pagination" v-if="events.total > EVENT_PAGE_LIMIT">
-            <b-pagination
-              :total="events.total"
-              v-model="featuredEventPage"
-              :per-page="EVENT_PAGE_LIMIT"
-            >
-            </b-pagination>
-          </div>
+        <div v-if="this.events.total > 0">
+          <multi-card :events="events.elements.slice(0, 6)" />
           <span class="view-all">
             <router-link :to="{ name: RouteName.SEARCH }"
-              >{{ $t("Filter") }} >></router-link
+              >{{ $t("View everything") }} >></router-link
             >
           </span>
         </div>
@@ -199,7 +191,7 @@
       />
       <section class="events-recent">
         <h2 class="title">
-          {{ $t("Upcoming events") }}
+          {{ $t("Last published events") }}
         </h2>
         <p>
           <i18n tag="span" path="On {instance} and other federated instances">
@@ -208,10 +200,10 @@
         </p>
 
         <div v-if="events.total > 0">
-          <multi-card :events="events.elements" />
+          <multi-card :events="events.elements.slice(0, 8)" />
           <span class="view-all">
             <router-link :to="{ name: RouteName.SEARCH }"
-              >{{ $t("Filter") }} >></router-link
+              >{{ $t("View everything") }} >></router-link
             >
           </span>
         </div>
@@ -255,16 +247,13 @@ import { IConfig } from "../types/config.model";
 import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
 import Subtitle from "../components/Utils/Subtitle.vue";
 
-const EVENT_PAGE_LIMIT = 161;
-
 @Component({
   apollo: {
     events: {
       query: FETCH_EVENTS,
       variables: {
-        orderBy: EventSortField.BEGINS_ON,
-        direction: SortDirection.ASC,
-        limit: EVENT_PAGE_LIMIT,
+        orderBy: EventSortField.INSERTED_AT,
+        direction: SortDirection.DESC,
       },
     },
     currentActor: {