Merge branch 'master' of github.com:StephenGrider/ReduxSimpleStarter

This commit is contained in:
stephen grider 2016-05-25 15:49:00 -07:00
commit a7b92d5c9c
4 changed files with 7 additions and 3 deletions

4
.gitignore vendored
View File

@ -1,3 +1,7 @@
/node_modules
bundle.js
npm-debug.log
# IntelliJ
*.iml
/.idea

View File

@ -7,7 +7,7 @@ Interested in learning [Redux](https://www.udemy.com/react-redux/)?
There are two methods for getting started with this repo.
####Familiar with Git?#####
Checkout this repo, install depdencies, then start the gulp process with the following:
Checkout this repo, install dependencies, then start the gulp process with the following:
```
> git clone git@github.com:StephenGrider/ReduxSimpleStarter.git

View File

@ -1,5 +1,4 @@
import React from 'react';
import { Component } from 'react';
import React, { Component } from 'react';
export default class App extends Component {
render() {

View File

@ -11,6 +11,7 @@ import reducers from '../src/reducers';
global.document = jsdom.jsdom('<!doctype html><html><body></body></html>');
global.window = global.document.defaultView;
global.navigator = global.window.navigator;
const $ = _$(window);
chaiJquery(chai, chai.util, $);