Skip to content

Commit 5f33a37

Browse files
committed
pageTabs, fix setup for builder
1 parent 2d17e84 commit 5f33a37

38 files changed

+423
-53
lines changed

lib/actions.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ var tutorial_config_1 = require('./modules/tutorial-config');
66
exports.tutorialConfigSave = tutorial_config_1.tutorialConfigSave;
77
var tutorial_info_1 = require('./modules/tutorial-info');
88
exports.tutorialInfoSave = tutorial_info_1.tutorialInfoSave;
9+
var setup_1 = require('./modules/setup');
10+
exports.setupVerify = setup_1.setupVerify;
11+
exports.setupPackage = setup_1.setupPackage;
912
var alert_1 = require('core-coderoad/lib/alert');
1013
exports.alertOpen = alert_1.alertOpen;
1114
exports.alertClose = alert_1.alertClose;
@@ -18,9 +21,6 @@ exports.editorSave = editor_1.editorSave;
1821
exports.editorSet = editor_1.editorSet;
1922
var route_1 = require('core-coderoad/lib/route');
2023
exports.routeSet = route_1.routeSet;
21-
var setup_1 = require('core-coderoad/lib/setup');
22-
exports.setupVerify = setup_1.setupVerify;
23-
exports.setupPackage = setup_1.setupPackage;
2424
var tutorial_1 = require('core-coderoad/lib/tutorial');
2525
exports.tutorialSet = tutorial_1.tutorialSet;
2626
var tutorials_1 = require('core-coderoad/lib/tutorials');

lib/components/Start/Checks/SetupChecks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +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'}, 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))));
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(Card_1.CardActions, null, React.createElement(VerifyButton_1.default, null))));
1717
};
1818
Object.defineProperty(exports, "__esModule", { value: true });
1919
exports.default = SetupChecks;

lib/components/top-panel/Top.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var Top = {
77
_this.top = document.createElement('div');
88
_this.top.setAttribute('id', 'crb-top');
99
_this.top.style.height = '33px';
10-
_this.top.style.border = 'solid 2px yellow';
1110
return _this.top;
1211
},
1312
unmount: function () {
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
"use strict";
22
var React = require('react');
3-
var TopPanel = function (_a) { return (React.createElement("div", null, React.createElement("h1", null, "Top"))); };
3+
var Tabs_1 = require('material-ui/Tabs');
4+
var add_1 = require('material-ui/svg-icons/content/add');
5+
var pageTabs_1 = require('./pageTabs');
6+
var styles = {
7+
tabs: {
8+
marginRight: '400px',
9+
},
10+
};
11+
var TopPanel = function (_a) {
12+
var tutorial = _a.tutorial;
13+
return (React.createElement(Tabs_1.Tabs, {style: styles.tabs}, pageTabs_1.default(tutorial), React.createElement(Tabs_1.Tab, {icon: React.createElement(add_1.default, null)})));
14+
};
415
Object.defineProperty(exports, "__esModule", { value: true });
516
exports.default = TopPanel;
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
"use strict";
2+
var React = require('react');
3+
var Tabs_1 = require('material-ui/Tabs');
4+
var styles = {};
5+
function pageTabs(tutorial) {
6+
if (!tutorial || !tutorial.pages) {
7+
return null;
8+
}
9+
return tutorial.pages.map(function (page) {
10+
return (React.createElement(Tabs_1.Tab, {label: page.title.substring(0, 10)}));
11+
});
12+
}
13+
Object.defineProperty(exports, "__esModule", { value: true });
14+
exports.default = pageTabs;

lib/components/top-panel/render.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var TopPanel_1 = require('./TopPanel');
77
var theme_1 = require('../styles/theme');
88
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
99
function render(target) {
10-
ReactDOM.render(React.createElement(react_redux_1.Provider, {store: store_1.default}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(TopPanel_1.default, null))), target);
10+
ReactDOM.render(React.createElement(react_redux_1.Provider, {store: store_1.default}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(TopPanel_1.default, {tutorial: store_1.default.tutorial}))), target);
1111
}
1212
Object.defineProperty(exports, "__esModule", { value: true });
1313
exports.default = render;

lib/components/top.js

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

lib/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"use strict";
22
var render_1 = require('./components/render');
3+
var render_2 = require('./components/top-panel/render');
34
var Root_1 = require('./components/Root');
45
var Top_1 = require('./components/top-panel/Top');
56
var polyfills_1 = require('core-coderoad/lib/polyfills');
@@ -24,6 +25,7 @@ var Main = (function () {
2425
});
2526
subscriptions_1.onActivate();
2627
render_1.default(this.root);
28+
render_2.default(this.top);
2729
};
2830
Main.prototype.deactivate = function () {
2931
subscriptions_1.onDeactivate();

lib/modules/setup/actions.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
"use strict";
2+
var types_1 = require('./types');
3+
function setupVerify() {
4+
return function (dispatch, getState) {
5+
dispatch(setupPackage());
6+
var _a = getState(), dir = _a.dir, packageJson = _a.packageJson;
7+
dispatch({ type: types_1.SETUP_VERIFY, payload: { dir: dir, packageJson: packageJson } });
8+
};
9+
}
10+
exports.setupVerify = setupVerify;
11+
function setupPackage() {
12+
return function (dispatch, getState) {
13+
var dir = getState().dir;
14+
dispatch({ type: types_1.SETUP_PACKAGE, payload: { dir: dir } });
15+
};
16+
}
17+
exports.setupPackage = setupPackage;

lib/modules/setup/checks/index.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
"use strict";
2+
var types_1 = require('../types');
3+
var verify_1 = require('../utils/verify');
4+
var _checks = {
5+
passed: false,
6+
system: {
7+
node: false,
8+
npm: false,
9+
xcode: false,
10+
},
11+
setup: {
12+
hasDir: false,
13+
}
14+
};
15+
function checks(checks, action) {
16+
if (checks === void 0) { checks = _checks; }
17+
switch (action.type) {
18+
case types_1.SETUP_VERIFY:
19+
var _a = action.payload, dir = _a.dir, packageJson = _a.packageJson;
20+
return verify_1.default(dir, packageJson);
21+
default:
22+
return checks;
23+
}
24+
}
25+
Object.defineProperty(exports, "__esModule", { value: true });
26+
exports.default = checks;

0 commit comments

Comments
 (0)