Skip to content

Commit 292c286

Browse files
ShMcKShMcK
committed
move route into route module
1 parent e9b224e commit 292c286

File tree

35 files changed

+191
-211
lines changed

35 files changed

+191
-211
lines changed

‎lib/actions/_types.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
66
exports.PAGE_SET = 'PAGE_SET';
77
exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
88
exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
9-
exports.ROUTE_SET = 'ROUTE_SET';
109
exports.TEST_SAVE = 'TEST_SAVE';
1110
exports.SETUP_PACKAGE = 'SETUP_PACKAGE';
1211
exports.SETUP_VERIFY = 'SETUP_VERIFY';

‎lib/actions/alert.js

-16
This file was deleted.

‎lib/actions/index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
"use strict";
2-
var actions_1 = require('../modules/alert/actions');
3-
exports.alertOpen = actions_1.alertOpen;
4-
exports.alertClose = actions_1.alertClose;
5-
exports.alertReplay = actions_1.alertReplay;
62
var progress_1 = require('./progress');
73
exports.progressLoad = progress_1.progressLoad;
84
exports.completePage = progress_1.completePage;
@@ -13,8 +9,6 @@ exports.hintPositionSet = hint_1.hintPositionSet;
139
var page_1 = require('./page');
1410
exports.pageSet = page_1.pageSet;
1511
exports.pageNext = page_1.pageNext;
16-
var route_1 = require('./route');
17-
exports.routeSet = route_1.routeSet;
1812
var setup_1 = require('./setup');
1913
exports.setupVerify = setup_1.setupVerify;
2014
exports.setupPackage = setup_1.setupPackage;
@@ -29,3 +23,9 @@ exports.tutorialSet = tutorial_1.tutorialSet;
2923
exports.tutorialUpdate = tutorial_1.tutorialUpdate;
3024
var toggle_1 = require('./toggle');
3125
exports.devToolsToggle = toggle_1.devToolsToggle;
26+
var actions_1 = require('../modules/alert/actions');
27+
exports.alertOpen = actions_1.alertOpen;
28+
exports.alertClose = actions_1.alertClose;
29+
exports.alertReplay = actions_1.alertReplay;
30+
var actions_2 = require('../modules/route/actions');
31+
exports.routeSet = actions_2.routeSet;

‎lib/actions/page.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
"use strict";
22
var _types_1 = require('./_types');
33
var hint_1 = require('./hint');
4+
var actions_1 = require('../modules/route/actions');
45
function pageNext() {
56
return function (dispatch, getState) {
6-
var _a = getState(), pagePosition = _a.pagePosition, tutorial = _a.tutorial;
7-
var pages = tutorial.pages;
8-
if (pagePosition >= pages.length - 1) {
9-
dispatch({ type: _types_1.ROUTE_SET, payload: { route: 'final' } });
10-
}
11-
else {
12-
pagePosition += 1;
13-
dispatch(pageSet(pagePosition));
14-
}
7+
var pagePosition = getState().pagePosition;
8+
dispatch(pageSet(pagePosition + 1));
159
};
1610
}
1711
exports.pageNext = pageNext;
@@ -20,7 +14,7 @@ function pageSet(pagePosition) {
2014
return function (dispatch, getState) {
2115
var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial, route = _a.route;
2216
if (pagePosition >= progress.pages.length) {
23-
dispatch({ type: _types_1.ROUTE_SET, payload: { route: 'final' } });
17+
return dispatch(actions_1.routeSet('final'));
2418
}
2519
dispatch(hint_1.hintPositionSet(0));
2620
var tasks = tutorial.pages[pagePosition].tasks || [];

‎lib/actions/route.js

-17
This file was deleted.

‎lib/actions/tutorial.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"use strict";
22
var _types_1 = require('./_types');
33
var progress_1 = require('./progress');
4-
var route_1 = require('./route');
5-
var actions_1 = require('../modules/alert/actions');
4+
var actions_1 = require('../modules/route/actions');
5+
var actions_2 = require('../modules/alert/actions');
66
function tutorialSet(name) {
77
return function (dispatch, getState) {
88
var dir = getState().dir;
99
dispatch({ type: _types_1.TUTORIAL_SET, payload: { name: name, dir: dir } });
1010
dispatch(progress_1.progressLoad());
11-
dispatch(route_1.routeSet('progress'));
11+
dispatch(actions_1.routeSet('progress'));
1212
};
1313
}
1414
exports.tutorialSet = tutorialSet;
@@ -20,7 +20,7 @@ function tutorialUpdate(name) {
2020
duration: 3000,
2121
};
2222
dispatch({ type: _types_1.TUTORIAL_UPDATE, payload: { name: name } });
23-
dispatch(actions_1.alertOpen(alert));
23+
dispatch(actions_2.alertOpen(alert));
2424
};
2525
}
2626
exports.tutorialUpdate = tutorialUpdate;

