Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/_elements/form-model/form-model.component.ts

2 files changed, 6 insertions, 1 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 d76af4d6..0c791a61 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.html
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.html
@@ -6,7 +6,7 @@
               <mat-icon>close</mat-icon>
             </button>
             <h1 class="mt-5 mb-4">Registracija</h1>
-            <form class="mx-4">
+            <form class="mx-4" (keydown)="doRegisterWithEnterKey($event)">
                 <!--Ime-->
                 <div>
                     <mat-form-field appearance="fill">
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 575fc717..a5c6ddc6 100644
--- a/frontend/src/app/_modals/register-modal/register-modal.component.ts
+++ b/frontend/src/app/_modals/register-modal/register-modal.component.ts
@@ -49,6 +49,11 @@ export class RegisterModalComponent implements OnInit {
   ngOnInit(): void {
   }
 
+  doRegisterWithEnterKey(keyboardEvent: KeyboardEvent) {
+    if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+      this.doRegister();
+  }
+
   doRegister() {
     this.validation();
   }