From 448974385346f28881179a517214e79de2cffd4a Mon Sep 17 00:00:00 2001
From: Laurent GAY <l.gay@sd-libre.fr>
Date: Wed, 27 Nov 2024 16:16:15 +0100
Subject: [PATCH] issue #1574 - home page & search page : 3 buttons for search

---
 src/components/Home/SearchFields.vue |  2 +-
 src/components/NavBar.vue            | 35 ----------------------------
 src/views/SearchView.vue             | 31 ------------------------
 3 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/src/components/Home/SearchFields.vue b/src/components/Home/SearchFields.vue
index 7a04715fc..6d4f331c2 100644
--- a/src/components/Home/SearchFields.vue
+++ b/src/components/Home/SearchFields.vue
@@ -58,7 +58,7 @@
       class="search-Activity min-w-40 mr-1 mb-1"
       native-type="submit"
       icon-left="calendar-star"
-      v-if="search == null && isLongEvents"
+      v-if="isLongEvents"
     >
       {{ t("Activities") }}
     </o-button>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index af5192e63..40dbc0417 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -179,39 +179,6 @@
         <ul
           class="flex flex-col md:flex-row md:space-x-8 mt-2 md:mt-0 md:font-lightbold"
         >
-          <li class="m-auto">
-            <router-link
-              :to="{
-                ...$route,
-                name: RouteName.SEARCH,
-                query: { ...$route.query, contentType: 'EVENTS' },
-              }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
-              >{{ t("Events") }}</router-link
-            >
-          </li>
-          <li class="m-auto" v-if="isLongEvents">
-            <router-link
-              :to="{
-                ...$route,
-                name: RouteName.SEARCH,
-                query: { ...$route.query, contentType: 'LONGEVENTS' },
-              }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
-              >{{ t("Activities") }}</router-link
-            >
-          </li>
-          <li class="m-auto">
-            <router-link
-              :to="{
-                ...$route,
-                name: RouteName.SEARCH,
-                query: { ...$route.query, contentType: 'GROUPS' },
-              }"
-              class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
-              >{{ t("Groups") }}</router-link
-            >
-          </li>
           <li class="m-auto">
             <router-link
               :to="{ name: RouteName.EVENT_CALENDAR }"
@@ -283,8 +250,6 @@ import {
 } from "@/graphql/user";
 import { ICurrentUser } from "@/types/current-user.model";
 
-const { isLongEvents } = useIsLongEvents();
-
 const { currentUser } = useCurrentUserClient();
 const { currentActor } = useCurrentActorClient();
 
diff --git a/src/views/SearchView.vue b/src/views/SearchView.vue
index f3fb69005..2424306ff 100644
--- a/src/views/SearchView.vue
+++ b/src/views/SearchView.vue
@@ -716,7 +716,6 @@ const GROUP_PAGE_LIMIT = 16;
 
 const { features } = useFeatures();
 const { eventCategories } = useEventCategories();
-const { isLongEvents } = useIsLongEvents();
 
 const orderedCategories = computed(() => {
   if (!eventCategories.value) return [];
@@ -829,36 +828,6 @@ const searchIsUrl = computed((): boolean => {
   return url.protocol === "http:" || url.protocol === "https:";
 });
 
-const contentTypeMapping = computed(() => {
-  if (isLongEvents.value) {
-    return [
-      {
-        contentType: ContentType.EVENTS,
-        label: t("Events"),
-      },
-      {
-        contentType: ContentType.LONGEVENTS,
-        label: t("Activities"),
-      },
-      {
-        contentType: ContentType.GROUPS,
-        label: t("Groups"),
-      },
-    ];
-  } else {
-    return [
-      {
-        contentType: ContentType.EVENTS,
-        label: t("Events"),
-      },
-      {
-        contentType: ContentType.GROUPS,
-        label: t("Groups"),
-      },
-    ];
-  }
-});
-
 const eventStatuses = computed(() => {
   return [
     {