From 56f3d70eda27403a4d794135f68f192ac463fc2f Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 08:40:06 -0400
Subject: [PATCH 01/23] Add api key to authenticate with server

---
 swiftplugin/swiftplugin/swiftplugin.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 60c68e0..fdd8501 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -56,6 +56,12 @@ class SwiftPluginXBlock(
         help="Problem title",
     )
 
+    api_key = String(
+        default="password",
+        scope=Scope.preferences,
+        help="Key to send to API",
+    )
+
     problem_description = String(
         default="Problem description here!",
         scope=Scope.settings,

From c96c148e656c19ce6766aa365431dfa38c2df5bf Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 08:40:18 -0400
Subject: [PATCH 02/23] set default language to swift

---
 swiftplugin/swiftplugin/swiftplugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index fdd8501..91176a2 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -77,7 +77,7 @@ class SwiftPluginXBlock(
     # )
 
     problem_language = String(
-        default="text/x-kotlin",
+        default="text/x-swift",
         scope=Scope.settings,
         help="Example: text/x-kotlin. Supported languages can be found at https://codemirror.net/5/mode/"
     )

From 4a7cf97003e33d75e6e8a80f3bbb8586122a668c Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 08:40:58 -0400
Subject: [PATCH 03/23] Add api key to headers and use json

---
 swiftplugin/swiftplugin/swiftplugin.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 91176a2..b852997 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -183,6 +183,12 @@ def get_problem_title(self, data, suffix=''):
             'problem_title': self.problem_title
         }
 
+    @XBlock.json_handler
+    def get_api_key(self, data, suffix=''):
+        return {
+            'api_key': self.api_key,
+        }
+
     # @XBlock.json_handler
     # def get_problem_solution(self, data, suffix=''):
     #     return {
@@ -214,13 +220,23 @@ def show_buttons(self, data, suffix=''):
         }
 
     def handle_run_request(self):
-        r = requests.post(get_server_url(self.api_url_run), json=self.build_request_body())
+        r = requests.post(get_server_url(self.api_url_run), json=self.build_request_body(),
+                          headers=self.build_headers())
         return r.json()
 
     def handle_submit_request(self):
-        r = requests.post(get_server_url(self.api_url_submit), json=self.build_request_body())
+        r = requests.post(get_server_url(self.api_url_submit), json=self.build_request_body(),
+                          headers=self.build_headers())
         return r.json()
 
