Improve some components

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/src/graphql/event.ts

@@ -466,44 +466,6 @@ export const FETCH_GROUP_EVENTS = gql`
   ${ADDRESS_FRAGMENT}
 `;
 
-export const CLOSE_EVENTS = gql`
-  query CloseEvents($location: String, $radius: Float) {
-    searchEvents(location: $location, radius: $radius, page: 1, limit: 10) {
-      total
-      elements {
-        id
-        title
-        uuid
-        beginsOn
-        picture {
-          id
-          url
-        }
-        tags {
-          ...TagFragment
-        }
-        options {
-          ...EventOptions
-        }
-        physicalAddress {
-          ...AdressFragment
-        }
-        attributedTo {
-          ...ActorFragment
-        }
-        organizerActor {
-          ...ActorFragment
-        }
-        __typename
-      }
-    }
-  }
-  ${ADDRESS_FRAGMENT}
-  ${TAG_FRAGMENT}
-  ${EVENT_OPTIONS_FRAGMENT}
-  ${ACTOR_FRAGMENT}
-`;
-
 export const EXPORT_EVENT_PARTICIPATIONS = gql`
   mutation ExportEventParticipants(
     $eventId: ID!

js/src/graphql/group.ts

@@ -408,3 +408,19 @@ export const GROUP_TIMELINE = gql`
   }
   ${ACTOR_FRAGMENT}
 `;
+
+export const CLOSE_GROUPS = gql`
+  query CloseGroups($location: String, $radius: Float) {
+    searchGroups(location: $location, radius: $radius, page: 1, limit: 10) {
+      total
+      elements {
+        ...ActorFragment
+        physicalAddress {
+          ...AdressFragment
+        }
+      }
+    }
+  }
+  ${ACTOR_FRAGMENT}
+  ${ADDRESS_FRAGMENT}
+`;

js/src/graphql/home.ts

@@ -105,3 +105,51 @@ export const HOME_USER_QUERIES = gql`
   ${EVENT_OPTIONS_FRAGMENT}
   ${ACTOR_FRAGMENT}
 `;
+
+export const CLOSE_CONTENT = gql`
+  query CloseContent(
+    $location: String!
+    $radius: Float
+    $page: Int
+    $limit: Int
+  ) {
+    searchEvents(
+      location: $location
+      radius: $radius
+      page: $page
+      limit: $limit
+    ) {
+      total
+      elements {
+        id
+        title
+        uuid
+        beginsOn
+        picture {
+          id
+          url
+        }
+        tags {
+          ...TagFragment
+        }
+        options {
+          ...EventOptions
+        }
+        physicalAddress {
+          ...AdressFragment
+        }
+        attributedTo {
+          ...ActorFragment
+        }
+        organizerActor {
+          ...ActorFragment
+        }
+        __typename
+      }
+    }
+  }
+  ${ADDRESS_FRAGMENT}
+  ${TAG_FRAGMENT}
+  ${EVENT_OPTIONS_FRAGMENT}
+  ${ACTOR_FRAGMENT}
+`;

js/src/graphql/search.ts

@@ -1,8 +1,10 @@
 import gql from "graphql-tag";
 import { ACTOR_FRAGMENT } from "./actor";
+import { ADDRESS_FRAGMENT } from "./address";
+import { TAG_FRAGMENT } from "./tags";
 
-export const SEARCH_EVENTS = gql`
-  query SearchEvents(
+export const SEARCH_EVENTS_AND_GROUPS = gql`
+  query SearchEventsAndGroups(
     $location: String
     $radius: Float
     $tags: String
@@ -33,23 +35,20 @@ export const SEARCH_EVENTS = gql`
           url
         }
         tags {
-          slug
-          title
+          ...TagFragment
+        }
+        physicalAddress {
+          ...AdressFragment
+        }
+        organizerActor {
+          ...ActorFragment
+        }
+        attributedTo {
+          ...ActorFragment
         }
         __typename
       }
     }
-  }
-`;
-
-export const SEARCH_GROUPS = gql`
-  query SearchGroups(
-    $term: String
-    $location: String
-    $radius: Float
-    $page: Int
-    $limit: Int
-  ) {
     searchGroups(
       term: $term
       location: $location
@@ -60,9 +59,21 @@ export const SEARCH_GROUPS = gql`
       total
       elements {
         ...ActorFragment
+        banner {
+          id
+          url
+        }
+        members(roles: "member,moderator,administrator,creator") {
+          total
+        }
+        followers(approved: true) {
+          total
+        }
       }
     }
   }
+  ${TAG_FRAGMENT}
+  ${ADDRESS_FRAGMENT}
   ${ACTOR_FRAGMENT}
 `;