diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js index c5735f7a7..ba77107c6 100644 --- a/frontend/karma.conf.js +++ b/frontend/karma.conf.js @@ -8,7 +8,7 @@ module.exports = (config) => { logLevel: config.LOG_INFO, webpackMiddleware: { - stats: "errors-only" + stats: "errors-only", }, frameworks: ["mocha"], diff --git a/frontend/src/component/p-navigation.vue b/frontend/src/component/p-navigation.vue index a146643b3..35b9325f1 100644 --- a/frontend/src/component/p-navigation.vue +++ b/frontend/src/component/p-navigation.vue @@ -191,7 +191,7 @@ - add_circle + camera_roll @@ -199,13 +199,13 @@ - + - save + share - Export + Share diff --git a/frontend/src/model/label.js b/frontend/src/model/label.js index 5d384e01d..4d3b0cf24 100644 --- a/frontend/src/model/label.js +++ b/frontend/src/model/label.js @@ -44,7 +44,7 @@ class Label extends Abstract { } getDateString() { - return moment(this.CreatedAt).format('LLL'); + return moment(this.CreatedAt).format("LLL"); } toggleLike() { diff --git a/frontend/src/model/photo.js b/frontend/src/model/photo.js index 28e32b399..12a613230 100644 --- a/frontend/src/model/photo.js +++ b/frontend/src/model/photo.js @@ -91,7 +91,7 @@ class Photo extends Abstract { } getDateString() { - return moment(this.TakenAt).format('LLL'); + return moment(this.TakenAt).format("LLL"); } hasLocation() { diff --git a/frontend/src/pages/labels.vue b/frontend/src/pages/labels.vue index 360b29fd7..b89f27148 100644 --- a/frontend/src/pages/labels.vue +++ b/frontend/src/pages/labels.vue @@ -70,7 +70,7 @@
-

{{ label.LabelName | capitalize }}

+

{{ label.LabelName | capitalize }}

@@ -90,15 +90,6 @@ props: { staticFilter: Object }, - watch: { - '$route'() { - const query = this.$route.query; - - this.filter.q = query['q']; - this.lastFilter = {}; - this.search(); - } - }, data() { const query = this.$route.query; const q = query['q'] ? query['q'] : ''; @@ -197,7 +188,7 @@ if (this.scrollDisabled) { this.$alert.info(this.results.length + ' labels found'); } else { - this.$alert.info('More than 50 labels found'); + this.$alert.info('More than 20 labels found'); this.$nextTick(() => this.$emit("scrollRefresh")); } diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue index e534e89cc..eb3d096df 100644 --- a/frontend/src/pages/photos.vue +++ b/frontend/src/pages/photos.vue @@ -29,15 +29,21 @@ }, watch: { '$route' () { + if(this.routeName === this.$route.name) { + return; + } + const query = this.$route.query; this.filter.q = query['q']; this.lastFilter = {}; + this.routeName = this.$route.name; this.search(); } }, data() { const query = this.$route.query; + const routeName = this.$route.name; const order = query['order'] ? query['order'] : 'newest'; const camera = query['camera'] ? parseInt(query['camera']) : 0; const q = query['q'] ? query['q'] : ''; @@ -55,6 +61,7 @@ settings: settings, filter: filter, lastFilter: {}, + routeName: routeName, }; }, methods: { diff --git a/frontend/src/pages/settings.vue b/frontend/src/pages/settings.vue index 9008e0496..9d3f705a3 100644 --- a/frontend/src/pages/settings.vue +++ b/frontend/src/pages/settings.vue @@ -1,17 +1,18 @@