Skip to content

Commit 692593f

Browse files
ShMcKShMcK
committed
Merge branch 'cl'
2 parents b0a1584 + 0aaece1 commit 692593f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+889
-528
lines changed

‎lib/actions/actionTypes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ exports.SET_PROJECT = 'SET_PROJECT';
33
exports.VERIFY_SETUP = 'VERIFY_SETUP';
44
exports.SET_GLOBALS = 'SET_GLOBALS';
55
exports.LOAD_TUTORIALS = 'LOAD_TUTORIALS';
6+
exports.UPDATE_TUTORIAL = 'UPDATE_TUTORIAL';
67
exports.SET_ROUTE = 'SET_ROUTE';
78
exports.SET_PAGE = 'SET_PAGE';
89
exports.NEXT_PAGE = 'NEXT_PAGE';

‎lib/actions/actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ exports.testResult = task_actions_1.testResult;
5353
exports.setHintPosition = task_actions_1.setHintPosition;
5454
var tutorials_1 = require('./tutorials');
5555
exports.loadTutorials = tutorials_1.loadTutorials;
56+
exports.updateTutorial = tutorials_1.updateTutorial;
5657
var alert_1 = require('./alert');
5758
exports.toggleAlert = alert_1.toggleAlert;
5859
exports.replayAlert = alert_1.replayAlert;

