Fix esling config (#113)

* Fix eslint config

* Update eslintrc

* Remove package-lock.json

* Change from js to jsx

* Remove package-lock.json

* CR comments

* fix linting errors and add js tests to the build

.eslintignore

@@ -1,3 +1,4 @@
 dist/
 coverage-html/
 venv/
+google_appengine

.eslintrc.js

@@ -1,6 +1,9 @@
 module.exports = {
-    'extends': 'airbnb',
-    'env': {
-        'browser': true
-    }
+    "extends": "airbnb",
+    "rules": {
+      "react/jsx-filename-extension": ["warn", { "extensions": [".js"] } ]
+    },
+    "env": {
+        "browser": true
+    },
 };

.travis.yml

@@ -8,7 +8,7 @@ before_script:
     - unzip google_appengine.zip >/dev/null
     - export APPENGINE_PATH=./google_appengine
     - export PATH=$PATH:$APPENGINE_PATH
-script: tox
+script: make test
 cache:
     directories:
         - $HOME/.cache/pip

Makefile

@@ -1,5 +1,5 @@
 VIRTUALENV_REQUIREMENTS = requirements.txt requirements-dev.txt
-SOURCES := $(shell find js -name '*.jsx' -o -name '*.js')
+SOURCES := $(shell find js -name '*.js')
 
 .PHONY: all
 all: development

js/App.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Header from './components/Header';
+import Footer from './components/Footer';
+
+function App(props) {
+  return (
+    <div>
+      <Header />
+      {props.children}
+      <Footer />
+    </div>
+  );
+}
+
+App.propTypes = {
+  children: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
+};
+
+export default App;

js/index.jsx → js/index.js

@@ -33,4 +33,3 @@ ReactDOM.render(
   </Provider>,
   document.querySelector('#container'),
 );
-

js/routes.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Route, IndexRoute } from 'react-router';
+
+import MetricsList from './containers/MetricsList';
+import MeetingRequest from './containers/MeetingRequest';
+import User from './containers/User';
+import App from './App';
+
+
+export default (
+  <Route path="/" component={App}>
+    <IndexRoute component={User} />
+    <Route path="/dashboard" component={MetricsList} />
+    <Route path="/user/:email" component={User} />
+    <Route path="/meeting_request/:id" component={MeetingRequest} />
+  </Route>
+);

package.json

@@ -9,6 +9,7 @@
     "react": "^16.1.1",
     "react-dom": "^16.1.1",
     "react-redux": "^5.0.6",
+    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "redux": "^3.7.2",
     "redux-promise": "^0.5.3"
@@ -37,7 +38,7 @@
   "scripts": {
     "webpack-dev-server": "webpack-dev-server --port 8001",
     "webpack": "webpack --progress --color",
-    "eslint": "eslint --ext .jsx --ext .js .",
+    "eslint": "eslint --ext .js .",
     "test": "jest --config .jestrc.json",
     "test:watch": "npm test -- --watch"
   },

webpack.config.js

@@ -14,7 +14,7 @@ const VENDOR = [
 
 module.exports = {
   entry: {
-    app: './js/index.jsx',
+    app: './js/index.js',
     vendor: VENDOR,
   },
   output: {
@@ -26,23 +26,20 @@ module.exports = {
     rules: [
       {
         use: 'eslint-loader?{fix: true}',
-        test: /\.jsx?$/,
+        test: /\.js$/,
         exclude: /node_modules/,
         enforce: 'pre',
       },
       {
         use: 'babel-loader',
-        test: /\.jsx?$/,
+        test: /\.js$/,
         exclude: /node_modules/,
       },
     ],
   },
   devtool: 'source-map',
-  devServer: {
-    contentBase: './',
-  },
   resolve: {
-    extensions: ['.js', '.jsx'],
+    extensions: ['.js'],
   },
   plugins: [
     new webpack.optimize.CommonsChunkPlugin({