Moved BasketProvider to _app

CrystallizeAPI · Nov 8, 2018 · c3bec35 · c3bec35
1 parent 4a95a04
commit c3bec35
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/components/layout/index.js b/components/layout/index.js
@@ -1,8 +1,7 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import Head from 'next/head';
 import Router from 'next/router';
 import CrystallizeLayout from '@crystallize/react-layout';
-import { BasketProvider } from '@crystallize/react-basket';
 
 import Aside from 'components/aside';
 
@@ -47,30 +46,25 @@ class Layout extends React.Component {
     }
 
     return (
-      <Fragment>
+      <>
         <Head>
           <title key="title">{displayTitle}</title>
           {description && (
             <meta key="description" name="description" content={description} />
           )}
         </Head>
-        <BasketProvider
-          shippingCost="199"
-          freeShippingMinimumPurchaseAmount="800"
-          validateEndpoint="/checkout/validate-basket"
-        >
-          <CrystallizeLayout right={Aside}>
-            <Header
-              categories={categories}
-              tenant={tenant}
-              simple={simpleHeader}
-            />
-            <Main loading={loading}>
-              {loading ? <div>{children || 'Loading...'}</div> : children}
-            </Main>
-          </CrystallizeLayout>
-        </BasketProvider>
-      </Fragment>
+
+        <CrystallizeLayout right={Aside}>
+          <Header
+            categories={categories}
+            tenant={tenant}
+            simple={simpleHeader}
+          />
+          <Main loading={loading}>
+            {loading ? <div>{children || 'Loading...'}</div> : children}
+          </Main>
+        </CrystallizeLayout>
+      </>
     );
   }
 }

diff --git a/pages/_app.js b/pages/_app.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import App, { Container } from 'next/app';
 import { ApolloProvider } from 'react-apollo';
+import { BasketProvider } from '@crystallize/react-basket';
 
 import withData from 'lib/with-data';
 
@@ -10,7 +11,13 @@ class MyApp extends App {
     return (
       <Container>
         <ApolloProvider client={apolloClient}>
-          <Component {...pageProps} />
+          <BasketProvider
+            shippingCost="199"
+            freeShippingMinimumPurchaseAmount="800"
+            validateEndpoint="/checkout/validate-basket"
+          >
+            <Component {...pageProps} />
+          </BasketProvider>
         </ApolloProvider>
       </Container>
     );