From 5d9b17d69acc8dfbe30859610c6ba2fa5d9d963f Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 14 Mar 2022 19:03:36 +0100
Subject: Sredjeni modali za login i register. Dodat folder images u
 src/assets.

---
 .../_modals/login-modal/login-modal.component.html |   6 ++--
 .../_modals/login-modal/login-modal.component.ts   |   4 +--
 .../register-modal/register-modal.component.html   |  37 ++++++---------------
 .../register-modal/register-modal.component.ts     |  29 ++++++----------
 frontend/src/assets/images/logo.png                | Bin 0 -> 13315 bytes
 frontend/src/assets/images/logo_crop.png           | Bin 0 -> 11447 bytes
 frontend/src/assets/images/logo_dark.png           | Bin 0 -> 15736 bytes
 frontend/src/assets/images/logo_dark_crop.png      | Bin 0 -> 10987 bytes
 8 files changed, 25 insertions(+), 51 deletions(-)
 create mode 100644 frontend/src/assets/images/logo.png
 create mode 100644 frontend/src/assets/images/logo_crop.png
 create mode 100644 frontend/src/assets/images/logo_dark.png
 create mode 100644 frontend/src/assets/images/logo_dark_crop.png

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 eb6f0c53..d694ea58 100644
--- a/frontend/src/app/_modals/login-modal/login-modal.component.html
+++ b/frontend/src/app/_modals/login-modal/login-modal.component.html
@@ -2,8 +2,8 @@
 <div class="modal fade" id="modalForLogin" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered">
     <div class="modal-content">
-      <div class="modal-header bg-info">
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" (click)="resetData()"></button>
+      <div class="modal-header" style="background-color: #003459;">
+        <button id="closeButton" type="button" class="btn-close" style="background-color:white;" data-bs-dismiss="modal" aria-label="Close" (click)="resetData()"></button>
       </div>
       <div class="modal-body px-5" style="color:#003459">
           <h1 class="text-center mt-2 mb-4">Prijavite se</h1>
@@ -27,7 +27,7 @@
             </div>
           </form>
           <div class="col-md-12 d-flex justify-content-center">
