TESTS

4 files changed, 17 insertions, 16 deletions

diff --git a/frontend/components/Nav.js b/frontend/components/Nav.js
index acfdfd1..1e39762 100644
--- a/frontend/components/Nav.js
+++ b/frontend/components/Nav.js
@@ -2,12 +2,12 @@ import React, { Fragment } from 'react';
 import Link from 'next/link';
 import styled from 'styled-components';
 import { Query } from 'react-apollo';
-import { CURRENT_USER_QUERY, LOCAL_STATE_QUERY } from '../queries/queries';
+import { CURRENT_USER_QUERY } from '../queries/queries';
 import CartCount from './CartCount';
 import Signout from './Signout';
 import { ApolloConsumer } from 'react-apollo';
 
-const StyledUl = styled.ul`
+const StyledNav = styled.ul`
   margin: 0;
   padding: 0;
   display: flex;
@@ -69,23 +69,20 @@ const StyledUl = styled.ul`
 `;
 
 class Nav extends React.Component {
-  componentDidMount() {
-    console.log('NAV MOUNTED');
-  }
   render() {
     return (
-      <Query query={CURRENT_USER_QUERY} ssr={false}>
-        {({ data: { me }, refetch }) => (
-          <StyledUl>
-            <Link prefetch href="/items">
+      <Query query={CURRENT_USER_QUERY}>
+        {({ data: { me } }) => (
+          <StyledNav data-test="nav">
+            <Link href="/items">
               <a>Shop</a>
             </Link>
-            <Link prefetch href="/add">
+            <Link href="/add">
               <a>Sell</a>
             </Link>
 
             {!me && (
-              <Link prefetch href="/signup">
+              <Link href="/signup">
                 <a>Sign In</a>
               </Link>
             )}
@@ -112,7 +109,7 @@ class Nav extends React.Component {
                 </ApolloConsumer>
               </Fragment>
             )}
-          </StyledUl>
+          </StyledNav>
         )}
       </Query>
     );
diff --git a/frontend/components/Pagination.js b/frontend/components/Pagination.js
index 53ad36f..39de901 100644
--- a/frontend/components/Pagination.js
+++ b/frontend/components/Pagination.js
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import Link from 'next/link';
 import PropTypes from 'prop-types';
 import { perPage } from '../config';
-import { ALL_ITEMS_QUERY, ITEM_COUNT_QUERY } from '../queries/queries';
+import { ALL_ITEMS_QUERY } from '../queries/queries';
 
 const PaginationStyles = styled.div`
   text-align: center;
@@ -33,6 +33,7 @@ const PaginationStyles = styled.div`
 const Pagination = props => (
   <Query query={ALL_ITEMS_QUERY}>
     {({ data, loading, error }) => {
+      console.log(error);
       if (loading) return null;
       const { aggregate } = data.itemsConnection;
       const { page } = props;
diff --git a/frontend/components/PleaseSignIn.js b/frontend/components/PleaseSignIn.js
index 4a2eabe..6be17cb 100644
--- a/frontend/components/PleaseSignIn.js
+++ b/frontend/components/PleaseSignIn.js
@@ -5,7 +5,8 @@ import Dump from './Dump';
 
 const PleaseSignIn = props => (
   <Query query={CURRENT_USER_QUERY}>
-    {({ data }) => {
+    {({ data, loading }) => {
+      if (loading) return <p>Loading...</p>;
       // check if they are signed in
       if (!data.me) {
         return (
@@ -24,7 +25,7 @@ const PleaseSignIn = props => (
         ) {
           return (
             <p>
-              Insufficient Permissions to Manage Permissions. You have:
+              Insufficient Permissions. You have:
               <strong>{data.me.permissions}</strong>
               and you need
               <strong>{props.allowedPermissions.join(' OR ')}</strong>
diff --git a/frontend/components/RemoveFromCart.js b/frontend/components/RemoveFromCart.js
index 9cd3a07..fee423b 100644
--- a/frontend/components/RemoveFromCart.js
+++ b/frontend/components/RemoveFromCart.js
@@ -21,6 +21,7 @@ class RemoveFromCart extends Component {
 
   update = (proxy, payload) => {
     const data = proxy.readQuery({ query: CURRENT_USER_QUERY });
+    console.log(data);
     const cartItemId = payload.data.removeFromCart.id;
     data.me.cart = data.me.cart.filter(item => item.id !== cartItemId);
     proxy.writeQuery({ query: CURRENT_USER_QUERY, data });
@@ -32,7 +33,8 @@ class RemoveFromCart extends Component {
         mutation={REMOVE_FROM_CART_MUTATION}
         variables={{ id: this.props.id }}
         update={this.update}
-        refetchQueries={[{ query: CURRENT_USER_QUERY }]}
+        // TODO - we should be able to remove this because we remove the item above
+        // refetchQueries={[{ query: CURRENT_USER_QUERY }]}
       >
         {removeFromCart => (
           <BigButton title="Remove From Cart" onClick={removeFromCart}>