Merge pull request CodewarsClone#39 from CodewarsClone/wedBranch

Wed branch

Author: Jon Myrick

controllers/kataCtrl.js

@@ -3,6 +3,7 @@ const db = app.get('db');
 
 module.exports = {
     getKatas: (req, res, next) => {
+        console.log('get katas ran');
         if (!req.params.kataId) {
             db.read.katas((err, kata) => {
                 if (err) {
@@ -17,22 +18,28 @@ module.exports = {
                     console.log(err);
                     res.status(500).json(err);
                 }
-                return res.status(200).json(kata[0]);
+                return res.status(200).json(kata);
             })
         }   
     },
 
     getRandomKata: (req, res, next) => {
+        console.log(1);
         if (!req.params.kyu) {
-            db.read.kata((err, katas) => {
+            console.log(2);
+            db.read.katas((err, katas) => {
+                console.log(3);
                 if (err) {
                     console.log(err);
                     res.status(500).json(err);
                 }
+                console.log(4);
                 return res.status(200).json(katas[Math.floor(Math.random() * katas.length + 1)]);
             })
         } else {
+            console.log(2.1);
             db.read.random_by_kyu([req.params.kyu], (err, katas) => {
+                console.log(3.1);
                 if (err) {
                     console.log(err);
                     res.status(500).json(err);

db/create/new_user_from_github.sql

@@ -1,2 +1,2 @@
-INSERT INTO users (github_id, name, email, username, picutre_url)
+INSERT INTO users (github_id, name, email, username, picture_url)
 VALUES ($1, $2, $3, $4, $5);

db/read/kata_by_id.sql

@@ -1,2 +1,2 @@
-select * from katas
+select id, kyu, description, starter_code, name, examples from katas
 where id = $1;

db/read/katas.sql

@@ -1 +1 @@
-select * from katas;
+select id, kyu, description, starter_code, name, examples from katas;

db/read/random_by_kyu.sql

@@ -1,2 +1,2 @@
-SELECT * FROM katas
+SELECT id, kyu, description, starter_code, name, examples FROM katas
 WHERE kyu = $1;

db/start/tables.sql

@@ -35,7 +35,7 @@ CREATE TABLE ratings (
   liked boolean not null
 );
 
-INSERT INTO users (github_id, name, email, username, picutre_url)
+INSERT INTO users (github_id, name, email, username, picture_url)
 VALUES ('12', 'Bob Smith', 'bob@smith.com', 'bobIScool', null);
 
 INSERT INTO katas (kyu, description, starter_code, name, examples, test_script)

server.js

@@ -92,20 +92,19 @@ app.get('/auth/github/callback',
 	});
 
 
-
-app.get('/kata', kataCtrl.getKatas);
-app.get('/kata/:kataId', kataCtrl.getKatas);
-app.get('/kata/completed', kataCtrl.getCompletedKatas);
-app.get('/kata/random', kataCtrl.getRandomKata);
-app.get('/kata/random/:kyu', kataCtrl.getRandomKata);
-app.get('/solutions/:kataId', kataCtrl.getKataSolutions);
-app.get('/me', (req, res, next) => {
+app.get('/api/me', (req, res, next) => {
 	return res.status(200).json(req.user);
 })
+app.get('/api/katas', kataCtrl.getKatas);
+app.get('/api/kata/:kataId', kataCtrl.getKatas);
+app.get('/api/completed-katas', kataCtrl.getCompletedKatas);
+app.get('/api/random-kata', kataCtrl.getRandomKata);
+app.get('/api/kata-random/:kyu', kataCtrl.getRandomKata);
+app.get('/api/solutions/:kataId', kataCtrl.getKataSolutions);
 
 app.post('/test/suite/:kataId', testCtrl.testKata);
 app.post('/test/examples', testCtrl.testExamplesKata);
-app.post('/solution/:kataId', kataCtrl.postSolution);
+app.post('/api/solution/:kataId', kataCtrl.postSolution);
 
 
 

src/components/home/home.html

@@ -1,4 +1,4 @@
-<section class="home">
+<section class="home" ng-init="init()">
 
   <div class="next-challenge">
     <p>Here's the next challenge</p>

src/components/home/homeCtrl.js

@@ -1,14 +1,29 @@
 /***********HOME CONTROLLER***********/
 
-// each Ctrl should call  - mainService.user - for access to the user object
-
 angular.module('app').controller('homeCtrl', function($scope, $state, mainService) {
 
-// get random kata using randomKata function on service
+    $scope.getUser = () => {
+        mainService.getUser().then(response => {
+            mainService.user = response.data[0];
+            console.log(mainService.user);
+        })
+    }
+
+    $scope.getRandomKata = (id) => {
+        mainService.getRandomKata(id).then(response => {
+            console.log(response.data);
+            $scope.randomKata = response.data;
+        })
+    }
+
+    // the random kata is stored on $scope.randomKata.
+    // If there is a button you can link the button to $scope.getRandomKata
+
+    $scope.init = () => {
+        $scope.getUser();
+        $scope.getRandomKata(mainService.user.id);
+    }
+
 
-    mainService.getMe().then(response => {
-        mainService.user = response.data[0];
-        console.log(mainService.user);
-    })
 
 });

src/components/kata_list/kata_listCtrl.js

@@ -3,7 +3,7 @@
 angular.module('app').controller('kata_listCtrl', function($scope, $state, mainService) {
 
 
-// a fimctopm tjat dpes tje following things !. gets all the katas according to user ability (kyu lebel) showing only one level higher and all the levels easier
+// a function that does the following things !. gets all the katas according to user ability (kyu level) showing only one level higher and all the levels easier
 // then the function will shuffle the order on the frontend