Skip to content
Permalink
Browse files

starting redux

  • Loading branch information
mjlaufer committed May 16, 2017
1 parent de3bc34 commit e5ce21fa37f01d6b7fa5e6b2302d051c3f017bac
Showing with 5 additions and 37 deletions.
  1. +0 −36 .eslintrc
  2. 0 app/actions/index.js
  3. +5 −1 chrome/extension/devpanel/index.js
@@ -1,4 +1,3 @@
<<<<<<< HEAD
{
"extends": "airbnb",
"env": {
@@ -16,10 +15,6 @@
"react/no-multi-comp": 0,
"react/prefer-stateless-function": 0,
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"react/jsx-no-bind": [2, {
'ignoreRefs': true,
'allowArrowFunctions': true,
}],
"id-length": 0,
"new-cap": 0,
"eol-last": 0,
@@ -30,34 +25,3 @@
"react"
]
}
=======
// {
// "extends": "airbnb",
// "env": {
// "browser": true,
// "mocha": true,
// "node": true
// },
// "parser": "babel-eslint",
// "rules": {
// "react/jsx-uses-react": 2,
// "react/jsx-uses-vars": 2,
// "react/react-in-jsx-scope": 2,
// "react/sort-comp": 0,
// "react/no-multi-comp": 0,
// "react/prefer-stateless-function": 0,
// "react/jsx-no-bind": [2, {
// "ignoreRefs": true,
// "allowArrowFunctions": true,
// }],
// "id-length": 0,
// "new-cap": 0,
// "eol-last": 0,
// "jsx-quotes": 0,
// "consistent-return": 0
// },
// "plugins": [
// "react"
// ]
// }
>>>>>>> chrome
No changes.
@@ -1,9 +1,13 @@
import 'babel-polyfill';
import React from 'react';
import { render } from 'react-dom';
import { Provider } from 'react-redux';
import { createStore } from 'redux';
import App from '../../../app/containers/App';

render(
<App/>,
<Provider store={store}>
<App/>,
</Provider>,
document.getElementById('root')
);

0 comments on commit e5ce21f

Please sign in to comment.
You can’t perform that action at this time.