Skip to content

Commit abf9a08

Browse files
ShMcKShMcK
committed
refactor into SidePanel, shortform for connected dispatches
1 parent a12c60a commit abf9a08

File tree

43 files changed

+253
-225
lines changed

Some content is hidden

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

43 files changed

+253
-225
lines changed

‎lib/components/Alert/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,14 @@ var Alert = (function (_super) {
3333
_super.apply(this, arguments);
3434
}
3535
Alert.prototype.render = function () {
36-
var _a = this.props, alert = _a.alert, close = _a.close;
36+
var _a = this.props, alert = _a.alert, alertClose = _a.alertClose;
3737
var action = alert.action, message = alert.message, open = alert.open, duration = alert.duration, color = alert.color;
38-
return (React.createElement(Snackbar_1.default, {style: styles.snackbar, bodyStyle: { color: color }, open: open, message: message || '', action: action || '', autoHideDuration: duration || 2000, onActionTouchTap: close, onRequestClose: close}));
38+
return (React.createElement(Snackbar_1.default, {style: styles.snackbar, bodyStyle: { color: color }, open: open, message: message || '', action: action || '', autoHideDuration: duration || 2000, onActionTouchTap: alertClose, onRequestClose: alertClose}));
3939
};
4040
Alert = __decorate([
4141
react_redux_1.connect(function (state) { return ({
4242
alert: state.alert,
43-
}); }, function (dispatch) { return ({
44-
close: function () { dispatch(actions_1.alertClose()); }
45-
}); }),
43+
}); }, { alertClose: actions_1.alertClose }),
4644
__metadata('design:paramtypes', [])
4745
], Alert);
4846
return Alert;

