Skip to content

Commit 0fe53c6

Browse files
ShMcKShMcK
committed
no typescript errors/warnings
1 parent 5a977fc commit 0fe53c6

File tree

38 files changed

+4867
-307
lines changed

38 files changed

+4867
-307
lines changed

‎lib/components/Common/RouteButton.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ var RouteButton = (function (_super) {
1919
};
2020
return RouteButton;
2121
}(React.Component));
22+
var mapStateToProps = function (state, props) { return ({
23+
label: props.label,
24+
route: props.route,
25+
style: props.style || {}
26+
}); };
2227
var mapDispatchToProps = { routeSet: actions_1.routeSet };
2328
Object.defineProperty(exports, "__esModule", { value: true });
24-
exports.default = react_redux_1.connect(null, mapDispatchToProps)(RouteButton);
29+
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(RouteButton);

‎lib/components/Page/Task/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var Task = (function (_super) {
4444
index + 1,
4545
"."),
4646
React.createElement("div", {style: styles.description},
47-
React.createElement(index_1.Markdown, null, task.description)
47+
React.createElement(index_1.Markdown, {children: task.description})
4848
)));
4949
};
5050
return Task;

‎lib/components/Page/TasksComplete/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var TasksComplete = (function (_super) {
2929
var onPageComplete = this.props.onPageComplete;
3030
return (React.createElement(Card_1.Card, {style: styles.card},
3131
React.createElement(Card_1.CardText, null,
32-
React.createElement(index_1.Markdown, {style: styles.text}, onPageComplete)
32+
React.createElement(index_1.Markdown, {style: styles.text, children: onPageComplete})
3333
)
3434
));
3535
};

‎lib/components/Progress/ProgressPage/index.js

+1-9
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ var __extends = (this && this.__extends) || function (d, b) {
55
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
66
};
77
var React = require('react');
8-
var react_redux_1 = require('react-redux');
9-
var actions_1 = require('../../../actions');
108
var progressIcon_1 = require('../progressIcon');
119
var List_1 = require('material-ui/List');
1210
var colors_1 = require('material-ui/styles/colors');
@@ -31,11 +29,5 @@ var ProgressPage = (function (_super) {
3129
return ProgressPage;
3230
}(React.Component));
3331
;
34-
var mapDispatchToProps = function (dispatch) { return ({
35-
selectPage: function (pagePosition) {
36-
dispatch(actions_1.pageSet(pagePosition));
37-
dispatch(actions_1.routeSet('page'));
38-
},
39-
}); };
4032
Object.defineProperty(exports, "__esModule", { value: true });
41-
exports.default = react_redux_1.connect(null, mapDispatchToProps)(ProgressPage);
33+
exports.default = ProgressPage;

‎lib/components/Progress/index.js

+10-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var __extends = (this && this.__extends) || function (d, b) {
66
};
77
var React = require('react');
88
var react_redux_1 = require('react-redux');
9-
var actions_1 = require('../../modules/progress/actions');
9+
var actions_1 = require('../../actions');
1010
var ProgressPage_1 = require('./ProgressPage');
1111
var List_1 = require('material-ui/List');
1212
var Paper_1 = require('material-ui/Paper');
@@ -25,11 +25,11 @@ var Progress = (function (_super) {
2525
_super.apply(this, arguments);
2626
}
2727
Progress.prototype.render = function () {
28-
var _a = this.props, progress = _a.progress, pagePosition = _a.pagePosition, info = _a.info, tutorial = _a.tutorial;
28+
var _a = this.props, progress = _a.progress, pagePosition = _a.pagePosition, info = _a.info, tutorial = _a.tutorial, selectPage = _a.selectPage;
2929
return (React.createElement(Paper_1.default, {style: styles.page},
3030
React.createElement(List_1.List, {style: styles.list},
3131
React.createElement(Subheader_1.default, null, info.title),
32-
tutorial.pages.map(function (page, index) { return (React.createElement(ProgressPage_1.default, {key: index, index: index, page: page, pagePosition: pagePosition, progress: progress})); }))
32+
tutorial.pages.map(function (page, index) { return (React.createElement(ProgressPage_1.default, {key: index, index: index, page: page, pagePosition: pagePosition, progress: progress, selectPage: selectPage})); }))
3333
));
3434
};
3535
Progress.prototype.componentWillMount = function () {
@@ -43,6 +43,12 @@ var mapStateToProps = function (state) { return ({
4343
info: state.tutorial.info,
4444
tutorial: state.tutorial,
4545
}); };
46-
var mapDispatchToProps = { progressLoad: actions_1.progressLoad };
46+
var mapDispatchToProps = function (dispatch) { return ({
47+
selectPage: function (pagePosition) {
48+
dispatch(actions_1.pageSet(pagePosition));
49+
dispatch(actions_1.routeSet('page'));
50+
},
51+
progressLoad: actions_1.progressLoad
52+
}); };
4753
Object.defineProperty(exports, "__esModule", { value: true });
4854
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(Progress);

‎lib/components/SidePanel/SidePanel.js

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ var SidePanel = (function (_super) {
3434
};
3535
SidePanel.prototype.startErrorLog = function () {
3636
window.onerror = function (message, file, line, column, errorObject) {
37-
column = column || (window.event && window.event.errorCharacter);
3837
var stack = errorObject ? errorObject.stack : null;
3938
var data = {
4039
message: message,

‎lib/components/Start/Checks/InstallGuide.js

+23-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
11
"use strict";
2+
var __extends = (this && this.__extends) || function (d, b) {
3+
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
4+
function __() { this.constructor = d; }
5+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
6+
};
27
var React = require('react');
3-
var InstallGuide = function (_a) {
4-
var checks = _a.checks;
5-
if (!checks || !checks.passed) {
6-
return null;
8+
var InstallGuide = (function (_super) {
9+
__extends(InstallGuide, _super);
10+
function InstallGuide() {
11+
_super.apply(this, arguments);
712
}
8-
return (React.createElement("div", {className: 'setup-guide'},
9-
"Check the",
10-
React.createElement("a", {href: 'https://coderoad.github.io/docs#install'},
11-
" ",
12-
React.createElement("strong", null, "Install Guide"))));
13-
};
13+
InstallGuide.prototype.render = function () {
14+
var checks = this.props.checks;
15+
if (!checks || !checks.passed) {
16+
return null;
17+
}
18+
return (React.createElement("div", {className: 'setup-guide'},
19+
"Check the",
20+
React.createElement("a", {href: 'https://coderoad.github.io/docs#install'},
21+
" ",
22+
React.createElement("strong", null, "Install Guide"))));
23+
};
24+
return InstallGuide;
25+
}(React.Component));
26+
;
1427
Object.defineProperty(exports, "__esModule", { value: true });
1528
exports.default = InstallGuide;

‎lib/components/Start/Checks/SetupChecks.js

+43-31
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,53 @@
11
"use strict";
2+
var __extends = (this && this.__extends) || function (d, b) {
3+
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
4+
function __() { this.constructor = d; }
5+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
6+
};
27
var React = require('react');
38
var DynamicStepper_1 = require('./DynamicStepper');
49
var StepCheck_1 = require('./StepCheck');
510
var VerifyButton_1 = require('./VerifyButton');
611
var Card_1 = require('material-ui/Card');
712
var FlatButton_1 = require('material-ui/FlatButton');
8-
var SetupChecks = function (_a) {
9-
var checks = _a.checks;
10-
var setup = checks.setup;
11-
if (setup.passed) {
12-
return null;
13+
var SetupChecks = (function (_super) {
14+
__extends(SetupChecks, _super);
15+
function SetupChecks() {
16+
_super.apply(this, arguments);
1317
}
14-
var hasDir = setup.hasDir, hasPackageJson = setup.hasPackageJson, hasTutorial = setup.hasTutorial;
15-
var status = [hasDir, hasPackageJson, hasTutorial];
16-
return (React.createElement(Card_1.Card, {className: 'cr-check'},
17-
React.createElement(Card_1.CardHeader, {title: 'Setup Checks', subtitle: 'CodeRoad requires a brief setup'}),
18-
React.createElement(Card_1.CardText, null,
19-
React.createElement(DynamicStepper_1.default, {status: status},
20-
React.createElement(StepCheck_1.default, {label: 'open a directory', completed: hasDir},
21-
React.createElement("p", null, "File -> Open (a new folder)"),
22-
React.createElement("br", null),
23-
React.createElement(FlatButton_1.default, {label: 'Open Directory', secondary: true})),
24-
React.createElement(StepCheck_1.default, {label: 'package.json', completed: hasPackageJson},
25-
"Create a package.json by running",
26-
React.createElement("br", null),
27-
React.createElement("code", null, "> npm init -y`"),
28-
React.createElement("br", null),
29-
React.createElement(FlatButton_1.default, {label: 'Create package.json', secondary: true})),
30-
React.createElement(StepCheck_1.default, {label: 'install a tutorial', completed: hasTutorial},
31-
"Install a tutorial using npm. For example:",
32-
React.createElement("br", null),
33-
React.createElement("code", null, "> npm install --save-dev coderoad-functional-school"),
34-
React.createElement("br", null)))
35-
),
36-
React.createElement(Card_1.CardActions, null,
37-
React.createElement(VerifyButton_1.default, null)
38-
)));
39-
};
18+
SetupChecks.prototype.render = function () {
19+
var setup = this.props.checks.setup;
20+
if (setup.passed) {
21+
return null;
22+
}
23+
var hasDir = setup.hasDir, hasPackageJson = setup.hasPackageJson, hasTutorial = setup.hasTutorial;
24+
var status = [hasDir, hasPackageJson, hasTutorial];
25+
return (React.createElement(Card_1.Card, {className: 'cr-check'},
26+
React.createElement(Card_1.CardHeader, {title: 'Setup Checks', subtitle: 'CodeRoad requires a brief setup'}),
27+
React.createElement(Card_1.CardText, null,
28+
React.createElement(DynamicStepper_1.default, {status: status},
29+
React.createElement(StepCheck_1.default, {label: 'open a directory', completed: hasDir},
30+
React.createElement("p", null, "File -> Open (a new folder)"),
31+
React.createElement("br", null),
32+
React.createElement(FlatButton_1.default, {label: 'Open Directory', secondary: true})),
33+
React.createElement(StepCheck_1.default, {label: 'package.json', completed: hasPackageJson},
34+
"Create a package.json by running",
35+
React.createElement("br", null),
36+
React.createElement("code", null, "> npm init -y`"),
37+
React.createElement("br", null),
38+
React.createElement(FlatButton_1.default, {label: 'Create package.json', secondary: true})),
39+
React.createElement(StepCheck_1.default, {label: 'install a tutorial', completed: hasTutorial},
40+
"Install a tutorial using npm. For example:",
41+
React.createElement("br", null),
42+
React.createElement("code", null, "> npm install --save-dev coderoad-functional-school"),
43+
React.createElement("br", null)))
44+
),
45+
React.createElement(Card_1.CardActions, null,
46+
React.createElement(VerifyButton_1.default, null)
47+
)));
48+
};
49+
return SetupChecks;
50+
}(React.Component));
51+
;
4052
Object.defineProperty(exports, "__esModule", { value: true });
4153
exports.default = SetupChecks;

‎lib/components/Start/Checks/SystemChecks.js

+47-35
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,58 @@
11
"use strict";
2+
var __extends = (this && this.__extends) || function (d, b) {
3+
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
4+
function __() { this.constructor = d; }
5+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
6+
};
27
var React = require('react');
38
var DynamicStepper_1 = require('./DynamicStepper');
49
var StepCheck_1 = require('./StepCheck');
510
var VerifyButton_1 = require('./VerifyButton');
611
var Card_1 = require('material-ui/Card');
712
var colors_1 = require('material-ui/styles/colors');
8-
var SystemChecks = function (_a) {
9-
var checks = _a.checks;
10-
var system = checks.system;
11-
if (system.passed) {
12-
return null;
13+
var SystemChecks = (function (_super) {
14+
__extends(SystemChecks, _super);
15+
function SystemChecks() {
16+
_super.apply(this, arguments);
1317
}
14-
var status = [system.node, system.npm];
15-
return (React.createElement(Card_1.Card, {className: 'cr-check'},
16-
React.createElement(Card_1.CardHeader, {title: 'System Checks', subtitle: 'CodeRoad requires several key dependencies'}),
17-
React.createElement(Card_1.CardText, null,
18-
React.createElement(DynamicStepper_1.default, {status: status},
19-
React.createElement(StepCheck_1.default, {label: 'Node >= 0.10', completed: system.node},
20-
React.createElement("p", null,
21-
"Install a newer version of ",
22-
React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://nodejs.org'}, "NodeJS")),
23-
React.createElement("p", null, "Either version 4 (stable) or above.")),
24-
React.createElement(StepCheck_1.default, {label: 'NPM >= 3', completed: system.npm},
25-
"Update your version of NPM.",
26-
React.createElement("br", null),
27-
React.createElement("code", null, "> npm update -g npm"),
28-
React.createElement("br", null)),
29-
React.createElement(StepCheck_1.default, {label: 'Atom >= 1.8', completed: system.atom},
30-
React.createElement("p", null, "First make sure you have atom shell commands installed." + ' ' + "Click the atom menu and select \"Istall Shell Commands\"."),
31-
React.createElement("p", null,
32-
"Otherwise, update your version of Atom.",
18+
SystemChecks.prototype.render = function () {
19+
var system = this.props.checks.system;
20+
if (system.passed) {
21+
return null;
22+
}
23+
var status = [system.node, system.npm];
24+
return (React.createElement(Card_1.Card, {className: 'cr-check'},
25+
React.createElement(Card_1.CardHeader, {title: 'System Checks', subtitle: 'CodeRoad requires several key dependencies'}),
26+
React.createElement(Card_1.CardText, null,
27+
React.createElement(DynamicStepper_1.default, {status: status},
28+
React.createElement(StepCheck_1.default, {label: 'Node >= 0.10', completed: system.node},
29+
React.createElement("p", null,
30+
"Install a newer version of ",
31+
React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://nodejs.org'}, "NodeJS")),
32+
React.createElement("p", null, "Either version 4 (stable) or above.")),
33+
React.createElement(StepCheck_1.default, {label: 'NPM >= 3', completed: system.npm},
34+
"Update your version of NPM.",
3335
React.createElement("br", null),
34-
"Click on the blue \"update\" squirrel in the bottom right corner of your editor.")),
35-
React.createElement(StepCheck_1.default, {label: 'Xcode', completed: system.xcode},
36-
React.createElement("p", null,
37-
"Install ",
38-
React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://developer.apple.com/xcode/download/'}, "XCode"))
39-
))
40-
),
41-
React.createElement(Card_1.CardActions, null,
42-
React.createElement(VerifyButton_1.default, null)
43-
)));
44-
};
36+
React.createElement("code", null, "> npm update -g npm"),
37+
React.createElement("br", null)),
38+
React.createElement(StepCheck_1.default, {label: 'Atom >= 1.8', completed: system.atom},
39+
React.createElement("p", null, "First make sure you have atom shell commands installed." + ' ' + "Click the atom menu and select \"Istall Shell Commands\"."),
40+
React.createElement("p", null,
41+
"Otherwise, update your version of Atom.",
42+
React.createElement("br", null),
43+
"Click on the blue \"update\" squirrel in the bottom right corner of your editor.")),
44+
React.createElement(StepCheck_1.default, {label: 'Xcode', completed: system.xcode},
45+
React.createElement("p", null,
46+
"Install ",
47+
React.createElement("a", {style: { color: colors_1.pink500 }, href: 'https://developer.apple.com/xcode/download/'}, "XCode"))
48+
))
49+
),
50+
React.createElement(Card_1.CardActions, null,
51+
React.createElement(VerifyButton_1.default, null)
52+
)));
53+
};
54+
return SystemChecks;
55+
}(React.Component));
56+
;
4557
Object.defineProperty(exports, "__esModule", { value: true });
4658
exports.default = SystemChecks;

‎lib/components/Start/Welcome/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var React = require('react');
44
var index_1 = require('../../index');
55
var styles = {
66
header: {
7+
backgroundImage: '',
78
backgroundRepeat: 'no-repeat',
89
backgroundColor: 'inherit',
910
height: '350px',

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ var SelectTutorial = (function (_super) {
2727
};
2828
return SelectTutorial;
2929
}(React.Component));
30+
var mapStateToProps = function (state, props) { return ({
31+
tutorial: props.tutorial
32+
}); };
3033
var mapDispatchToProps = { tutorialSet: actions_1.tutorialSet };
3134
Object.defineProperty(exports, "__esModule", { value: true });
32-
exports.default = react_redux_1.connect(null, mapDispatchToProps)(SelectTutorial);
35+
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(SelectTutorial);

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ var UpdateTutorial = (function (_super) {
3232
};
3333
return UpdateTutorial;
3434
}(React.Component));
35+
var mapStateToProps = function (state, props) { return ({
36+
tutorial: props.tutorial
37+
}); };
3538
var mapDispatchToProps = { tutorialUpdate: actions_1.tutorialUpdate };
3639
Object.defineProperty(exports, "__esModule", { value: true });
37-
exports.default = react_redux_1.connect(null, mapDispatchToProps)(UpdateTutorial);
40+
exports.default = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(UpdateTutorial);

‎lib/modules/dir/index.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
function dirReducer(dir) {
33
if (!atom) {
44
throw new Error('No project directory found. Atom may not be initialized.');
5-
return '';
65
}
76
if (atom && atom.project.rootDirectories.length > 0) {
87
return atom.project.rootDirectories[0].path;

‎lib/modules/progress/utils/local-storage.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ function saveToLocalStorage(tutorial, progress) {
1414
}
1515
exports.saveToLocalStorage = saveToLocalStorage;
1616
function loadProgressFromLocalStorage(tutorial) {
17-
var savedProgress = JSON.parse(window.localStorage.getItem(getLocalStorageKey(tutorial)) || null);
17+
var item = window.localStorage.getItem(getLocalStorageKey(tutorial));
18+
var savedProgress;
19+
if (item) {
20+
savedProgress = JSON.parse(item);
21+
}
1822
if (savedProgress) {
1923
return savedProgress;
2024
}

‎lib/modules/tutorial/reducer.js

-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
var path_1 = require('path');
33
var types_1 = require('./types');
44
var config_1 = require('./utils/config');
5-
var config_paths_1 = require('./utils/config-paths');
65
exports._tutorial = {
76
name: 'default',
87
version: '0.1.0',
@@ -14,7 +13,6 @@ exports._tutorial = {
1413
packageJson: null,
1514
config: null,
1615
};
17-
var configured = new Set();
1816
function tutorialReducer(t, action) {
1917
if (t === void 0) { t = exports._tutorial; }
2018
switch (action.type) {
@@ -25,12 +23,6 @@ function tutorialReducer(t, action) {
2523
var config = config_1.tutorialConfig(packageJson, dir);
2624
var coderoadJsonPath = path_1.join(packagePath, packageJson.main);
2725
var _b = require(coderoadJsonPath), info = _b.info, pages = _b.pages;
28-
if (configured.has(name_1)) {
29-
pages = config_paths_1.default(dir, name_1, config, pages || []);
30-
}
31-
else {
32-
configured.add(name_1);
33-
}
3426
return {
3527
name: packageJson.name,
3628
version: version,

0 commit comments

Comments
 (0)