update example

.eslintrc

@@ -13,7 +13,7 @@
     "import/no-duplicates": 0,
     "import/no-unresolved": 0,
     "import/no-named-as-default": 2,
-    "comma-dangle": 0,  // not sure why airbnb turned this on. gross!
+    "comma-dangle": 0,
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": 0,
     "no-alert": 0,

examples/jwt/.eslintrc

@@ -6,37 +6,38 @@
     "mocha": true
   },
   "rules": {
-    "react/no-multi-comp": 0,
+    "react/no-multi-comp": 2,
     "import/default": 0,
+    "import/named": 2,
+    "import/namespace": 2,
     "import/no-duplicates": 0,
-    "import/named": 0,
-    "import/namespace": 0,
     "import/no-unresolved": 0,
     "import/no-named-as-default": 2,
-    // Temporarirly disabled due to a possible bug in babel-eslint (todomvc example)
-    "block-scoped-var": 0,
-    // Temporarily disabled for test/* until babel/babel-eslint#33 is resolved
-    "padded-blocks": 0,
-    "comma-dangle": 0,  // not sure why airbnb turned this on. gross!
+    "comma-dangle": 0,
     "indent": [2, 2, {"SwitchCase": 1}],
     "no-console": 0,
-    "no-alert": 0
+    "no-alert": 0,
+    "no-nested-ternary": 0,
+    "max-len": 0
   },
   "plugins": [
-    "react", "import"
+    "react",
+    "import"
   ],
   "settings": {
     "import/parser": "babel-eslint",
     "import/resolve": {
-      moduleDirectory: ["node_modules", "node_modules/universal-redux/node_modules", "src"]
+      moduleDirectory: ["node_modules", "src"]
     }
   },
   "globals": {
     "__DEVELOPMENT__": true,
     "__CLIENT__": true,
     "__SERVER__": true,
+    "__LOGGER__": false,
     "__DISABLE_SSR__": true,
     "__DEVTOOLS__": true,
+    "__DEVTOOLS_IS_VISIBLE__": true,
     "__API_ENDPOINT__": '',
     "__API_HOST__": '',
     "__API_PORT__": '',

examples/jwt/package.json

@@ -4,13 +4,14 @@
   "description": "JWT example with Universal Redux",
   "main": "index.js",
   "scripts": {
-    "start": "concurrent --kill-others \"better-npm-run api\" \"better-npm-run auth\" \"better-npm-run server\"",
-    "build": "better-npm-run build",
-    "postinstall": "./bin/build_for_heroku.sh",
-    "dev-server": "better-npm-run dev-server",
     "api-server": "better-npm-run api-server",
     "auth-server": "better-npm-run auth-server",
+    "build": "better-npm-run build",
     "dev": "concurrent --kill-others \"npm run watch-client\" \"npm run api-server\" \"npm run auth-server\" \"npm run dev-server\"",
+    "dev-server": "better-npm-run dev-server",
+    "lint": "eslint -c .eslintrc src",
+    "postinstall": "./bin/build_for_heroku.sh",
+    "start": "concurrent --kill-others \"better-npm-run api\" \"better-npm-run auth\" \"better-npm-run server\"",
     "test": "echo \"Error: no test specified\" && exit 1",
     "watch-client": "better-npm-run watch-client"
   },

examples/jwt/src/containers/App/App.js

@@ -18,7 +18,8 @@ require('flexboxgrid/dist/flexboxgrid.css');
     authMessage: state.auth.message,
     loggedIn: state.auth.loggedIn,
     loggingIn: state.auth.loggingIn,
-    loginFailed: state.auth.loginFailed
+    loginFailed: state.auth.loginFailed,
+    path: state.routing.path
   }),
   dispatch => bindActionCreators({login, logout, makeAuthenticatedRequest}, dispatch)
 )
@@ -32,7 +33,8 @@ export default class App extends Component {
     loggedIn: PropTypes.bool,
     loggingIn: PropTypes.bool.isRequired,
     loginFailed: PropTypes.bool.isRequired,
-    makeAuthenticatedRequest: PropTypes.func.isRequired
+    makeAuthenticatedRequest: PropTypes.func.isRequired,
+    path: PropTypes.object.isRequired
   };
 
   state = {

examples/jwt/src/redux/middleware/fetcher.js

@@ -34,7 +34,6 @@ class ApiFetcher {
             resolve(res);
           }
         });
-
       }));
   }
 }