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

2 files changed, 12 insertions, 10 deletions

diff --git a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
index 2d7e4d86..84793260 100644
--- a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
+++ b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.html
@@ -1,9 +1,9 @@
-
-
-  <h2 mat-dialog-title >{{data.title}}</h2>
-  <div mat-dialog-content class="mt-4 text-offwhite" >
-    {{data.message}}
-  </div>
-  <div mat-dialog-actions class="d-flex justify-content-center mt-4">
+<h2 mat-dialog-title>{{data.title}}</h2>
+<div mat-dialog-content class="mt-4 text-offwhite">
+    <form (keydown)="withEnterKey($event)">
+        {{data.message}}
+    </form>
+</div>
+<div mat-dialog-actions class="d-flex justify-content-center mt-4">
     <button mat-raised-button cdkFocusInitial (click)="onOkClick()" color="basic">OK</button>
-  </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
index e15f3c6f..7558b527 100644
--- a/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
+++ b/frontend/src/app/_modals/alert-dialog/alert-dialog.component.ts
@@ -20,9 +20,11 @@ export class AlertDialogComponent {
     //public dialog: MatDialog
   ) {}
 
+  withEnterKey(keyboardEvent: KeyboardEvent) {
+    if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+      this.onOkClick();
+  }
   onOkClick(): void {
     this.dialogRef.close();
   }
-
-
 }