Merge pull request #473 from gaearon/tweak-example-conventions

Tweak example conventions

Author: gaearon

examples/counter/actions/CounterActions.js renamed to examples/counter/actions/counter.js

@@ -1,4 +1,5 @@
-import { INCREMENT_COUNTER, DECREMENT_COUNTER } from '../constants/ActionTypes';
+export const INCREMENT_COUNTER = 'INCREMENT_COUNTER';
+export const DECREMENT_COUNTER = 'DECREMENT_COUNTER';
 
 export function increment() {
   return {
@@ -24,7 +25,7 @@ export function incrementIfOdd() {
   };
 }
 
-export function incrementAsync(delay=1000) {
+export function incrementAsync(delay = 1000) {
   return dispatch => {
     setTimeout(() => {
       dispatch(increment());

examples/counter/components/Counter.js

@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 
 class Counter extends Component {
-
   render() {
     const { increment, incrementIfOdd, incrementAsync, decrement, counter } = this.props;
     return (

examples/counter/constants/ActionTypes.js

@@ -1,7 +1,7 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import Counter from '../components/Counter';
-import * as CounterActions from '../actions/CounterActions';
+import * as CounterActions from '../actions/counter';
 
 function mapStateToProps(state) {
   return {

examples/counter/containers/CounterApp.js

@@ -1,11 +1,11 @@
 import React, { Component } from 'react';
 import { Provider } from 'react-redux';
 import CounterApp from './CounterApp';
-import createCounterStore from '../store/createCounterStore';
+import configureStore from '../store/configureStore';
 
-const store = createCounterStore();
+const store = configureStore();
 
-export default class App extends Component {
+export default class Root extends Component {
   render() {
     return (
       <Provider store={store}>

examples/counter/containers/App.js renamed to examples/counter/containers/Root.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import App from './containers/App';
+import Root from './containers/Root';
 
 React.render(
-  <App />,
+  <Root />,
   document.getElementById('root')
 );

examples/counter/index.js

@@ -1,4 +1,4 @@
-import { INCREMENT_COUNTER, DECREMENT_COUNTER } from '../constants/ActionTypes';
+import { INCREMENT_COUNTER, DECREMENT_COUNTER } from '../actions/counter';
 
 export default function counter(state = 0, action) {
   switch (action.type) {

examples/counter/reducers/counter.js

@@ -1 +1,8 @@
-export { default as counter } from './counter';
+import { combineReducers } from 'redux';
+import counter from './counter';
+
+const rootReducer = combineReducers({
+  counter
+});
+
+export default rootReducer;

examples/counter/reducers/index.js

@@ -0,0 +1,11 @@
+import { createStore, applyMiddleware, combineReducers } from 'redux';
+import thunk from 'redux-thunk';
+import rootReducer from '../reducers';
+
+const createStoreWithMiddleware = applyMiddleware(
+  thunk
+)(createStore);
+
+export default function configureStore(initialState) {
+  return createStoreWithMiddleware(rootReducer, initialState);
+}

examples/counter/store/configureStore.js

@@ -1,15 +1,14 @@
 import expect from 'expect';
-import * as actions from '../../actions/CounterActions';
-import * as types from '../../constants/ActionTypes';
+import * as actions from '../../actions/counter';
 
 describe('actions', () => {
 
   it('increment should create increment action', () => {
-    expect(actions.increment()).toEqual({ type: types.INCREMENT_COUNTER });
+    expect(actions.increment()).toEqual({ type: actions.INCREMENT_COUNTER });
   });
 
   it('decrement should create decrement action', () => {
-    expect(actions.decrement()).toEqual({ type: types.DECREMENT_COUNTER });
+    expect(actions.decrement()).toEqual({ type: actions.DECREMENT_COUNTER });
   });
 
   it('incrementIfOdd should create increment action', () => {
@@ -18,7 +17,7 @@ describe('actions', () => {
     let dispatch = expect.createSpy();
     let getState = () => ({ counter: 1 });
     fn(dispatch, getState);
-    expect(dispatch).toHaveBeenCalledWith({ type: types.INCREMENT_COUNTER });
+    expect(dispatch).toHaveBeenCalledWith({ type: actions.INCREMENT_COUNTER });
   });
 
   it('incrementIfOdd shouldnt create increment action if counter is even', () => {
@@ -36,7 +35,7 @@ describe('actions', () => {
     let dispatch = expect.createSpy();
     fn(dispatch);
     setTimeout(() => {
-      expect(dispatch).toHaveBeenCalledWith({ type: types.INCREMENT_COUNTER });
+      expect(dispatch).toHaveBeenCalledWith({ type: actions.INCREMENT_COUNTER });
       done();
     }, 5);
   });

examples/counter/store/createCounterStore.js

@@ -3,12 +3,12 @@ import jsdomReact from '../jsdomReact';
 import React from 'react/addons';
 import { Provider } from 'react-redux';
 import CounterApp from '../../containers/CounterApp';
-import createCounterStore from '../../store/createCounterStore';
+import configureStore from '../../store/configureStore';
 
 const { TestUtils } = React.addons;
 
 function setup(initialState) {
-  const store = createCounterStore(initialState);
+  const store = configureStore(initialState);
   const app = TestUtils.renderIntoDocument(
     <Provider store={store}>
       {() => <CounterApp />}

examples/counter/test/actions/CounterActions.spec.js renamed to examples/counter/test/actions/counter.spec.js

@@ -1,6 +1,6 @@
 import expect from 'expect';
 import counter from '../../reducers/counter';
-import { INCREMENT_COUNTER, DECREMENT_COUNTER } from '../../constants/ActionTypes';
+import { INCREMENT_COUNTER, DECREMENT_COUNTER } from '../../actions/counter';
 
 describe('reducers', () => {
   describe('counter', () => {

examples/counter/test/containers/CounterApp.spec.js

@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 import { Provider } from 'react-redux';
 import { Router, Route } from 'react-router';
-import createAsyncExampleStore from '../store/createAsyncExampleStore';
+import configureStore from '../store/configureStore';
 import App from './App';
 import UserPage from './UserPage';
 import RepoPage from './RepoPage';
 
-const store = createAsyncExampleStore();
+const store = configureStore();
 
 export default class Root extends Component {
   render() {

examples/counter/test/reducers/counter.spec.js

@@ -14,6 +14,6 @@ const createStoreWithMiddleware = applyMiddleware(
 /**
  * Creates a preconfigured store for this example.
  */
-export default function createAsyncExampleStore(initialState) {
+export default function configureStore(initialState) {
   return createStoreWithMiddleware(reducer, initialState);
 }

examples/real-world/containers/Root.js

@@ -2,12 +2,11 @@ import React, { Component } from 'react';
 import TodoApp from './TodoApp';
 import { createStore, combineReducers } from 'redux';
 import { Provider } from 'react-redux';
-import * as reducers from '../reducers';
+import rootReducer from '../reducers';
 
-const reducer = combineReducers(reducers);
-const store = createStore(reducer);
+const store = createStore(rootReducer);
 
-export default class App extends Component {
+export default class Root extends Component {
   render() {
     return (
       <Provider store={store}>

examples/real-world/store/createAsyncExampleStore.js renamed to examples/real-world/store/configureStore.js

@@ -3,7 +3,7 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import Header from '../components/Header';
 import MainSection from '../components/MainSection';
-import * as TodoActions from '../actions/TodoActions';
+import * as TodoActions from '../actions/todos';
 
 class TodoApp extends Component {
   render() {

examples/todomvc/actions/TodoActions.js renamed to examples/todomvc/actions/todos.js

@@ -1,10 +1,10 @@
 import 'babel/polyfill';
 
 import React from 'react';
-import App from './containers/App';
+import Root from './containers/Root';
 import 'todomvc-app-css/index.css';
 
 React.render(
-  <App />,
+  <Root />,
   document.getElementById('root')
 );

examples/todomvc/containers/App.js renamed to examples/todomvc/containers/Root.js

@@ -1 +1,8 @@
-export { default as todos } from './todos';
+import { combineReducers } from 'redux';
+import todos from './todos';
+
+const rootReducer = combineReducers({
+  todos
+});
+
+export default rootReducer;

examples/todomvc/containers/TodoApp.js

@@ -1,4 +1,5 @@
 import { ADD_TODO, DELETE_TODO, EDIT_TODO, COMPLETE_TODO, COMPLETE_ALL, CLEAR_COMPLETED } from '../constants/ActionTypes';
+import { combineReducers } from 'redux';
 
 const initialState = [{
   text: 'Use Redux',

examples/todomvc/index.js

@@ -1,6 +1,6 @@
 import expect from 'expect';
 import * as types from '../../constants/ActionTypes';
-import * as actions from '../../actions/TodoActions';
+import * as actions from '../../actions/todos';
 
 describe('todo actions', () => {
 

examples/todomvc/reducers/index.js

@@ -1,12 +1,12 @@
 import expect from 'expect';
-import reducer from '../../reducers/todos';
+import todos from '../../reducers/todos';
 import * as types from '../../constants/ActionTypes';
 
 describe('todos reducer', () => {
 
   it('should handle initial state', () => {
     expect(
-      reducer(undefined, {})
+      todos(undefined, {})
     ).toEqual([{
       text: 'Use Redux',
       completed: false,
@@ -16,7 +16,7 @@ describe('todos reducer', () => {
 
   it('should handle ADD_TODO', () => {
     expect(
-      reducer([], {
+      todos([], {
         type: types.ADD_TODO,
         text: 'Run the tests'
       })
@@ -28,7 +28,7 @@ describe('todos reducer', () => {
     }]);
 
     expect(
-      reducer([{
+      todos([{
         text: 'Use Redux',
         completed: false,
         id: 0
@@ -49,7 +49,7 @@ describe('todos reducer', () => {
 
   it('should handle DELETE_TODO', () => {
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: false,
         id: 1
@@ -70,7 +70,7 @@ describe('todos reducer', () => {
 
   it('should handle EDIT_TODO', () => {
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: false,
         id: 1
@@ -96,7 +96,7 @@ describe('todos reducer', () => {
 
   it('should handle COMPLETE_TODO', () => {
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: false,
         id: 1
@@ -121,7 +121,7 @@ describe('todos reducer', () => {
 
   it('should handle COMPLETE_ALL', () => {
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: true,
         id: 1
@@ -144,7 +144,7 @@ describe('todos reducer', () => {
 
     // Unmark if all todos are currently completed
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: true,
         id: 1
@@ -168,7 +168,7 @@ describe('todos reducer', () => {
 
   it('should handle CLEAR_COMPLETED', () => {
     expect(
-      reducer([{
+      todos([{
         text: 'Run the tests',
         completed: true,
         id: 1