From 93395cbe37be4e5adf072bcf3d4cd35e01627f57 Mon Sep 17 00:00:00 2001
From: bastien ollier <bastien.ollier@etu.uca.fr>
Date: Mon, 15 Jan 2024 11:44:09 +0100
Subject: [PATCH 1/3] result to screen

---
 src/app/components/editor/editor.component.html | 15 +++++++++++++++
 src/app/components/editor/editor.component.ts   |  6 ++++++
 src/app/services/codeExecution.service.ts       | 15 +++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/app/components/editor/editor.component.html b/src/app/components/editor/editor.component.html
index 4c9981c..26a7fa7 100644
--- a/src/app/components/editor/editor.component.html
+++ b/src/app/components/editor/editor.component.html
@@ -14,6 +14,21 @@
     </ngx-codemirror>
   </div>
 
+  <div>
+    <ngx-codemirror
+      [options]="{
+        theme: 'material',
+        lineNumbers: false,
+        lineWrapping: false,
+        mode: mode,
+        autofocus: true,
+        readOnly: true
+      }"
+      [(ngModel)]="resultContent"  
+    >
+    </ngx-codemirror>
+  </div>
+
   <div>
     <label for="language">Langage de programmation</label>
     <select
diff --git a/src/app/components/editor/editor.component.ts b/src/app/components/editor/editor.component.ts
index 65fbb44..92c82d2 100644
--- a/src/app/components/editor/editor.component.ts
+++ b/src/app/components/editor/editor.component.ts
@@ -34,6 +34,7 @@ export class EditorComponent implements OnInit{
 
   // Contenu de l'éditeur que l'on passera au serveur
   editorContent: string = defaults[this.mode];
+  resultContent: string = defaults[this.mode];
 
   constructor(private router: Router, private codeExecutionService: CodeExecutionService) {}
 
@@ -62,6 +63,11 @@ export class EditorComponent implements OnInit{
   onRunButtonClicked() {
     // Le code à exécuter est le contenu de l'éditeur
     const codeToExecute = this.editorContent;
+
     this.codeExecutionService.executeCode(codeToExecute, this.mode);
+
+    this.codeExecutionService.getResult().subscribe(result => {
+      this.resultContent = decodeURIComponent(result.replace(/%00/g, ''));
+    });
   }
 }
diff --git a/src/app/services/codeExecution.service.ts b/src/app/services/codeExecution.service.ts
index c2ecafd..4aa2e08 100644
--- a/src/app/services/codeExecution.service.ts
+++ b/src/app/services/codeExecution.service.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { SSE } from 'sse.js';
+import { Observable, Subject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
 })
 export class CodeExecutionService {
-  private apiUrl = 'http://localhost:3000/run'; // Url du serveur Node.js en local
+  private apiUrl = 'http://localhost:3000/run';
+  private resultSubject = new Subject<string>();
 
   constructor(private http: HttpClient) {}
 
@@ -19,8 +21,17 @@ export class CodeExecutionService {
       },
       payload: JSON.stringify({ code, language }),
     });
+    
     sse.addEventListener('message', (event: MessageEvent<string>) => {
-      console.log(event.data);
+      const result = event.data;
+      console.log(result);
+      
+      // Émettre le résultat à tous les abonnés
+      this.resultSubject.next(result);
     });
   }
+
+  getResult(): Observable<string> {
+    return this.resultSubject.asObservable();
+  }
 }
-- 
2.36.3


From d332c8b702402d8426f2da33f1707e9b8549d0ac Mon Sep 17 00:00:00 2001
From: bastien ollier <bastien.ollier@etu.uca.fr>
Date: Tue, 16 Jan 2024 11:42:27 +0100
Subject: [PATCH 2/3] correction demande clement

---
 src/app/components/editor/editor.component.ts | 2 +-
 src/app/services/codeExecution.service.ts     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/components/editor/editor.component.ts b/src/app/components/editor/editor.component.ts
index 92c82d2..a048ccb 100644
--- a/src/app/components/editor/editor.component.ts
+++ b/src/app/components/editor/editor.component.ts
@@ -67,7 +67,7 @@ export class EditorComponent implements OnInit{
     this.codeExecutionService.executeCode(codeToExecute, this.mode);
 
     this.codeExecutionService.getResult().subscribe(result => {
-      this.resultContent = decodeURIComponent(result.replace(/%00/g, ''));
+      this.resultContent = result;
     });
   }
 }
diff --git a/src/app/services/codeExecution.service.ts b/src/app/services/codeExecution.service.ts
index 4aa2e08..abfebf9 100644
--- a/src/app/services/codeExecution.service.ts
+++ b/src/app/services/codeExecution.service.ts
@@ -24,10 +24,10 @@ export class CodeExecutionService {
     
     sse.addEventListener('message', (event: MessageEvent<string>) => {
       const result = event.data;
-      console.log(result);
-      
+            
       // Émettre le résultat à tous les abonnés
-      this.resultSubject.next(result);
+      const text = decodeURIComponent(result.replace(/%00/g, ''));
++     this.resultSubject.next(text);
     });
   }
 
-- 
2.36.3


From 37726cd51a0eb6e0d2eaf4cd04f514126f6c2bc6 Mon Sep 17 00:00:00 2001
From: clfreville2 <clement.freville2@etu.uca.fr>
Date: Tue, 16 Jan 2024 11:45:31 +0100
Subject: [PATCH 3/3] Fix typo

---
 src/app/services/codeExecution.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/codeExecution.service.ts b/src/app/services/codeExecution.service.ts
index abfebf9..f7f1b97 100644
--- a/src/app/services/codeExecution.service.ts
+++ b/src/app/services/codeExecution.service.ts
@@ -27,7 +27,7 @@ export class CodeExecutionService {
             
       // Émettre le résultat à tous les abonnés
       const text = decodeURIComponent(result.replace(/%00/g, ''));
-+     this.resultSubject.next(text);
+      this.resultSubject.next(text);
     });
   }
 
-- 
2.36.3