move apollo to _app

17 files changed, 222 insertions, 244 deletions

diff --git a/frontend/components/Page.js b/frontend/components/Page.js
index c6601f6..179c0ab 100644
--- a/frontend/components/Page.js
+++ b/frontend/components/Page.js
@@ -55,6 +55,8 @@ class Page extends React.Component {
   };
   componentDidMount() {
     // The first time we load in the client, we need to refetch the current user data
+    // TODO use ApolloContext API here instead
+    // TODO can we just use _app for this?
     if (typeof window !== 'undefined' && !window.__CLIENTLOADED__) {
       client.query({ query: CURRENT_USER_QUERY, fetchPolicy: 'network-only' });
       window.__CLIENTLOADED__ = true;
diff --git a/frontend/components/Signin.js b/frontend/components/Signin.js
index 77acc47..868b819 100644
--- a/frontend/components/Signin.js
+++ b/frontend/components/Signin.js
@@ -23,7 +23,6 @@ class Signin extends Component {
   };
 
   render() {
-    // TODO / ASK - do I really have to wrap this in a query just to access the refetch function
     return (
       <ApolloConsumer>
         {client => (
diff --git a/frontend/lib/withData.js b/frontend/lib/withData.js
index e419078..3210cf6 100644
--- a/frontend/lib/withData.js
+++ b/frontend/lib/withData.js
@@ -4,7 +4,7 @@ import { LOCAL_STATE_QUERY } from '../queries/queries';
 // can also be a function that accepts a `headers` object (SSR only) and returns a config
 
 const client = new ApolloClient({
-  uri: 'http://localhost:4444',
+  uri: process.env.NODE_ENV === 'development' ? 'http://localhost:4444' : 'http://localhost:4444',
   ssrMode: !process.browser, // Disables forceFetch on the server (so queries are only run once)
   request: operation => {
     // if we're in the client and the user has a token, send it along with the request
@@ -33,6 +33,7 @@ const client = new ApolloClient({
   },
 });
 
+// TODO don't export client for page.js
 export { client };
 
 export default withApollo({ client });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 292592d..429b049 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -942,7 +942,7 @@
         "@babel/plugin-transform-template-literals": "7.0.0-beta.42",
         "@babel/plugin-transform-typeof-symbol": "7.0.0-beta.42",
         "@babel/plugin-transform-unicode-regex": "7.0.0-beta.42",
-        "browserslist": "3.2.6",
+        "browserslist": "3.2.7",
         "invariant": "2.2.4",
         "semver": "5.5.0"
       }
@@ -965,7 +965,7 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz",
       "integrity": "sha512-iOGRzUoONLOtmCvjUsZv3mZzgCT6ljHQY5fr1qG1QIiJQwtM7zbPWGGpa3QWETq+UqwWyJnoi5XZDZRwZDFciQ==",
       "requires": {
-        "core-js": "2.5.5",
+        "core-js": "2.5.6",
         "regenerator-runtime": "0.11.1"
       }
     },
@@ -1098,22 +1098,22 @@
     },
     "@types/graphql": {
       "version": "0.12.6",
-      "resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz",
+      "resolved": "http://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz",
       "integrity": "sha512-wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ=="
     },
     "@types/next": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/@types/next/-/next-2.4.9.tgz",
-      "integrity": "sha512-Fqvsrs5N4bKCbhO3ykPI7MwQ6xDwa0UU0r7OgaLTc1lNvpyav0SoDo3DWMy3GKwWhtKl07YfYieUQ+1jlVRQoA==",
+      "version": "2.4.10",
+      "resolved": "https://registry.npmjs.org/@types/next/-/next-2.4.10.tgz",
+      "integrity": "sha512-inIs4SZ8H9PScj84UwOO1EHM/5tnuDyzCYzYucItW91px9Q1aSxuWWGG6Rpm0EhPTHxPIF4kCiZ2x7QgEHoY1A==",
       "requires": {
-        "@types/node": "10.0.3",
-        "@types/react": "16.3.13"
+        "@types/node": "9.6.15",
+        "@types/react": "16.3.14"
       }
     },
     "@types/node": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.0.3.tgz",
-      "integrity": "sha512-J7nx6JzxmtT4zyvfLipYL7jNaxvlCWpyG7JhhCQ4fQyG+AGfovAHoYR55TFx+X8akfkUJYpt5JG6GPeFMjZaCQ=="
+      "version": "9.6.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.15.tgz",
+      "integrity": "sha512-16zIiQkIZBc1ZpfrOZZZ/6LKDixPiAIZq5q1YE1stxG4Ic1VmQlkNNWGBydqBFcX8eS+m/Dd4z5HzDa+q0b2Xg=="
     },
     "@types/prop-types": {
       "version": "15.5.2",
@@ -1121,11 +1121,11 @@
       "integrity": "sha512-pQRkAVoxiuUrLq8+CDwiQX4pTCep/PmmNgBbjIwnnsd/HoYjGpR81+FFPE030lvNXgR0haaAU6eoRtztWDE4Xw=="
     },
     "@types/react": {
-      "version": "16.3.13",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.13.tgz",
-      "integrity": "sha512-YMFH/E9ryjUm2AoOy8KdTuG1SufaMuYmO/5xACROl0pm9dRmE2RN3d2zjv/eHALF6LGRZPVb7G9kqP0n5dWttQ==",
+      "version": "16.3.14",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.14.tgz",
+      "integrity": "sha512-wNUGm49fPl7eE2fnYdF0v5vSOrUMdKMQD/4NwtQRnb6mnPwtkhabmuFz37eq90+hhyfz0pWd38jkZHOcaZ6LGw==",
       "requires": {
-        "csstype": "2.4.2"
+        "csstype": "2.5.0"
       }
     },
     "@types/zen-observable": {
@@ -1191,14 +1191,14 @@
       }
     },
     "ajv": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz",
-      "integrity": "sha1-06/3jpJ3VJdx2vAWTP9ISCt1T8Y=",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz",
+      "integrity": "sha512-VDUX1oSajablmiyFyED9L1DFndg0P9h7p1F+NO8FkIzei6EPrR6Zu1n18rd5P8PqaSRd/FrWv3G1TVBqpM83gA==",
       "requires": {
-        "fast-deep-equal": "1.1.0",
+        "fast-deep-equal": "2.0.1",
         "fast-json-stable-stringify": "2.0.0",
         "json-schema-traverse": "0.3.1",
-        "uri-js": "3.0.2"
+        "uri-js": "4.2.1"
       }
     },
     "ajv-keywords": {
@@ -1518,12 +1518,12 @@
       }
     },
     "apollo-boost": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/apollo-boost/-/apollo-boost-0.1.5.tgz",
