diff options
Diffstat (limited to 'frontend/src/app/_modals/register-modal')
| -rw-r--r-- | frontend/src/app/_modals/register-modal/register-modal.component.html | 2 | ||||
| -rw-r--r-- | frontend/src/app/_modals/register-modal/register-modal.component.ts | 16 |
2 files changed, 12 insertions, 6 deletions
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(); } |