Refactor GraphQL queries and event cards

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

js/src/components/Event/EventCard.vue

@@ -40,6 +40,22 @@
         </div>
         <div class="media-content">
           <p class="event-title" :title="event.title">{{ event.title }}</p>
+          <div class="event-organizer">
+            <figure
+              class="image is-24x24"
+              v-if="organizer(event) && organizer(event).avatar"
+            >
+              <img
+                class="is-rounded"
+                :src="organizer(event).avatar.url"
+                alt=""
+              />
+            </figure>
+            <b-icon v-else icon="account-circle" />
+            <span class="organizer-name">
+              {{ organizerDisplayName(event) }}
+            </span>
+          </div>
           <div
             class="event-subtitle"
             v-if="event.physicalAddress"
@@ -49,7 +65,7 @@
                 : event.physicalAddress.description
             "
           >
-            <!--            <p>{{ $t('By @{username}', { username: actor.preferredUsername }) }}</p>-->
+            <b-icon icon="map-marker" />
             <span v-if="isDescriptionDifferentFromLocality">
               {{ event.physicalAddress.description }},
               {{ event.physicalAddress.locality }}
@@ -58,6 +74,13 @@
               {{ event.physicalAddress.description }}
             </span>
           </div>
+          <div
+            class="event-subtitle"
+            v-else-if="event.options && event.options.isOnline"
+          >
+            <b-icon icon="video" />
+            <span>{{ $t("Online") }}</span>
+          </div>
         </div>
       </div>
     </div>
@@ -100,7 +123,12 @@
 </template>
 
 <script lang="ts">
-import { IEvent, IEventCardOptions } from "@/types/event.model";
+import {
+  IEvent,
+  IEventCardOptions,
+  organizerDisplayName,
+  organizer,
+} from "@/types/event.model";
 import { Component, Prop, Vue } from "vue-property-decorator";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
 import LazyImageWrapper from "@/components/Image/LazyImageWrapper.vue";
@@ -125,6 +153,10 @@ export default class EventCard extends Vue {
 
   RouteName = RouteName;
 
+  organizerDisplayName = organizerDisplayName;
+
+  organizer = organizer;
+
   defaultOptions: IEventCardOptions = {
     hideDate: false,
     loggedPerson: false,
@@ -236,35 +268,58 @@ a.card {
         margin-bottom: 15px;
         margin-left: 0rem;
       }
+
+      & > .media-content {
+        flex: 1;
+        width: 100%;
+        overflow-x: inherit;
+      }
     }
 
     .event-title {
-      font-size: 1.2rem;
-      line-height: 1.25rem;
+      font-size: 18px;
+      line-height: 24px;
       display: -webkit-box;
-      -webkit-line-clamp: 2;
+      -webkit-line-clamp: 3;
       -webkit-box-orient: vertical;
       overflow: hidden;
-      min-height: 2.4rem;
+      // min-height: 2.4rem;
       font-weight: bold;
     }
 
+    .event-organizer {
+      display: flex;
+      align-items: center;
+      padding-top: 8px;
+
+      .organizer-name {
+        font-size: 14px;
+        padding-left: 5px;
+        font-weight: 600;
+      }
+    }
+
     .event-subtitle {
       font-size: 0.85rem;
-      display: inline-flex;
-      flex-wrap: wrap;
+      display: flex;
+      align-items: center;
+      // flex-wrap: wrap;
       color: #3c376e;
 
-      span {
-        width: 14rem;
-        display: block;
-        overflow: hidden;
-
-        flex-grow: 1;
-
-        text-overflow: ellipsis;
-        white-space: nowrap;
+      span:not(.icon) {
+        padding-left: 5px;
       }
+
+      // span {
+      //   width: 14rem;
+      //   display: block;
+      //   overflow: hidden;
+
+      //   flex-grow: 1;
+
+      //   text-overflow: ellipsis;
+      //   white-space: nowrap;
+      // }
     }
   }
 }

js/src/components/Event/MultiCard.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="multi-card-event">
+    <event-card
+      class="event-card"
+      v-for="event in events"
+      :event="event"
+      :key="event.uuid"
+    />
+  </div>
+</template>
+<script lang="ts">
+import { IEvent } from "@/types/event.model";
+import { PropType } from "vue";
+import { Component, Prop, Vue } from "vue-property-decorator";
+import EventCard from "./EventCard.vue";
+@Component({
+  components: {
+    EventCard,
+  },
+})
+export default class MultiCard extends Vue {
+  @Prop({ type: Array as PropType<IEvent[]>, required: true })
+  events!: IEvent[];
+}
+</script>
+<style lang="scss" scoped>
+.multi-card-event {
+  display: grid;
+  grid-auto-rows: 1fr;
+  grid-column-gap: 30px;
+  grid-row-gap: 30px;
+  grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+  // @media (min-width: 400px) {
+  //   grid-template-columns: repeat(2, 1fr);
+  // }
+  // @media (min-width: 800px) {
+  //   grid-template-columns: repeat(4, 1fr);
+  // }
+
+  .event-card {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+}
+</style>

js/src/components/Image/LazyImage.vue

@@ -63,12 +63,14 @@ export default class LazyImage extends Vue {
   onEnter(): void {
     // Image is visible (means: has entered the viewport),
     // so start loading by setting the src attribute
-    this.image.src = this.src;
+    if (this.image) {
+      this.image.src = this.src;
 
-    this.image.onload = () => {
-      // Image is loaded, so start fading in
-      this.isLoaded = true;
-    };
+      this.image.onload = () => {
+        // Image is loaded, so start fading in
+        this.isLoaded = true;
+      };
+    }
   }
 
   @Watch("src")

js/src/components/NavBar.vue

@@ -208,12 +208,8 @@ import RouteName from "../router/name";
 
 @Component({
   apollo: {
-    currentUser: {
-      query: CURRENT_USER_CLIENT,
-    },
-    currentActor: {
-      query: CURRENT_ACTOR_CLIENT,
-    },
+    currentUser: CURRENT_USER_CLIENT,
+    currentActor: CURRENT_ACTOR_CLIENT,
     identities: {
       query: IDENTITIES,
       update: ({ identities }) =>