training buttons start

Author: SterlingChin

src/components/menus/menu.html

@@ -43,9 +43,9 @@
         <div class='li65'><img src='./assets/imgs/asset_30.png' class='li65-img'></div>
         <div class='li65'><img src='./assets/imgs/asset_31.png' class='li65-img'></div>
         <div class='li170'>
-          <img src='{{userPic}}' class='li170-img'>
-          <div>{{userKyu}}</div>
-          <div>{{userPoints}}</div>
+          <img src='{{getUser.userPic}}' class='li170-img'>
+          <div>{{getUser.userKyu}}</div>
+          <div>{{getUser.userPoints}}</div>
         </div>
       </div>
     </div>

src/components/menus/menuCtrl.js

@@ -1,5 +1,7 @@
 angular.module('app').controller('menuCtrl', function($scope, $state, mainService, $stateParams){
-    $scope.userPic = mainService.user.picture_url;
-    $scope.userKyu = mainService.user.kyu_level;
-    // $scope.userPoints = mainService.user.points;
+    $scope.getUser = () => {
+        mainService.getUser().then(response => {
+            console.log(response.data);
+        })
+    };
 });

src/components/training/training.scss

@@ -24,6 +24,7 @@ $white: white;
 
 // STUFF ALONG THE TOP
 .training-top {
+  width: calc(100vw-55px);
   height: 60px;
   margin-top: 50px;
   display: flex;
@@ -67,6 +68,14 @@ $white: white;
 
 }
 
+.selection-div {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: row;
+  align-content: flex-start;
+  width: 60vw;
+}
+
 .select-dropdown {
   height: 52px;
   width: 175px;
@@ -75,14 +84,6 @@ $white: white;
   margin: 7.5px;
 }
 
-.selection-div {
-  display: flex;
-  justify-content: space-around;
-  flex-direction: row;
-  width: 60vw;
-}
-
-
 /***********MAIN TRAINING AREA***********/
 .kata {
   display: flex;

src/components/training/trainingCtrl.js

@@ -41,6 +41,7 @@ angular.module('app').controller('trainingCtrl', function ($scope, $state, mainS
 	// 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.replace(/\\n/g, '\n');
 			$scope.kyu = response.data.kyu;