beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

People: Open new faces tab when there are no people #22

Browse source
This commit is contained in:
Michael Mayer 2021-10-01 14:00:51 +02:00
parent 987d1808ed
commit bb9d078e0d
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/pages/people.vue
View file

@ -8,8 +8,8 @@
slider-color="secondary-dark" slider-color="secondary-dark"
:height="$vuetify.breakpoint.smAndDown ? 48 : 64" :height="$vuetify.breakpoint.smAndDown ? 48 : 64"
> >
<v-tab v-for="(item, index) in tabs" :id="'tab-' + item.name" :key="index" :class="item.class" ripple <v-tab v-for="(item, index) in tabs" :id="'tab-' + item.name" :key="index" :class="item.class"
@click="changePath(item.path)"> ripple @click="changePath(item.path)">
<v-icon v-if="$vuetify.breakpoint.smAndDown" :title="item.label">{{ item.icon }}</v-icon> <v-icon v-if="$vuetify.breakpoint.smAndDown" :title="item.label">{{ item.icon }}</v-icon>
<template v-else> <template v-else>
<v-icon :size="18" :left="!rtl" :right="rtl">{{ item.icon }}</v-icon> {{ item.label }} <v-icon :size="18" :left="!rtl" :right="rtl">{{ item.icon }}</v-icon> {{ item.label }}
@ -78,17 +78,7 @@ export default {
rtl: this.$rtl, rtl: this.$rtl,
}; };
}, },
created() {
this.load();
},
methods: { methods: {
load() {
this.$config.load().then(() => {
if(this.$config.values.count.people === 0) {
this.changePath(this.tabs[1].path);
}
});
},
changePath: function (path) { changePath: function (path) {
if (this.$route.path !== path) { if (this.$route.path !== path) {
this.$router.replace(path); this.$router.replace(path);

4
frontend/src/pages/people/faces.vue
View file

@ -514,14 +514,17 @@ export default {
}, },
onShow(face) { onShow(face) {
this.busy = true; this.busy = true;
this.dirty = true;
face.show().finally(() => this.busy = false); face.show().finally(() => this.busy = false);
}, },
onHide(face) { onHide(face) {
this.busy = true; this.busy = true;
this.dirty = true;
face.hide().finally(() => this.busy = false); face.hide().finally(() => this.busy = false);
}, },
onClearSubject(marker) { onClearSubject(marker) {
this.busy = true; this.busy = true;
this.dirty = true;
this.$notify.blockUI(); this.$notify.blockUI();
marker.clearSubject(marker).finally(() => { marker.clearSubject(marker).finally(() => {
this.$notify.unblockUI(); this.$notify.unblockUI();
@ -530,6 +533,7 @@ export default {
}, },
onRename(marker) { onRename(marker) {
this.busy = true; this.busy = true;
this.dirty = true;
this.$notify.blockUI(); this.$notify.blockUI();
marker.rename().finally(() => { marker.rename().finally(() => {
this.$notify.unblockUI(); this.$notify.unblockUI();

16
frontend/src/routes.js
View file

@ -45,7 +45,7 @@ import Feedback from "pages/about/feedback.vue";
import License from "pages/about/license.vue"; import License from "pages/about/license.vue";
import Help from "pages/help.vue"; import Help from "pages/help.vue";
import { $gettext } from "common/vm"; import { $gettext } from "common/vm";
import { session } from "./session"; import { session, config } from "./session";
const c = window.__CONFIG__; const c = window.__CONFIG__;
const appName = c.name; const appName = c.name;
@ -264,6 +264,20 @@ export default [
component: People, component: People,
meta: { title: $gettext("People"), auth: true, background: "application-light" }, meta: { title: $gettext("People"), auth: true, background: "application-light" },
props: { tab: "people-subjects" }, props: { tab: "people-subjects" },
beforeEnter: (to, from, next) => {
if (from.name.startsWith("people")) {
next();
} else {
config.load().finally(() => {
// Open new faces tab when there are no people.
if (config.values.count.people === 0) {
next({ name: "people_faces" });
} else {
next();
}
});
}
},
}, },
{ {
name: "people_faces", name: "people_faces",