-      "integrity": "sha512-Fjf7tKxrltG9txeIPTDTdkmcHgCNweLAannR4bDU0eUarUMzscwKe5Qn2QNl74JKjWi5OC/0A7BXKPwDWJ/oow==",
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/apollo-boost/-/apollo-boost-0.1.6.tgz",
+      "integrity": "sha512-z29fxgaNV7HLCcjgS7MgqPKdMc9is1pf4gaVk2ma9JvMZEwq7d5mAc1sBSq+u6de/oUdElES6f1wc1v1HruU+A==",
       "requires": {
-        "apollo-cache-inmemory": "1.2.0",
-        "apollo-client": "2.3.0",
+        "apollo-cache-inmemory": "1.2.1",
+        "apollo-client": "2.3.1",
         "apollo-link": "1.2.2",
         "apollo-link-error": "1.0.9",
         "apollo-link-http": "1.5.4",
@@ -1540,19 +1540,19 @@
       }
     },
     "apollo-cache-inmemory": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.0.tgz",
-      "integrity": "sha512-8upCp7SrM2F71CJJy2xhuqSrlbBjfAplZWmCvUrIf8d6XD2L+KBtwKK6LU4N030n6sGsLoandoQN4nP/+Jcz/A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.1.tgz",
+      "integrity": "sha512-WZ5EGmJqellVX+PPmq0QeqeQJiZCjjfmkp3x+MV3DRMwTzT2jeJYQAYGIzJuq8PjG4V0vljVJK/Ad93PHqzgdQ==",
       "requires": {
         "apollo-cache": "1.1.8",
         "apollo-utilities": "1.0.12",
-        "graphql-anywhere": "4.1.9"
+        "graphql-anywhere": "4.1.10"
       }
     },
     "apollo-client": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.3.0.tgz",
-      "integrity": "sha512-ihU+cpjS7IQzvQb7Mn/58Hlwv6fkG+OMgU1M5j33E2HtcOlwXt3N7LSMpuuf6ikEPiyV9cfUAYRf7EtGjZgNgw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.3.1.tgz",
+      "integrity": "sha512-f+692AEAY0XYUPAO4nuSOIAy7jgqNw94bXuvMvKmFYdMwJLRIr5gOPUXgOwCYwwVo+NqWF6cy20dkZ4gkCWZ+Q==",
       "requires": {
         "@types/async": "2.0.49",
         "@types/zen-observable": "0.5.3",
@@ -1629,7 +1629,7 @@
       "integrity": "sha512-69/til4ENfl/Fvf7br2xSsLSBcxcXPbOHVNkzLLejvUZickl93HLO4/fO+uvoBi4dCYRgN17Zr8FwI41ueRx0g==",
       "requires": {
         "apollo-utilities": "1.0.12",
-        "graphql-anywhere": "4.1.9"
+        "graphql-anywhere": "4.1.10"
       }
     },
     "apollo-utilities": {
@@ -2543,7 +2543,7 @@
           "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
           "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
           "requires": {
-            "caniuse-lite": "1.0.30000833",
+            "caniuse-lite": "1.0.30000839",
             "electron-to-chromium": "1.3.45"
           }
         }
