Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'add-wheel' into 'master'

Browse Source 
add loading wheel to some slow views

See merge request framasoft/mobilizon!1011
This commit is contained in:
Thomas Citharel 2021-08-04 09:56:58 +00:00
commit 637bc1ec3f
3 changed files with 584 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/views/Event/Event.vue
View File

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

1
js/src/views/Group/Group.vue
View File

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

13
js/src/views/Search.vue
View File

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