Merge remote-tracking branch 'origin/master'

Author: mts

.eslintignore

@@ -1,7 +1,5 @@
 node_modules/*
 
 packages/client/node_modules/*
-packages/client/src/*
 
 packages/server/node_modules/*
-packages/server/src/*

packages/client/package-lock.json

@@ -1,14 +1,14 @@
 import './Marker.scss'
 import React from 'react'
 import cx from 'classnames'
-import {string, bool} from 'prop-types'
+import { string, bool } from 'prop-types'
 
 const markerPosition = {
   position: 'absolute',
   width: 46,
   height: 59,
   left: -46 / 2,
-  top: -59
+  top: -59,
 }
 
 const Marker = ({ text, active, label }) => (
@@ -29,13 +29,13 @@ const Marker = ({ text, active, label }) => (
 Marker.propTypes = {
   text: string,
   label: bool,
-  active: bool
+  active: bool,
 }
 
 Marker.defaultProps = {
   text: '',
   label: false,
-  active: false
+  active: false,
 }
 
 export default Marker

packages/client/src/patterns/atoms/map/Marker/Marker.js

@@ -1,7 +1,7 @@
 import React from 'react'
-import { string, node } from 'prop-types'
+import { node } from 'prop-types'
 
-const HeroBanner = ({ className, children }) => (
+const HeroBanner = ({ children }) => (
   <div className="md-order-1 d-flex flex-lg-column flex-auto flex-wrap">
      <div className="flex-row width-full bg-blue py-3 py-lg-6">
         <div className="main-content mx-auto py-4 px-3 px-md-6 px-lg-3 text-white">
@@ -10,17 +10,15 @@ const HeroBanner = ({ className, children }) => (
            </div>
         </div>
      </div>
-     <div className="flex-row main-content my-6 mx-auto px-3 px-md-6 px-lg-3"></div>
+     <div className="flex-row main-content my-6 mx-auto px-3 px-md-6 px-lg-3" />
   </div>
 )
 
 HeroBanner.defaultProps = {
-  className: '',
   children: null,
 }
 
 HeroBanner.propTypes = {
-  className: string,
   children: node,
 }
 

packages/client/src/patterns/molecules/banner/HeroBanner.js

@@ -1,9 +1,10 @@
+/* eslint-disable */
 import React from 'react'
 import { arrayOf, shape, number, string } from 'prop-types'
 import GoogleMapReact from 'google-map-react'
-import Marker from '../../atoms/map/Marker'
-import list from '../../../data/stations.js'
 import { fitBounds } from 'google-map-react/utils'
+import Marker from '../../atoms/map/Marker'
+import list from '../../../data/stations'
 
 const K_MARGIN_TOP = 60
 const K_MARGIN_RIGHT = 30
@@ -235,3 +236,4 @@ Map.defaultProps = {
 }
 
 export default Map
+/* eslint-enable */

packages/client/src/patterns/molecules/map/Map.js

@@ -1,16 +1,15 @@
 import React from 'react'
-import { string, node } from 'prop-types'
+import { node } from 'prop-types'
 
 const style = {
-  'position': '-webkit-sticky',
   'position': 'sticky',
   'top': 0,
   'left': 0,
   'right': 0,
-  'zIndex': 101
+  'zIndex': 101,
 }
 
-const Header = ({ className, children }) => (
+const Header = ({ children }) => (
   <div className="bg-gray-dark" style={style}>
     <div className="main-nav d-flex flex-justify-between px-3 pl-md-4 pr-md-4 py-3 box-shadow bg-gray-dark Details js-details-container">
        <div className="d-flex flex-self-center flex-lg-auto mr-lg-2">
@@ -29,12 +28,10 @@ const Header = ({ className, children }) => (
 )
 
 Header.defaultProps = {
-  className: '',
   children: null,
 }
 
 Header.propTypes = {
-  className: string,
   children: node,
 }
 

packages/client/src/patterns/molecules/navigation/Header.js

@@ -1,9 +1,8 @@
 import React from 'react'
-import { string, node } from 'prop-types'
 import { Link } from 'react-router-dom'
 import { demoPageRoute } from '../../../routes'
 
-const SideBar = ({ className, children }) => (
+const SideBar = () => (
   <nav id="navigation" className="sidebar flex-column flex-justify-start overflow-auto border-right bg-gray-light pb-4" data-pjax="">
      <ul className="list-style-none">
         <li className="px-4 my-4">
@@ -16,28 +15,25 @@ const SideBar = ({ className, children }) => (
                   Transport
                   <span className="position-absolute right-0">
                      <span className="text-green  tooltipped tooltipped-nw" aria-label="New release">
-                        <svg height="18" className="octicon octicon-primitive-dot v-align-text-top" viewBox="0 0 8 16" version="1.1" width="9" aria-hidden="true">
-                           <path fillRule="evenodd" d="M0 8c0-2.2 1.8-4 4-4s4 1.8 4 4-1.8 4-4 4-4-1.8-4-4z"></path>
+                        <svg
+                          height="18" className="octicon octicon-primitive-dot v-align-text-top" viewBox="0 0 8 16" version="1.1"
+                          width="9" aria-hidden="true"
+                        >
+                           <path fillRule="evenodd" d="M0 8c0-2.2 1.8-4 4-4s4 1.8 4 4-1.8 4-4 4-4-1.8-4-4z" />
                         </svg>
                      </span>
                   </span>
               </Link>
               </li>
            </ul>
         </li>
-        <li className="mt-4 border-bottom"></li>
+        <li className="mt-4 border-bottom" />
      </ul>
   </nav>
 )
 
-SideBar.defaultProps = {
-  className: '',
-  children: null,
-}
+SideBar.defaultProps = {}
 
-SideBar.propTypes = {
-  className: string,
-  children: node,
-}
+SideBar.propTypes = {}
 
 export default SideBar