fix: submit

api/exercise/submit.php

@@ -22,7 +22,16 @@ function submitQuiz($exerciseId, $exerciseName, $selectedOptions, $userId, $isDo
     curl_setopt($ch, CURLOPT_URL, "http://192.168.0.11:5000/exercise/result/" . $exerciseId);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_POST, 1);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($submitData));
+    curl_setopt(
+        $ch, 
+        CURLOPT_POSTFIELDS, 
+        json_encode(
+            array(
+                "selectedOptions" => $submitData,
+                "userId" => (int)$userId,
+            )
+        )
+    );
     curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
 
     $response = curl_exec($ch);
@@ -75,45 +84,6 @@ function submitQuiz($exerciseId, $exerciseName, $selectedOptions, $userId, $isDo
         // echo 'Progress added successfully. Progress id: ' . $data['result']['progress_id'];
     }
 
-
-    // soap add gems
-    $baseUrl = 'http://soap:8080/service/gems';
-
-    $soapRequest = '<x:Envelope
-                        xmlns:x="http://schemas.xmlsoap.org/soap/envelope/"
-                        xmlns:ser="http://service.toco.org/">
-                        <x:Header/>
-                        <x:Body>
-                            <ser:addGems>
-                                <user_id>' . $userId . '</user_id>
-                                <gem>' . $score . '</gem>
-                                <type> Gems Recieved from ' . $exerciseName . ' Exercise</type>
-                            </ser:addGems>
-                        </x:Body>
-                    </x:Envelope>';
-
-    $ch = curl_init($baseUrl);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $soapRequest);
-    curl_setopt(
-        $ch,
-        CURLOPT_HTTPHEADER,
-        array(
-            'Content-Type: text/xml',
-            'SOAPAction: addGems',
-            'X-api-key: toco_php'
-        )
-    );
-
-    $response = curl_exec($ch);
-
-    if (curl_errno($ch)) {
-        echo 'Curl error: ' . curl_error($ch);
-    }
-
-    curl_close($ch);
-
     return $score;
 }
 

app/views/exercise/index.php

@@ -29,6 +29,16 @@ $selectedLanguageId = isset($_GET['language']) ? (int) $_GET['language'] : -1;
               <div class="exercise-head">
                 <div class="content">
                   <h2 class="font-bold text-md">
+                    <?php
+                    $imageUrl = null;
+                    foreach ($data["languages"] as $language) {
+                      if ($language["language_id"] == $exercise["language_id"]) {
+                        $imageUrl = $language["language_flag"];
+                        break;
+                      }
+                    }
+                    ?>
+                    <img src="<?= $imageUrl ?>" alt="language" width="20px" height="20px" class="language-icon">
                     <?= $exercise['exe_name'] ?>
                   </h2>
                   <?php

app/views/merchandise/index.php

@@ -3,12 +3,21 @@
         <h1 class="font-bold text-xl text-blue-purple-gradient">
             Merchandise
         </h1>
-        <h2 class="gems font-bold">
-            Your Balance: <?= $data['gems'] ?> gems
+        <h2 class="gems">
+            <img src="/public/icons/gems.svg" alt="gem" width="50px" class="gem-icon">
+            <div>
+                <div class="font-reg">
+                    Your Balance:
+                </div>
+                <div class="font-bold">
+                    <?= $data['gems'] ?> gems
+                </div>
+            </div>
         </h2>
         <div class="merchandise-items">
             <? foreach ($data['merch'] as $merch): ?>
-                <div class="merch-item" style="background-image: url('http://192.168.0.11:5000/image/?filename=<?= $merch['image'] ?>');">
+                <div class="merch-item"
+                    style="background-image: url('http://192.168.0.11:5000/image/?filename=<?= $merch['image'] ?>');">
                     <div class="merch-image"></div>
                     <div class="merch-details">
                         <div class="merch-name">
@@ -33,4 +42,4 @@
             <? endforeach; ?>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

public/css/merchandise.css

@@ -21,6 +21,15 @@
 .gems  {
     color: var(--orange);
     font-size: 28px;
+    min-width: 300px;
+    border-radius: 20px;
+    background: #FFFF9E;
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
+    justify-content: center;
+    cursor: pointer;
+    transition: all 0.3s ease 0s;
+    padding: 20px 0;
+    text-align: center;
 }
 
 .merchandise-items {