Skip to content

Commit 476e86e

Browse files
committed
update packages, use ts2.0, tslint, tslint-react
1 parent a4b638c commit 476e86e

33 files changed

+61
-340
lines changed

lib/actions.js

-9
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ exports.tutorialSet = tutorial_1.tutorialSet;
2323
var tutorials_1 = require('./modules/tutorials');
2424
exports.tutorialsFind = tutorials_1.tutorialsFind;
2525
exports.tutorialUpdate = tutorials_1.tutorialUpdate;
26-
var core_coderoad_1 = require('core-coderoad');
27-
exports.editorDevToolsToggle = core_coderoad_1.editorDevToolsToggle;
28-
exports.editorOpen = core_coderoad_1.editorOpen;
29-
exports.editorInsert = core_coderoad_1.editorInsert;
30-
exports.editorSave = core_coderoad_1.editorSave;
31-
exports.editorSet = core_coderoad_1.editorSet;
32-
exports.routeSet = core_coderoad_1.routeSet;
33-
exports.windowToggle = core_coderoad_1.windowToggle;
34-
exports.quit = core_coderoad_1.quit;

lib/components/AppMenu/CloseWindow.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ var CloseWindow = (function (_super) {
2424
_super.apply(this, arguments);
2525
}
2626
CloseWindow.prototype.render = function () {
27-
return (React.createElement(IconButton_1.default, {onClick: this.props.windowToggle},
28-
React.createElement(close_1.default, {color: 'white'})
29-
));
27+
return (React.createElement(IconButton_1.default, {onClick: this.props.windowToggle}, React.createElement(close_1.default, {color: 'white'})));
3028
};
3129
CloseWindow = __decorate([
3230
react_redux_1.connect(null, { windowToggle: actions_1.windowToggle }),

lib/components/AppMenu/menu.spec.js

Whitespace-only changes.

lib/components/AppMenu/menuIconRight.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ var React = require('react');
33
var IconButton_1 = require('material-ui/IconButton');
44
var more_vert_1 = require('material-ui/svg-icons/navigation/more-vert');
55
function menuIconRight() {
6-
return (React.createElement(IconButton_1.default, null,
7-
React.createElement(more_vert_1.default, {color: 'white'})
8-
));
6+
return (React.createElement(IconButton_1.default, null, React.createElement(more_vert_1.default, {color: 'white'})));
97
}
108
Object.defineProperty(exports, "__esModule", { value: true });
119
exports.default = menuIconRight;

lib/components/AppMenu/menuRight.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ var origin = {
1010
vertical: 'top',
1111
};
1212
function menuRight(route) {
13-
return (React.createElement(IconMenu_1.default, {iconButtonElement: menuIconRight_1.default(), targetOrigin: origin, anchorOrigin: origin},
14-
menuRightRouteOptions_1.default(route),
15-
React.createElement(Divider_1.default, null),
16-
React.createElement(Quit_1.default, null)));
13+
return (React.createElement(IconMenu_1.default, {iconButtonElement: menuIconRight_1.default(), targetOrigin: origin, anchorOrigin: origin}, menuRightRouteOptions_1.default(route), React.createElement(Divider_1.default, null), React.createElement(Quit_1.default, null)));
1714
}
1815
Object.defineProperty(exports, "__esModule", { value: true });
1916
exports.default = menuRight;

lib/components/AppMenu/menuRightRouteOptions.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ function menuRightRouteOptions(route) {
55
switch (route) {
66
case 'final':
77
case 'page':
8-
return (React.createElement("div", null,
9-
React.createElement(MenuLink_1.default, {route: 'progress'}),
10-
React.createElement(MenuLink_1.default, {route: 'tutorials'})));
8+
return (React.createElement("div", null, React.createElement(MenuLink_1.default, {route: 'progress'}), React.createElement(MenuLink_1.default, {route: 'tutorials'})));
119
case 'progress':
1210
return React.createElement(MenuLink_1.default, {route: 'tutorials'});
1311
default:

lib/components/FinalPage/index.js

+1-15
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,7 @@ var FinalPage = (function (_super) {
2929
_super.apply(this, arguments);
3030
}
3131
FinalPage.prototype.render = function () {
32-
return (React.createElement(Card_1.Card, {style: styles.card},
33-
React.createElement(Card_1.CardTitle, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}),
34-
React.createElement(Card_1.CardText, null,
35-
"What's next?",
36-
React.createElement("br", null),
37-
React.createElement("br", null),
38-
React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'},
39-
React.createElement(FlatButton_1.default, {label: 'See More Tutorials', disabled: true})
40-
),
41-
React.createElement("span", null, " (coming soon)"),
42-
React.createElement("br", null),
43-
React.createElement("br", null),
44-
React.createElement("a", {href: 'https://coderoad.github.io/build'},
45-
React.createElement(FlatButton_1.default, {label: 'Learn how to Create a Tutorial'})
46-
))));
32+
return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardTitle, {title: 'Congratulations!', subtitle: 'Tutorial Complete!'}), React.createElement(Card_1.CardText, null, "What's next?", React.createElement("br", null), React.createElement("br", null), React.createElement("a", {href: 'https://coderoad.github.io/#tutorials'}, React.createElement(FlatButton_1.default, {label: 'See More Tutorials', disabled: true})), React.createElement("span", null, " (coming soon)"), React.createElement("br", null), React.createElement("br", null), React.createElement("a", {href: 'https://coderoad.github.io/build'}, React.createElement(FlatButton_1.default, {label: 'Learn how to Create a Tutorial'})))));
4733
};
4834
FinalPage = __decorate([
4935
react_redux_1.connect(null, null),

lib/components/Page/EditPage/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ var EditPage = function (_a) {
1111
var tutorial = _a.tutorial;
1212
if (tutorial && tutorial.edit && tutorial.repo) {
1313
var repoPath = path_1.join(tutorial.repo, 'edit', 'master', tutorial.repo);
14-
return (React.createElement("a", {href: repoPath},
15-
React.createElement(mode_edit_1.default, {style: editStyle})
16-
));
14+
return (React.createElement("a", {href: repoPath}, React.createElement(mode_edit_1.default, {style: editStyle})));
1715
}
1816
};
1917
Object.defineProperty(exports, "__esModule", { value: true });

lib/components/Page/Hints/index.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,7 @@ var Hints = (function (_super) {
3636
if (!hint) {
3737
return null;
3838
}
39-
return (React.createElement(Card_1.Card, {style: styles},
40-
React.createElement(Card_1.CardHeader, {title: 'Hints', avatar: React.createElement(help_1.default, null), actAsExpander: true, showExpandableButton: true}),
41-
React.createElement(Card_1.CardText, {className: 'cr-task-hint', expandable: true},
42-
React.createElement(index_1.Markdown, null, hint)
43-
),
44-
React.createElement(Card_1.CardActions, {style: { paddingBottom: '30px !important' }, expandable: true, className: 'cr-task-hints-actions'},
45-
React.createElement(HintButton_1.default, {type: 'prev', label: 'Previous'}),
46-
React.createElement(HintButton_1.default, {type: 'next', label: 'Next'}))));
39+
return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardHeader, {title: 'Hints', avatar: React.createElement(help_1.default, null), actAsExpander: true, showExpandableButton: true}), React.createElement(Card_1.CardText, {className: 'cr-task-hint', expandable: true}, React.createElement(index_1.Markdown, null, hint)), React.createElement(Card_1.CardActions, {style: { paddingBottom: '30px !important' }, expandable: true, className: 'cr-task-hints-actions'}, React.createElement(HintButton_1.default, {type: 'prev', label: 'Previous'}), React.createElement(HintButton_1.default, {type: 'next', label: 'Next'}))));
4740
};
4841
Hints = __decorate([
4942
react_redux_1.connect(function (state) { return ({

lib/components/Page/PageToolbar/index.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,7 @@ var PageToolbar = (function (_super) {
3636
}
3737
PageToolbar.prototype.render = function () {
3838
var _a = this.props, tasksComplete = _a.tasksComplete, children = _a.children;
39-
return (React.createElement("section", {styles: styles},
40-
children,
41-
React.createElement(Toolbar_1.Toolbar, null,
42-
React.createElement(Toolbar_1.ToolbarGroup, {float: 'left'},
43-
React.createElement(ToggleDevTools_1.default, null)
44-
),
45-
React.createElement(Toolbar_1.ToolbarGroup, {float: 'right'}, tasksComplete ? React.createElement(Continue_1.default, null) : React.createElement(Save_1.default, null)))));
39+
return (React.createElement("section", {styles: styles}, children, React.createElement(Toolbar_1.Toolbar, null, React.createElement(Toolbar_1.ToolbarGroup, {float: 'left'}, React.createElement(ToggleDevTools_1.default, null)), React.createElement(Toolbar_1.ToolbarGroup, {float: 'right'}, tasksComplete ? React.createElement(Continue_1.default, null) : React.createElement(Save_1.default, null)))));
4640
};
4741
PageToolbar = __decorate([
4842
react_redux_1.connect(function (state) { return ({

lib/components/Page/Task/index.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,7 @@ var Task = (function (_super) {
4747
Task.prototype.render = function () {
4848
var _a = this.props, testRun = _a.testRun, task = _a.task, index = _a.index, isCurrentTask = _a.isCurrentTask, isCompletedTask = _a.isCompletedTask;
4949
var backgroundColor = isCompletedTask ? colors_1.lightGreen200 : 'inherit';
50-
return (React.createElement(List_1.ListItem, {key: index, style: Object.assign({}, styles.task, { backgroundColor: backgroundColor })},
51-
React.createElement(taskCheckbox_1.default, {index: index}),
52-
React.createElement("span", {style: styles.index},
53-
index + 1,
54-
"."),
55-
React.createElement("div", {style: styles.description},
56-
React.createElement(index_1.Markdown, null, task.description)
57-
)));
50+
return (React.createElement(List_1.ListItem, {key: index, style: Object.assign({}, styles.task, { backgroundColor: backgroundColor })}, React.createElement(taskCheckbox_1.default, {index: index}), React.createElement("span", {style: styles.index}, index + 1, "."), React.createElement("div", {style: styles.description}, React.createElement(index_1.Markdown, null, task.description))));
5851
};
5952
Task = __decorate([
6053
react_redux_1.connect(function (state, props) { return ({

lib/components/Page/Tasks/index.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ var Tasks = (function (_super) {
3434
Tasks.prototype.render = function () {
3535
var _a = this.props, tasks = _a.tasks, completed = _a.completed;
3636
var backgroundColor = completed ? colors_1.lightGreen200 : 'white';
37-
return (React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }},
38-
React.createElement(List_1.List, null,
39-
React.createElement(Subheader_1.default, null, "Tasks"),
40-
tasks.map(function (task, index) {
41-
return React.createElement(Task_1.default, {key: index, index: index});
42-
})),
43-
React.createElement("div", {ref: 'listEnd'})));
37+
return (React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), tasks.map(function (task, index) {
38+
return React.createElement(Task_1.default, {key: index, index: index});
39+
})), React.createElement("div", {ref: 'listEnd'})));
4440
};
4541
Tasks = __decorate([
4642
react_redux_1.connect(function (state) { return ({

lib/components/Page/TasksComplete/index.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ var TasksComplete = (function (_super) {
3636
}
3737
TasksComplete.prototype.render = function () {
3838
var onPageComplete = this.props.onPageComplete;
39-
return (React.createElement(Card_1.Card, {style: styles.card},
40-
React.createElement(Card_1.CardText, null,
41-
React.createElement(index_1.Markdown, {style: styles.text}, onPageComplete)
42-
)
43-
));
39+
return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardText, null, React.createElement(index_1.Markdown, {style: styles.text}, onPageComplete))));
4440
};
4541
TasksComplete = __decorate([
4642
react_redux_1.connect(function (state) { return ({

lib/components/Page/index.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,7 @@ var Page = (function (_super) {
3636
}
3737
Page.prototype.render = function () {
3838
var _a = this.props, page = _a.page, isCompleted = _a.isCompleted;
39-
return (React.createElement("section", {style: styles.page, className: 'cr-page'},
40-
React.createElement(index_1.ContentCard, {title: page.title, content: page.description}),
41-
React.createElement(Tasks_1.default, null),
42-
React.createElement(PageToolbar_1.default, null,
43-
React.createElement(Hints_1.default, null),
44-
isCompleted ? React.createElement(TasksComplete_1.default, null) : React.createElement(ProgressBar_1.default, null))));
39+
return (React.createElement("section", {style: styles.page, className: 'cr-page'}, React.createElement(index_1.ContentCard, {title: page.title, content: page.description}), React.createElement(Tasks_1.default, null), React.createElement(PageToolbar_1.default, null, React.createElement(Hints_1.default, null), isCompleted ? React.createElement(TasksComplete_1.default, null) : React.createElement(ProgressBar_1.default, null))));
4540
};
4641
Page = __decorate([
4742
react_redux_1.connect(function (state) { return ({

lib/components/Progress/index.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@ var Progress = (function (_super) {
3838
};
3939
Progress.prototype.render = function () {
4040
var _a = this.props, progress = _a.progress, pagePosition = _a.pagePosition, info = _a.info, tutorial = _a.tutorial;
41-
return (React.createElement(Paper_1.default, {style: styles.page},
42-
React.createElement(List_1.List, {style: styles.list},
43-
React.createElement(Subheader_1.default, null, info.title),
44-
tutorial.pages.map(function (page, index) { return (React.createElement(ProgressPage_1.default, {key: index, index: index, page: page, pagePosition: pagePosition, progress: progress})); }))
45-
));
41+
return (React.createElement(Paper_1.default, {style: styles.page}, React.createElement(List_1.List, {style: styles.list}, React.createElement(Subheader_1.default, null, info.title), tutorial.pages.map(function (page, index) { return (React.createElement(ProgressPage_1.default, {key: index, index: index, page: page, pagePosition: pagePosition, progress: progress})); }))));
4642
};
4743
Progress = __decorate([
4844
react_redux_1.connect(function (state) { return ({

lib/components/SidePanel/SidePanel.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ var SidePanel = (function (_super) {
2525
}
2626
SidePanel.prototype.render = function () {
2727
var isWindowOpen = this.props.isWindowOpen;
28-
return (React.createElement("section", null,
29-
React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: isWindowOpen},
30-
React.createElement("div", {className: 'cr-bg'},
31-
React.createElement(index_1.AppMenu, null),
32-
React.createElement(Routes_1.default, null))
33-
),
34-
React.createElement(index_1.Alert, null)));
28+
return (React.createElement("section", null, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: isWindowOpen}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, null), React.createElement(Routes_1.default, null))), React.createElement(index_1.Alert, null)));
3529
};
3630
SidePanel = __decorate([
3731
react_redux_1.connect(function (state) { return ({

lib/components/SidePanel/SideRoot.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ var react_redux_1 = require('react-redux');
44
var theme_1 = require('../styles/theme');
55
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
66
var SidePanel_1 = require('./SidePanel');
7-
var Root = function (store) { return (React.createElement(react_redux_1.Provider, {store: store},
8-
React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default},
9-
React.createElement(SidePanel_1.default, null)
10-
)
11-
)); };
7+
var Root = function (store) { return (React.createElement(react_redux_1.Provider, {store: store}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(SidePanel_1.default, null)))); };
128
Object.defineProperty(exports, "__esModule", { value: true });
139
exports.default = Root;

lib/components/Start/Checks/InstallGuide.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ var InstallGuide = function (_a) {
55
if (!checks || !checks.passed) {
66
return null;
77
}
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"))));
8+
return (React.createElement("div", {className: 'setup-guide'}, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs#install'}, " ", React.createElement("strong", null, "Install Guide"))));
139
};
1410
Object.defineProperty(exports, "__esModule", { value: true });
1511
exports.default = InstallGuide;

lib/components/Start/Checks/SetupChecks.js

+1-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,7 @@ var SetupChecks = function (_a) {
1313
}
1414
var hasDir = setup.hasDir, hasPackageJson = setup.hasPackageJson, hasTutorial = setup.hasTutorial;
1515
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-
)));
16+
return (React.createElement(Card_1.Card, {className: 'cr-check'}, React.createElement(Card_1.CardHeader, {title: 'Setup Checks', subtitle: 'CodeRoad requires a brief setup'}), React.createElement(Card_1.CardText, null, React.createElement(DynamicStepper_1.default, {status: status}, React.createElement(StepCheck_1.default, {label: 'open a directory', completed: hasDir}, React.createElement("p", null, "File -> Open (a new folder)"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Open Directory', secondary: true})), React.createElement(StepCheck_1.default, {label: 'package.json', completed: hasPackageJson}, "Create a package.json by running", React.createElement("br", null), React.createElement("code", null, "> npm init -y`"), React.createElement("br", null), React.createElement(FlatButton_1.default, {label: 'Create package.json', secondary: true})), React.createElement(StepCheck_1.default, {label: 'install a tutorial', completed: hasTutorial}, "Install a tutorial using npm. For example:", React.createElement("br", null), React.createElement("code", null, "> npm install --save-dev coderoad-functional-school"), React.createElement("br", null)))), React.createElement(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
3917
};
4018
Object.defineProperty(exports, "__esModule", { value: true });
4119
exports.default = SetupChecks;

0 commit comments

Comments
 (0)