lock screen improvements

This commit is contained in:
Kyle Spearrin 2019-01-08 00:32:35 -05:00
parent 6b0719db45
commit 3942409c9a
4 changed files with 14 additions and 6 deletions

2
jslib

@ -1 +1 @@
Subproject commit e7464785e134e5d723a4901cf54c5dd1668efb5c
Subproject commit 65bd33d860f3af71968a15e78491221091c4369e

View File

@ -16,6 +16,7 @@
<i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
</button>
</div>
<small class="text-muted form-text">{{'loggedInAsEmail' | i18n : email}}</small>
</div>
<hr>
<div class="d-flex">

View File

@ -1,7 +1,4 @@
import {
Component,
OnInit,
} from '@angular/core';
import { Component } from '@angular/core';
import { Router } from '@angular/router';
import { CryptoService } from 'jslib/abstractions/crypto.service';
@ -18,7 +15,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
selector: 'app-lock',
templateUrl: 'lock.component.html',
})
export class LockComponent extends BaseLockComponent implements OnInit {
export class LockComponent extends BaseLockComponent {
constructor(router: Router, i18nService: I18nService,
platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
userService: UserService, cryptoService: CryptoService,
@ -27,6 +24,7 @@ export class LockComponent extends BaseLockComponent implements OnInit {
}
async ngOnInit() {
await super.ngOnInit();
const authed = await this.userService.isAuthenticated();
if (!authed) {
this.router.navigate(['/']);

View File

@ -589,6 +589,15 @@
"unlock": {
"message": "Unlock"
},
"loggedInAsEmail": {
"message": "Logged in as $EMAIL$.",
"placeholders": {
"email": {
"content": "$1",
"example": "name@example.com"
}
}
},
"invalidMasterPassword": {
"message": "Invalid master password"
},