Merge branch 'master' into dataBaseEntry

Author: Joshua Baert

src/components/home/homeCtrl.js

@@ -7,14 +7,16 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
 
     $scope.getUser = () => {
         mainService.getUser().then(response => {
+            console.log(response.data);
             mainService.user = response.data;
             mainService.user.kyu_level = mainService.rankCalculator(mainService.user);
-            $scope.getRandomKata(mainService.user.id);
+            $scope.getRandomKata();
         })
     }
 
-    $scope.getRandomKata = (userid) => {
-        mainService.getRandomKata(userid).then(response => {
+    $scope.getRandomKata = () => {
+        console.log('hi');
+        mainService.getRandomKata().then(response => {
             console.log(response.data);
             $scope.randomKata = response.data;
         })

src/components/mainService.js

@@ -71,15 +71,15 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
   };
 
   // homeCtrl - displaying one kata withing range
-  this.getRandomKata = (userid) => { // eventually we will want it to return a random kata based on the users experience. THAT IS WHY THERE IS AN ID PARAM
+  this.getRandomKata = () => { // eventually we will want it to return a random kata based on the users experience. THAT IS WHY THERE IS AN ID PARAM
     return $http({
       method: 'GET',
-      url: `/api/random-kata`
+      url: `/api/random-kata/` 
     });
   };
 
   // kata_listCtrl = displays a plethora of katas based on user ability
-  this.getRandomKataList = (userid) => {
+  this.getRandomKataList = () => {
     return $http({
       method: 'GET',
       url: `/api/random-kata-list`
@@ -123,36 +123,7 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
   }
 
 // OTHER
-  this.pointsCalculator = (kyu, user) => {
-    switch (true) {
-      case kyu = 8:
-        return user.points += 1;
-        break;
-      case kyu = 7:
-        return user.points += 2;
-        break;
-      case kyu = 6:
-        return user.points += 4;
-        break;
-      case kyu = 5:
-        return user.points += 8;
-        break;
-      case kyu = 4:
-        return user.points += 16;
-        break;
-      case kyu = 3:
-        return user.points += 32;
-        break;
-      case kyu = 2:
-        return user.points += 64;
-        break;
-      case kyu = 1:
-        return user.points += 128;
-        break;
-    }
-  }
-
-this.rankCalculator = (user) => {
+  this.rankCalculator = (user) => {
   switch (true) {
     case user.points < 12:
       return user.kyu_level = 8;
@@ -181,5 +152,33 @@ this.rankCalculator = (user) => {
   }
 }
 
+  this.pointsCalculator = (kyu, user) => {
+    switch (true) {
+      case kyu = 8:
+        return user.points += 1;
+        break;
+      case kyu = 7:
+        return user.points += 2;
+        break;
+      case kyu = 6:
+        return user.points += 4;
+        break;
+      case kyu = 5:
+        return user.points += 8;
+        break;
+      case kyu = 4:
+        return user.points += 16;
+        break;
+      case kyu = 3:
+        return user.points += 32;
+        break;
+      case kyu = 2:
+        return user.points += 64;
+        break;
+      case kyu = 1:
+        return user.points += 128;
+        break;
+    }
+  }
 
 });