From a9287af015228a73b5053acdef421d9d63ba766b Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Tue, 15 Mar 2022 16:06:09 +0100
Subject: Dodao automatsko osvezavanja JWT tokena, automatsko ucitavanje
 ulogovanog korisnika. Prosirio modele Dataset, Model, Predictor tako da se
 moze definisati da li su javna ili da li bilo ko sa linkom moze da ih vidi,
 dodao lastUpdated datum. Login dugme u navbar-u radi funkcionalno.
 Login/logout ne moraju da osveze stranicu vise.

---
 .../register-modal/register-modal.component.html   | 142 ++++++++++++---------
 .../register-modal/register-modal.component.ts     |   6 +-
 2 files changed, 83 insertions(+), 65 deletions(-)

(limited to 'frontend/src/app/_modals/register-modal')

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 7ed2bbac..7098c040 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.html
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.html
@@ -1,70 +1,88 @@
 <!-- Modal -->
-<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" 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>
-        
-        <form class="mx-5">
-            <!--Ime-->
-            <div class="row">
-                <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...">
-                    <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..."/>
-                    <small *ngIf="wrongLastNameBool" class="form-text text-danger">Unesite ispravno prezime.</small>
-                </div>
+<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" 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="row">
-                <!--Korisnicko ime-->
-                <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..."/>
-                    <small *ngIf="wrongUsernameBool" class="form-text text-danger">Unesite ispravno korisničko ime.</small>
+            <div class="modal-body" style="color:#003459">
+                <h1 class="text-center mt-2 mb-4">Registracija</h1>
+
+                <form class="mx-5">
+                    <!--Ime-->
+                    <div class="row">
+                        <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...">
+                            <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..." />
+                            <small *ngIf="wrongLastNameBool" class="form-text text-danger">Unesite ispravno
+                                prezime.</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <!--Korisnicko ime-->
+                        <div class="col-12 px-3 py-3">
+                            <label class="form-label" for="username-register">Korisničko ime</label>
+                            <input type="text" id="username-register" class="form-control" [(ngModel)]="username"
+                                name="username-register" placeholder="Unesite korisničko ime..." />
+                            <small *ngIf="wrongUsernameBool" class="form-text text-danger">Unesite ispravno korisničko
+                                ime.</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <!--Email-->
+                        <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..." />
+                            <small *ngIf="wrongEmailBool" class="form-text text-danger">Unesite ispravno e-mail
+                                adresu.</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <!-- Lozinka 1. -->
+                        <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..." />
+                            <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..." />
+                            <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"
+                        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="row">
-                <!--Email-->
-                <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..."/>
-                    <small *ngIf="wrongEmailBool" class="form-text text-danger">Unesite ispravno e-mail adresu.</small>
-                </div>
+            <div class="modal-footer justify-content-center">
+                <p class="small fw-bold">Već imate kreiran nalog?
+                    <a id="linkToLoginModal" data-bs-toggle="modal" data-bs-target="#modalForLogin"
+                        class="link-danger">Prijavite se</a>
+                </p>
             </div>
-            <div class="row">
-                <!-- Lozinka 1. -->
-                <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..."/>
-                    <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..."/>
-                    <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" 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 id="linkToLoginModal" data-bs-toggle="modal" data-bs-target="#modalForLogin" class="link-danger">Prijavite se</a>
-        </p>
-    </div>
     </div>
-</div>
 </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 688fc806..c02a4e1a 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -48,7 +48,7 @@ export class RegisterModalComponent implements OnInit {
       return true;
     return false;
   }
-  isCorrectUsername(element: string) : boolean {
+  isCorrectUsername(element: string): boolean {
     if (this.pattUsername.test(element) && !(this.pattTwoSpaces.test(element)) && (element.length >= 1 && element.length <= 30))
       return true;
     return false;
@@ -85,7 +85,7 @@ export class RegisterModalComponent implements OnInit {
       this.wrongUsernameBool = false;
       return;
     }
-    (<HTMLSelectElement>document.getElementById('username')).focus();
+    (<HTMLSelectElement>document.getElementById('username-register')).focus();
     this.wrongUsernameBool = true;
   }
   emailValidation() {
@@ -146,7 +146,7 @@ export class RegisterModalComponent implements OnInit {
             }
             else if (response === 'Username Already Exists') {
               alert('Nalog sa unetim korisničkim imenom već postoji!');
-              (<HTMLSelectElement>document.getElementById('username')).focus();
+              (<HTMLSelectElement>document.getElementById('username-register')).focus();
             }
           }
         );
-- 
cgit v1.2.3