@@ -2587,7 +2587,7 @@
       "requires": {
         "babel-core": "6.26.3",
         "babel-runtime": "6.26.0",
-        "core-js": "2.5.5",
+        "core-js": "2.5.6",
         "home-or-tmp": "2.0.0",
         "lodash": "4.17.10",
         "mkdirp": "0.5.1",
@@ -2640,7 +2640,7 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "requires": {
-        "core-js": "2.5.5",
+        "core-js": "2.5.6",
         "regenerator-runtime": "0.11.1"
       }
     },
@@ -2947,11 +2947,11 @@
       }
     },
     "browserslist": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.6.tgz",
-      "integrity": "sha512-XCsMSg9V4S1VRdcp265dJ+8kBRjfuFXcavbisY7G6T9QI0H1Z24PP53vvs0WDYWqm38Mco1ILDtafcS8ZR4xiw==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz",
+      "integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==",
       "requires": {
-        "caniuse-lite": "1.0.30000833",
+        "caniuse-lite": "1.0.30000839",
         "electron-to-chromium": "1.3.45"
       }
     },
@@ -3027,7 +3027,7 @@
         "chownr": "1.0.1",
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
-        "lru-cache": "4.1.2",
+        "lru-cache": "4.1.3",
         "mississippi": "2.0.0",
         "mkdirp": "0.5.1",
         "move-concurrently": "1.0.1",
@@ -3111,9 +3111,18 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000833",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000833.tgz",
-      "integrity": "sha512-tKNuKu4WLImh4NxoTgntxFpDrRiA0Q6Q1NycNhuMST0Kx+Pt8YnRDW6V8xsyH6AtO2CpAoibatEk5eaEhP3O1g=="
+      "version": "1.0.30000839",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000839.tgz",
+      "integrity": "sha512-gJZIfmkuy84agOeAZc7WJOexZhisZaBSFk96gkGM6TkH7+1mBfr/MSPnXC8lO0g7guh/ucbswYjruvDbzc6i0g=="
+    },
+    "capture-exit": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+      "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+      "dev": true,
+      "requires": {
+        "rsvp": "3.6.2"
+      }
     },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.1.1",
@@ -3789,9 +3798,9 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
     },
     "core-js": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz",
-      "integrity": "sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs="
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz",
+      "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ=="
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -3799,9 +3808,9 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "create-ecdh": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz",
-      "integrity": "sha512-iZvCCg8XqHQZ1ioNBTzXS/cQSkqkqcPs8xSX4upNB+DAk9Ht3uzQf2J32uAHNCne8LDmKr29AgZrEs4oIrwLuQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "requires": {
         "bn.js": "4.11.8",
         "elliptic": "6.4.0"
@@ -3837,7 +3846,7 @@
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
       "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
       "requires": {
-        "lru-cache": "4.1.2",
+        "lru-cache": "4.1.3",
         "shebang-command": "1.2.0",
         "which": "1.3.0"
       }
@@ -3857,7 +3866,7 @@
       "requires": {
         "browserify-cipher": "1.0.1",
         "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.1",
+        "create-ecdh": "4.0.3",
         "create-hash": "1.2.0",
         "create-hmac": "1.1.7",
         "diffie-hellman": "5.0.3",
@@ -3886,9 +3895,9 @@
       }
     },
     "css-to-react-native": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.1.2.tgz",
-      "integrity": "sha512-akxvxNPNm+Qb7kGswgWhD8rLENM8857NVIn1lX0Dr9BQuju8vx6ypet7KvwvqBC01FUEne5V/jvt7FJXWJPtgw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.2.0.tgz",
+      "integrity": "sha512-SWG8+tsVRBHpxn1cSDmx7B95DJCiKwUecBbboGpm2znDCnJDMGkcoYR73w1p2IZMab6iNqVms8VC+4TrSqoFeQ==",
       "requires": {
         "css-color-keywords": "1.0.0",
         "fbjs": "0.8.16",
@@ -3917,9 +3926,9 @@
       }
     },
     "csstype": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.4.2.tgz",
-      "integrity": "sha512-1TnkyZwDy0oUl//6685j2bTMNe61SzntWntijNdmmEzvpYbGmVMZkj204gv4glcQp6z/ypg+YRziT91XVFmOyg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.0.tgz",
+      "integrity": "sha512-KyGTo7/Y1lIK+JIfZ4LNEFdjN5lYwmJPpiP2fJbZF9LL95sY4CvUibobzzyXVsiuiD/oKcCzGZfT7WWZxHvkCw=="
     },
     "currently-unhandled": {
       "version": "0.4.1",
@@ -4395,9 +4404,9 @@
       }
     },
     "domhandler": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
       "dev": true,
       "requires": {
         "domelementtype": "1.3.0"
@@ -4500,7 +4509,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "requires": {
-        "iconv-lite": "0.4.21"
+        "iconv-lite": "0.4.23"
       }
     },
     "end-of-stream": {
@@ -4861,7 +4870,7 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "requires": {
-        "fill-range": "2.2.3"
+        "fill-range": "2.2.4"
       }
     },
     "expect": {
@@ -4916,9 +4925,9 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -4950,7 +4959,7 @@
         "object-assign": "4.1.1",
         "promise": "7.3.1",
         "setimmediate": "1.0.5",
-        "ua-parser-js": "0.7.17"
+        "ua-parser-js": "0.7.18"
       },
       "dependencies": {
         "core-js": {
@@ -4981,13 +4990,13 @@
       "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
     },
     "fill-range": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
       "requires": {
         "is-number": "2.1.0",
         "isobject": "2.1.0",
-        "randomatic": "1.1.7",
+        "randomatic": "3.0.0",
         "repeat-element": "1.1.2",
         "repeat-string": "1.6.1"
       }
@@ -5007,7 +5016,7 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "requires": {
         "commondir": "1.0.1",
-        "make-dir": "1.2.0",
+        "make-dir": "1.3.0",
         "pkg-dir": "2.0.0"
       }
     },
