Merge remote-tracking branch 'origin/master'

master
FlayInAHook 4 years ago
commit c050447e01

@ -9,7 +9,7 @@ import { AuthService } from '../../services/auth.service';
styleUrls: ['./login.component.scss'], styleUrls: ['./login.component.scss'],
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
email = new FormControl('', [Validators.required, Validators.email]); email = new FormControl('', [Validators.required]);
password = new FormControl('', [Validators.required]); password = new FormControl('', [Validators.required]);
hide = true; hide = true;
loading = false; loading = false;
@ -18,10 +18,15 @@ export class LoginComponent implements OnInit {
returnUrl: string; returnUrl: string;
constructor(private authService: AuthService, private router: Router, private route: ActivatedRoute) {} constructor(
private authService: AuthService,
private router: Router,
private route: ActivatedRoute
) {}
ngOnInit(): void { ngOnInit(): void {
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/tableOverview'; this.returnUrl =
this.route.snapshot.queryParams['returnUrl'] || '/tableOverview';
} }
login() { login() {

Loading…
Cancel
Save