restructure with connected components

Author: ShMcK

lib/components/common/Alert.js renamed to lib/components/Alert/index.js

@@ -36,11 +36,11 @@ var Alert = (function (_super) {
         return (React.createElement(Snackbar_1.default, {style: styles, bodyStyle: { color: color }, open: open, message: message || '', action: action || '', autoHideDuration: duration || 2000, onActionTouchTap: close, onRequestClose: close}));
     };
     Alert = __decorate([
-        react_redux_1.connect(null, function (dispatch) {
-            return {
-                close: function () { return dispatch(actions_1.alertClose()); }
-            };
-        }), 
+        react_redux_1.connect(function (state) { return ({
+            alert: state.alert,
+        }); }, function (dispatch) { return ({
+            close: function () { return dispatch(actions_1.alertClose()); },
+        }); }), 
         __metadata('design:paramtypes', [])
     ], Alert);
     return Alert;

lib/components/App.js

@@ -4,14 +4,6 @@ var __extends = (this && this.__extends) || function (d, b) {
     function __() { this.constructor = d; }
     d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 };
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -32,13 +24,13 @@ var App = (function (_super) {
         _super.apply(this, arguments);
     }
     App.prototype.render = function () {
-        var store = this.props.store;
-        return (React.createElement("section", null, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: store.windowToggle}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, __assign({}, store)), React.createElement(Routes_1.default, __assign({}, store)))), React.createElement(index_1.Alert, __assign({}, store))));
+        var windowToggle = this.props.windowToggle;
+        return (React.createElement("section", null, React.createElement(Drawer_1.default, {width: 400, openSecondary: true, open: windowToggle}, React.createElement("div", {className: 'cr-bg'}, React.createElement(index_1.AppMenu, null), React.createElement(Routes_1.default, null))), React.createElement(index_1.Alert, null)));
     };
     App = __decorate([
-        react_redux_1.connect(function (store) {
-            return { store: store };
-        }), 
+        react_redux_1.connect(function (state) { return ({
+            windowToggle: state.windowToggle,
+        }); }), 
         __metadata('design:paramtypes', [])
     ], App);
     return App;

lib/components/AppMenu/CloseWindow.js

@@ -17,6 +17,7 @@ var React = require('react');
 var react_redux_1 = require('react-redux');
 var IconButton_1 = require('material-ui/IconButton');
 var close_1 = require('material-ui/svg-icons/navigation/close');
+var actions_1 = require('../../actions');
 var CloseWindow = (function (_super) {
     __extends(CloseWindow, _super);
     function CloseWindow() {
@@ -26,11 +27,9 @@ var CloseWindow = (function (_super) {
         return (React.createElement(IconButton_1.default, {onClick: this.props.windowToggle}, React.createElement(close_1.default, {color: 'white'})));
     };
     CloseWindow = __decorate([
-        react_redux_1.connect(null, function (dispatch) {
-            return {
-                windowToggle: function () { return dispatch({ type: 'WINDOW_TOGGLE' }); }
-            };
-        }), 
+        react_redux_1.connect(null, function (dispatch) { return ({
+            windowToggle: function () { return dispatch(actions_1.windowToggle()); },
+        }); }), 
         __metadata('design:paramtypes', [])
     ], CloseWindow);
     return CloseWindow;

lib/components/AppMenu/MenuLink/index.js

@@ -31,11 +31,9 @@ var MenuLink = (function (_super) {
         return (React.createElement(MenuItem_1.default, {style: styles, primaryText: title ? title : route, onTouchTap: routeTo.bind(this, route), key: route}));
     };
     MenuLink = __decorate([
-        react_redux_1.connect(null, function (dispatch) {
-            return {
-                routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
-            };
-        }), 
+        react_redux_1.connect(null, function (dispatch) { return ({
+            routeTo: function (route) { return dispatch(actions_1.routeSet(route)); },
+        }); }), 
         __metadata('design:paramtypes', [])
     ], MenuLink);
     return MenuLink;