1 files changed, 8 insertions, 16 deletions
diff --git a/frontend/pages/_app.js b/frontend/pages/_app.js
index f649067..27202d5 100644
--- a/frontend/pages/_app.js
+++ b/frontend/pages/_app.js
@@ -1,32 +1,24 @@
 import App, { Container } from 'next/app';
 import React from 'react';
+import { ApolloApp } from 'next-with-apollo';
 import withData from '../lib/withData';
-import { withRouter } from 'next/router';
 
 // 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.
 
 // This code is taken right from the Next.js docs, and then we add the Router to the page props, which is why we need a custom _app.js
 
-class MyApp extends App {
+class MyApp extends ApolloApp {
   static async getInitialProps({ Component, ctx }) {
     let pageProps = {};
-    const ComposedComponent = withData(Component);
 
-    if (ComposedComponent.getInitialProps) {
-      pageProps = await withData(Component).getInitialProps(ctx);
+    if (Component.getInitialProps) {
+      pageProps = await Component.getInitialProps(ctx);
     }
-    return { pageProps, query: ctx.query };
-  }
 
-  render() {
-    const { Component, pageProps, query } = this.props;
-    const ComposedComponent = withData(Component);
-    return (
-      <Container>
-        <ComposedComponent {...pageProps} query={query} />
-      </Container>
-    );
+    pageProps.query = ctx.query
+
+    return { pageProps };
   }
 }
 
-export default MyApp;
+export default withData(MyApp);