+    def build_headers(self):
+        headers = {
+            'Authorization': 'Bearer {}'.format(self.api_key),
+            'Content-Type': "application/json",
+            'Accept': 'application/json'
+        }
+        return headers
+
     def build_request_body(self):
         body = {
             "code": self.code,

From 31e7053d70b8fe11df0115038965996354da1d91 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 08:41:14 -0400
Subject: [PATCH 04/23] remove json.dumps and use single quotes for request
 body

---
 swiftplugin/swiftplugin/swiftplugin.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index b852997..92a261c 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -239,10 +239,10 @@ def build_headers(self):
 
     def build_request_body(self):
         body = {
-            "code": self.code,
-            "language": self.problem_language
+            'code': self.code,
+            'language': self.problem_language
         }
-        return json.dumps(body)
+        return body
 
     @staticmethod
     def workbench_scenarios():

From 5566713744ab942e6ee8f90af597ec55ccae69d1 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 08:41:28 -0400
Subject: [PATCH 05/23] Fix login for showing run and submit buttons

---
 swiftplugin/swiftplugin/swiftplugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 92a261c..b9a00ca 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -212,8 +212,8 @@ def get_problem_language(self, data, suffix=''):
 
     @XBlock.json_handler
     def show_buttons(self, data, suffix=''):
-        show_run_button = bool(self.api_url_run and self.api_url_run.isspace())
-        show_submit_button = bool(self.api_url_submit and self.api_url_submit.isspace())
+        show_run_button = bool(self.api_url_run and not self.api_url_run.isspace())
+        show_submit_button = bool(self.api_url_submit and not self.api_url_submit.isspace())
         return {
             'show_run_button': show_run_button,
             'show_submit_button': show_submit_button,

From 38e8a0c8e341dcc5b2e9483506e57a68e2b33bb4 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 21:37:50 -0400
Subject: [PATCH 06/23] Add support for grading

---
 swiftplugin/swiftplugin/swiftplugin.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index b9a00ca..199aa9a 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -69,6 +69,9 @@ class SwiftPluginXBlock(
         multiline_editor=True
     )
 
+    has_score = True
+    attempt = 1
+
     # problem_solution = String(
     #     default="",
     #     scope=Scope.settings,
@@ -159,10 +162,22 @@ def get_button_handler(self, data, suffix=''):
 
         elif 'submit' in data['type']:
             api_respo = self.handle_submit_request()
-            response['status'] = "Submitted code"
-            response['response'] = api_respo['message']
-            response['diff'] = self.calculate_diff(expected_output=api_respo['expected_output'],
-                                                   actual_output=api_respo['user_output'])
+            response['response'] = api_respo
+            if api_respo['error']:
+                return response
+            response['diff'] = self.calculate_diff(expected_output=api_respo['expectedOutput'],
+                                                   actual_output=api_respo['output'])
+            is_final_attempt = api_respo['finalAttempt'] == 'true'
+            success = api_respo['success'] == 'true'
+            if success:
+                self.runtime.publish(self, "grade",
+                                     {'value': 1.0,
+                                      'max_value': 1.0})
+            elif is_final_attempt:
+                self.runtime.publish(self, "grade",
+                                     {'value': 0.0,
+                                      'max_value': 1.0})
+
 
         else:
             response["status"] = "No valid type request"

From 799fee79c210eaf4425f688555410f427e44dc24 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 21:38:37 -0400
Subject: [PATCH 07/23] update body to send required params for server

---
 swiftplugin/swiftplugin/swiftplugin.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 199aa9a..84d85f7 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -19,6 +19,7 @@ def get_server_url(url: str):
         return "https://" + url
 
 
+@XBlock.wants('user')
 class SwiftPluginXBlock(
     StudioEditableXBlockMixin,
     XBlock):
@@ -253,9 +254,15 @@ def build_headers(self):
         return headers
 
     def build_request_body(self):
+        user_service = self.runtime.service(self, 'user')
+        xb_user = user_service.get_current_user()
+        email = xb_user.emails[0]
         body = {
             'code': self.code,
-            'language': self.problem_language
+            'language': self.problem_language,
+            'attempt': self.attempt,
+            'referenceId': self.problem_id,
+            'email': email,
         }
         return body
 

From cc91c1eff1e7cb4f3f048c1f827c3365388c96ef Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 21:38:54 -0400
Subject: [PATCH 08/23] Remove uncessary code

---
 swiftplugin/swiftplugin/swiftplugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 84d85f7..e5c0b32 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -158,7 +158,6 @@ def get_button_handler(self, data, suffix=''):
 
         if 'run' in data['type']:
             api_respo = self.handle_run_request()
-            response['status'] = "Executed code"
             response['response'] = api_respo
 
         elif 'submit' in data['type']:

From 42883298586c38c211b56fa4616fb149e2391a21 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 18 Sep 2022 21:39:22 -0400
Subject: [PATCH 09/23] Change output title color based on error or not

---
 .../swiftplugin/static/js/src/swiftplugin.js  | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
index f35ee49..0a36495 100644
--- a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
+++ b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
@@ -146,29 +146,38 @@ function SwiftPluginXBlock(runtime, element) {
         }*/
 
 
-        function updateResponse(response) {
+    function setOutput(response) {
+        const compilation_response = response.response.output
+        let output_response;
+        if (response.diff) {
+            const diff_response = response.diff
+            output_response = compilation_response + '</br>' + diff_response
+        } else {
+            output_response = compilation_response
+        }
+        document.getElementById('response-txt').innerHTML = output_response;
+        document.getElementById('response-title').style.color = "#33691E";
+    }
+
+    function updateResponse(response) {
+        console.log(response)
         if (response.response.output) {
-            const compilation_response = response.response.output
-            let output_response;
-            if (response.diff) {
-                const diff_response = response.diff
-                output_response = compilation_response + '</br>' + diff_response
-            } else {
-                output_response = compilation_response
-            }
-            document.getElementById('response-txt').innerHTML = output_response;
+            setOutput(response);
         } else if (response.response.error) {
-            document.getElementById('response-txt').innerHTML = response.response.error;
+            setError(response.response.error)
         }
     }
 
+    function setError(error) {
+        document.getElementById('response-txt').innerHTML = error;
+        document.getElementById('response-title').style.color = "#B00020";
+    }
+
     function handleError(response) {
-        console.log("error")
-        console.log(response)
         const compilation_response = response.response
         const diff_response = response.diff
         const output_response = compilation_response + '</br>' + diff_response
-        document.getElementById('response-txt').innerHTML = output_response;
+        setError(output_response)
     }
 
     function updateProblemDescription(response) {

From b90aad0d2aff9eea7e091397e149e4445b97d8eb Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 19 Sep 2022 13:18:37 -0400
Subject: [PATCH 10/23] update css to be less generic

---
 .../swiftplugin/static/css/swiftplugin.css    | 76 ++-----------------
 .../swiftplugin/static/html/swiftplugin.html  |  2 +-
 swiftplugin/swiftplugin/swiftplugin.py        | 20 ++---
 3 files changed, 18 insertions(+), 80 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/css/swiftplugin.css b/swiftplugin/swiftplugin/static/css/swiftplugin.css
index 534c0bb..a25b427 100644
--- a/swiftplugin/swiftplugin/static/css/swiftplugin.css
+++ b/swiftplugin/swiftplugin/static/css/swiftplugin.css
@@ -1,11 +1,6 @@
 /* CSS for SwiftPluginXBlock */
 
-.nav-tabs .nav-link {
-    margin-bottom: -1px;
-    background: rgba(0, 0, 0, 0.5);
-}
-
-.nav-link {
+.nav-tabs .nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
     padding: 8px 16px;
     color: #9E9E9E!important;
 }
@@ -14,19 +9,14 @@
     --bs-gutter-x: 0!important;
 }
 
-.nav-pills .nav-link.active {
+.nav-pills#myTab, .nav-link.active#yoursolution2-tab, .nav-link.active#empowrsolution-tab {
     background-color: transparent!important;
     border-radius: 16px 16px 0 0!important;
     font-weight: bold;
     color: #424242!important;
 }
 
-.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
-    color: #fff;
-    background-color: #3D9C06;
-}
-
-.nav-link {
+.nav-link#yoursolution2-tab, .nav-link#empowrsolution-tab {
     display: block;
     padding: .5rem 1rem;
     color: white;
@@ -44,23 +34,7 @@ div#code-container-area {
     overflow:hidden;
 }
 
-.code-instructions-background {
-    background: #3A3A3A;
-}
-
-.code-instructions {
-    color: white;
-}
-
-.tab-content {
-}
-.code-input {
-    height: 100%;
-    padding-left: 0;
-    padding-right: 0;
-}
-
-.code-area {
+/*.code-area {
     width: 100%;
     resize: none;
     border: none;
@@ -68,48 +42,13 @@ div#code-container-area {
     padding-right: 0;
     padding-left: 0;
     outline: none;
-}
+}*/
 
 .response-txt {
     color: black;
     white-space: pre-wrap;
 }
 
-.code-row {
-    width: 100%;
-    margin-right: 0;
-    margin-left: 0;
-    display: flex;
-}
-
-.code-container {
-    max-width: 100%;
-    width: auto;
-    display: flex;
-    height: inherit;
-}
-
-.submit-btn {
-    background: #3D9C06;
-    border-radius: 6px;
-    color: white;
-    min-width: 100px;
-    border: 0;
-}
-
-.button-row {
-    padding: 8px;
-}
-
-.run-btn {
-    background: #2F75EC;
-    border-radius: 6px;
-    margin-left: 16px;
-    color: white;
-    border: 0;
-    min-width: 100px;
-}
-
 .code-bottom {
     background: none;
     height: 30vh;
@@ -119,7 +58,6 @@ div#code-container-area {
 
 .tab-pane {
     min-height: 100px;
-
 }
 
 .instructions-container {
@@ -135,13 +73,13 @@ div#code-container-area {
 
 }
 
-.btn-primary {
+.btn-primary#run-btn, .btn-primary#submit-btn {
     color: #fff !important;
     background-color: #5c0e81 !important;
     border-color: #5c0e81 !important;
 }
 
-.btn-primary:hover {
+.btn-primary#run-btn:hover, .btn-primary#submit-btn:hover {
     background-color: #7730b0 !important;
     border-color: #7730b0 !important;
 }
diff --git a/swiftplugin/swiftplugin/static/html/swiftplugin.html b/swiftplugin/swiftplugin/static/html/swiftplugin.html
index b3a44ba..d3dac34 100644
--- a/swiftplugin/swiftplugin/static/html/swiftplugin.html
+++ b/swiftplugin/swiftplugin/static/html/swiftplugin.html
@@ -5,7 +5,7 @@
             <h1 class="mb-2" id="assignment-title">Title</h1>
             <div id="code-container-area">
                 <ul class="nav nav-pills" id="myTab" role="tablist">
-                    <li class="nav-item" role="presentation">
+                    <li class="nav-item" id="nav-item" role="presentation">
                         <button class="nav-link active" id="yoursolution2-tab" data-bs-toggle="tab"
                                 data-bs-target="#yoursolution2"
                                 type="button" role="tab" aria-controls="yoursolution2" aria-selected="true">Your Code
diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index e5c0b32..a8f6aea 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -40,13 +40,13 @@ class SwiftPluginXBlock(
     )
 
     api_url_submit = String(
-        default="",
+        default="http://127.0.0.1:8080/submit",
         scope=Scope.settings,
         help="URL api used to check the code (submit final response)"
     )
 
     api_url_run = String(
-        default="",
+        default="http://127.0.0.1:8080/run",
         scope=Scope.settings,
         help="URL api used to run the code (run code by api)"
     )
@@ -110,12 +110,19 @@ def student_view(self, context=None):
         print(self.problem_language)
         html = self.resource_string("static/html/swiftplugin.html")
         frag = Fragment(html.format(self=self))
-        frag.add_javascript_url("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/codemirror.js")
+
         frag.add_javascript_url(self.get_mode_url(self.problem_language))
         frag.add_javascript_url("https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js")
         frag.add_css(self.resource_string("static/css/swiftplugin.css"))
         frag.add_javascript(self.resource_string("static/js/src/swiftplugin.js"))
         frag.add_css_url("https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css")
+        frag.add_javascript_url(
+            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js")
+        frag.add_css_url(
+            "https://fonts.googleapis.com/css2?family=Archivo+Black&family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap")
+
+        # Code Mirror
+        frag.add_javascript_url("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/codemirror.js")
         frag.add_css_url("https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.css")
         frag.add_javascript_url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js")
         frag.add_javascript_url("https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.5/umd/popper.min.js")
@@ -125,14 +132,7 @@ def student_view(self, context=None):
         frag.add_javascript_url("https://codemirror.net/5/addon/search/jump-to-line.js")
         frag.add_javascript_url("https://codemirror.net/5/addon/dialog/dialog.js")
         frag.add_javascript_url("https://codemirror.net/5/addon/fold/foldcode.js")
-
         frag.add_css_url("https://codemirror.net/5/addon/dialog/dialog.css")
-        frag.add_javascript_url(
-            "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.0-beta2/js/bootstrap.bundle.min.js")
-        frag.add_css_url("https://d2l03dhf2zcc6i.cloudfront.net/css/custom.css")
-        frag.add_css_url("https://d2l03dhf2zcc6i.cloudfront.net/css/style.css")
-        frag.add_css_url(
-            "https://fonts.googleapis.com/css2?family=Archivo+Black&family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap")
         frag.initialize_js('SwiftPluginXBlock')
         return frag
 

From 628f23a1912a2ab41bd715fa85ef9fa0353189da Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Tue, 20 Sep 2022 13:24:03 -0400
Subject: [PATCH 11/23] show diff for run

---
 swiftplugin/swiftplugin/swiftplugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index a8f6aea..f3dd138 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -159,6 +159,8 @@ def get_button_handler(self, data, suffix=''):
         if 'run' in data['type']:
             api_respo = self.handle_run_request()
             response['response'] = api_respo
+            response['diff'] = self.calculate_diff(expected_output=api_respo['expectedOutput'],
+                                                   actual_output=api_respo['output'])
 
         elif 'submit' in data['type']:
             api_respo = self.handle_submit_request()

From baaa67dfe4cc9600633b3ad544d8d3200bf80688 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sat, 24 Sep 2022 21:20:53 -0400
Subject: [PATCH 12/23] Add javascript

---
 README.md                              | 1 +
 swiftplugin/swiftplugin/swiftplugin.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 205a0e2..67aac95 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ their mime-types
 | C++           | text/x-c++src     |
 | C#            | text/x-csharp     |
 | Java          | text/x-java       |
+| JavaScript    | text/javascript   |
 | Kotlin        | text/x-kotlin     |
 | Python        | text/x-python     |
 | Scala         | text/x-scala      |
diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index f3dd138..10224c2 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -306,6 +306,7 @@ def calculate_diff(self, expected_output: str, actual_output: str):
         "text/x-ttcn-asn": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/asn.1/asn.1.js",
         "text/x-python": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/python/python.js",
         "text/x-kotlin": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/clike/clike.js",
+        "text/javascript": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/javascript/javascript.js",
     }
 
     def get_mode_url(self, mode):

From ce5bb4ac50ed7106439d4d3fb0220b64c9a2eb9c Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sat, 24 Sep 2022 22:00:23 -0400
Subject: [PATCH 13/23] Increment attempt on submit

---
 swiftplugin/swiftplugin/swiftplugin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 10224c2..560f928 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -163,6 +163,7 @@ def get_button_handler(self, data, suffix=''):
                                                    actual_output=api_respo['output'])
 
         elif 'submit' in data['type']:
+            self.attempt = self.attempt + 1
             api_respo = self.handle_submit_request()
             response['response'] = api_respo
             if api_respo['error']:

From 6dea8189ffd12b1670e2b3d89cbf5d58480dd635 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 25 Sep 2022 16:46:53 -0400
Subject: [PATCH 14/23] Remove commented code

---
 swiftplugin/swiftplugin/static/css/swiftplugin.css | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/css/swiftplugin.css b/swiftplugin/swiftplugin/static/css/swiftplugin.css
index a25b427..95c0f0b 100644
--- a/swiftplugin/swiftplugin/static/css/swiftplugin.css
+++ b/swiftplugin/swiftplugin/static/css/swiftplugin.css
@@ -34,16 +34,6 @@ div#code-container-area {
     overflow:hidden;
 }
 
-/*.code-area {
-    width: 100%;
-    resize: none;
-    border: none;
-    display: flex;
-    padding-right: 0;
-    padding-left: 0;
-    outline: none;
-}*/
-
 .response-txt {
     color: black;
     white-space: pre-wrap;

From 85b9cdae3624425e0f2761decf79638a31c46caf Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 25 Sep 2022 16:47:18 -0400
Subject: [PATCH 15/23] Fix formatting

---
 swiftplugin/swiftplugin/swiftplugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 560f928..818b0bc 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -111,7 +111,6 @@ def student_view(self, context=None):
         html = self.resource_string("static/html/swiftplugin.html")
         frag = Fragment(html.format(self=self))
 
-        frag.add_javascript_url(self.get_mode_url(self.problem_language))
         frag.add_javascript_url("https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.1/showdown.min.js")
         frag.add_css(self.resource_string("static/css/swiftplugin.css"))
         frag.add_javascript(self.resource_string("static/js/src/swiftplugin.js"))
@@ -133,6 +132,7 @@ def student_view(self, context=None):
         frag.add_javascript_url("https://codemirror.net/5/addon/dialog/dialog.js")
         frag.add_javascript_url("https://codemirror.net/5/addon/fold/foldcode.js")
         frag.add_css_url("https://codemirror.net/5/addon/dialog/dialog.css")
+        frag.add_javascript_url(self.get_mode_url(self.problem_language))
         frag.initialize_js('SwiftPluginXBlock')
         return frag
 

From c905994dc7937b0e5a88418feedb8192850bc121 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 25 Sep 2022 16:48:52 -0400
Subject: [PATCH 16/23] Fix run requests

---
 .../swiftplugin/static/js/src/swiftplugin.js  | 17 +++++----
 swiftplugin/swiftplugin/swiftplugin.py        | 37 ++++++++++++++-----
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
index 0a36495..1de10b1 100644
--- a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
+++ b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
@@ -147,24 +147,27 @@ function SwiftPluginXBlock(runtime, element) {
 
 
     function setOutput(response) {
+        console.log(response)
         const compilation_response = response.response.output
         let output_response;
-        if (response.diff) {
+        let color = response.response.success ? "#33691E" : "#B00020"
+        if (response.response.success) {
+            output_response = compilation_response
+        } else if (response.diff) {
             const diff_response = response.diff
             output_response = compilation_response + '</br>' + diff_response
         } else {
             output_response = compilation_response
         }
         document.getElementById('response-txt').innerHTML = output_response;
-        document.getElementById('response-title').style.color = "#33691E";
+        document.getElementById('response-title').style.color = color;
     }
 
     function updateResponse(response) {
-        console.log(response)
-        if (response.response.output) {
-            setOutput(response);
-        } else if (response.response.error) {
-            setError(response.response.error)
+        if (response.error) {
+            setError(response.error)
+        } else {
+            setOutput(response)
         }
     }
 
diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 818b0bc..c5fefc1 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -144,23 +144,25 @@ def get_button_handler(self, data, suffix=''):
         response = {}
 
         if "code" not in data.keys():
-            logging.error("non code data in request!")
-            response['status'] = "Empty code!"
+            response['error'] = "Empty code!"
             return response
 
         self.code = data['code']
-
-        response['code'] = self.code
         if "type" not in data.keys():
-            logging.error("non request type in request")
-            response["status"] = "Non request type"
+            response["error"] = "Invalid request type"
             return response
 
         if 'run' in data['type']:
-            api_respo = self.handle_run_request()
+            api_respo = self.handle_request(self.api_url_run)
             response['response'] = api_respo
-            response['diff'] = self.calculate_diff(expected_output=api_respo['expectedOutput'],
-                                                   actual_output=api_respo['output'])
+            print(response)
+            if 'error' in api_respo:
+                response['error'] = api_respo['error']
+                return response
+            response['response']['success'] = True
+            diff = self.get_diff(api_respo)
+            if diff is not None:
+                response['diff'] = diff
 
         elif 'submit' in data['type']:
             self.attempt = self.attempt + 1
@@ -242,6 +244,23 @@ def handle_run_request(self):
                           headers=self.build_headers())
         return r.json()
 
+    def get_diff(self, resp):
+        if "expectedOutput" in resp and "output" in resp:
+            return self.calculate_diff(expected_output=resp['expectedOutput'],
+                                                   actual_output=resp['output'])
+        else:
+            return None
+
+    def handle_request(self, url):
+        try:
+            r = requests.post(get_server_url(url), json=self.build_request_body(), headers=self.build_headers())
+            return r.json()
+        except requests.exceptions.RequestException as e:
+            return json.dumps({
+                'error': e
+            })
+
+
     def handle_submit_request(self):
         r = requests.post(get_server_url(self.api_url_submit), json=self.build_request_body(),
                           headers=self.build_headers())

From 17f2f0369b8a75ff8ddc6fcc7a9a4f8c31f48d33 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 25 Sep 2022 16:49:03 -0400
Subject: [PATCH 17/23] remove debug logging

---
 swiftplugin/swiftplugin/static/js/src/swiftplugin.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
index 1de10b1..061725d 100644
--- a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
+++ b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
@@ -88,7 +88,6 @@ function SwiftPluginXBlock(runtime, element) {
             url: showButtonsUrl,
             data: JSON.stringify({}),
             success: function (data) {
-                console.log(data)
                 const is_run_hidden = data.show_run_button === false
                 const is_submit_hidden = data.show_submit_button === false
                 run_btn.hidden = is_run_hidden
@@ -104,7 +103,6 @@ function SwiftPluginXBlock(runtime, element) {
             url: handlerUrlLanguage,
             data: JSON.stringify({}),
             success: function (data) {
-                console.log(data)
                 init_code_mirror(data.problem_language)
             }
         });
@@ -120,7 +118,6 @@ function SwiftPluginXBlock(runtime, element) {
             lineWiseCopyCut: true,
             autoCloseBrackets: true,
         }
-        console.log(codemirror_config)
         var myTextArea = document.getElementById("code-area");
         myCodeMirror = CodeMirror(function (elt) {
             myTextArea.parentNode.replaceChild(elt, myTextArea);

From 8fe7bb7e803b61921c4eec1066c0a38e33016474 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Sun, 25 Sep 2022 16:49:11 -0400
Subject: [PATCH 18/23] remove unsued id

---
 swiftplugin/swiftplugin/static/html/swiftplugin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swiftplugin/swiftplugin/static/html/swiftplugin.html b/swiftplugin/swiftplugin/static/html/swiftplugin.html
index d3dac34..b3a44ba 100644
--- a/swiftplugin/swiftplugin/static/html/swiftplugin.html
+++ b/swiftplugin/swiftplugin/static/html/swiftplugin.html
@@ -5,7 +5,7 @@
             <h1 class="mb-2" id="assignment-title">Title</h1>
             <div id="code-container-area">
                 <ul class="nav nav-pills" id="myTab" role="tablist">
-                    <li class="nav-item" id="nav-item" role="presentation">
+                    <li class="nav-item" role="presentation">
                         <button class="nav-link active" id="yoursolution2-tab" data-bs-toggle="tab"
                                 data-bs-target="#yoursolution2"
                                 type="button" role="tab" aria-controls="yoursolution2" aria-selected="true">Your Code

From c6b36bb1c74da66b58ed677662ea74c2b9d69ada Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 26 Sep 2022 20:37:24 -0400
Subject: [PATCH 19/23] Add support for server generated diff

---
 .../swiftplugin/static/js/src/swiftplugin.js  | 13 ++--
 swiftplugin/swiftplugin/swiftplugin.py        | 63 ++++++-------------
 2 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
index 061725d..2f5a2c3 100644
--- a/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
+++ b/swiftplugin/swiftplugin/static/js/src/swiftplugin.js
@@ -144,19 +144,16 @@ function SwiftPluginXBlock(runtime, element) {
 
 
     function setOutput(response) {
-        console.log(response)
         const compilation_response = response.response.output
-        let output_response;
         let color = response.response.success ? "#33691E" : "#B00020"
         if (response.response.success) {
-            output_response = compilation_response
-        } else if (response.diff) {
-            const diff_response = response.diff
-            output_response = compilation_response + '</br>' + diff_response
+            document.getElementById('response-txt').innerHTML = compilation_response;
+        } else if (response.response.diff) {
+            document.getElementById('response-txt').innerHTML = response.response.diff;
         } else {
-            output_response = compilation_response
+            document.getElementById('response-txt').innerHTML = compilation_response;
         }
-        document.getElementById('response-txt').innerHTML = output_response;
+
         document.getElementById('response-title').style.color = color;
     }
 
diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index c5fefc1..3338521 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -5,9 +5,6 @@
 from xblock.core import XBlock
 from xblock.fields import String, Scope
 from xblockutils.studio_editable import StudioEditableXBlockMixin
-import difflib
-from io import StringIO
-import logging
 import requests
 import json
 
@@ -33,10 +30,10 @@ class SwiftPluginXBlock(
         help="User code",
     )
 
-    problem_id = String(
+    reference_id = String(
         default="",
         scope=Scope.settings,
-        help="Problem id used by the Api to checkcode"
+        help="Problem id used by the Api to check the code"
     )
 
     api_url_submit = String(
@@ -58,7 +55,7 @@ class SwiftPluginXBlock(
     )
 
     api_key = String(
-        default="password",
+        default="",
         scope=Scope.preferences,
         help="Key to send to API",
     )
@@ -87,7 +84,7 @@ class SwiftPluginXBlock(
     )
 
     editable_fields = [
-        'problem_id',
+        'reference_id',
         'problem_description',
         'problem_title',
         # 'problem_solution',
@@ -159,19 +156,15 @@ def get_button_handler(self, data, suffix=''):
             if 'error' in api_respo:
                 response['error'] = api_respo['error']
                 return response
-            response['response']['success'] = True
-            diff = self.get_diff(api_respo)
-            if diff is not None:
-                response['diff'] = diff
+            response['response']['success'] = self.check_run_success(api_respo)
 
         elif 'submit' in data['type']:
-            self.attempt = self.attempt + 1
-            api_respo = self.handle_submit_request()
+            api_respo = self.handle_request(self.api_url_submit)
             response['response'] = api_respo
-            if api_respo['error']:
+            if 'error' in api_respo:
+                response['error'] = api_respo['error']
                 return response
-            response['diff'] = self.calculate_diff(expected_output=api_respo['expectedOutput'],
-                                                   actual_output=api_respo['output'])
+            self.attempt = self.attempt + 1
             is_final_attempt = api_respo['finalAttempt'] == 'true'
             success = api_respo['success'] == 'true'
             if success:
@@ -182,6 +175,9 @@ def get_button_handler(self, data, suffix=''):
                 self.runtime.publish(self, "grade",
                                      {'value': 0.0,
                                       'max_value': 1.0})
+            else:
+                response['error'] = api_respo['output']
+                response.pop('output', None)
 
 
         else:
@@ -192,14 +188,14 @@ def get_button_handler(self, data, suffix=''):
     @XBlock.json_handler
     def get_problem_description(self, data, suffix=''):
         return {
-            'problem_id': self.problem_id,
+            'problem_id': self.reference_id,
             'problem_description': self.problem_description
         }
 
     @XBlock.json_handler
     def get_problem_title(self, data, suffix=''):
         return {
-            'problem_id': self.problem_id,
+            'problem_id': self.reference_id,
             'problem_title': self.problem_title
         }
 
@@ -219,7 +215,7 @@ def get_api_key(self, data, suffix=''):
     @XBlock.json_handler
     def get_problem_language(self, data, suffix=''):
         return {
-            'problem_id': self.problem_id,
+            'problem_id': self.reference_id,
             'problem_language': self.problem_language
         }
 
@@ -239,17 +235,11 @@ def show_buttons(self, data, suffix=''):
             'show_submit_button': show_submit_button,
         }
 
-    def handle_run_request(self):
-        r = requests.post(get_server_url(self.api_url_run), json=self.build_request_body(),
-                          headers=self.build_headers())
-        return r.json()
-
-    def get_diff(self, resp):
+    def check_run_success(self, resp):
         if "expectedOutput" in resp and "output" in resp:
-            return self.calculate_diff(expected_output=resp['expectedOutput'],
-                                                   actual_output=resp['output'])
+            return resp['expectedOutput'] == resp['output']
         else:
-            return None
+            return False
 
     def handle_request(self, url):
         try:
@@ -261,11 +251,6 @@ def handle_request(self, url):
             })
 
 
-    def handle_submit_request(self):
-        r = requests.post(get_server_url(self.api_url_submit), json=self.build_request_body(),
-                          headers=self.build_headers())
-        return r.json()
-
     def build_headers(self):
         headers = {
             'Authorization': 'Bearer {}'.format(self.api_key),
@@ -282,7 +267,7 @@ def build_request_body(self):
             'code': self.code,
             'language': self.problem_language,
             'attempt': self.attempt,
-            'referenceId': self.problem_id,
+            'referenceId': self.reference_id,
             'email': email,
         }
         return body
@@ -303,16 +288,6 @@ def workbench_scenarios():
              """),
         ]
 
-    def calculate_diff(self, expected_output: str, actual_output: str):
-        # To redirect std output
-        mystdout = StringIO()
-        d = difflib.Differ()
-        mystdout.writelines(list(d.compare(expected_output.splitlines(keepends=True),
-                                           actual_output.splitlines(keepends=True))))
-        # Read from mystdout output
-        diff = mystdout.getvalue()
-        return diff
-
     _modeUrl = {
         "text/x-swift": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/swift/swift.js",
         "text/x-csrc": "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2/mode/clike/clike.js",

From 999ea4712c783edab8efe4e0fc365ec9f4dfb867 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 26 Sep 2022 23:30:32 -0400
Subject: [PATCH 20/23] Use success from server

---
 swiftplugin/swiftplugin/swiftplugin.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 3338521..bc47602 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -152,11 +152,9 @@ def get_button_handler(self, data, suffix=''):
         if 'run' in data['type']:
             api_respo = self.handle_request(self.api_url_run)
             response['response'] = api_respo
-            print(response)
             if 'error' in api_respo:
                 response['error'] = api_respo['error']
                 return response
-            response['response']['success'] = self.check_run_success(api_respo)
 
         elif 'submit' in data['type']:
             api_respo = self.handle_request(self.api_url_submit)

From 79cb017971f6e57a4fd9a863aa1b1036a3f5f48b Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 26 Sep 2022 23:31:46 -0400
Subject: [PATCH 21/23] Remove boolean check for submit

---
 swiftplugin/swiftplugin/swiftplugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 3338521..7d90f16 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -165,8 +165,8 @@ def get_button_handler(self, data, suffix=''):
                 response['error'] = api_respo['error']
                 return response
             self.attempt = self.attempt + 1
-            is_final_attempt = api_respo['finalAttempt'] == 'true'
-            success = api_respo['success'] == 'true'
+            is_final_attempt = api_respo['finalAttempt']
+            success = api_respo['success']
             if success:
                 self.runtime.publish(self, "grade",
                                      {'value': 1.0,

From e8b6712062268f4a5917503909bca4b643c7e030 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 26 Sep 2022 23:32:05 -0400
Subject: [PATCH 22/23] Format file

---
 swiftplugin/swiftplugin/swiftplugin.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 7d90f16..372805b 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -31,7 +31,7 @@ class SwiftPluginXBlock(
     )
 
     reference_id = String(
-        default="",
+        default="assignment-2",
         scope=Scope.settings,
         help="Problem id used by the Api to check the code"
     )
@@ -55,7 +55,7 @@ class SwiftPluginXBlock(
     )
 
     api_key = String(
-        default="",
+        default="password",
         scope=Scope.preferences,
         help="Key to send to API",
     )
@@ -175,9 +175,6 @@ def get_button_handler(self, data, suffix=''):
                 self.runtime.publish(self, "grade",
                                      {'value': 0.0,
                                       'max_value': 1.0})
-            else:
-                response['error'] = api_respo['output']
-                response.pop('output', None)
 
 
         else:
@@ -235,12 +232,6 @@ def show_buttons(self, data, suffix=''):
             'show_submit_button': show_submit_button,
         }
 
-    def check_run_success(self, resp):
-        if "expectedOutput" in resp and "output" in resp:
-            return resp['expectedOutput'] == resp['output']
-        else:
-            return False
-
     def handle_request(self, url):
         try:
             r = requests.post(get_server_url(url), json=self.build_request_body(), headers=self.build_headers())
@@ -250,7 +241,6 @@ def handle_request(self, url):
                 'error': e
             })
 
-
     def build_headers(self):
         headers = {
             'Authorization': 'Bearer {}'.format(self.api_key),

From fe6685b5d6719ad1066d66e36d90942df6920e51 Mon Sep 17 00:00:00 2001
From: adevezin <adrianldevezin@mailfence.com>
Date: Mon, 26 Sep 2022 23:40:52 -0400
Subject: [PATCH 23/23] Remove defaults

---
 swiftplugin/swiftplugin/swiftplugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swiftplugin/swiftplugin/swiftplugin.py b/swiftplugin/swiftplugin/swiftplugin.py
index 2504591..db0d081 100644
--- a/swiftplugin/swiftplugin/swiftplugin.py
+++ b/swiftplugin/swiftplugin/swiftplugin.py
@@ -31,7 +31,7 @@ class SwiftPluginXBlock(
     )
 
     reference_id = String(
-        default="assignment-2",
+        default="",
         scope=Scope.settings,
         help="Problem id used by the Api to check the code"
     )
@@ -55,7 +55,7 @@ class SwiftPluginXBlock(
     )
 
     api_key = String(
-        default="password",
+        default="",
         scope=Scope.preferences,
         help="Key to send to API",
     )