Merge pull request CodewarsClone#118 from CodewarsClone/branchFri

Branch fri

Author: Jon Myrick

README.md

@@ -16,10 +16,9 @@ We made this as a group project for our dev bootcamp
 * Angular 1.5
 * Express
 * Node
-  * (most javascript was written with ES2015 complied by gulp)
+  * (most javascript was written with ES2015 compiled by gulp)
 * Postgres
 
-
 ### Minor Techs used
 
 * JQuery
@@ -36,3 +35,29 @@ We have docker installed and brought down codewars/base-runner & codewars/node-r
 Codewars Runner uses the Mocha unit-testing framework so the test have been written in mocha. 
 
 In node we are using exec to run a CLI to invoke docker and this image and then parsing the response into an object that allows the front-end to display with the describes and its correctly
+
+## How the Site Works
+
+### Login
+
+Using Github OAuth . . . 
+
+### Home
+
+See completed katas and your solutions to them
+
+Choose a random kata according to your kyu level range . . .
+
+### Training
+
+Complete the function
+
+run tests and see if you have passed . . .
+
+### Solutions 
+
+See all the solutions for that kata . . .
+
+### List of All Katas 
+
+Sort through all of the katas and choose one to train . . .

src/components/home/homeCtrl.js

@@ -5,6 +5,7 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
     mainService.checkAuth();
     $scope.languageOptions = ["JavaScript", "Ruby", "C++"];
     $scope.progressOptions = ["Fundamentals", "Rank Up", "Practice and Repeat", "Beta", "Random"];
+
     //Dummy userKatas for purposes of styling.
     // $scope.userKatas = [{kyu: 8, id: 1, name: "Kata name", script: "var a = 1", tags: ['FUNDAMENTALS'], user_id: 2},{kyu: 8, id: 2, name: "Kata name", script: "var a = 1", tags: ['FUNDAMENTALS'], user_id: 2},{kyu: 8, id: 3, name: "Kata name", script: "var a = 1", tags: ['FUNDAMENTALS']}]
 
@@ -40,8 +41,12 @@ angular.module('app').controller('homeCtrl', function($scope, $state, mainServic
 
     $scope.getUserKatas = (userid) => {
         mainService.getUserKatas(userid).then(response => {
+<<<<<<< HEAD
+            $scope.userKatas = response.data;
+=======
              $scope.userKatas = response.data;
              console.log($scope.userKatas);
+>>>>>>> master
         })
     }
 

src/components/mainService.js

@@ -4,8 +4,6 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
 
   // $sce.trustAsResourceUrl('/s');
 
-  // Dummy information so I don't have to mess with the server all the time.
-  // this.user = {id: 4, github_id: "20197415", name: "Steven", email: null, picture_url: "https://avatars.githubusercontent.com/u/20197415?v=3", username: "Steven-Nagie"};
   this.user = {};
 
 // POST
@@ -43,7 +41,6 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
     });
   };
 
-   //kata_listCtrl
   this.searchKatasByName = (input) => {
     return $http({
       method: 'POST',
@@ -86,47 +83,41 @@ angular.module('app').service('mainService', function($http, $q, $sce, $state) {
     })
   };
 
-  // trainingCtrl
   this.getKataById = (kataid) => {
     return $http({
       method: 'GET',
       url: `/api/kata/` + kataid
     });
   };
 
-  // homeCtrl - displaying one kata within range
   this.getRandomKata = (userkyu) => {
     return $http({
       method: 'GET',
       url: `/api/random-kata/${userkyu}`
     });
   };
 
-  // kata_listCtrl = displays a plethora of katas based on user ability
   this.getRandomKataList = (userkyu) => {
     return $http({
       method: 'GET',
       url: `/api/random-kata-list/${userkyu}`
     });
   };
 
-  // kata_listCtrl
   this.getKatasByKyu = (kyu) => {
     return $http({
       method: 'GET',
       url: `/api/katas-by-kyu/` + kyu
     });
   };
 
-  // solutionsCtrl
   this.getKataSolutions = (kataid) => {
     return $http({
       method: 'GET',
       url: `/api/solutions/` + kataid
     });
   };
 
-  // profileCtrl - brings back a specific users kata information (script, name, kyu, description) - use on kata tab soltion tab
   this.getUserKatas = (userid) => {
     return $http({
       method: 'GET',