Merge pull request #7 from Team-Kaleidoscope/devHEADv0.2main

Second Stage: Complete

1 files changed, 10 insertions, 13 deletions

diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index c3fb79c..a0ce730 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl, AbstractControl } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
 import { Router } from '@angular/router';
 import { Title } from '@angular/platform-browser';
 import { UserService } from 'src/app/services/user.service';
@@ -16,6 +16,7 @@ export class LoginComponent implements OnInit {
   @ViewChild(ErrorBarComponent) private _errorBar: ErrorBarComponent;
   private _title = 'Login';
   public loginUserFormGroup: FormGroup;
+  public showingPassword = false;
 
   constructor(private _titleService: Title, private _fb: FormBuilder, private _router: Router, private _userService: UserService, private _tokenService: TokenService) {
     this._titleService.setTitle(this._title);
@@ -32,28 +33,24 @@ export class LoginComponent implements OnInit {
     });
   }
 
+  toggleShowPassword(): void {
+    this.showingPassword = !this.showingPassword;
+  }
+
   onSubmit(): void {
     this._errorBar.hideError();
-    this._userService.loginUserRequest(this.loginUserFormGroup).subscribe(
-        (res: object) => {
+    this._userService.loginUserRequest(this.loginUserFormGroup).subscribe({
+        next: (res: object) => {
           this._tokenService.setUserTokenToSessionStorage(res);
           this._router.navigate(['/']);
         },
-        (err: HttpErrorResponse) => {
+        error: (err: HttpErrorResponse) => {
           this._errorBar.showError(err);
         }
-    );
+    });
   }
 
   onRedirectRegister(): void {
     this._router.navigate(['/register']);
   }
-
-  get username(): AbstractControl | null  {
-    return this.loginUserFormGroup.get('username');
-  }
-
-  get password(): AbstractControl | null  {
-    return this.loginUserFormGroup.get('password');
-  }
 }