Skip to content

Commit f08a68c

Browse files
ShMcKShMcK
committed
remove console.logs, repair file paths
1 parent f63b205 commit f08a68c

File tree

6 files changed

+62
-116
lines changed

6 files changed

+62
-116
lines changed

‎lib/components/Tutorials/SelectTutorial/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ var SelectTutorial = (function (_super) {
2525
SelectTutorial.prototype.render = function () {
2626
var _a = this.props, tutorial = _a.tutorial, tutorialSet = _a.tutorialSet;
2727
var name = tutorial.name, version = tutorial.version;
28-
console.log(name, version);
2928
return (React.createElement(FlatButton_1.default, {label: this.displayName(name), primary: true, onTouchTap: tutorialSet.bind(this, { name: name, version: version })}));
3029
};
3130
SelectTutorial.prototype.displayName = function (name) {

‎lib/components/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ var Page_1 = require('./Page');
1111
exports.Page = Page_1.default;
1212
var Progress_1 = require('./Progress');
1313
exports.Progress = Progress_1.default;
14-
var Routes_1 = require('./Routes');
15-
exports.Routes = Routes_1.default;
1614
var Start_1 = require('./Start');
1715
exports.Start = Start_1.default;
1816
var Tutorials_1 = require('./Tutorials');

‎lib/modules/tests/test-run/parse-loaders.js

-49
Original file line numberDiff line numberDiff line change
@@ -1,49 +0,0 @@
1-
"use strict";
2-
var fs_1 = require('fs');
3-
var path_1 = require('path');
4-
var comments = {
5-
py: '#',
6-
js: '\/{2,3}',
7-
};
8-
function loaderRegex(fileType) {
9-
var comment = '\/{2,3}';
10-
if (comments[fileType]) {
11-
comment = comments[fileType];
12-
}
13-
return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](, ?true)?\\)", 'm');
14-
}
15-
function parseLoaders(data, fileType, tutorial, dir) {
16-
var i = -1;
17-
var lines = data.split('\n');
18-
var filesLoaded = [];
19-
var loaderMatch = loaderRegex(fileType);
20-
while (i < lines.length - 1) {
21-
i += 1;
22-
var loader = lines[i].match(loaderMatch);
23-
if (loader) {
24-
var fileToLoad = loader[1];
25-
if (filesLoaded.indexOf(fileToLoad) > -1) {
26-
console.log("\"" + fileToLoad + "\" already loaded.");
27-
continue;
28-
}
29-
var pathToFile = null;
30-
if (loader[2]) {
31-
pathToFile = path_1.normalize(path_1.join(tutorial.config.dir, fileToLoad));
32-
}
33-
else {
34-
pathToFile = path_1.normalize(path_1.join(dir, fileToLoad));
35-
}
36-
try {
37-
lines[i] = fs_1.readFileSync(pathToFile, 'utf8');
38-
}
39-
catch (e) {
40-
var message = 'File not found: ' + pathToFile;
41-
lines[i] = message;
42-
console.log(message);
43-
}
44-
}
45-
}
46-
return lines.join('\n');
47-
}
48-
Object.defineProperty(exports, "__esModule", { value: true });
49-
exports.default = parseLoaders;

‎src/components/Tutorials/SelectTutorial/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export default class SelectTutorial extends React.Component<{
1111
public render() {
1212
const {tutorial, tutorialSet} = this.props;
1313
const {name, version} = tutorial;
14-
console.log(name, version);
1514
return (
1615
<FlatButton
1716
label={this.displayName(name)}

‎src/components/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export {default as AppMenu} from './AppMenu';
55
export {default as FinalPage} from './FinalPage';
66
export {default as Page} from './Page';
77
export {default as Progress} from './Progress';
8-
export {default as Routes} from './Routes';
98
export {default as Start} from './Start';
109
export {default as Tutorials} from './Tutorials';
1110

‎src/modules/tests/test-run/parse-loaders.ts

+62-62
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
import {readFileSync} from 'fs';
2-
import {join, normalize} from 'path';
3-
4-
// TODO: load comments from core-coderoad
5-
6-
const comments = {
7-
py: '#',
8-
js: '\/{2,3}',
9-
};
10-
11-
function loaderRegex(fileType: string): RegExp {
12-
let comment = '\/{2,3}';
13-
if (comments[fileType]) {
14-
comment = comments[fileType];
15-
}
16-
return new RegExp(`^${comment} ?load\\(['"](.+)['"](\, ?true)?\\)`, 'm');
17-
}
18-
19-
export default function parseLoaders(
20-
data: string, fileType: string, tutorial: CR.Tutorial, dir: string
21-
): string {
22-
23-
// loop over lines and add editor files
24-
let i = -1;
25-
let lines = data.split('\n');
26-
27-
let filesLoaded = [];
28-
let loaderMatch = loaderRegex(fileType);
29-
30-
while (i < lines.length - 1) {
31-
i += 1;
32-
let loader: string[] = lines[i].match(loaderMatch);
33-
34-
if (loader) {
35-
// loader found
36-
let fileToLoad: string = loader[1];
37-
38-
if (filesLoaded.indexOf(fileToLoad) > -1) {
39-
console.log(`"${fileToLoad}" already loaded.`);
40-
continue;
41-
}
42-
43-
let pathToFile: string = null;
44-
if (loader[2]) {
45-
// path to file from config specified dir
46-
pathToFile = normalize(join(tutorial.config.dir, fileToLoad));
47-
} else {
48-
// path to file from working directory
49-
pathToFile = normalize(join(dir, fileToLoad));
50-
}
51-
52-
try {
53-
lines[i] = readFileSync(pathToFile, 'utf8');
54-
} catch (e) {
55-
let message = 'File not found: ' + pathToFile;
56-
lines[i] = message;
57-
console.log(message);
58-
}
59-
}
60-
}
61-
return lines.join('\n');
62-
}
1+
// import {readFileSync} from 'fs';
2+
// import {join, normalize} from 'path';
3+
//
4+
// // TODO: load comments from core-coderoad
5+
//
6+
// const comments = {
7+
// py: '#',
8+
// js: '\/{2,3}',
9+
// };
10+
//
11+
// function loaderRegex(fileType: string): RegExp {
12+
// let comment = '\/{2,3}';
13+
// if (comments[fileType]) {
14+
// comment = comments[fileType];
15+
// }
16+
// return new RegExp(`^${comment} ?load\\(['"](.+)['"](\, ?true)?\\)`, 'm');
17+
// }
18+
//
19+
// export default function parseLoaders(
20+
// data: string, fileType: string, tutorial: CR.Tutorial, dir: string
21+
// ): string {
22+
//
23+
// // loop over lines and add editor files
24+
// let i = -1;
25+
// let lines = data.split('\n');
26+
//
27+
// let filesLoaded = [];
28+
// let loaderMatch = loaderRegex(fileType);
29+
//
30+
// while (i < lines.length - 1) {
31+
// i += 1;
32+
// let loader: string[] = lines[i].match(loaderMatch);
33+
//
34+
// if (loader) {
35+
// // loader found
36+
// let fileToLoad: string = loader[1];
37+
//
38+
// if (filesLoaded.indexOf(fileToLoad) > -1) {
39+
// console.log(`"${fileToLoad}" already loaded.`);
40+
// continue;
41+
// }
42+
//
43+
// let pathToFile: string = null;
44+
// if (loader[2]) {
45+
// // path to file from config specified dir
46+
// pathToFile = normalize(join(tutorial.config.dir, fileToLoad));
47+
// } else {
48+
// // path to file from working directory
49+
// pathToFile = normalize(join(dir, fileToLoad));
50+
// }
51+
//
52+
// try {
53+
// lines[i] = readFileSync(pathToFile, 'utf8');
54+
// } catch (e) {
55+
// let message = 'File not found: ' + pathToFile;
56+
// lines[i] = message;
57+
// console.log(message);
58+
// }
59+
// }
60+
// }
61+
// return lines.join('\n');
62+
// }

0 commit comments

Comments
 (0)