@@ -6058,9 +6067,9 @@
       }
     },
     "graphql-anywhere": {
-      "version": "4.1.9",
-      "resolved": "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.9.tgz",
-      "integrity": "sha512-/Jhj+KaNuXQbgVsD7usuyNV/RHjNYH/GMr0mYiAAp8+TpoP3Q1AokHQePizZ7ck4kPfZmJ724aBc5gK1WCDTjQ==",
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.10.tgz",
+      "integrity": "sha512-ab1O4mOkjlk+17ye5a7DxUuWafKP8aoH+xmc6SsPNZlrQ7spbArqyLIf2JdbwpzsVLXOyRvQpD6tcc0GtnxBfw==",
       "requires": {
         "apollo-utilities": "1.0.12"
       }
@@ -6074,40 +6083,13 @@
       }
     },
     "graphql-mock": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/graphql-mock/-/graphql-mock-0.4.1.tgz",
-      "integrity": "sha512-z2zNNpmhGKTkf23rAtds2mBOkM0XJJKD8NIDXZ2XhsxBp5POyllYBo66Y/i3z+f2+qbMT7LIEWE50+7x3j+ApA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/graphql-mock/-/graphql-mock-1.0.0.tgz",
+      "integrity": "sha512-0ltTXbohJqCI/bbw2aG60wE53D3Qtp/2e7O0u0zKouXRk3qOkZcjhLHcYUFasOXtuM/16TnBSgLiBYAeY1wBsA==",
       "requires": {
         "apollo-link-schema": "1.1.0",
-        "graphql": "0.12.3",
-        "graphql-tools": "2.24.0"
-      },
-      "dependencies": {
-        "graphql": {
-          "version": "0.12.3",
-          "resolved": "https://registry.npmjs.org/graphql/-/graphql-0.12.3.tgz",
-          "integrity": "sha512-Hn9rdu4zacplKXNrLCvR8YFiTGnbM4Zw/UH8FDmzBDsH7ou40lSNH4tIlsxcYnz2TGNVJCpu1WxCM23yd6kzhA==",
-          "requires": {
-            "iterall": "1.1.3"
-          }
-        },
-        "graphql-tools": {
-          "version": "2.24.0",
-          "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-2.24.0.tgz",
-          "integrity": "sha512-Mz9I7jyizrd+RafC/5EogJKTVzBbIddDCrW0sP5QLmsVVM3ujfhqVYu2lEXOaJW8Sy18f3ZICHirmKcn6oMAcA==",
-          "requires": {
-            "apollo-link": "1.2.2",
-            "apollo-utilities": "1.0.12",
-            "deprecated-decorator": "0.1.6",
-            "iterall": "1.1.3",
-            "uuid": "3.2.1"
-          }
-        },
-        "iterall": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.1.3.tgz",
-          "integrity": "sha512-Cu/kb+4HiNSejAPhSaN1VukdNTTi/r4/e+yykqjlG/IW+1gZH5b4+Bq3whDX4tvbYugta3r8KTMUiqT3fIGxuQ=="
-        }
+        "fast-deep-equal": "2.0.1",
+        "graphql-tools": "3.0.1"
       }
     },
     "graphql-tag": {
@@ -6116,10 +6098,9 @@
       "integrity": "sha512-qnNmof9pAqj/LUzs3lStP0Gw1qhdVCUS7Ab7+SUB6KD5aX1uqxWQRwMnOGTkhKuLvLNIs1TvNz+iS9kUGl1MhA=="
     },
     "graphql-tools": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.0.0.tgz",