‎lib/components/AppMenu/CloseWindow.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ var CloseWindow = (function (_super) {
2727
return (React.createElement(IconButton_1.default, {onClick: this.props.windowToggle}, React.createElement(close_1.default, {color: 'white'})));
2828
};
2929
CloseWindow = __decorate([
30-
react_redux_1.connect(null, function (dispatch) { return ({
31-
windowToggle: function () { dispatch(actions_1.windowToggle()); },
32-
}); }),
30+
react_redux_1.connect(null, { windowToggle: actions_1.windowToggle }),
3331
__metadata('design:paramtypes', [])
3432
], CloseWindow);
3533
return CloseWindow;

‎lib/components/AppMenu/MenuLink/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ var MenuLink = (function (_super) {
2727
_super.apply(this, arguments);
2828
}
2929
MenuLink.prototype.render = function () {
30-
var _a = this.props, route = _a.route, title = _a.title, routeTo = _a.routeTo;
31-
return (React.createElement(MenuItem_1.default, {style: styles, primaryText: title ? title : route, onTouchTap: routeTo.bind(this, route), key: route}));
30+
var _a = this.props, route = _a.route, title = _a.title, routeSet = _a.routeSet;
31+
return (React.createElement(MenuItem_1.default, {style: styles, primaryText: title ? title : route, onTouchTap: routeSet.bind(this, route), key: route}));
3232
};
3333
MenuLink = __decorate([
34-
react_redux_1.connect(null, function (dispatch) { return ({
35-
routeTo: function (route) { dispatch(actions_1.routeSet(route)); },
36-
}); }),
34+
react_redux_1.connect(null, { routeSet: actions_1.routeSet }),
3735
__metadata('design:paramtypes', [])
3836
], MenuLink);
3937
return MenuLink;

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,20 @@ var Hints = (function (_super) {
3232
};
3333
}
3434
Hints.prototype.handleChange = function (event) {
35-
console.log(event);
3635
this.setState({
3736
text: event.target.value,
3837
});
3938
};
4039
Hints.prototype.render = function () {
4140
var _this = this;
42-
var _a = this.props, hints = _a.hints, markdownOpen = _a.markdownOpen;
41+
var _a = this.props, hints = _a.hints, editorMarkdownOpen = _a.editorMarkdownOpen;
4342
var text = this.state.text;
4443
return (React.createElement(List_1.List, null, !hints || !hints.length
4544
? []
46-
: hints.map(function (hint, index) { return (React.createElement(List_1.ListItem, {key: index, secondaryText: React.createElement("p", null, index + 1, ". ", hint), onClick: markdownOpen.bind(_this, hint)})); }), React.createElement(TextField_1.default, {style: styles.text, hintText: 'Hint text', multiLine: true, value: text, onChange: this.handleChange.bind(this)})));
45+
: hints.map(function (hint, index) { return (React.createElement(List_1.ListItem, {key: index, secondaryText: React.createElement("p", null, index + 1, ". ", hint), onClick: editorMarkdownOpen.bind(_this, hint, null)})); }), React.createElement(TextField_1.default, {style: styles.text, hintText: 'Hint text', multiLine: true, value: text, onChange: this.handleChange.bind(this)})));
4746
};
4847
Hints = __decorate([
49-
react_redux_1.connect(null, function (dispatch) { return ({
50-
markdownOpen: function (content) {
51-
dispatch(actions_1.editorMarkdownOpen(null, content));
52-
},
53-
}); }),
48+
react_redux_1.connect(null, { editorMarkdownOpen: actions_1.editorMarkdownOpen }),
5449
__metadata('design:paramtypes', [Object])
5550
], Hints);
5651
return Hints;

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,16 @@ var PageDescription = (function (_super) {
3131
}
3232
PageDescription.prototype.render = function () {
3333
var _this = this;
34-
var _a = this.props, page = _a.page, markdownOpen = _a.markdownOpen;
34+
var _a = this.props, page = _a.page, editorMarkdownOpen = _a.editorMarkdownOpen;
3535
var title = page.title, description = page.description;
3636
var contentArray = description.split('\n\n');
3737
return (React.createElement(Card_1.Card, {style: styles.card, initiallyExpanded: true}, title
38-
? React.createElement(Card_1.CardHeader, {title: title, actAsExpander: true, showExpandableButton: true}) : null, React.createElement(Card_1.CardText, {expandable: true}, contentArray.map(function (c, index) { return (React.createElement(index_1.Markdown, {key: index, onClick: markdownOpen.bind(_this, c)}, c)); }))));
38+
? React.createElement(Card_1.CardHeader, {title: title, actAsExpander: true, showExpandableButton: true}) : null, React.createElement(Card_1.CardText, {expandable: true}, contentArray.map(function (c, index) { return (React.createElement(index_1.Markdown, {key: index, onClick: editorMarkdownOpen.bind(_this, c, null)}, c)); }))));
3939
};
4040
PageDescription = __decorate([
4141
react_redux_1.connect(function (state) { return ({
4242
page: selectors_1.pageSelector(state),
43-
}); }, function (dispatch) { return ({
44-
markdownOpen: function (content) {
45-
dispatch(actions_1.editorMarkdownOpen(null, content));
46-
},
47-
}); }),
43+
}); }, { editorMarkdownOpen: actions_1.editorMarkdownOpen }),
4844
__metadata('design:paramtypes', [])
4945
], PageDescription);
5046
return PageDescription;

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ var TaskActions = (function (_super) {
5353
});
5454
};
5555
TaskActions.prototype.handleText = function (event) {
56-
console.log(event);
5756
this.setState({
5857
stepIndex: this.state.stepIndex,
5958
as: {
@@ -64,22 +63,15 @@ var TaskActions = (function (_super) {
6463
};
6564
TaskActions.prototype.render = function () {
6665
var _this = this;
67-
var _a = this.props, actions = _a.actions, addAction = _a.addAction, markdownOpen = _a.markdownOpen;
66+
var _a = this.props, actions = _a.actions, tutorialActionAdd = _a.tutorialActionAdd, editorMarkdownOpen = _a.editorMarkdownOpen;
6867
var stepIndex = this.state.stepIndex;
6968
var actionList = actions.map(function (a) { return task_object_1.default(a); });
7069
return (React.createElement("section", null, React.createElement(Stepper_1.Stepper, {activeStep: stepIndex, linear: false, orientation: 'vertical'}, actionList.map(function (a, index) { return (React.createElement(Stepper_1.Step, {key: index}, React.createElement(Stepper_1.StepButton, {onClick: function () { return _this.setState({
7170
stepIndex: index, as: _this.state.as }); }}, a.action + (a.singleLine ? ' ' + a.content : '')), React.createElement(Stepper_1.StepContent, null, a.singleLine ? ''
72-
: React.createElement("div", {onClick: markdownOpen.bind(_this, a.content)}, React.createElement(index_1.Markdown, null, '```js\n' + a.content + '\n```'))))); })), React.createElement("span", {style: styles.form}, React.createElement(SelectField_1.default, {value: this.state.as.action, onChange: this.handleSelect.bind(this), style: styles.select}, React.createElement(MenuItem_1.default, {key: 'open', value: 'open', primaryText: 'open'}), React.createElement(MenuItem_1.default, {key: 'set', value: 'set', primaryText: 'set'}), React.createElement(MenuItem_1.default, {key: 'insert', value: 'insert', primaryText: 'insert'})), React.createElement(TextField_1.default, {hintText: 'Content', value: this.state.as.content, onChange: this.handleText.bind(this)}))));
71+
: React.createElement("div", {onClick: editorMarkdownOpen.bind(_this, a.content, null)}, React.createElement(index_1.Markdown, null, '```js\n' + a.content + '\n```'))))); })), React.createElement("span", {style: styles.form}, React.createElement(SelectField_1.default, {value: this.state.as.action, onChange: this.handleSelect.bind(this), style: styles.select}, React.createElement(MenuItem_1.default, {key: 'open', value: 'open', primaryText: 'open'}), React.createElement(MenuItem_1.default, {key: 'set', value: 'set', primaryText: 'set'}), React.createElement(MenuItem_1.default, {key: 'insert', value: 'insert', primaryText: 'insert'})), React.createElement(TextField_1.default, {hintText: 'Content', value: this.state.as.content, onChange: this.handleText.bind(this)}))));
7372
};
7473
TaskActions = __decorate([
75-
react_redux_1.connect(null, function (dispatch) { return ({
76-
addAction: function (actionString) {
77-
dispatch(actions_1.tutorialActionAdd(this.props.taskPosition, actionString));
78-
},
79-
markdownOpen: function (content) {
80-
dispatch(actions_1.editorMarkdownOpen(null, content));
81-
},
82-
}); }),
74+
react_redux_1.connect(null, { tutorialActionAdd: actions_1.tutorialActionAdd, editorMarkdownOpen: actions_1.editorMarkdownOpen }),
8375
__metadata('design:paramtypes', [Object])
8476
], TaskActions);
8577
return TaskActions;

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,13 @@ var Tasks = (function (_super) {
5454
}
5555
Tasks.prototype.render = function () {
5656
var _this = this;
57-
var _a = this.props, tasks = _a.tasks, taskAdd = _a.taskAdd, markdownOpen = _a.markdownOpen;
58-
return (React.createElement("div", null, tasks.map(function (task, index) { return (React.createElement(Card_1.Card, {key: index, style: styles.card, initiallyExpanded: index === 0}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}, React.createElement("span", {style: styles.title}, "Task ", index + 1), React.createElement(Tests_1.default, {style: styles.test, tests: task.tests})), React.createElement(Card_1.CardText, {expandable: true, style: styles.cardContent}, React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabBar}, React.createElement(Tabs_1.Tab, {label: 'Description'}, React.createElement("div", {onClick: markdownOpen.bind(_this, task.description)}, React.createElement(Task_1.default, {key: index, index: index, task: task}))), React.createElement(Tabs_1.Tab, {label: 'Actions'}, React.createElement(TaskActions_1.default, {actions: task.actions, taskPosition: index})), React.createElement(Tabs_1.Tab, {label: 'Hints'}, React.createElement(Hints_1.default, {hints: task.hints, taskPosition: index})))))); }), React.createElement(AddButton_1.default, {callback: taskAdd})));
57+
var _a = this.props, tasks = _a.tasks, tutorialTaskAdd = _a.tutorialTaskAdd, editorMarkdownOpen = _a.editorMarkdownOpen;
58+
return (React.createElement("div", null, tasks.map(function (task, index) { return (React.createElement(Card_1.Card, {key: index, style: styles.card, initiallyExpanded: index === 0}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}, React.createElement("span", {style: styles.title}, "Task ", index + 1), React.createElement(Tests_1.default, {style: styles.test, tests: task.tests})), React.createElement(Card_1.CardText, {expandable: true, style: styles.cardContent}, React.createElement(Tabs_1.Tabs, {tabItemContainerStyle: styles.tabBar}, React.createElement(Tabs_1.Tab, {label: 'Description'}, React.createElement("div", {onClick: editorMarkdownOpen.bind(_this, task.description, null)}, React.createElement(Task_1.default, {key: index, index: index, task: task}))), React.createElement(Tabs_1.Tab, {label: 'Actions'}, React.createElement(TaskActions_1.default, {actions: task.actions, taskPosition: index})), React.createElement(Tabs_1.Tab, {label: 'Hints'}, React.createElement(Hints_1.default, {hints: task.hints, taskPosition: index})))))); }), React.createElement(AddButton_1.default, {callback: tutorialTaskAdd})));
5959
};
6060
Tasks = __decorate([
6161
react_redux_1.connect(function (state) { return ({
6262
tasks: selectors_1.tasksSelector(state),
63-
}); }, function (dispatch) { return ({
64-
taskAdd: function () { dispatch(actions_1.tutorialTaskAdd()); },
65-
markdownOpen: function (content) {
66-
dispatch(actions_1.editorMarkdownOpen(null, content));
67-
},
68-
}); }),
63+
}); }, { tutorialTaskAdd: actions_1.tutorialTaskAdd, editorMarkdownOpen: actions_1.editorMarkdownOpen }),
6964
__metadata('design:paramtypes', [])
7065
], Tasks);
7166
return Tasks;

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,13 @@ var TasksComplete = (function (_super) {
3636
_super.apply(this, arguments);
3737
}
3838
TasksComplete.prototype.render = function () {
39-
var _a = this.props, page = _a.page, markdownOpen = _a.markdownOpen;
40-
return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}), React.createElement(Card_1.CardText, {expandable: true}, React.createElement("div", {onClick: markdownOpen}, React.createElement(index_1.Markdown, {style: styles.text}, page.onPageComplete || 'add on page complete message')))));
39+
var _a = this.props, page = _a.page, editorMarkdownOpen = _a.editorMarkdownOpen;
40+
return (React.createElement(Card_1.Card, {style: styles.card}, React.createElement(Card_1.CardHeader, {actAsExpander: true, showExpandableButton: true}), React.createElement(Card_1.CardText, {expandable: true}, React.createElement("div", {onClick: editorMarkdownOpen.bind(this, '@onPageComplete', null)}, React.createElement(index_1.Markdown, {style: styles.text}, page.onPageComplete || 'add on page complete message')))));
4141
};
4242
TasksComplete = __decorate([
4343
react_redux_1.connect(function (state) { return ({
4444
page: selectors_1.pageSelector(state),
45-
}); }, function (dispatch) { return ({
46-
markdownOpen: function () {
47-
dispatch(actions_1.editorMarkdownOpen(null, '@onPageComplete'));
48-
},
49-
}); }),
45+
}); }, { editorMarkdownOpen: actions_1.editorMarkdownOpen }),
5046
__metadata('design:paramtypes', [])
5147
], TasksComplete);
5248
return TasksComplete;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ var Tests = (function (_super) {
3333
Tests.prototype.render = function () {
3434
var _this = this;
3535
var _a = this.props, tests = _a.tests, config = _a.config, style = _a.style, open = _a.open;
36-
var suffix = options_1.default[config.language].language.suffix;
37-
return (React.createElement("div", {style: style}, tests.map(function (test, index) { return (React.createElement(FlatButton_1.default, {key: index, style: styles.button, onClick: open.bind(_this, test.concat('.' + suffix)), label: 'Test', secondary: true})); })));
36+
return (React.createElement("div", {style: style}, tests.map(function (file, index) { return (React.createElement(FlatButton_1.default, {key: index, style: styles.button, onClick: open.bind(_this, file), label: 'Test', secondary: true})); })));
3837
};
3938
Tests = __decorate([
4039
react_redux_1.connect(function (state) { return ({
4140
config: selectors_1.configSelector(state),
42-
}); }, function (dispatch) { return ({
41+
}); }, function (dispatch, props) { return ({
4342
open: function (file) {
43+
var suffix = options_1.default[props.config.language].language.suffix;
44+
file = file.concat('.' + suffix);
4445
dispatch(actions_1.editorOpen(path_1.join('tutorial', file)));
4546
},
4647
}); }),

‎lib/components/SidePanel/SidePanelRoot.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
"use strict";
2+
var React = require('react');
3+
var react_redux_1 = require('react-redux');
4+
var index_1 = require('./index');
5+
var theme_1 = require('../styles/theme');
6+
var MuiThemeProvider_1 = require('material-ui/styles/MuiThemeProvider');
7+
var SidePanelRoot = function (store) { return (React.createElement(react_redux_1.Provider, {store: store}, React.createElement(MuiThemeProvider_1.default, {muiTheme: theme_1.default}, React.createElement(index_1.default, null)))); };
8+
Object.defineProperty(exports, "__esModule", { value: true });
9+
exports.default = SidePanelRoot;

0 commit comments

Comments
 (0)