fix conflict

framework/vendure/utils/fragments/search-result-fragment.ts

@@ -19,6 +19,8 @@ export const searchResultFragment = /* GraphQL */ `
         min
         max
       }
-    }
+    },
+    facetValueIds,
+    collectionIds,
   }
 `

framework/vendure/utils/normalize.ts

@@ -1,22 +1,23 @@
-import { Product } from '@commerce/types/product'
 import { Cart } from '@commerce/types/cart'
+import { ProductCard } from '@commerce/types/product'
 import { CartFragment, SearchResultFragment } from '../schema'
 
-export function normalizeSearchResult(item: SearchResultFragment): Product {
+export function normalizeSearchResult(item: SearchResultFragment): ProductCard {
   return {
     id: item.productId,
     name: item.productName,
-    description: item.description,
     slug: item.slug,
-    path: item.slug,
-    images: [{ url: item.productAsset?.preview + '?w=800&mode=crop' || '' }],
-    variants: [],
-    price: {
-      value: (item.priceWithTax as any).min / 100,
-      currencyCode: item.currencyCode,
-    },
-    options: [],
-    sku: item.sku,
+    imageSrc: item.productAsset?.preview ? item.productAsset?.preview + '?w=800&mode=crop' : '',
+    price: (item.priceWithTax as any).min / 100,
+    currencyCode: item.currencyCode,
+    facetValueIds: item.facetValueIds,
+    collectionIds: item.collectionIds,
+    
+    // TODO:
+    // oldPrice: item.price
+    // discount
+    // isNotSell
+    // weight
   }
 }
 

framework/vendure/utils/queries/get-all-collections-query.ts

@@ -0,0 +1,12 @@
+export const getAllCollectionsQuery = /* GraphQL */ `
+query collections ($options: CollectionListOptions) {
+  collections (options: $options){
+    totalItems,
+    items {
+      id
+      name
+      slug
+    }
+  }
+}
+`

framework/vendure/utils/queries/get-all-facets-query.ts

@@ -0,0 +1,17 @@
+export const getAllFacetsQuery = /* GraphQL */ `
+query facets ($options: FacetListOptions) {
+  facets (options: $options){
+    totalItems,
+    items {
+      id
+      name
+      code
+      values {
+        id
+        name
+        code
+      }
+    }
+  }
+}
+`

framework/vendure/utils/queries/get-all-products-query.ts

@@ -3,6 +3,7 @@ import { searchResultFragment } from '../fragments/search-result-fragment'
 export const getAllProductsQuery = /* GraphQL */ `
   query getAllProducts($input: SearchInput!) {
     search(input: $input) {
+      totalItems
       items {
         ...SearchResult
       }

framework/vendure/utils/queries/get-collections-query.ts

@@ -24,7 +24,7 @@ export const getCollectionsNameQuery = /* GraphQL */ `
     collections{
       items{
           name
-          link:slug
+          slug
       }
     }
   }

framework/vendure/utils/queries/get-product-query.ts

@@ -36,6 +36,28 @@ export const getProductQuery = /* GraphQL */ `
           name
         }
       }
+      facetValues {
+        id
+      }
+      collections {
+        id
+      }
     }
   }
 `
+export const getProductDetailQuery = /* GraphQL */ `
+  query GetProductDetail($slug: String! = "hand-trowel") {
+  product(slug: $slug) {
+    name
+    description
+    variants {
+      price
+      priceWithTax
+    }
+    assets {
+      preview
+      name
+    }
+  }
+}
+`