Update application to work with latest versions of plugins

w3bdesign · w3bdesign · commit 0f847bcfff9e · 2020-10-24T06:09:08.000+02:00
diff --git a/components/Cart/AddToCartButton.component.jsx b/components/Cart/AddToCartButton.component.jsx
@@ -7,8 +7,8 @@ import { useQuery, useMutation } from '@apollo/client';
 import { AppContext } from 'utils/context/AppContext';
 import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';
 
-import { GET_CART } from 'utils/const/GQL_QUERIES';
-import { ADD_TO_CART } from 'utils/const/GQL_MUTATIONS';
+import { GET_CART } from 'utils/gql/GQL_QUERIES';
+import { ADD_TO_CART } from 'utils/gql/GQL_MUTATIONS';
 
 import { getFormattedCart } from 'utils/functions/functions';
 
@@ -23,7 +23,7 @@ const AddToCartButton = ({ product }) => {
   const [showViewCart, setShowViewCart] = useState(false);
   const [showAddToCart, setshowAddToCart] = useState(false);
 
-  const productId = product.productId ? product.productId : product;
+  const productId = product.databaseId ? product.databaseId : product;
 
   const productQueryInput = {
     clientMutationId: uuidv4(), // Generate a unique id.
diff --git a/components/Cart/CartPage/CartItemsContainer.component.jsx b/components/Cart/CartPage/CartItemsContainer.component.jsx
@@ -14,8 +14,8 @@ import RegularCart from './RegularCart.component';
 import MobileCart from './MobileCart.component';
 import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';
 
-import { GET_CART } from 'utils/const/GQL_QUERIES';
-import { UPDATE_CART } from 'utils/const/GQL_MUTATIONS';
+import { GET_CART } from 'utils/gql/GQL_QUERIES';
+import { UPDATE_CART } from 'utils/gql/GQL_MUTATIONS';
 
 const CartItemsContainer = () => {
   const [cart, setCart] = useContext(AppContext);
diff --git a/components/Checkout/CheckoutForm.component.jsx b/components/Checkout/CheckoutForm.component.jsx
@@ -7,8 +7,8 @@ import MobileOrderDetails from './MobileOrderDetails.component';
 import LoadingSpinner from '../LoadingSpinner/LoadingSpinner.component';
 //import Payment from './Payment.component';
 
-import { GET_CART } from 'utils/const/GQL_QUERIES';
-import { CHECKOUT_MUTATION } from 'utils/const/GQL_MUTATIONS';
+import { GET_CART } from 'utils/gql/GQL_QUERIES';
+import { CHECKOUT_MUTATION } from 'utils/gql/GQL_MUTATIONS';
 
 import { AppContext } from 'utils/context/AppContext';
 
diff --git a/components/Product/IndexProducts.component.jsx b/components/Product/IndexProducts.component.jsx
@@ -1,7 +1,7 @@
 import Link from 'next/link';
 import { v4 as uuidv4 } from 'uuid';
 
-import WOO_CONFIG  from 'utils/config/nextConfig';
+import WOO_CONFIG from 'utils/config/nextConfig';
 
 /**
  * Displays all of the products as long as length is defined.
@@ -16,7 +16,8 @@ const IndexProducts = ({ products }) => {
           {products ? (
             products.map(
               ({
-                productId,
+                id,
+                databaseId,
                 name,
                 price,
                 regularPrice,
@@ -29,10 +30,7 @@ const IndexProducts = ({ products }) => {
                   key={uuidv4()}
                   className="flex flex-col p-6 md:w-1/2 xl:w-1/4"
                 >
-                  <Link
-                    href="/produkt/[post]"
-                    as={`/produkt/${slug}?productId=${productId}`}
-                  >
+                  <Link href="/produkt/[post]" as={`/produkt/${slug}?id=${id}`}>
                     <a>
                       {image ? (
                         <img
@@ -51,10 +49,7 @@ const IndexProducts = ({ products }) => {
                       )}
                     </a>
                   </Link>
-                  <Link
-                    href="/produkt/[post]"
-                    as={`/produkt/${slug}?productId=${productId}`}
-                  >
+                  <Link href="/produkt/[post]" as={`/produkt/${slug}?id=${id}`}>
                     <a>
                       <div className="flex justify-center pt-3">
                         <p className="font-bold text-center cursor-pointer">
diff --git a/pages/index.js b/pages/index.js
@@ -5,12 +5,12 @@ import PageTitle from 'components/Title/PageTitle.component';
 
 import client from 'utils/apollo/ApolloClient.js';
 
-import { FETCH_ALL_PRODUCTS_QUERY } from 'utils/const/GQL_QUERIES';
+import { FETCH_ALL_PRODUCTS_QUERY } from 'utils/gql/GQL_QUERIES';
 
 /**
  * Main index page
  * @param {Object} products
- * Initial static data is sent as props from getStaticProps and loaded through 'utils/const/INITIAL_PRODUCTS'
+ * Initial static data is sent as props from getStaticProps and loaded through 'utils/gql/INITIAL_PRODUCTS'
  */
 const HomePage = ({ products }) => {
   return (
diff --git a/pages/kategori/[slug].js b/pages/kategori/[slug].js
@@ -6,7 +6,7 @@ import PageTitle from 'components/Title/PageTitle.component';
 
 import client from 'utils/apollo/ApolloClient';
 
-import { GET_PRODUCTS_FROM_CATEGORY } from 'utils/const/GQL_QUERIES';
+import { GET_PRODUCTS_FROM_CATEGORY } from 'utils/gql/GQL_QUERIES';
 
 /**
  * Display a single product with dynamic pretty urls
diff --git a/pages/kategorier.js b/pages/kategorier.js
@@ -5,7 +5,7 @@ import PageTitle from 'components/Title/PageTitle.component';
 
 import client from 'utils/apollo/ApolloClient.js';
 
-import { FETCH_ALL_CATEGORIES_QUERY } from 'utils/const/GQL_QUERIES';
+import { FETCH_ALL_CATEGORIES_QUERY } from 'utils/gql/GQL_QUERIES';
 
 /**
  * Category page displays all of the categories
diff --git a/pages/produkt/[slug].js b/pages/produkt/[slug].js
@@ -5,7 +5,7 @@ import Header from 'components/Header/Header.component';
 
 import client from 'utils/apollo/ApolloClient';
 
-import { GET_SINGLE_PRODUCT } from 'utils/const/GQL_QUERIES';
+import { GET_SINGLE_PRODUCT } from 'utils/gql/GQL_QUERIES';
 
 /**
  * Display a single product with dynamic pretty urls
@@ -33,10 +33,10 @@ const Produkt = ({ product }) => {
 
 export default withRouter(Produkt);
 
-export async function getServerSideProps({ query: { productId } }) {
+export async function getServerSideProps({ query: { id } }) {
   const res = await client.query({
     query: GET_SINGLE_PRODUCT,
-    variables: { id: productId },
+    variables: { id: id },
   });
 
   return {
diff --git a/pages/produkter.js b/pages/produkter.js
@@ -3,7 +3,7 @@ import IndexProducts from 'components/Product/IndexProducts.component';
 import LoadingSpinner from 'components/LoadingSpinner/LoadingSpinner.component';
 import PageTitle from 'components/Title/PageTitle.component';
 
-import { FETCH_ALL_PRODUCTS_QUERY } from 'utils/const/GQL_QUERIES';
+import { FETCH_ALL_PRODUCTS_QUERY } from 'utils/gql/GQL_QUERIES';
 
 import client from 'utils/apollo/ApolloClient.js';
 
diff --git a/utils/gql/GQL_MUTATIONS.js b/utils/gql/GQL_MUTATIONS.js
@@ -7,7 +7,7 @@ export const ADD_TO_CART = gql`
         key
         product {
           id
-          productId
+          databaseId
           name
           description
           type
@@ -30,7 +30,7 @@ export const ADD_TO_CART = gql`
         }
         variation {
           id
-          variationId
+          databaseId
           name
           description
           type
@@ -67,7 +67,7 @@ export const CHECKOUT_MUTATION = gql`
       clientMutationId
       order {
         id
-        orderId
+        databaseId
         refunds {
           nodes {
             amount
diff --git a/utils/gql/GQL_QUERIES.js b/utils/gql/GQL_QUERIES.js
@@ -2,9 +2,9 @@ import { gql } from '@apollo/client';
 
 export const GET_SINGLE_PRODUCT = gql`
   query Product($id: ID!) {
-    product(id: $id, idType: DATABASE_ID) {
-      id
-      productId
+    product(id: $id) {
+      id 
+      databaseId     
       averageRating
       slug
       description
@@ -36,7 +36,7 @@ export const GET_SINGLE_PRODUCT = gql`
         variations {
           nodes {
             id
-            variationId
+            databaseId
             name
             stockStatus
             stockQuantity
@@ -104,7 +104,8 @@ export const FETCH_ALL_PRODUCTS_QUERY = gql`
   query MyQuery {
     products(first: 24) {
       nodes {
-        productId
+        id
+        databaseId
         name
         onSale
         slug
@@ -199,7 +200,7 @@ export const GET_CART = gql`
           key
           product {
             id
-            productId
+            databaseId
             name
             description
             type
@@ -226,7 +227,7 @@ export const GET_CART = gql`
           }
           variation {
             id
-            variationId
+            databaseId
             name
             description
             type
@@ -258,7 +259,7 @@ export const GET_CART = gql`
       appliedCoupons {
         nodes {
           id
-          couponId
+          databaseId
           discountType
           amount
           dateExpiry
