luisgulo/photoprism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Albums: Show progress bar #15

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2019-12-08 18:19:58 +01:00
parent 3edf49bacd
commit b74c32b5f2
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/pages/album/photos.vue
View File

@ -5,7 +5,10 @@
<p-album-search :settings="settings" :filter="filter" :filter-change="updateQuery"
:refresh="refresh"></p-album-search>
<v-container fluid class="pa-0">
<v-container fluid class="pa-4" v-if="loading">
<v-progress-linear color="secondary-dark" :indeterminate="true"></v-progress-linear>
</v-container>
<v-container fluid class="pa-0" v-else>
<p-scroll-top></p-scroll-top>
<p-photo-clipboard :refresh="refresh"
@ -55,6 +58,7 @@
this.filter.camera = query['camera'] ? parseInt(query['camera']) : 0;
this.filter.country = query['country'] ? query['country'] : '';
this.lastFilter = {};
this.loading = true;
this.routeName = this.$route.name;
this.findAlbum();
this.search();
@ -84,6 +88,7 @@
filter: filter,
lastFilter: {},
routeName: routeName,
loading: true
};
},
methods: {
@ -201,6 +206,7 @@
const params = this.searchParams();
Photo.search(params).then(response => {
this.loading = false;
this.results = response.models;
this.scrollDisabled = (response.models.length < this.pageSize);

8
frontend/src/pages/photos.vue
View File

@ -5,7 +5,10 @@
<p-photo-search :settings="settings" :filter="filter" :filter-change="updateQuery"
:refresh="refresh"></p-photo-search>
<v-container fluid class="pa-0">
<v-container fluid class="pa-4" v-if="loading">
<v-progress-linear color="secondary-dark" :indeterminate="true"></v-progress-linear>
</v-container>
<v-container fluid class="pa-0" v-else>
<p-scroll-top></p-scroll-top>
<p-photo-clipboard :refresh="refresh" :selection="selection"></p-photo-clipboard>
@ -50,6 +53,7 @@
this.filter.before = query['before'] ? query['before'] : '';
this.filter.after = query['after'] ? query['after'] : '';
this.lastFilter = {};
this.loading = true;
this.routeName = this.$route.name;
this.search();
}
@ -77,6 +81,7 @@
filter: filter,
lastFilter: {},
routeName: routeName,
loading: true
};
},
methods: {
@ -192,6 +197,7 @@
const params = this.searchParams();
Photo.search(params).then(response => {
this.loading = false;
this.results = response.models;
this.scrollDisabled = (response.models.length < this.pageSize);