diff options
39 files changed, 74 insertions, 58 deletions
diff --git a/frontend/__tests__/AddToCart.test.js b/frontend/__tests__/AddToCart.test.js index 9faa883..888ad68 100644 --- a/frontend/__tests__/AddToCart.test.js +++ b/frontend/__tests__/AddToCart.test.js @@ -6,7 +6,7 @@ import { ApolloConsumer } from 'react-apollo'; import { MockedProvider } from 'react-apollo/test-utils'; import wait from 'waait'; import { fakeCartItem, fakeUser } from '../lib/testUtils'; -import { ADD_TO_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { ADD_TO_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/Cart.test.js b/frontend/__tests__/Cart.test.js index f782708..f32c7f9 100644 --- a/frontend/__tests__/Cart.test.js +++ b/frontend/__tests__/Cart.test.js @@ -6,7 +6,7 @@ import wait from 'waait'; import Cart from '../components/Cart'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeCartItem, fakeUser } from '../lib/testUtils'; -import { CURRENT_USER_QUERY, LOCAL_STATE_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY, LOCAL_STATE_QUERY } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/CreateItem.test.js b/frontend/__tests__/CreateItem.test.js index 37e5121..a2fcb90 100644 --- a/frontend/__tests__/CreateItem.test.js +++ b/frontend/__tests__/CreateItem.test.js @@ -6,7 +6,7 @@ import { MockedProvider } from 'react-apollo/test-utils'; import CreateItem from '../components/CreateItem'; import wait from 'waait'; import { fakeItem } from '../lib/testUtils'; -import { CREATE_ITEM_MUTATION } from '../queries/queries'; +import { CREATE_ITEM_MUTATION } from '../queries/queries.graphql'; const dogImage = 'https://dog.com/dog.jpg'; diff --git a/frontend/__tests__/EditUser.test.js b/frontend/__tests__/EditUser.test.js index 68ff971..c1aea1c 100644 --- a/frontend/__tests__/EditUser.test.js +++ b/frontend/__tests__/EditUser.test.js @@ -5,7 +5,7 @@ import EditUser from '../components/EditUser'; import wait from 'waait'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeUser } from '../lib/testUtils'; -import { CURRENT_USER_QUERY, UPDATE_USER_MUTATION } from '../queries/queries'; +import { CURRENT_USER_QUERY, UPDATE_USER_MUTATION } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/Nav.test.js b/frontend/__tests__/Nav.test.js index ab8a139..16f20e3 100644 --- a/frontend/__tests__/Nav.test.js +++ b/frontend/__tests__/Nav.test.js @@ -6,7 +6,7 @@ import Router from 'next/router'; import Nav from '../components/Nav'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeUser } from '../lib/testUtils'; -import { CURRENT_USER_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; // Mock the router Router.router = { push() {} }; diff --git a/frontend/__tests__/Order.test.js b/frontend/__tests__/Order.test.js index c74e384..5cb21c8 100644 --- a/frontend/__tests__/Order.test.js +++ b/frontend/__tests__/Order.test.js @@ -5,7 +5,7 @@ import wait from 'waait'; import Order from '../components/Order'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeOrder } from '../lib/testUtils'; -import { SINGLE_ORDER_QUERY } from '../queries/queries'; +import { SINGLE_ORDER_QUERY } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/Pagination.test.js b/frontend/__tests__/Pagination.test.js index 1dbc7b4..1202d9a 100644 --- a/frontend/__tests__/Pagination.test.js +++ b/frontend/__tests__/Pagination.test.js @@ -5,7 +5,7 @@ import Pagination from '../components/Pagination'; import { MockedProvider } from 'react-apollo/test-utils'; import wait from 'waait'; import { fakeItem } from '../lib/testUtils'; -import { ALL_ITEMS_QUERY } from '../queries/queries'; +import { ALL_ITEMS_QUERY } from '../queries/queries.graphql'; import Router from 'next/router'; diff --git a/frontend/__tests__/PleaseSignIn.test.js b/frontend/__tests__/PleaseSignIn.test.js index 5a5a856..68581b7 100644 --- a/frontend/__tests__/PleaseSignIn.test.js +++ b/frontend/__tests__/PleaseSignIn.test.js @@ -4,7 +4,7 @@ import wait from 'waait'; import PleaseSignIn from '../components/PleaseSignIn'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeUser } from '../lib/testUtils'; -import { CURRENT_USER_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; const notSignedInMocks = [ { diff --git a/frontend/__tests__/RemoveFromCart.test.js b/frontend/__tests__/RemoveFromCart.test.js index 5439129..581e815 100644 --- a/frontend/__tests__/RemoveFromCart.test.js +++ b/frontend/__tests__/RemoveFromCart.test.js @@ -6,7 +6,7 @@ import { MockedProvider } from 'react-apollo/test-utils'; import wait from 'waait'; import RemoveFromCart from '../components/RemoveFromCart'; import { fakeCartItem, fakeUser } from '../lib/testUtils'; -import { CURRENT_USER_QUERY, REMOVE_FROM_CART_MUTATION } from '../queries/queries'; +import { CURRENT_USER_QUERY, REMOVE_FROM_CART_MUTATION } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/ResetRequest.test.js b/frontend/__tests__/ResetRequest.test.js index 4f21911..7e9a7c2 100644 --- a/frontend/__tests__/ResetRequest.test.js +++ b/frontend/__tests__/ResetRequest.test.js @@ -5,7 +5,7 @@ import ResetRequest from '../components/ResetRequest'; import { MockedProvider } from 'react-apollo/test-utils'; import wait from 'waait'; import { fakeItem } from '../lib/testUtils'; -import { REQUEST_RESET_MUTATION, RESET_MUTATION } from '../queries/queries'; +import { REQUEST_RESET_MUTATION, RESET_MUTATION } from '../queries/queries.graphql'; const mocks = [ { diff --git a/frontend/__tests__/Signup.test.js b/frontend/__tests__/Signup.test.js index 8f475f7..018f9b9 100644 --- a/frontend/__tests__/Signup.test.js +++ b/frontend/__tests__/Signup.test.js @@ -5,7 +5,7 @@ import wait from 'waait'; import Signup from '../components/Signup'; import { MockedProvider } from 'react-apollo/test-utils'; import { LocalStorageMock, fakeItem, fakeUser, fakeCartItem } from '../lib/testUtils'; -import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; function type(wrapper, name, value) { wrapper.find(`input[name="${name}"]`).simulate('change', { diff --git a/frontend/__tests__/SingleItem.test.js b/frontend/__tests__/SingleItem.test.js index f362e58..e99facf 100644 --- a/frontend/__tests__/SingleItem.test.js +++ b/frontend/__tests__/SingleItem.test.js @@ -3,7 +3,7 @@ import { mount } from 'enzyme'; import wait from 'waait'; import toJSON from 'enzyme-to-json'; import SingleItem from '../components/SingleItem'; -import { SINGLE_ITEM_QUERY } from '../queries/queries'; +import { SINGLE_ITEM_QUERY } from '../queries/queries.graphql'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeItem } from '../lib/testUtils'; diff --git a/frontend/__tests__/TakeMyMoney.test.js b/frontend/__tests__/TakeMyMoney.test.js index 1b131a5..b17de17 100644 --- a/frontend/__tests__/TakeMyMoney.test.js +++ b/frontend/__tests__/TakeMyMoney.test.js @@ -7,7 +7,7 @@ import Router from 'next/router'; import wait from 'waait'; import { MockedProvider } from 'react-apollo/test-utils'; import { fakeItem, fakeUser, fakeCartItem } from '../lib/testUtils'; -import { CREATE_ITEM_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { CREATE_ITEM_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; Router.router = { push() {} }; diff --git a/frontend/components/AddToCart.js b/frontend/components/AddToCart.js index e2770cb..105f558 100644 --- a/frontend/components/AddToCart.js +++ b/frontend/components/AddToCart.js @@ -1,7 +1,7 @@ import { Component } from 'react'; import { Mutation, Query } from 'react-apollo'; import PropTypes from 'prop-types'; -import { ADD_TO_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { ADD_TO_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; class AddToCart extends Component { static propTypes = { diff --git a/frontend/components/Cart.js b/frontend/components/Cart.js index 5d68102..059ec39 100644 --- a/frontend/components/Cart.js +++ b/frontend/components/Cart.js @@ -4,7 +4,7 @@ import { adopt } from 'react-adopt'; import TakeMyMoney from './TakeMyMoney'; import formatMoney from '../lib/formatMoney'; import CartItem from './CartItem'; -import { CURRENT_USER_QUERY, LOCAL_STATE_QUERY, TOGGLE_CART_MUTATION } from '../queries/queries'; +import { CURRENT_USER_QUERY, LOCAL_STATE_QUERY, TOGGLE_CART_MUTATION } from '../queries/queries.graphql'; import calcTotalPrice from '../lib/calcTotalPrice'; import Error from './ErrorMessage'; import CartStyles from './styles/CartStyles'; diff --git a/frontend/components/CreateItem.js b/frontend/components/CreateItem.js index 0e26330..06e2da3 100644 --- a/frontend/components/CreateItem.js +++ b/frontend/components/CreateItem.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Mutation } from 'react-apollo'; import Router from 'next/router'; -import { CREATE_ITEM_MUTATION } from '../queries/queries'; +import { CREATE_ITEM_MUTATION } from '../queries/queries.graphql'; import Error from './ErrorMessage'; import Form from './styles/Form'; import formatMoney from '../lib/formatMoney'; diff --git a/frontend/components/DeleteItem.js b/frontend/components/DeleteItem.js index 0f00d8d..4ef227d 100644 --- a/frontend/components/DeleteItem.js +++ b/frontend/components/DeleteItem.js @@ -1,7 +1,7 @@ import React from 'react'; import { Mutation } from 'react-apollo'; import PropTypes from 'prop-types'; -import { REMOVE_ITEM_MUTATION, ALL_ITEMS_QUERY } from '../queries/queries'; +import { REMOVE_ITEM_MUTATION, ALL_ITEMS_QUERY } from '../queries/queries.graphql'; class DeleteItem extends React.Component { static propTypes = { diff --git a/frontend/components/EditUser.js b/frontend/components/EditUser.js index aea890c..ce56e11 100644 --- a/frontend/components/EditUser.js +++ b/frontend/components/EditUser.js @@ -1,7 +1,7 @@ import React from 'react'; import { Query, Mutation } from 'react-apollo'; import Form from './styles/Form'; -import { CURRENT_USER_QUERY, UPDATE_USER_MUTATION } from '../queries/queries'; +import { CURRENT_USER_QUERY, UPDATE_USER_MUTATION } from '../queries/queries.graphql'; import Error from './ErrorMessage'; class EditUser extends React.Component { diff --git a/frontend/components/Items.js b/frontend/components/Items.js index 2eacd22..618cc84 100644 --- a/frontend/components/Items.js +++ b/frontend/components/Items.js @@ -6,7 +6,7 @@ import Pagination from './Pagination'; import Item from './Item'; import LoadingItem from './LoadingItem'; import { perPage } from '../config'; -import { ALL_ITEMS_QUERY } from '../queries/queries'; +import { ALL_ITEMS_QUERY } from '../queries/queries.graphql'; const Items = styled.div` display: grid; diff --git a/frontend/components/Nav.js b/frontend/components/Nav.js index 9572677..a90568c 100644 --- a/frontend/components/Nav.js +++ b/frontend/components/Nav.js @@ -1,7 +1,7 @@ import React, { Fragment } from 'react'; import Link from 'next/link'; import { Query, ApolloConsumer } from 'react-apollo'; -import { CURRENT_USER_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; import CartCount from './CartCount'; import Signout from './Signout'; diff --git a/frontend/components/Order.js b/frontend/components/Order.js index 0e0aa5f..a224c1b 100644 --- a/frontend/components/Order.js +++ b/frontend/components/Order.js @@ -3,7 +3,7 @@ import { Query } from 'react-apollo'; import { format } from 'date-fns'; import Head from 'next/head'; import PropTypes from 'prop-types'; -import { SINGLE_ORDER_QUERY } from '../queries/queries'; +import { SINGLE_ORDER_QUERY } from '../queries/queries.graphql'; import formatMoney from '../lib/formatMoney'; import Error from './ErrorMessage'; import OrderStyles from './styles/OrderStyles'; diff --git a/frontend/components/OrderList.js b/frontend/components/OrderList.js index 501852f..eef69ca 100644 --- a/frontend/components/OrderList.js +++ b/frontend/components/OrderList.js @@ -3,7 +3,7 @@ import { Query } from 'react-apollo'; import { formatDistance } from 'date-fns'; import Link from 'next/link'; import styled from 'styled-components'; -import { USER_ORDERS_QUERY } from '../queries/queries'; +import { USER_ORDERS_QUERY } from '../queries/queries.graphql'; import formatMoney from '../lib/formatMoney'; import OrderItemStyles from './styles/OrderItemStyles'; diff --git a/frontend/components/Pagination.js b/frontend/components/Pagination.js index cb43a10..d56b100 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 } from '../queries/queries'; +import { ALL_ITEMS_QUERY } from '../queries/queries.graphql'; const PaginationStyles = styled.div` text-align: center; diff --git a/frontend/components/Permissions.js b/frontend/components/Permissions.js index dc5b246..1807366 100644 --- a/frontend/components/Permissions.js +++ b/frontend/components/Permissions.js @@ -1,7 +1,7 @@ import React from 'react'; import { Query, Mutation } from 'react-apollo'; import PropTypes from 'prop-types'; -import { ALL_USERS_QUERY, UPDATE_PERMISSIONS_MUTATION } from '../queries/queries'; +import { ALL_USERS_QUERY, UPDATE_PERMISSIONS_MUTATION } from '../queries/queries.graphql'; import Error from './ErrorMessage'; import SickButton from './styles/SickButton'; import Table from './styles/Table'; diff --git a/frontend/components/PleaseSignIn.js b/frontend/components/PleaseSignIn.js index 9933d49..22c58c9 100644 --- a/frontend/components/PleaseSignIn.js +++ b/frontend/components/PleaseSignIn.js @@ -1,6 +1,6 @@ import { Query } from 'react-apollo'; import PropTypes from 'prop-types'; -import { CURRENT_USER_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; import Signin from './Signin'; const PleaseSignIn = props => ( diff --git a/frontend/components/RemoveFromCart.js b/frontend/components/RemoveFromCart.js index b80f7f7..bd8a15f 100644 --- a/frontend/components/RemoveFromCart.js +++ b/frontend/components/RemoveFromCart.js @@ -2,7 +2,7 @@ import { Component } from 'react'; import { Mutation } from 'react-apollo'; import styled from 'styled-components'; import PropTypes from 'prop-types'; -import { REMOVE_FROM_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { REMOVE_FROM_CART_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; const BigButton = styled.button` font-size: 3rem; diff --git a/frontend/components/Reset.js b/frontend/components/Reset.js index 4c20cd2..0815262 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/queries'; +import { RESET_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; class Reset extends React.Component { static propTypes = { diff --git a/frontend/components/ResetRequest.js b/frontend/components/ResetRequest.js index e655148..1762aa3 100644 --- a/frontend/components/ResetRequest.js +++ b/frontend/components/ResetRequest.js @@ -1,6 +1,6 @@ import React from 'react'; import { Mutation } from 'react-apollo'; -import { REQUEST_RESET_MUTATION } from '../queries/queries'; +import { REQUEST_RESET_MUTATION } from '../queries/queries.graphql'; import Form from './styles/Form'; import Error from './ErrorMessage'; diff --git a/frontend/components/Search.js b/frontend/components/Search.js index 74aa410..eb00d93 100644 --- a/frontend/components/Search.js +++ b/frontend/components/Search.js @@ -4,7 +4,7 @@ import Router from 'next/router'; import { ApolloConsumer } from 'react-apollo'; import styled, { keyframes } from 'styled-components'; import debounce from 'lodash.debounce'; -import { SEARCH_ITEMS_QUERY } from '../queries/queries'; +import { SEARCH_ITEMS_QUERY } from '../queries/queries.graphql'; function routeToItem(item) { Router.push({ diff --git a/frontend/components/Signin.js b/frontend/components/Signin.js index 868b819..f719c60 100644 --- a/frontend/components/Signin.js +++ b/frontend/components/Signin.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Mutation, ApolloConsumer } from 'react-apollo'; -import { SIGNIN_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { SIGNIN_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; import Error from './ErrorMessage'; import Form from './styles/Form'; diff --git a/frontend/components/Signout.js b/frontend/components/Signout.js index 875a183..4ef8e6c 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/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; class Signout extends Component { signout = refetch => { diff --git a/frontend/components/Signup.js b/frontend/components/Signup.js index a4bc13c..e8c639b 100644 --- a/frontend/components/Signup.js +++ b/frontend/components/Signup.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Mutation, ApolloConsumer } from 'react-apollo'; -import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { SIGNUP_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; import Form from './styles/Form'; import Error from './ErrorMessage'; diff --git a/frontend/components/SingleItem.js b/frontend/components/SingleItem.js index c619486..b709ff1 100644 --- a/frontend/components/SingleItem.js +++ b/frontend/components/SingleItem.js @@ -2,7 +2,7 @@ import { Query } from 'react-apollo'; import PropTypes from 'prop-types'; import styled from 'styled-components'; import Link from 'next/link'; -import { SINGLE_ITEM_QUERY } from '../queries/queries'; +import { SINGLE_ITEM_QUERY } from '../queries/queries.graphql'; import Error from './ErrorMessage'; const SingleItemStyles = styled.div` diff --git a/frontend/components/TakeMyMoney.js b/frontend/components/TakeMyMoney.js index 3ecacb8..8efdb6b 100644 --- a/frontend/components/TakeMyMoney.js +++ b/frontend/components/TakeMyMoney.js @@ -4,7 +4,7 @@ import { Mutation, Query } from 'react-apollo'; import Router from 'next/router'; import NProgress from 'nprogress'; import PropTypes from 'prop-types'; -import { CREATE_ORDER_MUTATION, CURRENT_USER_QUERY } from '../queries/queries'; +import { CREATE_ORDER_MUTATION, CURRENT_USER_QUERY } from '../queries/queries.graphql'; import calcTotalPrice from '../lib/calcTotalPrice'; import Error from './ErrorMessage'; diff --git a/frontend/components/UpdateItem.js b/frontend/components/UpdateItem.js index 7639518..ecaac75 100644 --- a/frontend/components/UpdateItem.js +++ b/frontend/components/UpdateItem.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Query, Mutation } from 'react-apollo'; import PropTypes from 'prop-types'; -import { SINGLE_ITEM_QUERY, UPDATE_ITEM_MUTATION } from '../queries/queries'; +import { SINGLE_ITEM_QUERY, UPDATE_ITEM_MUTATION } from '../queries/queries.graphql'; import Form from './styles/Form'; import Error from './ErrorMessage'; diff --git a/frontend/lib/withData.js b/frontend/lib/withData.js index 3a7f479..9f7c2a8 100644 --- a/frontend/lib/withData.js +++ b/frontend/lib/withData.js @@ -1,6 +1,6 @@ import withApollo from 'next-with-apollo'; import ApolloClient from 'apollo-boost'; -import { LOCAL_STATE_QUERY } from '../queries/queries'; +import { LOCAL_STATE_QUERY } from '../queries/queries.graphql'; // can also be a function that accepts a `headers` object (SSR only) and returns a config const client = new ApolloClient({ diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 929ef9c..24c62d3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5825,6 +5825,12 @@ "pretty-format": "22.4.3" } }, + "jest-transform-graphql": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/jest-transform-graphql/-/jest-transform-graphql-2.1.0.tgz", + "integrity": "sha1-kDy2a7J7wncv0+XdT36bVyMPWCk=", + "dev": true + }, "jest-util": { "version": "22.4.3", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-22.4.3.tgz", @@ -6530,6 +6536,15 @@ } } }, + "next-plugin-graphql": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/next-plugin-graphql/-/next-plugin-graphql-0.0.1.tgz", + "integrity": "sha512-saei0RmUlYP5mF/7i6IvDhacnpMaSv0NpalBLtfELja47AHxGpuEk3CCcyS/bAOWRF7xGKeFYXtAwFSlZa2NzQ==", + "dev": true, + "requires": { + "graphql-tag": "2.9.2" + } + }, "next-tick": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", diff --git a/frontend/pages/_app.js b/frontend/pages/_app.js index b23df9b..ccbc3ae 100644 --- a/frontend/pages/_app.js +++ b/frontend/pages/_app.js @@ -1,6 +1,6 @@ import { ApolloApp } from 'next-with-apollo'; import withData from '../lib/withData'; -import { CURRENT_USER_QUERY } from '../queries/queries'; +import { CURRENT_USER_QUERY } from '../queries/queries.graphql'; // 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. diff --git a/frontend/queries/queries.graphql b/frontend/queries/queries.graphql index 54a1aef..d9a5588 100644 --- a/frontend/queries/queries.graphql +++ b/frontend/queries/queries.graphql @@ -10,7 +10,7 @@ fragment itemDetails on Item { # export const CREATE_ITEM_MUTATION = gql` # ${itemDetails} - mutation createItem($description: String!, $title: String!, $price: Int!, $image: String, $largeImage: String) { + mutation CREATE_ITEM_MUTATION($description: String!, $title: String!, $price: Int!, $image: String, $largeImage: String) { createItem(description: $description, title: $title, price: $price, image: $image, largeImage: $largeImage) { ...itemDetails } @@ -18,7 +18,7 @@ fragment itemDetails on Item { # `; # export const SIGNUP_MUTATION = gql` - mutation signup($email: String!, $name: String!, $password: String!) { + mutation SIGNUP_MUTATION($email: String!, $name: String!, $password: String!) { signup(email: $email, name: $name, password: $password) { token user { @@ -31,7 +31,7 @@ fragment itemDetails on Item { # `; # export const SIGNIN_MUTATION = gql` - mutation signup($email: String!, $password: String!) { + mutation SIGNIN_MUTATION($email: String!, $password: String!) { signin(email: $email, password: $password) { token user { @@ -44,7 +44,7 @@ fragment itemDetails on Item { # `; # export const REQUEST_RESET_MUTATION = gql` - mutation requestReset($email: String!) { + mutation REQUEST_RESET_MUTATION($email: String!) { requestReset(email: $email) { id } @@ -52,7 +52,7 @@ fragment itemDetails on Item { # `; # export const RESET_MUTATION = gql` - mutation resetPassword($resetToken: String!, $password: String!, $confirmPassword: String!) { + mutation RESET_MUTATION($resetToken: String!, $password: String!, $confirmPassword: String!) { resetPassword(resetToken: $resetToken, password: $password, confirmPassword: $confirmPassword) { token user { @@ -65,7 +65,7 @@ fragment itemDetails on Item { # `; # export const CREATE_ORDER_MUTATION = gql` - mutation CreateOrderMutation($token: String!) { + mutation CREATE_ORDER_MUTATION($token: String!) { createOrder(token: $token) { id charge @@ -81,7 +81,7 @@ fragment itemDetails on Item { # export const ALL_ITEMS_QUERY = gql` # Import the Fragment # ${itemDetails} - query AllItemsQuery($skip: Int = 0, $first: Int = ${perPage}) { + query ALL_ITEMS_QUERY($skip: Int = 0, $first: Int = ${perPage}) { itemsConnection(orderBy: createdAt_DESC, first: $first, skip: $skip) { aggregate { count @@ -95,7 +95,7 @@ fragment itemDetails on Item { # export const SINGLE_ITEM_QUERY = gql` # ${itemDetails} - query FindItem($id: ID!) { + query SINGLE_ITEM_QUERY($id: ID!) { items(where: { id: $id }) { user { id @@ -108,7 +108,7 @@ fragment itemDetails on Item { # `; # export const SINGLE_ORDER_QUERY = gql` - query order($id: ID!) { + query SINGLE_ORDER_QUERY($id: ID!) { order(id: $id) { id charge @@ -131,7 +131,7 @@ fragment itemDetails on Item { # export const SEARCH_ITEMS_QUERY = gql` # ${itemDetails} - query SearchItems($searchTerm: String!) { + query SEARCH_ITEMS_QUERY($searchTerm: String!) { items( where: { OR: [ @@ -146,7 +146,7 @@ fragment itemDetails on Item { # `; # export const REMOVE_ITEM_MUTATION = gql` - mutation RemoveItem($id: ID!) { + mutation REMOVE_ITEM_MUTATION($id: ID!) { deleteItem(id: $id) { id title @@ -157,7 +157,7 @@ fragment itemDetails on Item { # export const UPDATE_ITEM_MUTATION = gql` # ${itemDetails} - mutation UpdateItem( + mutation UPDATE_ITEM_MUTATION( $id: ID! $title: String $description: String @@ -175,7 +175,7 @@ fragment itemDetails on Item { # `; # export const UPDATE_USER_MUTATION = gql` - mutation UpdateUser($name: String!) { + mutation UPDATE_USER_MUTATION($name: String!) { updateUser(name: $name) { name } @@ -184,7 +184,7 @@ fragment itemDetails on Item { # export const CURRENT_USER_QUERY = gql` # ${itemDetails} - query userQuery { + query CURRENT_USER_QUERY { me { id email @@ -207,7 +207,7 @@ fragment itemDetails on Item { # `; # export const USER_ORDERS_QUERY = gql` - query orders { + query USER_ORDERS_QUERY { orders(orderBy: createdAt_DESC) { id total @@ -226,7 +226,7 @@ fragment itemDetails on Item { # `; # export const ADD_TO_CART_MUTATION = gql` - mutation addToCart($id: ID!) { + mutation ADD_TO_CART_MUTATION($id: ID!) { addToCart(id: $id) { id quantity @@ -242,7 +242,7 @@ fragment itemDetails on Item { # `; # export const REMOVE_FROM_CART_MUTATION = gql` - mutation removeFromCart($id: ID!) { + mutation REMOVE_FROM_CART_MUTATION($id: ID!) { removeFromCart(id: $id) { id } @@ -250,7 +250,7 @@ fragment itemDetails on Item { # `; # export const ALL_USERS_QUERY = gql` - query Users { + query ALL_USERS_QUERY { users { id name @@ -261,7 +261,7 @@ fragment itemDetails on Item { # `; # export const UPDATE_PERMISSIONS_MUTATION = gql` - mutation updatePermissions($permissions: [Permission], $userId: ID!) { + mutation UPDATE_PERMISSIONS_MUTATION($permissions: [Permission], $userId: ID!) { updatePermissions(permissions: $permissions, userId: $userId) { id permissions @@ -272,13 +272,14 @@ fragment itemDetails on Item { # `; # export const LOCAL_STATE_QUERY = gql` - { + query LOCAL_STATE_QUERY { cartOpen @client } # `; # export const TOGGLE_CART_MUTATION = gql` - mutation toggleCart { + mutation TOGGLE_CART_MUTATION { toggleCart @client } # `; + " |