From 0b14f8c6ac85ae898d13dbd503fedb421076bc06 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Wed, 15 Feb 2023 15:50:39 +0100
Subject: [PATCH 1/8] Update package-lock.json

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1d38e5d..a69af2ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
   "name": "nuxtjs-woocommerce",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "hasInstallScript": true,
       "dependencies": {
         "@formkit/nuxt": "^1.0.0-beta.15",

From 6a8c488fe81fc4390507e18c5fa9ff198ba1ca20 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 00:52:45 +0100
Subject: [PATCH 2/8] Testing fix

---
 apollo/mutations/ADD_TO_CART_MUTATION.gql     | 72 +++++++-------
 apollo/queries/GET_CART_QUERY.gql             | 96 ++++++++-----------
 apollo/queries/GET_SINGLE_PRODUCT_QUERY.gql   |  4 +-
 components/Products/ProductsSingleProduct.vue |  2 +-
 4 files changed, 82 insertions(+), 92 deletions(-)

diff --git a/apollo/mutations/ADD_TO_CART_MUTATION.gql b/apollo/mutations/ADD_TO_CART_MUTATION.gql
index dfdfe876..d4046f06 100644
--- a/apollo/mutations/ADD_TO_CART_MUTATION.gql
+++ b/apollo/mutations/ADD_TO_CART_MUTATION.gql
@@ -1,51 +1,55 @@
-mutation($input: AddToCartInput!) {
+mutation ($input: AddToCartInput!) {
   addToCart(input: $input) {
     cartItem {
       key
       product {
-        id
-        databaseId
-        name
-        description
-        type
-        onSale
-        slug
-        averageRating
-        reviewCount
-        image {
+        node {
           id
-          sourceUrl
-          altText
-        }
-        galleryImages {
-          nodes {
+          databaseId
+          name
+          description
+          type
+          onSale
+          slug
+          averageRating
+          reviewCount
+          image {
             id
             sourceUrl
             altText
           }
+          galleryImages {
+            nodes {
+              id
+              sourceUrl
+              altText
+            }
+          }
         }
       }
       variation {
-        id
-        databaseId
-        name
-        description
-        type
-        onSale
-        price
-        regularPrice
-        salePrice
-        image {
+        node {
           id
-          sourceUrl
-          altText
-        }
-        attributes {
-          nodes {
+          databaseId
+          name
+          description
+          type
+          onSale
+          price
+          regularPrice
+          salePrice
+          image {
             id
-            attributeId
-            name
-            value
+            sourceUrl
+            altText
+          }
+          attributes {
+            nodes {
+              id
+              attributeId
+              name
+              value
+            }
           }
         }
       }
diff --git a/apollo/queries/GET_CART_QUERY.gql b/apollo/queries/GET_CART_QUERY.gql
index 47d39e24..f53f4e96 100644
--- a/apollo/queries/GET_CART_QUERY.gql
+++ b/apollo/queries/GET_CART_QUERY.gql
@@ -4,54 +4,58 @@
       nodes {
         key
         product {
-          id
-          databaseId
-          name
-          description
-          type
-          onSale
-          slug
-          averageRating
-          reviewCount
-          image {
+          node {
             id
-            sourceUrl
-            srcSet
-            altText
-            title
-          }
-          galleryImages {
-            nodes {
+            databaseId
+            name
+            description
+            type
+            onSale
+            slug
+            averageRating
+            reviewCount
+            image {
               id
               sourceUrl
               srcSet
               altText
               title
             }
+            galleryImages {
+              nodes {
+                id
+                sourceUrl
+                srcSet
+                altText
+                title
+              }
+            }
           }
         }
         variation {
-          id
-          databaseId
-          name
-          description
-          type
-          onSale
-          price
-          regularPrice
-          salePrice
-          image {
+          node {
             id
-            sourceUrl
-            srcSet
-            altText
-            title
-          }
-          attributes {
-            nodes {
+            databaseId
+            name
+            description
+            type
+            onSale
+            price
+            regularPrice
+            salePrice
+            image {
               id
-              name
-              value
+              sourceUrl
+              srcSet
+              altText
+              title
+            }
+            attributes {
+              nodes {
+                id
+                name
+                value
+              }
             }
           }
         }
@@ -61,25 +65,7 @@
         subtotalTax
       }
     }
-    appliedCoupons {
-      nodes {
-        id
-        databaseId
-        discountType
-        amount
-        dateExpiry
-        products {
-          nodes {
-            id
-          }
-        }
-        productCategories {
-          nodes {
-            id
-          }
-        }
-      }
-    }
+
     subtotal
     subtotalTax
     shippingTax
diff --git a/apollo/queries/GET_SINGLE_PRODUCT_QUERY.gql b/apollo/queries/GET_SINGLE_PRODUCT_QUERY.gql
index 2d3fdfa6..3ad5eed6 100644
--- a/apollo/queries/GET_SINGLE_PRODUCT_QUERY.gql
+++ b/apollo/queries/GET_SINGLE_PRODUCT_QUERY.gql
@@ -25,12 +25,12 @@ query Product($id: ID!) {
       salePrice
       regularPrice
       databaseId
-      paColors {
+      allPaColors {
         nodes {
           name
         }
       }
-      paSizes {
+      allPaSizes {
         nodes {
           name
         }
diff --git a/components/Products/ProductsSingleProduct.vue b/components/Products/ProductsSingleProduct.vue
index 43f6d7fc..b5ecdc48 100644
--- a/components/Products/ProductsSingleProduct.vue
+++ b/components/Products/ProductsSingleProduct.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="data.product">
+  <div v-if="data?.product">
     <section>
       <div class="container flex flex-wrap items-center pt-4 pb-12 mx-auto">
         <div

From 2ebc4024af47ad2d896f1ed5f32302fbe6aea471 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 01:26:39 +0100
Subject: [PATCH 3/8] Update cart functionality

---
 apollo/mutations/UPDATE_CART_MUTATION.gql | 101 +++++++++++++---------
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git a/apollo/mutations/UPDATE_CART_MUTATION.gql b/apollo/mutations/UPDATE_CART_MUTATION.gql
index e8171249..a217bcbb 100644
--- a/apollo/mutations/UPDATE_CART_MUTATION.gql
+++ b/apollo/mutations/UPDATE_CART_MUTATION.gql
@@ -1,54 +1,60 @@
-mutation($input: UpdateItemQuantitiesInput!) {
+mutation ($input: UpdateItemQuantitiesInput!) {
   updateItemQuantities(input: $input) {
     items {
       key
       product {
-        id
-        databaseId
-        name
-        description
-        type
-        onSale
-        slug
-        averageRating
-        reviewCount
-        image {
+        node {
           id
-          sourceUrl
-          altText
-        }
-        galleryImages {
-          nodes {
+          databaseId
+          name
+          description
+          type
+          onSale
+          slug
+          averageRating
+          reviewCount
+          image {
             id
             sourceUrl
             altText
           }
+          galleryImages {
+            nodes {
+              id
+              sourceUrl
+              altText
+            }
+          }
         }
       }
+
       variation {
-        id
-        databaseId
-        name
-        description
-        type
-        onSale
-        price
-        regularPrice
-        salePrice
-        image {
+        node {
           id
-          sourceUrl
-          altText
-        }
-        attributes {
-          nodes {
+          databaseId
+          name
+          description
+          type
+          onSale
+          price
+          regularPrice
+          salePrice
+          image {
             id
-            attributeId
-            name
-            value
+            sourceUrl
+            altText
+          }
+          attributes {
+            nodes {
+              id
+              attributeId
+              name
+              value
+            }
           }
         }
       }
+
       quantity
       total
       subtotal
@@ -57,23 +63,34 @@ mutation($input: UpdateItemQuantitiesInput!) {
     removed {
       key
       product {
-        id
-        databaseId
+        node {
+          id
+          databaseId
+        }
       }
+
       variation {
-        id
-        databaseId
+        node {
+          id
+          databaseId
+        }
       }
     }
+
     updated {
       key
       product {
-        id
-        databaseId
+        node {
+          id
+          databaseId
+        }
       }
+
       variation {
-        id
-        databaseId
+        node {
+          id
+          databaseId
+        }
       }
     }
   }

From 3a268c431092e03d558fa30ddcaf9000cc94d729 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 01:38:26 +0100
Subject: [PATCH 4/8] Update tested versions

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7a08ed67..517a4f65 100644
--- a/README.md
+++ b/README.md
@@ -46,9 +46,9 @@ Optional plugin:
 The current release has been tested and is confirmed working with the following plugin versions:
 
 -   WordPress version 6.1.1
--   WooCommerce version 7.1.0
--   WP GraphQL version 1.5.0
--   WooGraphQL version 0.6.2
+-   WooCommerce version 7.4.0
+-   WP GraphQL version 1.13.8
+-   WooGraphQL version 0.12.0
 
 2.  Make sure WooCommerce has some products already or import some sample products
 

From 51e3d1cf45b206087750d529e0d4d65ee8fbb546 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 01:40:36 +0100
Subject: [PATCH 5/8] Fix product name

---
 components/Cart/CartContents.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Cart/CartContents.vue b/components/Cart/CartContents.vue
index d5f898ba..785426cf 100644
--- a/components/Cart/CartContents.vue
+++ b/components/Cart/CartContents.vue
@@ -24,7 +24,7 @@
 
           <div class="item">
             <span class="block mt-2 font-extrabold">Name: <br /></span>
-            <span class="item-content">{{ products.product.name }}</span>
+            <span class="item-content">{{ products.product.node.name }}</span>
           </div>
           <div class="item">
             <span class="block mt-2 font-extrabold">Quantity: <br /> </span>

From b89b702960509bae184f106e8838b1f95eeba199 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 02:25:24 +0100
Subject: [PATCH 6/8] Update ID type

---
 apollo/queries/GET_PRODUCTS_FROM_CATEGORY_QUERY.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apollo/queries/GET_PRODUCTS_FROM_CATEGORY_QUERY.gql b/apollo/queries/GET_PRODUCTS_FROM_CATEGORY_QUERY.gql
index d275be9b..42b2bb46 100644
--- a/apollo/queries/GET_PRODUCTS_FROM_CATEGORY_QUERY.gql
+++ b/apollo/queries/GET_PRODUCTS_FROM_CATEGORY_QUERY.gql
@@ -1,5 +1,5 @@
 query ProductsFromCategory($id: ID!) {
-  productCategory(id: $id) {
+  productCategory(id: $id, idType: ID) {
     id
     name
     products(first: 50) {

From 34b3f2cd8361d5519aa29df1e263fc5502876abf Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Thu, 16 Feb 2023 21:42:05 +0100
Subject: [PATCH 7/8] Fix category product display

---
 components/Products/ProductsShowAll.vue | 72 +++++++++++++++++++++----
 1 file changed, 62 insertions(+), 10 deletions(-)

diff --git a/components/Products/ProductsShowAll.vue b/components/Products/ProductsShowAll.vue
index d9223016..7f35a715 100644
--- a/components/Products/ProductsShowAll.vue
+++ b/components/Products/ProductsShowAll.vue
@@ -1,8 +1,62 @@
 <template>
-  <div v-if="data?.products?.nodes">
+  <div v-if="allCategoryProducts?.productCategory?.products?.nodes">
     <section>
       <div id="product-container" class="flex flex-wrap items-center">
-        <template v-for="product in data.products.nodes">
+        <template
+          v-for="product in allCategoryProducts.productCategory.products.nodes"
+        >
+          <div
+            v-if="product.slug"
+            :key="product.id"
+            class="flex flex-col mt-6 sm:w1/2 md:w-1/3 lg:w-1/4 lg:mr-4"
+          >
+            <NuxtLink
+              class="text-black cursor-pointer hover:underline"
+              :to="{
+                path: '/product/' + product.slug,
+                query: { id: product.databaseId },
+              }"
+            >
+              <img
+                id="product-image"
+                class="p-8 border mx-auto w-4/5 border-gray-200 lg:h-[230px] rounded drop-shadow-lg transition duration-500 ease-in-out transform cursor-pointer lg:ml-0 lg:w-full lg:p-2 hover:scale-95"
+                :alt="product.name"
+                :src="productImage(product)"
+              />
+              <div class="flex justify-center pt-3">
+                <p class="text-2xl font-bold text-center cursor-pointer">
+                  {{ product.name }}
+                </p>
+              </div>
+            </NuxtLink>
+            <div v-if="product.onSale" class="flex justify-center mt-2">
+              <div class="text-lg text-gray-900 line-through">
+                <span v-if="product.variations">
+                  {{ filteredVariantPrice(product.price, "right") }}</span
+                >
+                <span v-else>{{ product.regularPrice }}</span>
+              </div>
+              <div class="ml-4 text-xl text-gray-900">
+                <span v-if="product.variations">
+                  {{ filteredVariantPrice(product.price) }}</span
+                >
+                <span v-else>{{ product.salePrice }}</span>
+              </div>
+            </div>
+            <div v-else>
+              <p class="mt-2 text-xl text-center text-gray-900">
+                {{ product.price }}
+              </p>
+            </div>
+          </div>
+        </template>
+      </div>
+    </section>
+  </div>
+  <div v-else>
+    <section>
+      <div id="product-container" class="flex flex-wrap items-center">
+        <template v-for="product in allProducts.products.nodes">
           <div
             v-if="product.slug"
             :key="product.id"
@@ -70,18 +124,16 @@ const productImage = (product) =>
   product.image ? product.image.sourceUrl : config.placeholderImage;
 
 const productVariables = { limit: 99 };
-const { data } = await useAsyncQuery(
+const { data: allProducts } = await useAsyncQuery(
   FETCH_ALL_PRODUCTS_QUERY,
   productVariables
 );
 
-if (props.id) {
-  const categoryVariables = { id: props.categoryId, slug: props.categorySlug };
-  const { data } = await useAsyncQuery(
-    GET_PRODUCTS_FROM_CATEGORY_QUERY,
-    categoryVariables
-  );
-}
+const categoryVariables = { id: props.categoryId };
+const { data: allCategoryProducts } = await useAsyncQuery(
+  GET_PRODUCTS_FROM_CATEGORY_QUERY,
+  categoryVariables
+);
 </script>
 
 <style scoped>

From ddb53a4683e9bc1a5b524925de53d22fb8717515 Mon Sep 17 00:00:00 2001
From: w3bdesign <45217974+w3bdesign@users.noreply.github.com>
Date: Sun, 19 Feb 2023 03:47:11 +0100
Subject: [PATCH 8/8] Wpgraphql cors

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 517a4f65..c6a4539a 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ The current release has been tested and is confirmed working with the following
 -   WooCommerce version 7.4.0
 -   WP GraphQL version 1.13.8
 -   WooGraphQL version 0.12.0
+-   WPGraphQL CORS version 2.1
 
 2.  Make sure WooCommerce has some products already or import some sample products