From 31642f68564e67175301235546b74baf56ac5882 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 21 Mar 2022 19:14:19 +0100
Subject: Register - nakon uspesne registracije, korisnik je automatski
 ulogovan. Login - obavestenje o netacnim podacima.

---
 .../_modals/login-modal/login-modal.component.html | 10 +++++-----
 .../_modals/login-modal/login-modal.component.ts   | 23 +++++++++++++++-------
 .../register-modal/register-modal.component.html   |  2 +-
 .../register-modal/register-modal.component.ts     | 16 ++++++++++-----
 4 files changed, 33 insertions(+), 18 deletions(-)

(limited to 'frontend/src/app/_modals')

diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.html b/frontend/src/app/_modals/login-modal/login-modal.component.html
index d694ea58..d7836848 100644
--- a/frontend/src/app/_modals/login-modal/login-modal.component.html
+++ b/frontend/src/app/_modals/login-modal/login-modal.component.html
@@ -20,12 +20,12 @@
                 <input [(ngModel)]="password" name="password" type="password" id="password"
                     class="form-control form-control" placeholder="Unesite lozinku..." />
             </div>
-
-            <div class="text-center text-lg-start mt-5 pt-2">
-                <p *ngIf="wrongCreds" class="small fw-bold mt-2 pt-1 mb-0 text-danger">Lozinka ili e-mail su pogrešni
-                </p>
-            </div>
           </form>
+          
+          <div class="text-center text-lg-start mt-5">
+            <p *ngIf="wrongCreds" class="small fw-bold text-danger text-center">Unesite ispravan e-mail i lozinku.</p>
+          </div>
+
           <div class="col-md-12 d-flex justify-content-center">
             <button type="button" class="btn btn-lg" style="color:white; background-color: #003459; margin-right: 10px;" (click)="doLogin()">Prijavite se</button>
             <button type="button" class="btn btn-lg btn-outline-secondary" data-bs-dismiss="modal" (click)="resetData()">Odustanite</button>
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 = '';
   }
diff --git a/frontend/src/app/_modals/register-modal/register-modal.component.html b/frontend/src/app/_modals/register-modal/register-modal.component.html
index 7098c040..68025a46 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.html
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.html
@@ -4,7 +4,7 @@
     <div class="modal-dialog modal-dialog-centered modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header" style="background-color: #003459;">
-                <button type="button" class="btn-close" data-bs-dismiss="modal" style="background-color: white;"
+                <button id="closeButtonReg" type="button" class="btn-close" data-bs-dismiss="modal" style="background-color: white;"
                     aria-label="Close" (click)="resetData()"></button>
             </div>
             <div class="modal-body" style="color:#003459">
diff --git a/frontend/src/app/_modals/register-modal/register-modal.component.ts b/frontend/src/app/_modals/register-modal/register-modal.component.ts
index c02a4e1a..c045f1ce 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -136,15 +136,21 @@ export class RegisterModalComponent implements OnInit {
         .subscribe(
           (response) => {
             console.log(response);
-            if (response === 'User added') {
-              this.resetData();
-              (<HTMLSelectElement>document.getElementById('linkToLoginModal')).click();
+            if (response == 'User added') {
+              //nakon sto je registrovan, nek bude ulogovan
+              this.authService.login(this.username, this.pass1).subscribe((response) => {
+
+                this.authService.authenticate(response);
+                console.log("close button");
+                (<HTMLSelectElement>document.getElementById('closeButtonReg')).click();
+                //(<HTMLSelectElement>document.getElementById('linkToLoginModal')).click();
+              }, (error) => console.warn(error));             
             }
-            else if (response === 'Email Already Exists') {
+            else if (response == 'Email Already Exists') {
               alert('Nalog sa unetim email-om već postoji!');
               (<HTMLSelectElement>document.getElementById('email')).focus();
             }
-            else if (response === 'Username Already Exists') {
+            else if (response == 'Username Already Exists') {
               alert('Nalog sa unetim korisničkim imenom već postoji!');
               (<HTMLSelectElement>document.getElementById('username-register')).focus();
             }
-- 
cgit v1.2.3