2 files changed, 26 insertions, 28 deletions

diff --git a/frontend/src/app/_pages/login-page/login-page.component.html b/frontend/src/app/_pages/login-page/login-page.component.html
index b8620e2f..906eaba6 100644
--- a/frontend/src/app/_pages/login-page/login-page.component.html
+++ b/frontend/src/app/_pages/login-page/login-page.component.html
@@ -1,39 +1,43 @@
-<div *ngIf="pageLoaded" style="min-height: 100vh; position: relative;">
-    
+<div style="min-height: 100vh; position: relative;">
+
     <!-- TODO : <app-navbar [activeNav]="'login'"></app-navbar>-->
-    
+
     <div class="container p-5 rounded-3 shadow-sm border" style="max-width: 50em; margin-top: 50px;">
         <h3 class="text-center pb-5">Prijavite se</h3>
         <form>
             <!-- Email input -->
             <div class="form-outline mb-4">
                 <label class="form-label" for="email">Email adresa</label>
-                <input [(ngModel)]="email" name="email" type="email" id="email" class="form-control form-control-lg" placeholder="Unesite email adresu..." />
+                <input [(ngModel)]="email" name="email" type="email" id="email" class="form-control form-control-lg"
+                    placeholder="Unesite email adresu..." />
             </div>
-      
+
             <!-- Password input -->
             <div class="form-outline mb-3">
                 <label class="form-label" for="password">Lozinka</label>
-                <input [(ngModel)]="password" name="password" type="password" id="password" class="form-control form-control-lg" placeholder="Unesite lozinku..." />
+                <input [(ngModel)]="password" name="password" type="password" id="password"
+                    class="form-control form-control-lg" placeholder="Unesite lozinku..." />
             </div>
-      
+
             <div class="text-center text-lg-start mt-4 pt-2">
                 <!-- Pogresna lozinka -->
-                <p *ngIf="wrongCreds" class="small fw-bold mt-2 pt-1 mb-0 text-danger">Lozinka ili e-mail su pogrešni</p>
+                <p *ngIf="wrongCreds" class="small fw-bold mt-2 pt-1 mb-0 text-danger">Lozinka ili e-mail su pogrešni
+                </p>
                 <!-- Nepotvrdjena registracija
                 <p *ngIf="notApproved" class="small fw-bold mt-2 pt-1 mb-0 text-danger">Vaša registracija još uvek nije potvrđena</p>-->
                 <br>
-        
-                <button type="button" class="btn btn-primary btn-lg" style="padding-left: 2.5rem; padding-right: 2.5rem;"
-                    (click)="onSubmit()">Prijava
+
+                <button type="button" class="btn btn-primary btn-lg"
+                    style="padding-left: 2.5rem; padding-right: 2.5rem;" (click)="onSubmit()">Prijava
                 </button>
-        
-                <p class="small fw-bold mt-2 pt-1 mb-0">Još uvek nemate nalog? 
-                <a routerLink="/register" class="link-danger">Registrujte se</a></p>
+
+                <p class="small fw-bold mt-2 pt-1 mb-0">Još uvek nemate nalog?
+                    <a routerLink="/register" class="link-danger">Registrujte se</a>
+                </p>
             </div>
         </form>
     </div>
-    
+
     <!-- TODO: <app-footer></app-footer>-->
 
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/login-page/login-page.component.ts b/frontend/src/app/_pages/login-page/login-page.component.ts
index c041003d..fec5e16e 100644
--- a/frontend/src/app/_pages/login-page/login-page.component.ts
+++ b/frontend/src/app/_pages/login-page/login-page.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { response } from 'express';
 import { AuthService } from 'src/app/_services/auth.service';
 //import { LoginService } from 'src/app/_services/login.service';
 
@@ -9,8 +10,6 @@ import { AuthService } from 'src/app/_services/auth.service';
   styleUrls: ['./login-page.component.css']
 })
 export class LoginPageComponent implements OnInit {
-
-  public pageLoaded: boolean = false; //ako korisnik ne sme da ima pristup stranici (vec je ulogovan itd), ona ne sme ni da se ucita
   email: string = '';
   password: string = '';
 
@@ -20,26 +19,21 @@ export class LoginPageComponent implements OnInit {
   pattEmail: RegExp = /^[a-zA-Z0-9]+([\.\-\+][a-zA-Z0-9]+)*\@([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}$/;
 
   constructor(
-    private activatedRoute: ActivatedRoute,
     private authService: AuthService
-    //private loginService: LoginService
   ) { }
 
   ngOnInit(): void {
-    /*this.authService.checkAccess(this.activatedRoute, this,
-      (self: any) => self.pageLoaded = true;
-      );*/
   }
 
   onSubmit() {
-    //this.wrongCreds = false;      
-    //this.notApproved = false;     RAZMOTRITI
-
-    if (this.pattEmail.test(this.email)) {
-      //this.loginService.login(this.email, this.password);
+    if (!this.pattEmail.test(this.email)) {
+      console.warn('Bad email!');
+      return;
     }
     else {
-      //this.wrongCreds = true;     
+      this.authService.login(this.email, this.password).subscribe((response) => {
+        console.log(response)
+      })
     }
   }