‎lib/components/AppMenu/CloseWindow.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
18-
var actions_1 = require('../../actions');
1918
var IconButton_1 = require('material-ui/IconButton');
2019
var close_1 = require('material-ui/svg-icons/navigation/close');
2120
var CloseWindow = (function (_super) {
@@ -29,7 +28,7 @@ var CloseWindow = (function (_super) {
2928
CloseWindow = __decorate([
3029
react_redux_1.connect(null, function (dispatch) {
3130
return {
32-
windowToggle: function () { return dispatch(actions_1.windowToggle()); }
31+
windowToggle: function () { return dispatch({ type: 'WINDOW_TOGGLE' }); }
3332
};
3433
}),
3534
__metadata('design:paramtypes', [])

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ var SelectTutorial = (function (_super) {
3939
SelectTutorial = __decorate([
4040
react_redux_1.connect(null, function (dispatch) {
4141
return {
42-
selectTutorial: function (name) {
43-
dispatch(actions_1.tutorialSet(name));
44-
},
42+
selectTutorial: function (name) { return dispatch(actions_1.tutorialSet(name)); }
4543
};
4644
}),
4745
__metadata('design:paramtypes', [])

‎lib/components/Tutorials/index.js

+42-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,54 @@
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+
};
7+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
8+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
9+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
10+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
11+
return c > 3 && r && Object.defineProperty(target, key, r), r;
12+
};
13+
var __metadata = (this && this.__metadata) || function (k, v) {
14+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
15+
};
216
var React = require('react');
17+
var react_redux_1 = require('react-redux');
318
var Table_1 = require('material-ui/Table');
419
var LoadTutorials_1 = require('./LoadTutorials');
520
var UpdateTutorial_1 = require('./UpdateTutorial');
621
var SelectTutorial_1 = require('./SelectTutorial');
22+
var actions_1 = require('../../actions');
723
var styles = {
824
padding: '10px',
925
textAlign: 'center',
1026
};
11-
var Tutorials = function (_a) {
12-
var tutorialList = _a.tutorialList;
13-
return (React.createElement("div", {style: styles}, React.createElement(Table_1.Table, null, React.createElement(Table_1.TableHeader, {displaySelectAll: false, adjustForCheckbox: false}, React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableHeaderColumn, null, "Tutorial"), React.createElement(Table_1.TableHeaderColumn, null, "Version"))), React.createElement(Table_1.TableBody, {displayRowCheckbox: false}, tutorialList.map(function tutorialRow(tutorial, index) {
14-
return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(SelectTutorial_1.default, {tutorial: tutorial})), React.createElement(Table_1.TableRowColumn, null, tutorial.version, !!tutorial.latest
15-
? React.createElement(UpdateTutorial_1.default, {tutorial: tutorial})
16-
: null)));
17-
}))), React.createElement("br", null), React.createElement(LoadTutorials_1.default, null)));
18-
};
27+
var Tutorials = (function (_super) {
28+
__extends(Tutorials, _super);
29+
function Tutorials(props) {
30+
_super.call(this, props);
31+
}
32+
Tutorials.prototype.componentDidMount = function () {
33+
this.props.loadTutorials();
34+
};
35+
Tutorials.prototype.render = function () {
36+
var tutorialList = this.props.tutorialList;
37+
return (React.createElement("div", {style: styles}, React.createElement(Table_1.Table, null, React.createElement(Table_1.TableHeader, {displaySelectAll: false, adjustForCheckbox: false}, React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableHeaderColumn, null, "Tutorial"), React.createElement(Table_1.TableHeaderColumn, null, "Version"))), React.createElement(Table_1.TableBody, {displayRowCheckbox: false}, tutorialList.map(function tutorialRow(tutorial, index) {
38+
return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(SelectTutorial_1.default, {tutorial: tutorial})), React.createElement(Table_1.TableRowColumn, null, tutorial.version, !!tutorial.latest
39+
? React.createElement(UpdateTutorial_1.default, {tutorial: tutorial})
40+
: null)));
41+
}))), React.createElement("br", null), React.createElement(LoadTutorials_1.default, null)));
42+
};
43+
Tutorials = __decorate([
44+
react_redux_1.connect(null, function (dispatch) {
45+
return {
46+
loadTutorials: function () { return dispatch(actions_1.tutorialsFind()); }
47+
};
48+
}),
49+
__metadata('design:paramtypes', [Object])
50+
], Tutorials);
51+
return Tutorials;
52+
}(React.Component));
1953
Object.defineProperty(exports, "__esModule", { value: true });
2054
exports.default = Tutorials;

