fixed conflict

Author: alexisgraff5

src/components/mainService.js

@@ -57,7 +57,7 @@ this.user = {}
   this.getKataById = (kataid) => {
     return $http({
       method: 'GET',
-      url: `/api/kata/` + kataid
+      url: `http://192.168.0.186:3030/api/kata/` + kataid
     });
   };
 

src/components/training/instructions.html

@@ -1,5 +1,5 @@
 
   <h2 class="font20-reg">Instructions</h2>
   <div>
-    <p>These are the instructions.</p><p>Moreinfor</p>
+    <p class="font14-reg">{{instructions}}</p>
   </div>

src/components/training/output.html

@@ -3,7 +3,8 @@ <h2 class="font20-reg">Output</h2>
   <div>
     <p>This is the goddamn output.</p>
     <div ng-repeat="test in output">
-        <p>{{test.test}}</p>
-        <p>{{test.result}}</p>
+        <p class="font14-reg">{{test.test}}</p>
+        <p class="font14-reg">{{test.result}}</p>
+        <p class="font14-reg">{{time}}</p>
     </div>
   </div>

src/components/training/training.html

@@ -82,7 +82,7 @@ <h2 class="font20-reg">Name of Kata</h2>
             <textarea name="examples" id="example-input" ng-init="examplesInput = 'Test.assertEquals(a, 1);'" id="example-tests-input" ng-model="examplesInput"></textarea>
           </form>
           <button ng-click="testExamples()" class="test-examples-button font12-reg-blue">RUN EXAMPLES</button>
-          <button ng-click="testSuite(solutionInput)" class="test-suite-button font12-reg-black" style=""><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>ATTEMPT</button>
+          <button ng-click="testSuite()" class="test-suite-button font12-reg-black" style=""><i class="fa fa-caret-right fa-lg" style="margin-right: 2px" aria-hidden="true"></i>ATTEMPT</button>
         </div>
         </div>
       </div>

src/components/training/trainingCtrl.js

@@ -4,6 +4,7 @@
 
 angular.module('app').controller('trainingCtrl', function($scope, $state, mainService) {
 
+  /** Create text areas **/
   var textarea1 = document.getElementById('solution-input');
   var solutionsCode = CodeMirror.fromTextArea(textarea1, {
    lineNumbers: true,
@@ -30,28 +31,52 @@ angular.module('app').controller('trainingCtrl', function($scope, $state, mainSe
   $scope.showInstructions = function() {
     $scope.showOutputShow = true;
     $scope.showInstructionsShow = false;
-  }//comment
+  }
+
+  // GET KATA INFORMATION
+  $scope.getKataById = (kataid) => {
+    mainService.getKataById(kataid).then((response) => {
+      console.log(response.data);
+      $scope.name = response.data.name;
+      $scope.instructions = response.data.description;
+      $scope.kyu = response.data.kyu;
+      $scope.starter = response.data.starter_code;
+      $scope.examples = response.data.examples.map((example) => {return example.test});
+      $scope.kataid = response.data.id;
+    }).then(() =>{
+      solutionsCode.setValue($scope.starter);
+      examplesCode.setValue($scope.examples.join(/\n/));
+    });
+  }
+
+  $scope.getKataById(2);
+
+
 
   //Examples should be an array of objects. Returned results will be an array with the different tests and their results.
   $scope.testExamples = function() {
-    let solutions = solutionsCode.getValue();
-    let examples = examplesCode.getValue();
+    var solutions = solutionsCode.getValue();
+    var examples = examplesCode.getValue();
     $scope.showOutput();
     solutions = solutions.replace(/\n/g, " ");
     solutions = solutions.replace(/\s+/g, " ");
-    let examplesArr = [];
+    var examplesArr = [];
     console.log("solutions: ", solutions, " examples: ", examples);
     examples = examples.split(/\n/);
     console.log(examples);
-    // examples.forEach(example => examplesArr.push({test: example}));
-    // mainService.testExamples(solutions, examplesArr).then((response) => $scope.output.push(response.data[0]));
+    examples.forEach(example => examplesArr.push({test: example}));
+    var t0 = performance.now()
+    mainService.testExamples(solutions, examplesArr).then((response) => $scope.output.push(response.data[0]));
+    var t1 = performance.now();
+    $scope.time = "Time: " + Math.round((t1 - t0)*1000) + " ms";
   }
 
-
-  $scope.testSuite = function(solutions) {
+  $scope.testSuite = function() {
+    var solutions = solutionsCode.getValue();
     $scope.showOutput();
     solutions = solutions.replace(/\n/g, " ");
-    // mainService.testSuite(solutions, kataid).then((response) => console.log(response));
+    solutions = solutions.replace(/\s+/g, " ");
+    // mainService.testSuite(solutions, $scope.kataid).then((response) => console.log(response));
   }
 
   // this function needs to call the kata by id when the user selects train on the home page -getKataById