-      "integrity": "sha512-orcLQm0pc6dcIvFyAudgmno/akZy07bbMalTv5dj6B8uW2ZPmwIANr7pDEJoiumb67h2kZjsU9yvgTwmF0kMPQ==",
-      "dev": true,
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.0.1.tgz",
+      "integrity": "sha512-E7OjLQt+T/ASJTIyX7uX6EnUiTh7qpfg5O1E/sMTLnT0IHLNzTVy1oDsQP8gezTFnsAopjEBozhRDRLStG7D1Q==",
       "requires": {
         "apollo-link": "1.2.1",
         "apollo-utilities": "1.0.12",
@@ -6128,19 +6109,12 @@
         "uuid": "3.2.1"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "9.6.11",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.11.tgz",
-          "integrity": "sha512-Zm2W8b3ouIP/rB4ZgIDBMsdi1a/5NuKG3IguCM6aUwXtT+h6g1/Lh59Td7S1QtHMRXU7AbrGRDJ7lbxW4MEDmg==",
-          "dev": true
-        },
         "apollo-link": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.1.tgz",
           "integrity": "sha512-6Ghf+j3cQLCIvjXd2dJrLw+16HZbWbwmB1qlTc41BviB2hv+rK1nJr17Y9dWK0UD4p3i9Hfddx3tthpMKrueHg==",
-          "dev": true,
           "requires": {
-            "@types/node": "9.6.11",
+            "@types/node": "9.6.15",
             "apollo-utilities": "1.0.12",
             "zen-observable-ts": "0.8.9"
           }
@@ -6438,7 +6412,7 @@
       "dev": true,
       "requires": {
         "domelementtype": "1.3.0",
-        "domhandler": "2.4.1",
+        "domhandler": "2.4.2",
         "domutils": "1.5.1",
         "entities": "1.1.1",
         "inherits": "2.0.3",
@@ -6491,9 +6465,9 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.21",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz",
-      "integrity": "sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
         "safer-buffer": "2.1.2"
       }
@@ -7295,7 +7269,7 @@
         "jest-serializer": "22.4.3",
         "jest-worker": "22.4.3",
         "micromatch": "2.3.11",
-        "sane": "2.5.0"
+        "sane": "2.5.2"
       }
     },
     "jest-jasmine2": {
@@ -7736,6 +7710,12 @@
             }
           }
         },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true
+        },
         "form-data": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
@@ -8188,18 +8168,18 @@
       "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
     },
     "lru-cache": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-      "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
       "requires": {
         "pseudomap": "1.0.2",
         "yallist": "2.1.2"
       }
     },
     "make-dir": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
-      "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "requires": {
         "pify": "3.0.0"
       }
@@ -8231,6 +8211,11 @@
         "object-visit": "1.0.1"
       }
     },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w="
+    },
     "maximatch": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/maximatch/-/maximatch-0.1.0.tgz",
@@ -8670,9 +8655,9 @@
       "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ="
     },
     "next": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/next/-/next-6.0.0.tgz",
-      "integrity": "sha1-cASJ/52Tw2863gtHTQi5sN2e97M=",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/next/-/next-6.0.1.tgz",
+      "integrity": "sha1-3FYLMsw8wc/h7U66jlL8No0CFWQ=",
       "requires": {
         "@babel/core": "7.0.0-beta.42",
         "@babel/plugin-proposal-class-properties": "7.0.0-beta.42",
@@ -8708,16 +8693,17 @@
         "path-to-regexp": "2.1.0",
         "prop-types": "15.6.0",
         "prop-types-exact": "1.1.1",
-        "react-hot-loader": "4.1.1",
+        "react-hot-loader": "4.1.3",
         "recursive-copy": "2.0.6",
         "resolve": "1.5.0",
         "send": "0.16.1",
+        "source-map": "0.5.7",
         "strip-ansi": "3.0.1",
         "styled-jsx": "2.2.6",
         "touch": "3.1.0",
         "uglifyjs-webpack-plugin": "1.1.6",
         "unfetch": "3.0.0",
-        "update-check": "1.3.2",
+        "update-check": "1.4.0",
         "url": "0.11.0",
         "uuid": "3.1.0",
         "walk": "2.3.9",
@@ -8756,10 +8742,10 @@
       "integrity": "sha512-pWLGu8i730btcAJXsCOPfW5rmYiqlC8r6fvoNWDOITvi8o6QGerlAyNrzSZePts4OPamJr/5nvjFeAUxvl10Kg==",
       "requires": {
         "@types/graphql": "0.12.6",
-        "@types/next": "2.4.9",
+        "@types/next": "2.4.10",
         "@types/prop-types": "15.5.2",
-        "@types/react": "16.3.13",
-        "apollo-client": "2.3.0",
+        "@types/react": "16.3.14",
+        "apollo-client": "2.3.1",
         "apollo-link": "1.2.2",
         "apollo-link-context": "1.0.8",
         "apollo-link-error": "1.0.9",
@@ -8856,6 +8842,11 @@
             "ms": "2.0.0"
           }
         },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
         "has-flag": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
@@ -9103,7 +9094,7 @@
         "querystring-es3": "0.2.1",
         "readable-stream": "2.3.6",
         "stream-browserify": "2.0.1",
-        "stream-http": "2.8.1",
+        "stream-http": "2.8.2",
         "string_decoder": "1.1.1",
         "timers-browserify": "2.0.10",
         "tty-browserify": "0.0.0",