-            <button type="button" class="btn btn-lg btn-info" style="color:white; border-color: #00a8e8; margin-right: 10px;" (click)="doLogin()">Prijavite se</button>
+            <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>
           </div>
           <br>
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 3ee2c7fe..22bd9a28 100644
--- a/frontend/src/app/_modals/login-modal/login-modal.component.ts
+++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts
@@ -10,7 +10,6 @@ import { AuthService } from 'src/app/_services/auth.service';
 })
 export class LoginModalComponent implements OnInit {
 
-  loginModal: any;
   username: string = '';
   password: string = '';
 
@@ -29,8 +28,7 @@ export class LoginModalComponent implements OnInit {
     this.authService.login(this.username, this.password).subscribe((response) => { //ako nisu ok podaci, ne ide hide nego mora opet da ukucava!!!!podesi
       console.log(response);
       this.cookie.set('token', response);
-      this.resetData(); //dodato
-      this.loginModal.hide(); //dodato
+      (<HTMLSelectElement>document.getElementById('closeButton')).click();
       this.router.navigate(['add-model']);
     }, error => {
       console.warn(error); //NETACNI PODACI
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 d20b199f..7ed2bbac 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.html
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.html
@@ -2,8 +2,8 @@
 <div class="modal fade" id="modalForRegister" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
 <div class="modal-dialog modal-dialog-centered modal-dialog modal-lg">
     <div class="modal-content">
-    <div class="modal-header bg-info">
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close" (click)="resetData()"></button>
+    <div class="modal-header" style="background-color: #003459;">
+        <button 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">
         <h1 class="text-center mt-2 mb-4">Registracija</h1>
@@ -14,15 +14,13 @@
                 <div class="col-6 px-3 py-3">
                     <label class="form-label" for="firstName">Ime</label>
                     <input type="text" id="firstName" class="form-control" [(ngModel)]="firstName" name="firstName" placeholder="Unesite ime...">
-                    <p *ngIf="wrongFirstNameBool" class="small fw-bold text-danger">Unesite ispravno ime. (minimum 1, maksimum 30 karaktera)</p>
-                    <!--<small *ngIf="wrongFirstNameBool" class="form-text text-muted">Unesite ispravno ime</small>
-                    <small class="form-text text-muted" [ngClass]="{wrongFirstNameBool} ? 'notCorrect' : 'correct'">Ispravno uneto ime</small>-->
+                    <small *ngIf="wrongFirstNameBool" class="form-text text-danger">Unesite ispravno ime.</small>
                 </div>
                 <!--Prezime-->
                 <div class="col-6 px-3 py-3">
                     <label class="form-label" for="lastName">Prezime</label>
                     <input type="text" id="lastName" class="form-control" [(ngModel)]="lastName" name="lastName" placeholder="Unesite prezime..."/>
-                    <p *ngIf="wrongLastNameBool" class="small fw-bold text-danger">Unesite ispravno prezime. (minimum 1, maksimum 30 karaktera)</p>
+                    <small *ngIf="wrongLastNameBool" class="form-text text-danger">Unesite ispravno prezime.</small>
                 </div>
             </div>
             <div class="row">
@@ -30,7 +28,7 @@
                 <div class="col-12 px-3 py-3">
                     <label class="form-label" for="username">Korisničko ime</label>
                     <input type="text" id="username" class="form-control" [(ngModel)]="username" name="username" placeholder="Unesite korisničko ime..."/>
-                    <p *ngIf="wrongUsernameBool" class="small fw-bold text-danger">Unesite ispravno korisničko ime.</p>
+                    <small *ngIf="wrongUsernameBool" class="form-text text-danger">Unesite ispravno korisničko ime.</small>
                 </div>
             </div>
             <div class="row">
@@ -38,7 +36,7 @@
                 <div class="col-12 px-3 py-3">
                     <label class="form-label" for="email">E-mail adresa</label>
                     <input type="email" id="email" class="form-control" [(ngModel)]="email" name="email" placeholder="Unesite email adresu..."/>
-                    <p *ngIf="wrongEmailBool" class="small fw-bold text-danger">Unesite ispravnu e-mail adresu.</p>
+                    <small *ngIf="wrongEmailBool" class="form-text text-danger">Unesite ispravno e-mail adresu.</small>
                 </div>
             </div>
             <div class="row">
@@ -46,40 +44,27 @@
                 <div class="col-6 px-3 py-3">
                     <label class="form-label" for="pass1">Lozinka</label>
                     <input type="password" id="pass1" class="form-control" [(ngModel)]="pass1" name="pass1" placeholder="Unesite lozinku..."/>
-                    <p *ngIf="wrongPass1Bool" class="small fw-bold text-danger">Lozinka se mora sastojati od najmanje 6 karaktera.</p>
+                    <small *ngIf="wrongPass1Bool" class="form-text text-danger">Lozinka se mora sastojati od najmanje 6 karaktera.</small>
                 </div>
                 <!-- Lozinka 2. -->
                 <div class="col-6 px-3 py-3">
                     <label class="form-label" for="pass2">Potvrdite lozinku</label>
                     <input type="password" id="pass2" class="form-control" [(ngModel)]="pass2" name="pass2" placeholder="Ponovite lozinku..."/>
-                    <p *ngIf="wrongPass2Bool" class="small fw-bold text-danger">Lozinke se ne podudaraju.</p>
+                    <small *ngIf="wrongPass2Bool" class="form-text text-danger">Lozinke se ne podudaraju.</small>
                 </div>
             </div>
         </form>
         <div class="col-md-12 d-flex justify-content-center mt-5">
-            <button type="button" class="btn btn-lg btn-info" style="color:white; border-color: #00a8e8; margin-right: 10px;" (click)="doRegister()">Registracija</button>
+            <button type="button" class="btn btn-lg" style="color:white; background-color: #003459; margin-right: 10px;" (click)="doRegister()">Registrujte se</button>
             <button type="button" class="btn btn-lg btn-outline-secondary" style="margin-left: 15px;" data-bs-dismiss="modal" (click)="resetData()">Odustanite</button>
         </div>
         <br>
     </div>
     <div class="modal-footer justify-content-center">
         <p class="small fw-bold">Već imate kreiran nalog?
-        <a data-bs-toggle="modal" data-bs-target="#modalForLogin" class="link-danger">Prijavite se</a>
+        <a id="linkToLoginModal" data-bs-toggle="modal" data-bs-target="#modalForLogin" class="link-danger">Prijavite se</a>
         </p>
     </div>
     </div>
 </div>
-</div>
-
-<style>
-.correct {
-    content: "✔️";
-    margin: 5px;
-    color: green;
-}
-.notCorrect {
-    content: "✕";
-    margin: 5px;
-    color: red;
-}
-</style>
\ No newline at end of file
+</div>
\ No newline at end of file
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 d86345b5..688fc806 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -1,9 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
 import { AuthService } from 'src/app/_services/auth.service';
 
-declare var window: any;
-
 @Component({
   selector: 'app-register-modal',
   templateUrl: './register-modal.component.html',
@@ -11,8 +8,6 @@ declare var window: any;
 })
 export class RegisterModalComponent implements OnInit {
 
-  registerModal: any;
-
   firstName: string = '';
   lastName: string = '';
   username: string = '';
@@ -28,25 +23,18 @@ export class RegisterModalComponent implements OnInit {
   wrongPass2Bool: boolean = false;
 
   pattName: RegExp = /^[a-zA-ZšŠđĐčČćĆžŽ]+([ \-][a-zA-ZšŠđĐčČćĆžŽ]+)*$/;
-  pattUsername: RegExp = /^[a-zA-Z0-9](_(?!(\.|_))|\.(?!(_|\.))|[a-zA-Z0-9]){6,18}[a-zA-Z0-9]$/;
+  pattUsername: RegExp = /^[a-zA-Z0-9]{6,18}$/;
   pattTwoSpaces: RegExp = /  /;
   pattEmail: RegExp = /^[a-zA-Z0-9]+([\.\-\+][a-zA-Z0-9]+)*\@([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}$/;
   pattPassword: RegExp = /.{6,30}$/;
 
   constructor(
-    private router: Router,
     private authService: AuthService
   ) { }
 
   ngOnInit(): void {
-    this.registerModal = new window.bootstrap.Modal(
-      document.getElementById("modalForRegister")
-    ); 
   }
 
-  openModal() {
-    this.registerModal.show();
-  }
   doRegister() {
     this.validation();
   }
@@ -149,14 +137,17 @@ export class RegisterModalComponent implements OnInit {
           (response) => {
             console.log(response);
             if (response === 'User added') {
-              this.resetData(); //DODATO
-              this.registerModal.hide(); //dodato
-              this.router.navigate(['/login']); //registracija uspesna, idi na LOGIN MODAL, SREDITI
+              this.resetData();
+              (<HTMLSelectElement>document.getElementById('linkToLoginModal')).click();
             }
-            else if (response === 'Email Already Exists')
+            else if (response === 'Email Already Exists') {
               alert('Nalog sa unetim email-om već postoji!');
-            else if (response === 'Username Already Exists')
-              alert('Nalog sa unetim korisnićkim imenom već postoji!');
+              (<HTMLSelectElement>document.getElementById('email')).focus();
+            }
+            else if (response === 'Username Already Exists') {
+              alert('Nalog sa unetim korisničkim imenom već postoji!');
+              (<HTMLSelectElement>document.getElementById('username')).focus();
+            }
           }
         );
     }
diff --git a/frontend/src/assets/images/logo.png b/frontend/src/assets/images/logo.png
new file mode 100644
index 00000000..2e15550a
Binary files /dev/null and b/frontend/src/assets/images/logo.png differ
diff --git a/frontend/src/assets/images/logo_crop.png b/frontend/src/assets/images/logo_crop.png
new file mode 100644
index 00000000..1775a465
Binary files /dev/null and b/frontend/src/assets/images/logo_crop.png differ
diff --git a/frontend/src/assets/images/logo_dark.png b/frontend/src/assets/images/logo_dark.png
new file mode 100644
index 00000000..95c06d8f
Binary files /dev/null and b/frontend/src/assets/images/logo_dark.png differ
diff --git a/frontend/src/assets/images/logo_dark_crop.png b/frontend/src/assets/images/logo_dark_crop.png
new file mode 100644
index 00000000..d66f13e2
Binary files /dev/null and b/frontend/src/assets/images/logo_dark_crop.png differ
-- 
cgit v1.2.3