queries fix

12 files changed, 36 insertions, 20 deletions

diff --git a/frontend/__tests__/ResetRequest.test.js b/frontend/__tests__/ResetRequest.test.js
index 638a2aa..c465f34 100644
--- a/frontend/__tests__/ResetRequest.test.js
+++ b/frontend/__tests__/ResetRequest.test.js
@@ -4,7 +4,6 @@ import toJSON from 'enzyme-to-json';
 import { ApolloProvider } from 'react-apollo';
 import ResetRequest from '../components/ResetRequest';
 import mountOptions from './mockMang';
-import wait from 'waait';
 
 describe('<ResetRequest/>', () => {
   it('renders and matches snapshot', async () => {
@@ -20,10 +19,10 @@ describe('<ResetRequest/>', () => {
     input.simulate('change', { target: { name: 'email', value: 'wesbos@gmail.com' } });
     // Create a spy function on mutate
     mutation.client.mutate = jest.fn();
-    mutation.forceUpdate();
+    // mutation.forceUpdate();
     wrapper.find('Form').simulate('submit');
 
-    expect(mutation.client.mutate).toBeCalledWithVariables({ email: 'wesbos@gmail.com' });
+    expect(mutation.client.mutate).toBeCalledWithVariables({ email: 'wesbos@gmail.comx' });
 
     expect(toJSON(wrapper)).toMatchSnapshot();
   });
diff --git a/frontend/components/CreateItem.js b/frontend/components/CreateItem.js
index 8072905..b812db2 100644
--- a/frontend/components/CreateItem.js
+++ b/frontend/components/CreateItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Mutation } from 'react-apollo';
-import { CREATE_ITEM_MUTATION, ALL_ITEMS_QUERY } from '../queries';
+import { CREATE_ITEM_MUTATION, ALL_ITEMS_QUERY } from '../queries/queries';
 import Error from './ErrorMessage';
 import Form from './styles/Form';
 import PropTypes from 'prop-types';
diff --git a/frontend/components/OrderList.js b/frontend/components/OrderList.js
index 5467f93..d663b98 100644
--- a/frontend/components/OrderList.js
+++ b/frontend/components/OrderList.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { Query } from 'react-apollo';
 import { format, formatDistance } from 'date-fns';
 import Link from 'next/link';
-import { USER_ORDERS_QUERY } from '../queries';
+import { USER_ORDERS_QUERY } from '../queries/queries';
 import styled from 'styled-components';
 import formatMoney from '../lib/formatMoney';
 
@@ -92,7 +92,9 @@ class OrderList extends React.Component {
                           </p>
                         </div>
                         <div className="images">
-                          {order.items.map(item => <img key={item.id} src={item.image} alt={item.title} />)}
+                          {order.items.map(item => (
+                            <img key={item.id} src={item.image} alt={item.title} />
+                          ))}
                         </div>
                       </a>
                     </Link>
diff --git a/frontend/components/Page.js b/frontend/components/Page.js
index ab14b10..7ec585d 100644
--- a/frontend/components/Page.js
+++ b/frontend/components/Page.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import Header from './Header';
 import Meta from './Meta';
 import { client } from '../lib/withData';
-import { CURRENT_USER_QUERY } from '../queries';
+import { CURRENT_USER_QUERY } from '../queries/queries';
 
 const theme = {
   red: '#FF0000',
diff --git a/frontend/components/Reset.js b/frontend/components/Reset.js
index bbfc436..94a2ba2 100644
--- a/frontend/components/Reset.js
+++ b/frontend/components/Reset.js
@@ -3,7 +3,7 @@ import { Mutation } from 'react-apollo';
 import PropTypes from 'prop-types';
 import Form from './styles/Form';
 import Error from './ErrorMessage';
-import { RESET_MUTATION, CURRENT_USER_QUERY } from '../queries';
+import { RESET_MUTATION, CURRENT_USER_QUERY } from '../queries/queries';
 
 class Reset extends React.Component {
   static propTypes = {
diff --git a/frontend/components/Search.js b/frontend/components/Search.js
index a1b69cb..399b772 100644
--- a/frontend/components/Search.js
+++ b/frontend/components/Search.js
@@ -3,7 +3,7 @@ import Router from 'next/router';
 import styled, { keyframes } from 'styled-components';
 import debounce from 'lodash.debounce';
 import { client } from '../lib/withData';
-import { SEARCH_ITEMS_QUERY } from '../queries';
+import { SEARCH_ITEMS_QUERY } from '../queries/queries';
 
 function routeToItem(item) {
   Router.push({
diff --git a/frontend/components/Signin.js b/frontend/components/Signin.js
index e701e94..f8a72e4 100644
--- a/frontend/components/Signin.js
+++ b/frontend/components/Signin.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Mutation, Query, ApolloConsumer } from 'react-apollo';
-import { SIGNIN_MUTATION, CURRENT_USER_QUERY } from '../queries';
+import { SIGNIN_MUTATION, CURRENT_USER_QUERY } from '../queries/queries';
 import Error from './ErrorMessage';
 import Form from './styles/Form';
 import { client } from '../lib/withData';
diff --git a/frontend/components/Signout.js b/frontend/components/Signout.js
index b2a7ad6..875a183 100644
--- a/frontend/components/Signout.js
+++ b/frontend/components/Signout.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Query } from 'react-apollo';
-import { CURRENT_USER_QUERY } from '../queries';
+import { CURRENT_USER_QUERY } from '../queries/queries';
 
 class Signout extends Component {
   signout = refetch => {
diff --git a/frontend/components/Signup.js b/frontend/components/Signup.js
index 2fc8950..d7c7062 100644
--- a/frontend/components/Signup.js
+++ b/frontend/components/Signup.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Mutation } from 'react-apollo';
-import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries';
+import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries/queries';
 import Form from './styles/Form';
 import Error from './ErrorMessage';
 import { client } from '../lib/withData';
@@ -45,7 +45,13 @@ class Signup extends Component {
 
               <label htmlFor="name">
                 Name
-                <input type="text" name="name" placeholder="name" value={this.state.name} onChange={this.saveToState} />
+                <input
+                  type="text"
+                  name="name"
+                  placeholder="name"
+                  value={this.state.name}
+                  onChange={this.saveToState}
+                />
               </label>
 
               <label htmlFor="signupPassword">
diff --git a/frontend/components/TakeMyMoney.js b/frontend/components/TakeMyMoney.js
index 593c610..e8b11f2 100644
--- a/frontend/components/TakeMyMoney.js
+++ b/frontend/components/TakeMyMoney.js
@@ -3,7 +3,7 @@ import StripeCheckout from 'react-stripe-checkout';
 import { Mutation, Query } from 'react-apollo';
 import Router from 'next/router';
 import NProgress from 'nprogress';
-import { CREATE_ORDER_MUTATION, CURRENT_USER_QUERY } from '../queries';
+import { CREATE_ORDER_MUTATION, CURRENT_USER_QUERY } from '../queries/queries';
 import calcTotalPrice from '../lib/calcTotalPrice';
 
 function totalItems(cart) {
diff --git a/frontend/components/UpdateItem.js b/frontend/components/UpdateItem.js
index a96c8f7..31b094c 100644
--- a/frontend/components/UpdateItem.js
+++ b/frontend/components/UpdateItem.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Query, Mutation } from 'react-apollo';
-import { SINGLE_ITEM_QUERY, UPDATE_ITEM_MUTATION } from '../queries';
+import { SINGLE_ITEM_QUERY, UPDATE_ITEM_MUTATION } from '../queries/queries';
 import Form from './styles/Form';
 import Error from './ErrorMessage';
 import Dump from './Dump';
@@ -62,12 +62,21 @@ class UpdateItem extends Component {
 
                     <label htmlFor="description">
                       Description
-                      <textarea defaultValue={item.description} name="description" onChange={this.saveToState} />
+                      <textarea
+                        defaultValue={item.description}
+                        name="description"
+                        onChange={this.saveToState}
+                      />
                     </label>
 
                     <label htmlFor="price">
                       Price
-                      <input type="number" name="price" onChange={this.saveToState} defaultValue={item.price} />
+                      <input
+                        type="number"
+                        name="price"
+                        onChange={this.saveToState}
+                        defaultValue={item.price}
+                      />
                     </label>
                     <button type="submit">Save...</button>
                   </fieldset>
diff --git a/frontend/jest.setup.js b/frontend/jest.setup.js
index 1783f17..c3fa88e 100644
--- a/frontend/jest.setup.js
+++ b/frontend/jest.setup.js
@@ -8,9 +8,9 @@ expect.extend({
     const receivedVariables = received.mock.calls[0][0].variables;
     const pass = this.equals(receivedVariables, argument);
     const message = () =>
-      `expected ${this.utils.printExpected(argument)} to match ${this.utils.printReceived(
-        receivedVariables
-      )}`;
+      `expected ${this.utils.printExpected(argument)}
+
+to match ${this.utils.printReceived(receivedVariables)}`;
 
     return { message, pass };
   },