@@ -9643,7 +9634,7 @@
       "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
       "dev": true,
       "requires": {
-        "@types/node": "10.0.3"
+        "@types/node": "9.6.15"
       }
     },
     "pascalcase": {
@@ -10014,39 +10005,24 @@
       }
     },
     "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
       },
       "dependencies": {
         "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "requires": {
-            "kind-of": "3.2.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "requires": {
-                "is-buffer": "1.1.6"
-              }
-            }
-          }
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
         },
         "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
         }
       }
     },
@@ -10095,9 +10071,9 @@
       }
     },
     "react-adopt": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/react-adopt/-/react-adopt-0.4.1.tgz",
-      "integrity": "sha1-IujAhqZMp06YKFceOMNjW+TMnLk=",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/react-adopt/-/react-adopt-0.5.1.tgz",
+      "integrity": "sha1-hRql0pmPr5qzZUDYeO2lPUyULg8=",
       "requires": {
         "react": "16.3.2"
       }
@@ -10138,15 +10114,15 @@
       }
     },
     "react-hot-loader": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.1.1.tgz",
-      "integrity": "sha512-bwDWesjqXABplFfqNOC6imbmW9y1JtT5RAo+hdIJ4OW2FsU48nrVzFiG8z9a+eB3Xd0C+KzFwD8aq31M+6SYKQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.1.3.tgz",
+      "integrity": "sha512-CF3Y/qUfL1PkM6TPrELNsSiHGKJFRnpyLdzsk+HV4IIuQAY2g1aZXQmK4L/O8WOaldoOujxAYfRfpzrWTvmvtg==",
       "requires": {
         "fast-levenshtein": "2.0.6",
         "global": "4.3.2",
         "hoist-non-react-statics": "2.5.0",
         "prop-types": "15.6.1",
-        "react-lifecycles-compat": "2.0.2",
+        "react-lifecycles-compat": "3.0.4",
         "shallowequal": "1.0.2"
       }
     },
@@ -10156,9 +10132,9 @@
       "integrity": "sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q=="
     },
     "react-lifecycles-compat": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-2.0.2.tgz",
-      "integrity": "sha512-BPksUj7VMAAFhcCw79sZA0Ow/LTAEjs3Sio1AQcuwLeOP+ua0f/08Su2wyiW+JjDDH6fRqNy3h5CLXh21u1mVg=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
     "react-proxy": {
       "version": "3.0.0-alpha.1",
@@ -10610,6 +10586,12 @@
         "nearley": "2.13.0"
       }
     },
+    "rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "dev": true
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -10637,12 +10619,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sane": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.0.tgz",
-      "integrity": "sha512-glfKd7YH4UCrh/7dD+UESsr8ylKWRE7UQPoXuz28FgmcF0ViJQhCTCCZHICRKxf8G8O1KdLEn20dcICK54c7ew==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+      "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
       "dev": true,
       "requires": {
         "anymatch": "2.0.0",
+        "capture-exit": "1.2.0",
         "exec-sh": "0.2.1",
         "fb-watchman": "2.0.0",
         "fsevents": "1.2.3",
@@ -10948,7 +10931,7 @@
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
       "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
       "requires": {
-        "ajv": "6.4.0",
+        "ajv": "6.5.0",
         "ajv-keywords": "3.2.0"
       }
     },
@@ -11148,7 +11131,7 @@
         "extend-shallow": "2.0.1",
         "map-cache": "0.2.2",
         "source-map": "0.5.7",
-        "source-map-resolve": "0.5.1",
+        "source-map-resolve": "0.5.2",
         "use": "3.1.0"
       },
       "dependencies": {
@@ -11269,9 +11252,9 @@
       "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
     },
     "source-map-resolve": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz",
-      "integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "requires": {
         "atob": "2.1.1",
         "decode-uri-component": "0.2.0",
@@ -11456,9 +11439,9 @@
       }
     },
     "stream-http": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz",
