Fixed merge conflicts with Login Page

Author: SterlingChin

.gitignore

@@ -3,3 +3,4 @@ node_modules
 config.js
 test.js
 dist/
+

controllers/kataCtrl.js

@@ -3,48 +3,76 @@ const db = app.get('db');
 
 module.exports = {
     getKata: (req, res, next) => {
-        if (dsf) {
+        if (!req.params.kataId) {
             db.read.get_kata([], (err, kata) => {
-
+                if (err) {
+                    console.log(err);
+                    res.status(500).json(err);
+                }
+                return res.status(200).json(kata);
             }) 
-            
         } else {
-            db.read.kata_by_id([], (err, kata) => {
-
+            db.read.kata_by_id([req.params.kataId], (err, kata) => {
+                if (err) {
+                    console.log(err);
+                    res.status(500).json(err);
+                }
+                return res.status(200).json(kata[0]);
             })
         }   
     },
 
-	postSolution: (req, res, next) => {
-        db.create.post_solution([], (err, user) => {
-            
-        })
-    },
-
     getRandomKata: (req, res, next) => {
-        if (dsf) {
-            db.read.get_random_kata([], (err, kata) => {
-
+        if (!req.params.kyu) {
+            db.read.get_random_kata([], (err, katas) => {
+                if (err) {
+                    console.log(err);
+                    res.status(500).json(err);
+                }
+                // math floor for random 
+                return res.status(200).json(katas);
             })
         } else {
-            db.read.get_random_by_kyu([], (err, kata) => {
-                
+            db.read.get_random_by_kyu([req.params.kyu], (err, katas) => {
+                if (err) {
+                    console.log(err);
+                    res.status(500).json(err);
+                } 
+                // get random kata based on kyu choice
+                return res.status(200).json(katas);
             })
         }
     },
 
     getCompletedKatas: (req, res, next) => {
-        db.read.get_completed_katas([], (err, user) => {
-            
+        db.read.get_completed_katas([req.params.userId], (err, katas) => {
+            if (err) {
+                console.log(err);
+                res.status(500).json(err);
+            }
+            // get kata info based on if they have been completed by that user
+            return res.status(200).json(katas);
         })
     },
 
     getKataSolutions: (req, res, next) => {
-        db.read.get_kata_solutions([], (err, user) => {
-            
+        db.read.get_kata_solutions([req.params.kataId], (err, solutions) => {
+           if (err) {
+                console.log(err);
+                res.status(500).json(err);
+            }
+            return res.status(200).json(solutions);
         })
     },
 
-    
+    postSolution: (req, res, next) => {
+        db.create.post_solution([req.body.script, req.params.kataId], (err, solution) => {
+            if (err) {
+                console.log(err);
+                res.status(500).json(err);   
+            }
+             return res.status(201).json(solution);
+        })
+    },
 
 }

db/read/get_kata.sql

@@ -0,0 +1 @@
+select * from katas;

db/read/get_kata_solutions.sql

@@ -0,0 +1,2 @@
+SELECT * FROM solutions
+WHERE kata_id = $1;

db/read/kata_by_id.sql

@@ -1,2 +1,2 @@
-select * from kata
-where id = $1
+select * from katas
+where id = $1;

server.js

@@ -70,7 +70,7 @@ app.get('/auth/github/callback',
 
 app.get('/kata', kataCtrl.getKata);
 app.get('/kata/:kataId', kataCtrl.getKata);
-app.get('/kata/completed', kataCtrl.getCompletedKatas);
+app.get('/kata/completed/:userId', kataCtrl.getCompletedKatas);
 app.get('/kata/random', kataCtrl.getRandomKata);
 app.get('/kata/random/:kyu', kataCtrl.getRandomKata);
 app.get('/solutions/:kataId', kataCtrl.getKataSolutions);