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

Improve UX of account page

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-06-30 09:06:59 +02:00
parent 0e426a547b
commit 2f88ab2ebc
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/pages/settings/account.vue
View file

@ -43,9 +43,11 @@
v-model="confirmPassword" v-model="confirmPassword"
></v-text-field> ></v-text-field>
</v-flex> </v-flex>
<v-flex xs12 text-xs-left class="px-2 pt-4 pb-2"> <v-flex xs12 class="px-2 pt-4 pb-2">
<v-btn depressed dark color="secondary-dark" @click.stop="confirm" <v-btn depressed color="secondary-dark"
class="action-confirm ma-0" :disabled="busy"> @click.stop="confirm"
:disabled="disabled()"
class="action-confirm white--text ma-0">
<translate>Change Password</translate> <translate>Change Password</translate>
<v-icon right dark>vpn_key</v-icon> <v-icon right dark>vpn_key</v-icon>
</v-btn> </v-btn>
@ -71,7 +73,7 @@
}, },
methods: { methods: {
disabled() { disabled() {
return (this.oldPassword === "" || this.newPassword === "" || (this.newPassword !== this.confirmPassword)); return (this.busy || this.oldPassword === "" || this.newPassword === "" || (this.newPassword !== this.confirmPassword));
}, },
confirm() { confirm() {
this.busy = true; this.busy = true;

3
internal/entity/password.go
View file

@ -3,7 +3,6 @@ package entity
import ( import (
"time" "time"
"github.com/photoprism/photoprism/pkg/txt"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
) )
@ -68,8 +67,6 @@ func FindPassword(uid string) *Password {
if err := Db().Where("uid = ?", uid).First(&result).Error; err == nil { if err := Db().Where("uid = ?", uid).First(&result).Error; err == nil {
return &result return &result
} else {
log.Errorf("auth: no password for %s", txt.Quote(uid))
} }
return nil return nil