Merge branch 'add-wheel' into 'master'

add loading wheel to some slow views

See merge request framasoft/mobilizon!1011

js/src/views/Event/Event.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <transition appear name="fade" mode="out-in">
+    <b-loading :active.sync="$apollo.queries.event.loading" />
     <div class="wrapper">
       <event-banner :picture="event.picture" />
       <div class="intro-wrapper">
@@ -329,10 +329,7 @@
                 </div>
               </div>
             </event-metadata-block>
-              <event-metadata-block
-                :title="$t('Date and time')"
-                icon="calendar"
-              >
+            <event-metadata-block :title="$t('Date and time')" icon="calendar">
               <event-full-date
                 :beginsOn="event.beginsOn"
                 :show-start-time="event.options.showStartTime"
@@ -453,10 +450,7 @@
         has-modal-card
         ref="shareModal"
       >
-          <share-event-modal
-            :event="event"
-            :eventCapacityOK="eventCapacityOK"
-          />
+        <share-event-modal :event="event" :eventCapacityOK="eventCapacityOK" />
       </b-modal>
       <b-modal
         :active.sync="isJoinModalActive"
@@ -612,7 +606,6 @@
         </div>
       </b-modal>
     </div>
-    </transition>
   </div>
 </template>
 

js/src/views/Group/Group.vue

@@ -22,6 +22,7 @@
           </li>
         </ul>
       </nav>
+      <b-loading :active.sync="$apollo.loading"></b-loading>
       <invitations
         v-if="isCurrentActorAnInvitedGroupMember"
         :invitations="[groupMember]"

js/src/views/Search.vue

@@ -85,6 +85,7 @@
       >
     </section>
     <b-tabs v-else v-model="activeTab" type="is-boxed" class="searchTabs">
+      <b-loading :active.sync="$apollo.loading"></b-loading>
       <b-tab-item>
         <template slot="header">
           <b-icon icon="calendar"></b-icon>
@@ -119,12 +120,6 @@
         <b-message v-else-if="$apollo.loading === false" type="is-danger">{{
           $t("No events found")
         }}</b-message>
-        <b-loading
-          v-else-if="$apollo.loading"
-          :is-full-page="false"
-          v-model="$apollo.loading"
-          :can-cancel="false"
-        />
       </b-tab-item>
       <b-tab-item v-if="!tag">
         <template slot="header">
@@ -162,12 +157,6 @@
         <b-message v-else-if="$apollo.loading === false" type="is-danger">
           {{ $t("No groups found") }}
         </b-message>
-        <b-loading
-          v-else-if="$apollo.loading"
-          :is-full-page="false"
-          v-model="$apollo.loading"
-          :can-cancel="false"
-        />
       </b-tab-item>
     </b-tabs>
   </div>