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

2 files changed, 11 insertions, 6 deletions

diff --git a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
index 06e74093..77e7be42 100644
--- a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
+++ b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.html
@@ -1,8 +1,10 @@
 <h2 mat-dialog-title class="text-muted">{{data.title}}</h2>
 <div mat-dialog-content class="mt-4" style="color: rgb(81, 76, 76);">
-  {{data.message}}
+    <form (keydown)="withEnterKey($event)">
+        {{data.message}}
+    </form>
 </div>
 <div mat-dialog-actions class="d-flex justify-content-center mt-4">
-  <button mat-button cdkFocusInitial (click)="onYesClick()" style="background-color: lightgray;">Da</button>
-  <button mat-button cdkFocusInitial (click)="onNoClick()" style="background-color: lightgray;">Ne</button>
+    <button mat-button cdkFocusInitial (click)="onYesClick()" style="background-color: lightgray;">Da</button>
+    <button mat-button cdkFocusInitial (click)="onNoClick()" style="background-color: lightgray;">Ne</button>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
index de1cdd4f..a7db1e7f 100644
--- a/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
+++ b/frontend/src/app/_modals/yes-no-dialog/yes-no-dialog.component.ts
@@ -24,10 +24,13 @@ export class YesNoDialogComponent {
   onNoClick(): void {
     this.dialogRef.close();
   }
-  onYesClick():void{
+
+  withEnterKey(keyboardEvent: KeyboardEvent) {
+      if (keyboardEvent.code == "Enter" || keyboardEvent.code == "NumpadEnter") 
+        this.onYesClick();
+  }
+  onYesClick():void {
     this.data.yesFunction();
     this.dialogRef.close();
   }
-
-
 }