-      "integrity": "sha512-cQ0jo17BLca2r0GfRdZKYAGLU6JRoIWxqSOakUMuKOT6MOK7AAlE856L33QuDmAy/eeOrhLee3dZKX0Uadu93A==",
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz",
+      "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==",
       "requires": {
         "builtin-status-codes": "3.0.0",
         "inherits": "2.0.3",
@@ -11566,7 +11549,7 @@
       "integrity": "sha1-mebnWnRr3t0pWhfgPdFJMFWhzDs=",
       "requires": {
         "buffer": "5.1.0",
-        "css-to-react-native": "2.1.2",
+        "css-to-react-native": "2.2.0",
         "fbjs": "0.8.16",
         "hoist-non-react-statics": "2.5.0",
         "is-plain-object": "2.0.4",
@@ -12246,9 +12229,9 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "ua-parser-js": {
-      "version": "0.7.17",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
-      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
+      "version": "0.7.18",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz",
+      "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA=="
     },
     "uglify-es": {
       "version": "3.3.9",
@@ -12434,18 +12417,18 @@
       "integrity": "sha512-qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww=="
     },
     "update-check": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz",
-      "integrity": "sha512-0iGt63gXrsU4VTw4tIGVVk14H6KLHI7ExNPuSmdDdwUrUAQTBnh1hQcRpnoBWetb3/Ab4YyXK1iDWXP7D0VHTQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.4.0.tgz",
+      "integrity": "sha512-KSPgYhsCqS78LnMmJIcsh1BIOaOvSRPDo8x7Qcz0LF5ZsaioDyiVon5o0wqZgzkrU4jgrm5yuu9Ec/B84N6TZg==",
       "requires": {
         "registry-auth-token": "3.3.2",
         "registry-url": "3.1.0"
       }
     },
     "uri-js": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-3.0.2.tgz",
-      "integrity": "sha1-+QuFhQf4HepNz7s8TD2/orVX+qo=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz",
+      "integrity": "sha512-jpKCA3HjsBfSDOEgxRDAxQCNyHfCPSbq57PqCkd3gAyBuPb3IWxw54EHncqESznIdqSetHfw3D7ylThu2Kcc9A==",
       "requires": {
         "punycode": "2.1.0"
       }
@@ -12684,6 +12667,11 @@
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
           "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
         },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+        },
         "has-flag": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 5c1d911..3e64429 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,22 +12,22 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "apollo-boost": "^0.1.5",
-    "apollo-client": "^2.3.0",
+    "apollo-boost": "^0.1.6",
+    "apollo-client": "^2.3.1",
     "babel-plugin-styled-components": "^1.5.1",
     "date-fns": "^2.0.0-alpha.7",
     "downshift": "^1.31.14",
     "graphql": "^0.13.2",
     "graphql-import": "^0.5.2",
-    "graphql-mock": "0.4.1",
+    "graphql-mock": "1.0.0",
     "graphql-tag": "^2.9.2",
     "lodash.debounce": "^4.0.8",
-    "next": "^6.0.0",
+    "next": "^6.0.1",
     "next-with-apollo": "^1.0.6",
     "nprogress": "^0.2.0",
     "prop-types": "^15.6.1",
     "react": "^16.3.2",
-    "react-adopt": "^0.4.1",
+    "react-adopt": "^0.5.1",
     "react-apollo": "^2.1.4",
     "react-dom": "^16.3.2",
     "react-stripe-checkout": "^2.6.3",
@@ -40,7 +40,7 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "^3.3.3",
-    "graphql-tools": "^3.0.0",
+    "graphql-tools": "^3.0.1",
     "jest": "^22.4.3",
     "waait": "^1.0.2"
   },
diff --git a/frontend/pages/_app.js b/frontend/pages/_app.js
index 5cedb5a..e13643b 100644
--- a/frontend/pages/_app.js
+++ b/frontend/pages/_app.js
@@ -1,6 +1,7 @@
 import App, { Container } from 'next/app';
 import React from 'react';
 import { withRouter } from 'next/router';
+import withData from '../lib/withData';
 
 // Next.js wraps each Page in an <App></App> component. This is handy for when you want to persist anything from page to page, or just access a component that is 1 level higher than each page.
 
@@ -30,4 +31,4 @@ class MyApp extends App {
   }
 }
 
-export default withRouter(MyApp);
+export default withData(withRouter(MyApp));
diff --git a/frontend/pages/add.js b/frontend/pages/add.js
index bbe89d6..118d6f9 100644
--- a/frontend/pages/add.js
+++ b/frontend/pages/add.js
@@ -1,17 +1,13 @@
 import Page from '../components/Page';
-import withData from '../lib/withData';
 import CreateItem from '../components/CreateItem';
 import PleaseSignIn from '../components/PleaseSignIn';
 
-const Home = props => {
-  const page = parseInt(props.url.query.page) || 1;
-  return (
-    <Page>
-      <PleaseSignIn>
-        <CreateItem />
-      </PleaseSignIn>
-    </Page>
-  );
-};
+const Add = () => (
+  <Page>
+    <PleaseSignIn>
+      <CreateItem />
+    </PleaseSignIn>
+  </Page>
+);
 
-export default withData(Home);
+export default Add;
diff --git a/frontend/pages/diagram.js b/frontend/pages/diagram.js
index a5ad1f7..89a252e 100644
--- a/frontend/pages/diagram.js
+++ b/frontend/pages/diagram.js
@@ -1,5 +1,4 @@
 import Page from '../components/Page';
