Skip to content

Commit 4c49dc4

Browse files
committed
Det finns ingen gud.
2 parents ed63d69 + d06a81b commit 4c49dc4

6 files changed

Lines changed: 89 additions & 56 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
node_modules
33
config.js
44
test.js
5-
./dist

controllers/endPointCtrl.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

controllers/kataCtrl.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
const app = require('../server');
2+
const db = app.get('db');
3+
4+
module.exports = {
5+
getKata: (req, res, next) => {
6+
7+
},
8+
9+
postSolution: (req, res, next) => {
10+
11+
},
12+
13+
getRandomKata: (req, res, next) => {
14+
15+
},
16+
17+
getCompletedKatas: (req, res, next) => {
18+
19+
},
20+
21+
getKataSolutions: (req, res, next) => {
22+
23+
},
24+
25+
26+
27+
}

controllers/testCtrl.js

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
*
66
*/
77

8-
const exec = require('child_process').exec;
9-
10-
// let script = `let addTwo = (x) => {return x+2};`;
11-
12-
13-
148
// This is where wer run a script.. I have verified that so long as we get it in string format we run unit tests
159
// exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
1610
// (err, stdout, stderr) => {
@@ -20,20 +14,39 @@ const exec = require('child_process').exec;
2014
// console.log('stderr', stderr);
2115
// });
2216

17+
const app = require('../server');
18+
const db = app.get('db');
19+
20+
const exec = require('child_process').exec;
21+
22+
let test = `Test.assertEquals(addTwo(2), 4)`;
23+
2324
module.exports = {
24-
firstTest: (script) => {
25-
console.log(script);
26-
return exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
27-
(err, stdout, stderr) => {
28-
if (err) {
29-
console.log('err', err);
30-
} else if (stdout) {
31-
console.log('after stdOut');
32-
console.log(typeof stdout);
33-
return stdout;
34-
} else if (stderr) {
35-
return stderr;
36-
}
37-
});
38-
}
39-
}
25+
testScript: (req, res, next) => {
26+
let script = req.body.script;
27+
28+
exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
29+
(err, stdout, stderr) => {
30+
if (err) {
31+
console.log('err', err);
32+
} else if (stdout) {
33+
console.log('after stdOut');
34+
console.log(typeof stdout);
35+
res.json(stdout);
36+
} else if (stderr) {
37+
res.json(stderr);
38+
}
39+
return
40+
});
41+
42+
},
43+
44+
testKata: (req, res, next) => {
45+
46+
},
47+
48+
testExamplesKata: (req, res, next) => {
49+
50+
},
51+
52+
};

server.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ const passport = require('passport');
88
const GithubStrategy = require('passport-github2').Strategy;
99
const connectionString = config.connectionString;
1010

11+
const testCtrl = require('./controllers/testCtrl');
12+
const kataCtrl = require('./controllers/kataCtrl');
13+
1114
passport.serializeUser((user, done) => {
1215
done(null, user);
1316
});
@@ -38,20 +41,17 @@ app.use(express.static(__dirname + '/dist'));
3841
app.use(bodyParser.json());
3942
app.use(cors());
4043

41-
4244
app.use(session({
4345
secret: config.sessionSecret,
4446
saveUninitialized: false,
4547
resave: false
4648
}));
4749

48-
4950
app.use(passport.initialize());
5051
app.use(passport.session());
5152

5253
app.set('db', massiveInstance);
53-
const db = app.get('db');
54-
const endPointCtrl = require('./controllers/endPointCtrl');
54+
const db = app.get('db')
5555

5656
app.get('/auth/github', passport.authenticate('github'));
5757

@@ -62,7 +62,18 @@ app.get('/auth/github/callback',
6262
res.redirect('/');
6363
});
6464

65-
app.post('/solution', endPointCtrl.testScript);
65+
66+
app.get('/kata', kataCtrl.getKata);
67+
app.get('/kata/:kataId', kataCtrl.getKata);
68+
app.get('/kata/completed', kataCtrl.getCompletedKatas);
69+
app.get('/kata/random', kataCtrl.getRandomKata);
70+
app.get('/kata/random/:kyu', kataCtrl.getRandomKata);
71+
app.get('/solutions/:kataId', kataCtrl.getKataSolutions);
72+
73+
app.post('/test/:kataId', testCtrl.testKata);
74+
app.post('/test/examples/:kataId', testCtrl.testExamplesKata);
75+
app.post('/solution/:kataId', kataCtrl.postSolution);
76+
6677

6778

6879
app.listen(config.port, function() {

src/components/directive.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
angular.module('app').directive('animateDir', function () {
2+
return {
3+
scope: {
4+
settings: "="
5+
},
6+
restrict: 'EA',
7+
link: function (scope, elems, attrs) {
8+
$(document).ready(function () {})
9+
}
10+
}
11+
});

0 commit comments

Comments
 (0)