‎lib/components/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
"use strict";
2-
var alert_1 = require('../modules/alert');
3-
exports.Alert = alert_1.Alert;
42
var AppMenu_1 = require('./AppMenu');
53
exports.AppMenu = AppMenu_1.default;
64
var FinalPage_1 = require('./FinalPage');
@@ -17,7 +15,9 @@ var Tutorials_1 = require('./Tutorials');
1715
exports.Tutorials = Tutorials_1.default;
1816
var Markdown_1 = require('./common/Markdown');
1917
exports.Markdown = Markdown_1.default;
20-
var RouteButton_1 = require('./common/RouteButton');
21-
exports.RouteButton = RouteButton_1.default;
2218
var ContentCard_1 = require('./common/ContentCard');
2319
exports.ContentCard = ContentCard_1.default;
20+
var alert_1 = require('../modules/alert');
21+
exports.Alert = alert_1.Alert;
22+
var route_1 = require('../modules/route');
23+
exports.RouteButton = route_1.RouteButton;

‎lib/components/Alert/index.js renamed to ‎lib/modules/route/RouteButton.js

+13-18
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,26 @@ var __metadata = (this && this.__metadata) || function (k, v) {
1515
};
1616
var React = require('react');
1717
var react_redux_1 = require('react-redux');
18-
var Snackbar_1 = require('material-ui/Snackbar');
19-
var actions_1 = require('../../actions');
20-
var defaultAlert = {
21-
message: '',
22-
open: false,
23-
};
24-
var Alert = (function (_super) {
25-
__extends(Alert, _super);
26-
function Alert() {
18+
var RaisedButton_1 = require('material-ui/RaisedButton');
19+
var actions_1 = require('./actions');
20+
var RouteButton = (function (_super) {
21+
__extends(RouteButton, _super);
22+
function RouteButton() {
2723
_super.apply(this, arguments);
2824
}
29-
Alert.prototype.render = function () {
30-
var _a = this.props, alert = _a.alert, close = _a.close;
31-
var action = alert.action, message = alert.message, open = alert.open, duration = alert.duration;
32-
return (React.createElement(Snackbar_1.default, {className: "cr-alert " + action, open: open, message: message || '', action: action || 'NOTE', autoHideDuration: duration || 2000, onRequestClose: close}));
25+
RouteButton.prototype.render = function () {
26+
var _a = this.props, label = _a.label, route = _a.route, style = _a.style, routeTo = _a.routeTo;
27+
return (React.createElement(RaisedButton_1.default, {label: label, style: style || {}, onTouchTap: routeTo.bind(this, route), secondary: true}));
3328
};
34-
Alert = __decorate([
29+
RouteButton = __decorate([
3530
react_redux_1.connect(null, function (dispatch) {
3631
return {
37-
close: function () { return dispatch(actions_1.alertClose()); }
32+
routeTo: function (route) { return dispatch(actions_1.routeSet(route)); }
3833
};
3934
}),
4035
__metadata('design:paramtypes', [])
41-
], Alert);
42-
return Alert;
36+
], RouteButton);
37+
return RouteButton;
4338
}(React.Component));
4439
Object.defineProperty(exports, "__esModule", { value: true });
45-
exports.default = Alert;
40+
exports.default = RouteButton;

‎lib/modules/route/actions.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
"use strict";
2+
var types_1 = require('./types');
3+
var previous = null;
4+
function routeSet(route) {
5+
if (route && route !== previous) {
6+
return function (dispatch) {
7+
previous = route;
8+
dispatch({ type: types_1.ROUTE_SET, payload: { route: route } });
9+
};
10+
}
11+
}
12+
exports.routeSet = routeSet;

‎lib/modules/route/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
"use strict";
2+
var RouteButton_1 = require('./RouteButton');
3+
exports.RouteButton = RouteButton_1.default;
4+
var reducer_1 = require('./reducer');
5+
exports.reducer = reducer_1.default;

‎lib/reducers/route/index.js renamed to ‎lib/modules/route/reducer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use strict";
2-
var _types_1 = require('../../actions/_types');
2+
var types_1 = require('./types');
33
var _route = 'start';
44
function routeReducer(route, action) {
55
if (route === void 0) { route = _route; }
66
switch (action.type) {
7-
case _types_1.ROUTE_SET:
7+
case types_1.ROUTE_SET:
88
return action.payload.route;
99
default:
1010
return route;

‎lib/modules/route/types.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"use strict";
2+
exports.ROUTE_SET = 'ROUTE_SET';

‎lib/reducers/alert/index.js

-41
This file was deleted.

‎lib/reducers/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
"use strict";
22
var redux_1 = require('redux');
3-
var alert_1 = require('../modules/alert');
4-
var window_1 = require('../modules/window');
53
var checks_1 = require('./checks');
64
var devTools_toggle_1 = require('./devTools-toggle');
75
var dir_1 = require('./dir');
@@ -10,18 +8,20 @@ var package_json_1 = require('./package-json');
108
var page_1 = require('./page');
119
var page_position_1 = require('./page-position');
1210
var progress_1 = require('./progress');
13-
var route_1 = require('./route');
1411
var tasks_1 = require('./tasks');
1512
var task_actions_1 = require('./task-actions');
1613
var task_position_1 = require('./task-position');
1714
var task_tests_1 = require('./task-tests');
1815
var test_run_1 = require('./test-run');
1916
var tutorial_1 = require('./tutorial');
2017
var tutorial_list_1 = require('./tutorial-list');
18+
var alert_1 = require('../modules/alert');
19+
var window_1 = require('../modules/window');
20+
var route_1 = require('../modules/route');
2121
Object.defineProperty(exports, "__esModule", { value: true });
2222
exports.default = redux_1.combineReducers({
2323
alert: alert_1.reducer, checks: checks_1.default, devToolsToggle: devTools_toggle_1.default, dir: dir_1.default, hintPosition: hint_position_1.default,
24-
packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.default, tasks: tasks_1.default,
24+
packageJson: package_json_1.default, page: page_1.default, pagePosition: page_position_1.default, progress: progress_1.default, route: route_1.reducer, tasks: tasks_1.default,
2525
tutorial: tutorial_1.default, tutorialList: tutorial_list_1.default,
2626
taskActions: task_actions_1.default, taskPosition: task_position_1.default, taskTests: task_tests_1.default, testRun: test_run_1.default, windowToggle: window_1.reducer
2727
});

0 commit comments

Comments
 (0)