-import withData from '../lib/withData';
 import styled from 'styled-components';
 
 const DiagramStyles = styled.div`
@@ -205,4 +204,4 @@ const DiagramPage = () => (
   </Page>
 );
 
-export default withData(DiagramPage);
+export default DiagramPage;
diff --git a/frontend/pages/index.js b/frontend/pages/index.js
index d7996d9..527b9a6 100644
--- a/frontend/pages/index.js
+++ b/frontend/pages/index.js
@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import Items from '../components/Items';
 import Page from '../components/Page';
-import withData from '../lib/withData';
 
 const Home = props => {
   const page = parseInt(props.router.query.page) || 1;
@@ -16,4 +15,4 @@ Home.propTypes = {
   router: PropTypes.object.isRequired,
 };
 
-export default withData(Home);
+export default Home;
diff --git a/frontend/pages/item.js b/frontend/pages/item.js
index 7f25dd8..4c0ddad 100644
--- a/frontend/pages/item.js
+++ b/frontend/pages/item.js
@@ -1,11 +1,11 @@
-import withData from '../lib/withData';
+import React from 'react';
 import Page from '../components/Page';
 import SingleItem from '../components/SingleItem';
 
 const ItemPage = props => (
   <Page>
-    <SingleItem id={props.url.query.id} />
+    <SingleItem id={props.router.query.id} />
   </Page>
 );
 
-export default withData(ItemPage);
+export default ItemPage;
diff --git a/frontend/pages/me.js b/frontend/pages/me.js
index 581eb0c..b363448 100644
--- a/frontend/pages/me.js
+++ b/frontend/pages/me.js
@@ -1,9 +1,8 @@
-import { Component } from 'react';
-import withData from '../lib/withData';
+import React from 'react';
 import Page from '../components/Page';
 import EditUser from '../components/EditUser';
 
-class Orders extends Component {
+class MyAccount extends React.Component {
   render() {
     return (
       <Page>
@@ -14,4 +13,4 @@ class Orders extends Component {
   }
 }
 
-export default withData(Orders);
+export default MyAccount;
diff --git a/frontend/pages/order.js b/frontend/pages/order.js
index d206990..d8cac2e 100644
--- a/frontend/pages/order.js
+++ b/frontend/pages/order.js
@@ -1,5 +1,4 @@
-import { Component } from 'react';
-import withData from '../lib/withData';
+import React from 'react';
 import Page from '../components/Page';
 import Order from '../components/Order';
 
@@ -9,4 +8,4 @@ const OrderPage = props => (
   </Page>
 );
 
-export default withData(OrderPage);
+export default OrderPage;
diff --git a/frontend/pages/orders.js b/frontend/pages/orders.js
index 772bb74..a087ec1 100644
--- a/frontend/pages/orders.js
+++ b/frontend/pages/orders.js
@@ -1,5 +1,4 @@
 import { Component } from 'react';
-import withData from '../lib/withData';
 import Page from '../components/Page';
 import OrderList from '../components/OrderList';
 import PleaseSignIn from '../components/PleaseSignIn';
@@ -16,4 +15,4 @@ class Orders extends Component {
   }
 }
 
-export default withData(Orders);
+export default Orders;
diff --git a/frontend/pages/permissions.js b/frontend/pages/permissions.js
index ae20a08..0b76e51 100644
--- a/frontend/pages/permissions.js
+++ b/frontend/pages/permissions.js
@@ -1,4 +1,3 @@
-import withData from '../lib/withData';
 import Page from '../components/Page';
 import Permissions from '../components/Permissions';
 import PleaseSignIn from '../components/PleaseSignIn';
@@ -11,4 +10,4 @@ const ItemPage = props => (
   </Page>
 );
 
-export default withData(ItemPage);
+export default ItemPage;
diff --git a/frontend/pages/reset.js b/frontend/pages/reset.js
index 2b4008a..cc856e0 100644
--- a/frontend/pages/reset.js
+++ b/frontend/pages/reset.js
@@ -1,4 +1,3 @@
-import withData from '../lib/withData';
 import Page from '../components/Page';
 import Reset from '../components/Reset';
 
@@ -9,4 +8,4 @@ const ResetPage = props => (
   </Page>
 );
 
-export default withData(ResetPage);
+export default ResetPage;
diff --git a/frontend/pages/signup.js b/frontend/pages/signup.js
index d9bc5e9..28e9a58 100644
--- a/frontend/pages/signup.js
+++ b/frontend/pages/signup.js
@@ -1,6 +1,5 @@
-import { Component } from 'react';
+import React from 'react';
 import styled from 'styled-components';
-import withData from '../lib/withData';
 import Signup from '../components/Signup';
 import Signin from '../components/Signin';
 import Page from '../components/Page';
@@ -22,4 +21,4 @@ const SignUpPage = () => (
   </Page>
 );
 
-export default withData(SignUpPage);
+export default SignUpPage;
diff --git a/frontend/pages/update.js b/frontend/pages/update.js
index f5fbc43..69cfdc3 100644
--- a/frontend/pages/update.js
+++ b/frontend/pages/update.js
@@ -1,5 +1,4 @@
 import { Component } from 'react';
-import withData from '../lib/withData';
 import UpdateItem from '../components/UpdateItem';
 import Page from '../components/Page';
 import PleaseSignIn from '../components/PleaseSignIn';
@@ -16,4 +15,4 @@ class Home extends Component {
   }
 }
 
-export default withData(Home);
+export default Home;