From d3838ccb799cd8c286efcea90d776e8b6936d484 Mon Sep 17 00:00:00 2001 From: Wes Bos Date: Fri, 11 May 2018 12:31:49 -0400 Subject: move apollo to _app --- frontend/pages/_app.js | 3 ++- frontend/pages/add.js | 20 ++++++++------------ frontend/pages/diagram.js | 3 +-- frontend/pages/index.js | 3 +-- frontend/pages/item.js | 6 +++--- frontend/pages/me.js | 7 +++---- frontend/pages/order.js | 5 ++--- frontend/pages/orders.js | 3 +-- frontend/pages/permissions.js | 3 +-- frontend/pages/reset.js | 3 +-- frontend/pages/signup.js | 5 ++--- frontend/pages/update.js | 3 +-- 12 files changed, 26 insertions(+), 38 deletions(-) (limited to 'frontend/pages') 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 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 ( - - - - - - ); -}; +const Add = () => ( + + + + + +); -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 = () => ( ); -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 => ( - + ); -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 ( @@ -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 => ( ); -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 => ( ); -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 => ( ); -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 = () => ( ); -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; -- cgit v1.3