Skip to content

Commit b0d08e9

Browse files
author
Joshua Baert
committed
Merge branch 'master' into dataBaseEntry
2 parents 6c9fa3f + 511c67b commit b0d08e9

4 files changed

Lines changed: 312 additions & 5 deletions

File tree

‎db/create/solution.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO solutions (user_id, kata_id, script) VALUES ($1, $2, $3);
1+
INSERT INTO solutions (user_id, kata_id, script) VALUES ($1, $2, $3);

‎db/start/katas.sql‎

Lines changed: 116 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,125 @@ VALUES (8, 'var a should equal 1', 'var a = 1', 'Sumbit This','["Fake"]', '["Jav
1616
(6, 'Kebabize', '["FUNDAMENTALS","STRINGS"]', '["JavaScript","CoffeeScript","Crystal","Python","Ruby"]', 'function kebabize(str) {}', 'Modify the kebabize function so that it converts a camel case string into a kebab case.\n\nkebabize(''camelsHaveThreeHumps'') // camels-have-three-humps\nkebabize(''camelsHave3Humps'') // camels-have-humps\n\nNotes:\nthe returned string should only contain lowercase letters\n', '[{"test":"Test.assertEquals(kebabize(''myCamelCasedString''), ''my-camel-cased-string'');"},{"test":"Test.assertEquals(kebabize(''myCamelHas3Humps''), ''my-camel-has-humps'');"}]', '[{"test":" Test.describe(''tests'', _ => { Test.it(''fixed tests'', _ => { Test.assertEquals(kebabize(''myCamelCasedString''), ''my-camel-cased-string''); Test.assertEquals(kebabize(''myCamelHas3Humps''), ''my-camel-has-humps''); }); Test.it(''random tests'', _ => { function fixture (str) { return str.replace(/\\d/g,'''').split(/(?=[A-Z])/).map(s => s.toLowerCase()).join(''-''); } for (let i = 0; i <= 100; i += 1) { let token = Test.randomToken(); let camel = token.split('''').map(c => { const rand = Math.random(); return rand > 0.9 ? c.toUpperCase() : c; }).join(''''); Test.assertEquals(kebabize(camel), fixture(camel)); } }); }); "}]')
1717
;
1818

19+
20+
-- December 27:
21+
-- Here are some solutions to populate the solutions page. I forget what we decided regarding formatting, so I'm just copy/pasting them directly from codewars. Therefore, they have line breaks in them, which we can exhange with \n if we so desire.
1922
INSERT INTO solutions (user_id, kata_id, script)
20-
VALUES (1, 1, 'var a = 1'),
23+
VALUES (1, 2, "function generateRange(min, max, step){
24+
let arr = [];
25+
for (let i=min; i<=max; i += step) {
26+
arr.push(i);
27+
}
28+
return arr;
29+
}"),
30+
31+
(1, 3, "function descendingOrder(n){
32+
return parseInt(n.toString().split('').sort((a, b) => b - a).join(''));
33+
}"),
34+
35+
(1, 4, "function disemvowel(str) {
36+
var vowels = ['a', 'e', 'i', 'o', 'u'];
37+
return str.split('').map((letter) => {
38+
if (vowels.indexOf(letter.toLowerCase()) === -1) {
39+
return letter;
40+
}
41+
}).join('');
42+
}"),
43+
44+
(1, 5, "function isValidWalk(walk) {
45+
46+
var horizontal = 0;
47+
var vertical = 0;
48+
var total = 0;
49+
50+
walk.forEach((word) => {
51+
switch (word) {
52+
case 'n':
53+
vertical += 1;
54+
total += 1;
55+
break;
56+
case 's':
57+
vertical -= 1;
58+
total += 1;
59+
break;
60+
case 'e':
61+
horizontal += 1;
62+
total += 1;
63+
break;
64+
case 'w':
65+
horizontal -= 1;
66+
total += 1;
67+
break;
68+
default:
69+
console.log("It's broken");
70+
}
71+
72+
});
73+
74+
if (horizontal === 0 && vertical === 0 && total === 10) {
75+
return true;
76+
} else {
77+
return false;
78+
}
79+
80+
}"),
81+
82+
(1, 6, "function solution(number){
83+
84+
var arr = [];
85+
86+
for (var i = 3; i < number; i++) {
87+
if (i % 3 === 0 || i % 5 === 0) {
88+
arr.push(i);
89+
}
90+
}
91+
92+
var final = 0;
93+
if (arr[0]) {
94+
final = arr.reduce((a, b) => a + b)
95+
}
96+
97+
return final;
98+
99+
}"),
100+
101+
(1, 7, "function bubblesortOnce(intArr) {
102+
103+
var bubble;
104+
105+
for (var i = 0; i < intArr.length; i++) {
106+
if (intArr[i] > intArr[i+1]) {
107+
bubble = intArr[i+1];
108+
intArr.splice(i + 1, 1);
109+
intArr.splice(i, 0, bubble);
110+
}
111+
}
112+
113+
return intArr;
114+
}"),
115+
116+
(1, 8, "function kebabize(str) {
117+
str = str.split('').map((letter) => {
118+
if (!isNaN(parseInt(letter))) {
119+
return "";
120+
}else if (letter === letter.toUpperCase()) {
121+
return "-" + letter.toLowerCase();
122+
} else {
123+
return letter;
124+
}
125+
}).join('');
126+
127+
if (str.charAt(0) === "-") {
128+
str = str.slice(1);
129+
}
130+
131+
return str;
132+
}"),
133+
(1, 1, 'var a = 1'),
21134
(1,1, 'let a = 1'),
22135
(1, 8, 'function kebabize(str) { return str.replace(/[^a-z]/ig, ''). replace(/^[A-Z]/, c => c.toLowerCase()). replace(/[A-Z]/g, c => `-${c.toLowerCase()}`); }')
23136
;
24137
25138
INSERT INTO ratings (user_id, solution_id, liked)
26-
VALUES (1, 1, true);
139+
VALUES (1, 1, true);
140+

‎npm-debug.log‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
0 info it worked if it ends with ok
2+
1 verbose cli [ 'C:\\Program Files\\nodejs\\node.exe',
3+
1 verbose cli 'C:\\ProgramData\\chocolatey\\lib\\npm\\tools\\node_modules\\npm\\bin\\npm-cli.js',
4+
1 verbose cli 'i',
5+
1 verbose cli '-g',
6+
1 verbose cli 'karma-cli' ]
7+
2 info using npm@1.4.9
8+
3 info using node@v6.9.2
9+
4 verbose cache add [ 'karma-cli', null ]
10+
5 verbose cache add name=undefined spec="karma-cli" args=["karma-cli",null]
11+
6 verbose parsed url Url {
12+
6 verbose parsed url protocol: null,
13+
6 verbose parsed url slashes: null,
14+
6 verbose parsed url auth: null,
15+
6 verbose parsed url host: null,
16+
6 verbose parsed url port: null,
17+
6 verbose parsed url hostname: null,
18+
6 verbose parsed url hash: null,
19+
6 verbose parsed url search: null,
20+
6 verbose parsed url query: null,
21+
6 verbose parsed url pathname: 'karma-cli',
22+
6 verbose parsed url path: 'karma-cli',
23+
6 verbose parsed url href: 'karma-cli' }
24+
7 silly lockFile aa100f68-karma-cli karma-cli
25+
8 verbose lock karma-cli C:\Users\Steven\AppData\Roaming\npm-cache\aa100f68-karma-cli.lock
26+
9 silly lockFile aa100f68-karma-cli karma-cli
27+
10 silly lockFile aa100f68-karma-cli karma-cli
28+
11 verbose addNamed [ 'karma-cli', '' ]
29+
12 verbose addNamed [ null, '*' ]
30+
13 silly lockFile 8f6f2c72-karma-cli karma-cli@
31+
14 verbose lock karma-cli@ C:\Users\Steven\AppData\Roaming\npm-cache\8f6f2c72-karma-cli.lock
32+
15 silly addNameRange { name: 'karma-cli', range: '*', hasData: false }
33+
16 verbose url raw karma-cli
34+
17 verbose url resolving [ 'https://registry.npmjs.org/', './karma-cli' ]
35+
18 verbose url resolved https://registry.npmjs.org/karma-cli
36+
19 info trying registry request attempt 1 at 3:50:12 PM
37+
20 http GET https://registry.npmjs.org/karma-cli
38+
21 http 200 https://registry.npmjs.org/karma-cli
39+
22 silly registry.get cb [ 200,
40+
22 silly registry.get { server: 'nginx/1.10.1',
41+
22 silly registry.get 'content-type': 'application/json',
42+
22 silly registry.get 'last-modified': 'Fri, 09 Dec 2016 16:52:41 GMT',
43+
22 silly registry.get etag: 'W/"584ae159-4339"',
44+
22 silly registry.get 'content-encoding': 'gzip',
45+
22 silly registry.get 'cache-control': 'max-age=300',
46+
22 silly registry.get 'content-length': '2510',
47+
22 silly registry.get 'accept-ranges': 'bytes',
48+
22 silly registry.get date: 'Wed, 28 Dec 2016 22:50:22 GMT',
49+
22 silly registry.get via: '1.1 varnish',
50+
22 silly registry.get age: '187',
51+
22 silly registry.get connection: 'close',
52+
22 silly registry.get 'x-served-by': 'cache-den6021-DEN',
53+
22 silly registry.get 'x-cache': 'HIT',
54+
22 silly registry.get 'x-cache-hits': '43',
55+
22 silly registry.get 'x-timer': 'S1482965422.999451,VS0,VE0',
56+
22 silly registry.get vary: 'Accept-Encoding' } ]
57+
23 silly addNameRange number 2 { name: 'karma-cli', range: '*', hasData: true }
58+
24 silly addNameRange versions [ 'karma-cli',
59+
24 silly addNameRange [ '0.0.1',
60+
24 silly addNameRange '0.0.2',
61+
24 silly addNameRange '0.0.3',
62+
24 silly addNameRange '0.0.4',
63+
24 silly addNameRange '0.1.0',
64+
24 silly addNameRange '0.1.1',
65+
24 silly addNameRange '0.1.2',
66+
24 silly addNameRange '1.0.0',
67+
24 silly addNameRange '1.0.1' ] ]
68+
25 verbose addNamed [ 'karma-cli', '1.0.1' ]
69+
26 verbose addNamed [ '1.0.1', '1.0.1' ]
70+
27 silly lockFile a1f21cc8-karma-cli-1-0-1 karma-cli@1.0.1
71+
28 verbose lock karma-cli@1.0.1 C:\Users\Steven\AppData\Roaming\npm-cache\a1f21cc8-karma-cli-1-0-1.lock
72+
29 silly lockFile 958d9c21-rg-karma-cli-karma-cli-1-0-1-tgz https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz
73+
30 verbose lock https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz C:\Users\Steven\AppData\Roaming\npm-cache\958d9c21-rg-karma-cli-karma-cli-1-0-1-tgz.lock
74+
31 verbose addRemoteTarball [ 'https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz',
75+
31 verbose addRemoteTarball 'ae6c3c58a313a1d00b45164c455b9b86ce17f960' ]
76+
32 info retry fetch attempt 1 at 3:50:13 PM
77+
33 verbose fetch to= C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz
78+
34 http GET https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz
79+
35 http 200 https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz
80+
36 verbose tar unpack C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz
81+
37 silly lockFile ec0ac654-pm-cache-karma-cli-1-0-1-package tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package
82+
38 verbose lock tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package C:\Users\Steven\AppData\Roaming\npm-cache\ec0ac654-pm-cache-karma-cli-1-0-1-package.lock
83+
39 silly lockFile f3649192-3321-0-18202021235883525-tmp-tgz tar://C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz
84+
40 verbose lock tar://C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz C:\Users\Steven\AppData\Roaming\npm-cache\f3649192-3321-0-18202021235883525-tmp-tgz.lock
85+
41 silly gunzTarPerm modes [ '755', '644' ]
86+
42 silly gunzTarPerm extractEntry package.json
87+
43 silly gunzTarPerm extractEntry LICENSE
88+
44 silly gunzTarPerm extractEntry gruntfile.js
89+
45 silly gunzTarPerm extractEntry CHANGELOG.md
90+
46 silly gunzTarPerm extractEntry bin/karma
91+
47 silly gunzTarPerm extractEntry lib/log.js
92+
48 silly lockFile ec0ac654-pm-cache-karma-cli-1-0-1-package tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package
93+
49 silly lockFile ec0ac654-pm-cache-karma-cli-1-0-1-package tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package
94+
50 silly lockFile f3649192-3321-0-18202021235883525-tmp-tgz tar://C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz
95+
51 silly lockFile f3649192-3321-0-18202021235883525-tmp-tgz tar://C:\Users\Steven\AppData\Local\Temp\npm-10912-ZBU5M5fM\1482965413321-0.18202021235883525\tmp.tgz
96+
52 silly lockFile 958d9c21-rg-karma-cli-karma-cli-1-0-1-tgz https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz
97+
53 silly lockFile 958d9c21-rg-karma-cli-karma-cli-1-0-1-tgz https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz
98+
54 silly lockFile a1f21cc8-karma-cli-1-0-1 karma-cli@1.0.1
99+
55 silly lockFile a1f21cc8-karma-cli-1-0-1 karma-cli@1.0.1
100+
56 silly lockFile 8f6f2c72-karma-cli karma-cli@
101+
57 silly lockFile 8f6f2c72-karma-cli karma-cli@
102+
58 silly resolved [ { name: 'karma-cli',
103+
58 silly resolved description: 'The Karma command line interface.',
104+
58 silly resolved homepage: 'http://karma-runner.github.io/',
105+
58 silly resolved repository:
106+
58 silly resolved { type: 'git',
107+
58 silly resolved url: 'git://github.com/karma-runner/karma-cli.git' },
108+
58 silly resolved bugs: { url: 'https://github.com/karma-runner/karma-cli/issues' },
109+
58 silly resolved keywords:
110+
58 silly resolved [ 'karma',
111+
58 silly resolved 'spectacular',
112+
58 silly resolved 'runner',
113+
58 silly resolved 'karma',
114+
58 silly resolved 'js',
115+
58 silly resolved 'javascript',
116+
58 silly resolved 'testing',
117+
58 silly resolved 'test',
118+
58 silly resolved 'remote',
119+
58 silly resolved 'execution' ],
120+
58 silly resolved author: { name: 'Vojta Jína', email: 'vojta.jina@gmail.com' },
121+
58 silly resolved contributors:
122+
58 silly resolved [ [Object],
123+
58 silly resolved [Object],
124+
58 silly resolved [Object],
125+
58 silly resolved [Object],
126+
58 silly resolved [Object],
127+
58 silly resolved [Object],
128+
58 silly resolved [Object],
129+
58 silly resolved [Object],
130+
58 silly resolved [Object] ],
131+
58 silly resolved dependencies: { resolve: '^1.1.6' },
132+
58 silly resolved devDependencies:
133+
58 silly resolved { 'eslint-config-standard': '^4.4.0',
134+
58 silly resolved 'eslint-plugin-standard': '^1.3.1',
135+
58 silly resolved grunt: '^0.4.1',
136+
58 silly resolved 'grunt-bump': '^0.3.1',
137+
58 silly resolved 'grunt-conventional-changelog': '^1.2.2',
138+
58 silly resolved 'grunt-eslint': '^17.0.0',
139+
58 silly resolved 'grunt-npm': '0.0.2',
140+
58 silly resolved 'load-grunt-tasks': '^3.2.0' },
141+
58 silly resolved preferGlobal: true,
142+
58 silly resolved bin: { karma: './bin/karma' },
143+
58 silly resolved engines: { node: '0.10 || 0.12 || 4 || 5 || 6' },
144+
58 silly resolved version: '1.0.1',
145+
58 silly resolved license: 'MIT',
146+
58 silly resolved readme: 'ERROR: No README data found!',
147+
58 silly resolved _id: 'karma-cli@1.0.1',
148+
58 silly resolved _shasum: 'ae6c3c58a313a1d00b45164c455b9b86ce17f960',
149+
58 silly resolved _from: 'karma-cli@',
150+
58 silly resolved _resolved: 'https://registry.npmjs.org/karma-cli/-/karma-cli-1.0.1.tgz' } ]
151+
59 info install karma-cli@1.0.1 into C:\Program Files\nodejs
152+
60 info installOne karma-cli@1.0.1
153+
61 info C:\Program Files\nodejs\node_modules\karma-cli unbuild
154+
62 verbose tar unpack C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package.tgz
155+
63 silly lockFile a2b6d4ea-es-nodejs-node-modules-karma-cli tar://C:\Program Files\nodejs\node_modules\karma-cli
156+
64 verbose lock tar://C:\Program Files\nodejs\node_modules\karma-cli C:\Users\Steven\AppData\Roaming\npm-cache\a2b6d4ea-es-nodejs-node-modules-karma-cli.lock
157+
65 silly lockFile c1b782b4-ache-karma-cli-1-0-1-package-tgz tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package.tgz
158+
66 verbose lock tar://C:\Users\Steven\AppData\Roaming\npm-cache\karma-cli\1.0.1\package.tgz C:\Users\Steven\AppData\Roaming\npm-cache\c1b782b4-ache-karma-cli-1-0-1-package-tgz.lock
159+
67 silly gunzTarPerm modes [ '755', '644' ]
160+
68 error Error: EPERM: operation not permitted, mkdir 'C:\Program Files\nodejs\node_modules\karma-cli'
161+
68 error at Error (native)
162+
68 error { Error: EPERM: operation not permitted, mkdir 'C:\Program Files\nodejs\node_modules\karma-cli'
163+
68 error at Error (native)
164+
68 error errno: -4048,
165+
68 error code: 'EPERM',
166+
68 error syscall: 'mkdir',
167+
68 error path: 'C:\\Program Files\\nodejs\\node_modules\\karma-cli',
168+
68 error fstream_type: 'Directory',
169+
68 error fstream_path: 'C:\\Program Files\\nodejs\\node_modules\\karma-cli',
170+
68 error fstream_class: 'DirWriter',
171+
68 error fstream_stack:
172+
68 error [ 'C:\\ProgramData\\chocolatey\\lib\\npm\\tools\\node_modules\\npm\\node_modules\\fstream\\lib\\dir-writer.js:36:23',
173+
68 error 'C:\\ProgramData\\chocolatey\\lib\\npm\\tools\\node_modules\\npm\\node_modules\\mkdirp\\index.js:37:53',
174+
68 error 'FSReqWrap.oncomplete (fs.js:123:15)' ] }
175+
69 error Please try running this command again as root/Administrator.
176+
70 error System Windows_NT 10.0.10586
177+
71 error command "C:\\Program Files\\nodejs\\node.exe" "C:\\ProgramData\\chocolatey\\lib\\npm\\tools\\node_modules\\npm\\bin\\npm-cli.js" "i" "-g" "karma-cli"
178+
72 error cwd C:\Users\Steven\Documents\DevMtn\Clonewars
179+
73 error node -v v6.9.2
180+
74 error npm -v 1.4.9
181+
75 error path C:\Program Files\nodejs\node_modules\karma-cli
182+
76 error syscall mkdir
183+
77 error fstream_path C:\Program Files\nodejs\node_modules\karma-cli
184+
78 error fstream_type Directory
185+
79 error fstream_class DirWriter
186+
80 error code EPERM
187+
81 error errno -4048
188+
82 error stack Error: EPERM: operation not permitted, mkdir 'C:\Program Files\nodejs\node_modules\karma-cli'
189+
82 error stack at Error (native)
190+
83 error fstream_stack C:\ProgramData\chocolatey\lib\npm\tools\node_modules\npm\node_modules\fstream\lib\dir-writer.js:36:23
191+
83 error fstream_stack C:\ProgramData\chocolatey\lib\npm\tools\node_modules\npm\node_modules\mkdirp\index.js:37:53
192+
83 error fstream_stack FSReqWrap.oncomplete (fs.js:123:15)
193+
84 verbose exit [ -4048, true ]

‎src/components/training/trainingCtrl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ angular.module('app').controller('trainingCtrl', function($scope, $state, mainSe
44

55
$scope.kataid = $stateParams.kataid;
66
$scope.passed = false;
7-
7+
88
/** Create text areas **/
99
var textarea1 = document.getElementById('solution-input');
1010
var solutionsCode = CodeMirror.fromTextArea(textarea1, {
@@ -71,7 +71,7 @@ angular.module('app').controller('trainingCtrl', function($scope, $state, mainSe
7171
console.log(examples);
7272
mainService.testExamples(solutions, examples).then((response) => {
7373
});
74-
74+
7575
}
7676

7777
$scope.testSuite = function() {

0 commit comments

Comments
 (0)