Merge branch 'dev' into 'Privremeno-cuvanje-podataka'

# Conflicts:
#   backend/api/api/Controllers/ModelController.cs

1 files changed, 16 insertions, 7 deletions

diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.ts b/frontend/src/app/_modals/login-modal/login-modal.component.ts
index d17d7017..1b634c9a 100644
--- a/frontend/src/app/_modals/login-modal/login-modal.component.ts
+++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts
@@ -13,7 +13,7 @@ export class LoginModalComponent implements OnInit {
   username: string = '';
   password: string = '';
 
-  public wrongCreds: boolean = false;      //RAZMOTRITI
+  wrongCreds: boolean = false;
 
   constructor(
     private authService: AuthService,
@@ -26,17 +26,26 @@ export class LoginModalComponent implements OnInit {
 
   doLogin() {
     if (this.username.length > 0 && this.password.length > 0) {
-      this.authService.login(this.username, this.password).subscribe((response) => { //ako nisu ok podaci, ne ide hide nego mora opet da ukucava!!!!podesi
+      this.authService.login(this.username, this.password).subscribe((response) => {
         console.log(response);
-        this.authService.authenticate(response);
-        (<HTMLSelectElement>document.getElementById('closeButton')).click();
-      }, error => {
-        console.warn(error); //NETACNI PODACI
+
+        if (response == "Username doesn't exist" || response == "Wrong password") {
+          this.wrongCreds = true;
+          this.password = '';
+        }
+        else {
+          this.authService.authenticate(response);
+          (<HTMLSelectElement>document.getElementById('closeButton')).click();
+        }
       });
     }
-    
+    else {
+      this.wrongCreds = true;
+      this.password = '';
+    }
   }
   resetData() {
+    this.wrongCreds = false;
     this.username = '';
     this.password = '';
   }