I did not break my stuff

SterlingChin · SterlingChin · commit 6f3a145276a3 · 2016-12-20T16:41:24.000-07:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ node_modules
 config.js
 test.js
 dist/
-
+.DS_Store/
diff --git a/controllers/testCtrl.js b/controllers/testCtrl.js
@@ -17,7 +17,7 @@ module.exports = {
 		console.log('hit testCtrl');
 		
 		let body = req.body;
-		
+		console.log(body);
 		
 		db.read.kata_by_id([req.params.kataId], (err, kataArray)=>{
 			if(err) console.log(err);
@@ -26,7 +26,6 @@ module.exports = {
 			
 			
 			
-			
 			kata.test_script.forEach((ele, i) =>{
 				let deffered = Q.defer();
 				
@@ -56,6 +55,33 @@ module.exports = {
 	},
 	
 	testExamplesKata: (req, res, next) => {
+		let body = req.body;
+		let promiseArr = [];
+		console.log(body.script);
+		
+		body.examples.forEach((ele, i) => {
+			let deffered = Q.defer();
+			
+			exec(`docker run --rm codewars/node-runner run -l javascript -c "${body.script}" -t cw -f "${ele.test}"`,
+				(err, stdOut, stdErr) => {
+					if (err) {
+						console.log(err);
+					} else if (stdOut) {
+						deffered.resolve(stdOut);
+						ele.result = stdOut;
+					} else if (stdErr) {
+						deffered.resolve(stdErr);
+						ele.result = stdErr;
+					}
+				});
+			
+			promiseArr.push(deffered.promise)
+		});
+		
+		Q.all(promiseArr).then(response => {
+			console.log(body.examples);
+			res.json(body.examples);
+		})
 		
 	},
 	
diff --git a/db/create/new_user_from_github.sql b/db/create/new_user_from_github.sql
@@ -1,2 +1,2 @@
-INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
-VALUES ($1, null, null, $2, $3, $4);
+INSERT INTO users (github_id, name, email, username, picutre_url)
+VALUES ($1, $2, $3, $4, $5);
diff --git a/db/start/katas.sql b/db/start/katas.sql
@@ -0,0 +1,6 @@
+INSERT INTO katas (kyu, name, starter_code, description, examples, test_script)
+VALUES (8, 'Generate range of integers', 'function generateRange(min, max, step){}', 'Implement a function named generateRange(min, max, step), which takes three arguments and generates a range of integers from min to max, with the step. The first integer is the minimum value, the second is the maximum of the range and the third is the step. (min < max)', '[{"test":"Test.assertSimilar(generateRange(2, 10, 2), [2,4,6,8,10]);","result":""}]','[{"test":"Test.assertSimilar(generateRange(2, 10, 2), [2,4,6,8,10]);","result":""},{"test":"Test.assertSimilar(generateRange(1, 10, 3), [1,4,7,10]);","result":""},{"test":"var generateRandom = function(min, max){ return Math.floor(Math.random() * max) + min; }; var range = function(min, max, step){ var z = []; for(var i = min; i <= max; i += step){ z.push(i); } return z; }; for(var i = 0; i < 10; i++){ var randomMax = generateRandom(30, 100), randomMin = generateRandom(1, 20), randomStep = generateRandom(1, 10); Test.assertSimilar(generateRange(randomMin, randomMax, randomStep), range(randomMin, randomMax, randomStep)); }","result":""}]'),
+
+(7, 'Descending Order', 'function descendingOrder(n){}', 'Descending Order', '[{"test":"Test.assertEquals(descendingOrder(15), 51)","result":""}]', '[{"test":"Test.assertEquals(descendingOrder(0), 0)","result":""},{"test":"Test.assertEquals(descendingOrder(1), 1)","result":""},{"test":"Test.assertEquals(descendingOrder(111), 111)","result":""},{"test":"Test.assertEquals(descendingOrder(15), 51)","result":""},{"test":"Test.assertEquals(descendingOrder(1021), 2110)","result":""},{"test":"Test.assertEquals(descendingOrder(123456789), 987654321)","result":""}]'),
+
+;
diff --git a/db/start/tables.sql b/db/start/tables.sql
@@ -3,11 +3,10 @@ DROP TABLE IF EXISTS ratings, rating,  solutions, katas, kata, users;
 CREATE TABLE users (
   id serial primary key,
   github_id varchar(255),
-  first_name varchar(40),
-  last_name varchar(40),
+  name varchar(80),
   email varchar(255),
   username varchar (40),
-  picutre_url text
+  picture_url text
 
 );
 
@@ -36,8 +35,8 @@ CREATE TABLE ratings (
   liked boolean not null
 );
 
-INSERT INTO users (github_id, first_name, last_name, email, username, picutre_url)
-VALUES ('12', 'bob', 'smith', 'bob@smith.com', 'bobIScool', null);
+INSERT INTO users (github_id, name, email, username, picutre_url)
+VALUES ('12', 'Bob Smith', 'bob@smith.com', 'bobIScool', null);
 
 INSERT INTO katas (kyu, description, starter_code, name, examples, test_script)
 VALUES (8, 'var a should equal 1', 'var a = 1', 'Sumbit This', '[{"test":"Test.assertEquals(a, 1)","result":""}]', '[{"test":"Test.assertEquals(a, 0)","result":""},{"test":"Test.assertEquals(a, 2)","result":""},{"test":"Test.assertEquals(a, 1)","result":""}]');
diff --git a/restartDb.js b/restartDb.js
@@ -13,8 +13,15 @@ let db = massive.connect({
 		if (err) {
 			console.log(err)
 		} else {
-			console.log('Reset the database.');
-			process.exit();
+			db.start.katas([], (err) => {
+				if (err) {
+					console.log(err);
+				} else {
+					console.log('Reset the database.');
+					process.exit();
+				}
+			})
+			
 		}
 	})
 	
diff --git a/server.js b/server.js
@@ -23,14 +23,15 @@ passport.use(new GithubStrategy({
 	callbackURL: '/auth/github/callback'
 }, (accessToken, refreshToken, profile, done) => {
 	db.read.user_by_github_id([profile.id], (err, user) => {
-		console.log(user);
 		if (err) {
 			console.log(err);
 		} else if (user [0]) {
 			done(null, user);
 		} else {
+
 			console.log('attempting account creation')
-			db.create.new_user_from_github([profile.id, profile._json.email, profile.displayName, profile._json.avatar_url],
+			db.create.new_user_from_github([profile.id, profile.displayName, profile._json.email, profile.username, profile._json.avatar_url],
+
 				(err) => {
 					if (err) {
 						console.log(err);
@@ -39,7 +40,6 @@ passport.use(new GithubStrategy({
 							if(err) {
 								console.log(err);
 							} else {
-								console.log(newUser);
 								done(null, newUser[0])
 							}
 						});
@@ -88,7 +88,7 @@ app.get('/auth/github/callback',
 	passport.authenticate('github', {failureRedirect: '/login'}),
 	function (req, res) {
 		// Successful authentication, redirect home.
-		res.redirect('/');
+		res.redirect('/#/home');
 	});
 
 
@@ -99,6 +99,9 @@ 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) => {
+	return res.status(200).json(req.user);
+})
 
 app.post('/test/suite/:kataId', testCtrl.testKata);
 app.post('/test/examples', testCtrl.testExamplesKata);
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/assets/.DS_Store b/src/assets/.DS_Store
diff --git a/src/assets/lib/.DS_Store b/src/assets/lib/.DS_Store
diff --git a/src/assets/lib/mode/.DS_Store b/src/assets/lib/mode/.DS_Store
diff --git a/src/components/home/homeCtrl.js b/src/components/home/homeCtrl.js
@@ -1,5 +1,14 @@
 /***********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
+
+    mainService.getMe().then(response => {
+        mainService.user = response.data[0];
+        console.log(mainService.user);
+    })
+
 });
diff --git a/src/components/kata_list/kata_listCtrl.js b/src/components/kata_list/kata_listCtrl.js
@@ -0,0 +1,10 @@
+// each Ctrl should call  - mainService.user - for access to the user object
+
+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
+// then the function will shuffle the order on the frontend
+
+
+});
diff --git a/src/components/mainService.js b/src/components/mainService.js
@@ -2,6 +2,8 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
 
   // $sce.trustAsResourceUrl('/s');
 
+this.user = {}
+
 // POST
   this.testExamples = (solution, examples) => {
     return $http({
@@ -36,6 +38,13 @@ angular.module('app').service('mainService', function($http, $q, $sce) {
 
 
 // GET
+  this.getMe = () => {
+    return $http({
+      method: 'GET',
+      url: `/me`
+    })
+  }
+
   this.getKatas = () => {
     return $http({
       method: 'GET',
diff --git a/src/components/menus/menuCtrl.js b/src/components/menus/menuCtrl.js
diff --git a/src/components/profile/profileCtrl.js b/src/components/profile/profileCtrl.js
@@ -0,0 +1,5 @@
+// each Ctrl should call  - mainService.user - for access to the user object
+
+angular.module('app').controller('profileCtrl', function($scope, $state, mainService) {
+
+});
diff --git a/src/components/solutions/solutionsCtrl.js b/src/components/solutions/solutionsCtrl.js
@@ -0,0 +1,8 @@
+
+// each Ctrl should call  - mainService.user - for access to the user object
+
+angular.module('app').controller('solutionsCtrl', function($scope, $state, mainService) {
+
+// get all solutions for one kata (by kataid) using the kataSolutions function on service.
+
+});
diff --git a/src/components/training/trainingCtrl.js b/src/components/training/trainingCtrl.js
@@ -1,5 +1,7 @@
 /**********TRAINING CONTROLLER************/
 
+// each Ctrl should call  - mainService.user - for access to the user object
+
 angular.module('app').controller('trainingCtrl', function($scope, $state, mainService) {
 
 var textarea = document.getElementById('solution-input');
@@ -24,13 +26,14 @@ var textarea = document.getElementById('solution-input');
     $scope.showInstructionsShow = false;
   }
 
-
   //Examples should be an array of objects. Returned results will be an array with the different tests and their results.
   $scope.testExamples = function(solutions, examples) {
     $scope.showOutput();
     solutions = solutions.replace(/\n/g, " ");
     let examplesArr = [];
+    console.log(examples);
     examples = examples.split(/\n/);
+    console.log(examples);
     examples.forEach(example => examplesArr.push({test: example}));
     mainService.testExamples(solutions, examplesArr).then((response) => $scope.output.push(response.data[0]));
   }
@@ -42,6 +45,10 @@ var textarea = document.getElementById('solution-input');
     // mainService.testSuite(solutions, kataid).then((response) => console.log(response));
   }
 
+  // this function needs to call the kata by id when the user selects train on the home page -getKataById
+
+
+  // submit final solution once they have passed the testSuite using setSoluton funciton on the service
 
 
 });
