-
-
-
-
-
-
-
-
-
-
-
+const DemoReactPage = () => (
+
+
+
+
+
+
+
+
-
-
- )
-}
+
+
+ {({ data }) => data.stations && data.stations.stations ?
+
+
+
+
+)
export default DemoReactPage
diff --git a/packages/client/src/pages/StartPage/index.js b/packages/client/src/pages/StartPage/index.js
index 83eba4c..1738061 100644
--- a/packages/client/src/pages/StartPage/index.js
+++ b/packages/client/src/pages/StartPage/index.js
@@ -7,7 +7,7 @@ const StartPage = () => {
window.scrollTo({
top: 0,
left: 0,
- behavior: 'smooth'
+ behavior: 'smooth',
})
return (
diff --git a/packages/client/src/patterns/molecules/map/Map.js b/packages/client/src/patterns/molecules/map/Map.js
index 4a7c71d..99634c7 100644
--- a/packages/client/src/patterns/molecules/map/Map.js
+++ b/packages/client/src/patterns/molecules/map/Map.js
@@ -1,10 +1,10 @@
/* eslint-disable */
import React from 'react'
-import { arrayOf, shape, number, string } from 'prop-types'
+import { arrayOf, shape, number, string, bool } from 'prop-types'
import GoogleMapReact from 'google-map-react'
import { fitBounds } from 'google-map-react/utils'
import Marker from '../../atoms/map/Marker'
-import list from '../../../data/stations'
+import client from '../../../graphql/client'
const K_MARGIN_TOP = 60
const K_MARGIN_RIGHT = 30
@@ -18,8 +18,6 @@ class Map extends React.Component {
constructor(props) {
super(props)
- const {lat, lng} = list[0]
-
this.state = {
center: undefined,
zoom: undefined,
@@ -168,8 +166,9 @@ class Map extends React.Component {
}
render() {
- const { initialCenter, initialZoom, apiKey, showLimit, items } = this.props;
+ const { initialZoom, apiKey, showLimit, items } = this.props;
const { center, zoom } = this.state;
+ const initialCenter = {lat: items[0].lat, lng: items[0].lng}
const markers = items.slice(0, showLimit).map((item, index) => {
return (
@@ -208,10 +207,6 @@ class Map extends React.Component {
}
Map.propTypes = {
- initialCenter: shape({
- lat: number,
- lng: number
- }),
initialZoom: number,
apiKey: string,
showLimit: number,
@@ -220,19 +215,17 @@ Map.propTypes = {
id: string,
lat: number,
lng: number,
+ text: string,
+ isFocussed: bool,
+ isSelected: bool,
})
),
}
Map.defaultProps = {
- initialCenter: {
- lat: list[0].lat,
- lng: list[0].lng
- },
initialZoom: 11,
apiKey: process.env.API_KEY,
showLimit: 10,
- items: list,
}
export default Map
diff --git a/packages/client/src/patterns/molecules/navigation/SideBar.js b/packages/client/src/patterns/molecules/navigation/SideBar.js
index 9f31abb..e292bb3 100644
--- a/packages/client/src/patterns/molecules/navigation/SideBar.js
+++ b/packages/client/src/patterns/molecules/navigation/SideBar.js
@@ -32,8 +32,4 @@ const SideBar = () => (
)
-SideBar.defaultProps = {}
-
-SideBar.propTypes = {}
-
export default SideBar
diff --git a/packages/server/README.md b/packages/server/README.md
index 08b27af..cb88d9c 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -4,7 +4,7 @@
[](http://npm-stat.com/charts.html?package=streams-server&from=2018-10-13)
[](http://opensource.org/licenses/MIT)
-> Streams Server implements an Express Server
+> Streams Server implements an Apollo GraphQL Server
## Scripts
diff --git a/packages/server/src/datasources/stations.json b/packages/server/src/datasources/data.json
similarity index 100%
rename from packages/server/src/datasources/stations.json
rename to packages/server/src/datasources/data.json
diff --git a/packages/server/src/datasources/station.js b/packages/server/src/datasources/station.js
index 9e93f2b..dee177d 100644
--- a/packages/server/src/datasources/station.js
+++ b/packages/server/src/datasources/station.js
@@ -1,6 +1,6 @@
/* eslint class-methods-use-this: 0 */
const { RESTDataSource } = require('apollo-datasource-rest')
-const { stations } = require('./stations.json')
+const { stations } = require('./data.json')
class StationAPI extends RESTDataSource {
async getAllStations() {
diff --git a/packages/server/src/resolvers.js b/packages/server/src/resolvers.js
index 29fa78c..415996b 100644
--- a/packages/server/src/resolvers.js
+++ b/packages/server/src/resolvers.js
@@ -1,4 +1,4 @@
-const { paginateResults } = require('./utils');
+const { paginateResults } = require('./utils')
module.exports = {
Query: {
@@ -20,6 +20,6 @@ module.exports = {
allStations[allStations.length - 1].cursor
: false,
}
- }
- }
+ },
+ },
}
diff --git a/packages/server/src/schema.js b/packages/server/src/schema.js
index 6bc74a4..d8f17a3 100644
--- a/packages/server/src/schema.js
+++ b/packages/server/src/schema.js
@@ -1,4 +1,4 @@
-const { gql } = require('apollo-server');
+const { gql } = require('apollo-server')
const typeDefs = gql`
type Query {
diff --git a/packages/server/src/utils.js b/packages/server/src/utils.js
index a2832d8..67c088f 100644
--- a/packages/server/src/utils.js
+++ b/packages/server/src/utils.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
module.exports.paginateResults = ({
after: cursor,
pageSize = 20,
@@ -8,7 +9,7 @@ module.exports.paginateResults = ({
if (!cursor) return results.slice(0, pageSize)
const cursorIndex = results.findIndex(item => {
- let itemCursor = item.cursor ? item.cursor : getCursor(item)
+ const itemCursor = item.cursor ? item.cursor : getCursor(item)
return itemCursor ? cursor === itemCursor : false
})
@@ -24,3 +25,4 @@ module.exports.paginateResults = ({
results.slice(cursorIndex >= 0 ? cursorIndex + 1 : 0, cursorIndex >= 0)
}
+/* eslint-enable */