‎lib/actions/routes.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function setRoute(route) {
77
if (route && route !== previous) {
88
switch (route) {
99
case 'tutorials':
10-
console.log('load');
1110
store_1.store.dispatch(Action.loadTutorials());
1211
}
1312
previous = route;

‎lib/actions/tutorials.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ function loadTutorials() {
44
return { type: Type.LOAD_TUTORIALS };
55
}
66
exports.loadTutorials = loadTutorials;
7+
function updateTutorial(name) {
8+
return { type: Type.UPDATE_TUTORIAL, payload: { name: name } };
9+
}
10+
exports.updateTutorial = updateTutorial;

‎lib/components/_components.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ var routes_1 = require('./routes/routes');
55
exports.Routes = routes_1.default;
66
var page_1 = require('./page/page');
77
exports.Page = page_1.default;
8-
var chapter_1 = require('./page/chapter');
9-
exports.Chapter = chapter_1.default;
8+
var chapter_1 = require('./page/chapter/chapter');
9+
exports.Chapter = chapter_1.Chapter;
1010
var menu_1 = require('./menu/menu');
1111
exports.Menu = menu_1.default;
1212
var progress_1 = require('./progress/progress');
13-
exports.Progress = progress_1.default;
14-
var checks_1 = require('./checks/checks');
15-
exports.Checks = checks_1.Checks;
13+
exports.Progress = progress_1.Progress;
14+
var start_1 = require('./start/start');
15+
exports.Start = start_1.Start;
1616
var tutorials_1 = require('./tutorials/tutorials');
1717
exports.Tutorials = tutorials_1.Tutorials;
1818
var final_page_1 = require('./final-page/final-page');
1919
exports.FinalPage = final_page_1.FinalPage;
2020
var markdown_1 = require('./markdown/markdown');
21-
exports.MarkdownText = markdown_1.default;
21+
exports.Markdown = markdown_1.Markdown;
2222
var alert_1 = require('./alert/alert');
2323
exports.Alert = alert_1.default;

‎lib/components/alert/alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var Action = require('../../actions/actions');
19-
var snackbar_1 = require('material-ui/lib/snackbar');
19+
var snackbar_1 = require('material-ui/snackbar');
2020
var classNames = require('classnames');
2121
var defaultAlert = {
2222
open: false,

‎lib/components/app.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
1818
var _components_1 = require('./_components');
19+
var theme_1 = require('./theme/theme');
20+
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
1921
var height = atom.getSize().height;
2022
window.onresize = function () {
2123
height = atom.getSize().height;
@@ -27,8 +29,7 @@ var default_1 = (function (_super) {
2729
}
2830
default_1.prototype.render = function () {
2931
var state = this.props.state;
30-
console.log(state);
31-
return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Routes, {state: state, ref: 'route'}), React.createElement(_components_1.Alert, {alert: state.alert})));
32+
return (React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.muiTheme}, React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Routes, {state: state, ref: 'route'}), React.createElement(_components_1.Alert, {alert: state.alert}))));
3233
};
3334
default_1 = __decorate([
3435
react_redux_1.connect(function (state) {

‎lib/components/checks/checks.js

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1414
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
1515
};
1616
var React = require('react');
17-
var paper_1 = require('material-ui/lib/paper');
1817
var setup_checker_1 = require('./setup-checker');
19-
var VerticalStep_1 = require('material-ui/lib/Stepper/VerticalStep');
20-
var flat_button_1 = require('material-ui/lib/flat-button');
18+
var Stepper_1 = require('material-ui/Stepper');
19+
var FlatButton_1 = require('material-ui/FlatButton');
2120
var action_setup_1 = require('../../reducers/checks/action-setup');
2221
var react_redux_1 = require('react-redux');
2322
var store_1 = require('../../store/store');
2423
var Action = require('../../actions/actions');
25-
var style = {
26-
icon: {
27-
backgroundColor: 'red'
28-
}
29-
};
24+
var fail = '✗';
3025
var Checks = (function (_super) {
3126
__extends(Checks, _super);
3227
function Checks() {
@@ -42,22 +37,22 @@ var Checks = (function (_super) {
4237
};
4338
Checks.prototype.render = function () {
4439
var _a = this.props, checks = _a.checks, routeToTutorials = _a.routeToTutorials, verify = _a.verify;
45-
return React.createElement(paper_1.default, {className: 'cr-start'}, React.createElement("div", {className: 'cr-start-header'}, React.createElement("p", {className: 'tagline'}, "Setup"), checks.system.passed ? null : React.createElement(setup_checker_1.default, {title: 'Dependency Checks', status: this.getSystemChecks(checks)}, React.createElement(VerticalStep_1.default, {style: style, orderStepLabel: '✗', stepLabel: 'Node >= 0.10', actions: [
46-
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify})
47-
]}, React.createElement("div", null, "Install a newer version of ", React.createElement("a", {href: 'https://nodejs.org'}, "Node"))), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'NPM >= 3', actions: [
48-
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
49-
]}, React.createElement("div", null, "Update your version of NPM.", React.createElement("br", null), "`> npm update -g npm`"))), checks.setup.passed ? null : React.createElement(setup_checker_1.default, {title: 'Setup Checks', status: this.getSetupChecks(checks)}, React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'working directory', actions: [
50-
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
51-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.openDirectory})
52-
]}, React.createElement("div", null, "File -> Open (a new folder)")), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'package.json', actions: [
53-
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
54-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.createPackageJson})
55-
]}, React.createElement("div", null, "Create a package.json by running", React.createElement("br", null), "`> npm init -y`")), React.createElement(VerticalStep_1.default, {orderStepLabel: '✗', stepLabel: 'install tutorial', actions: [
56-
React.createElement(flat_button_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
57-
React.createElement(flat_button_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.installTutorial})
58-
]}, React.createElement("div", null, "Install a tutorial using npm. For example:", React.createElement("br", null), "`> npm install coderoad-functional-school --save-dev`")))), checks.passed
59-
? React.createElement(flat_button_1.default, {label: 'Begin', primary: true, onTouchTap: routeToTutorials})
60-
: React.createElement("div", {className: 'setup-guide'}, React.createElement("span", null, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs#install'}, " ", React.createElement("strong", null, "Install Guide")))), React.createElement("p", {className: 'version'}, "Beta"));
40+
return React.createElement("div", {className: 'cr-checks'}, React.createElement("p", {className: 'tagline'}, "Setup"), checks.system.passed ? null : React.createElement(setup_checker_1.default, {title: 'Dependency Checks', status: this.getSystemChecks(checks)}, React.createElement(Stepper_1.Step, {orderStepLabel: fail, stepLabel: 'Node >= 0.10', actions: [
41+
React.createElement(FlatButton_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify})
42+
]}, React.createElement("div", null, "Install a newer version of ", React.createElement("a", {href: 'https://nodejs.org'}, "Node"))), React.createElement(Stepper_1.Step, {orderStepLabel: fail, stepLabel: 'NPM >= 3', actions: [
43+
React.createElement(FlatButton_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
44+
]}, React.createElement("div", null, "Update your version of NPM.", React.createElement("br", null), "`> npm update -g npm`"))), checks.setup.passed ? null : React.createElement(setup_checker_1.default, {title: 'Setup Checks', status: this.getSetupChecks(checks)}, React.createElement(Stepper_1.Step, {orderStepLabel: fail, stepLabel: 'working directory', actions: [
45+
React.createElement(FlatButton_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
46+
React.createElement(FlatButton_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.openDirectory})
47+
]}, React.createElement("div", null, "File -> Open (a new folder)")), React.createElement(Stepper_1.Step, {orderStepLabel: fail, stepLabel: 'package.json', actions: [
48+
React.createElement(FlatButton_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
49+
React.createElement(FlatButton_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.createPackageJson})
50+
]}, React.createElement("div", null, "Create a package.json by running", React.createElement("br", null), "`> npm init -y`")), React.createElement(Stepper_1.Step, {orderStepLabel: fail, stepLabel: 'install tutorial', actions: [
51+
React.createElement(FlatButton_1.default, {key: 0, primary: true, label: 'Verify', onTouchTap: verify}),
52+
React.createElement(FlatButton_1.default, {key: 1, secondary: true, label: 'Do it for me', onTouchTap: action_setup_1.installTutorial})
53+
]}, React.createElement("div", null, "Install a tutorial using npm. For example:", React.createElement("br", null), "`> npm install coderoad-functional-school --save-dev`"))), checks.passed
54+
? null
55+
: React.createElement("div", {className: 'setup-guide'}, React.createElement("span", null, "Check the", React.createElement("a", {href: 'https://coderoad.github.io/docs#install'}, " ", React.createElement("strong", null, "Install Guide")))));
6156
};
6257
Checks = __decorate([
6358
react_redux_1.connect(null, function (dispatch) {
@@ -70,4 +65,5 @@ var Checks = (function (_super) {
7065
], Checks);
7166
return Checks;
7267
}(React.Component));
73-
exports.Checks = Checks;
68+
Object.defineProperty(exports, "__esModule", { value: true });
69+
exports.default = Checks;

‎lib/components/checks/setup-checker.js

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

‎lib/components/final-page/final-page.js

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/components/markdown/markdown.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function formatText(text) {
2323
return marked(text.toString(), options);
2424
}
2525
;
26-
Object.defineProperty(exports, "__esModule", { value: true });
27-
exports.default = function (_a) {
28-
var text = _a.text;
29-
return (React.createElement("span", {className: 'cr-markdown', dangerouslySetInnerHTML: { __html: formatText(text) }}));
26+
exports.Markdown = function (_a) {
27+
var children = _a.children;
28+
var text = formatText(children);
29+
return React.createElement("span", {className: 'cr-markdown', dangerouslySetInnerHTML: { __html: text }});
3030
};

0 commit comments

Comments
 (0)