@jetshop/template-trend 5.15.2 → 5.16.0

package/cypress.json

@@ -1,4 +1,5 @@
 {
   "baseUrl": "http://localhost:3000",
-  "chromeWebSecurity": false
+  "chromeWebSecurity": false,
+  "video": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/template-trend",
-  "version": "5.15.2",
+  "version": "5.16.0",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,11 +45,11 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "5.16.0-alpha.86c426f4",
+    "@jetshop/core": "^5.16.0",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "5.16.0-alpha.86c426f4",
-    "@jetshop/react-scripts": "5.16.0-alpha.86c426f4",
-    "@jetshop/ui": "5.16.0-alpha.86c426f4",
+    "@jetshop/intl": "^5.16.0",
+    "@jetshop/react-scripts": "^5.16.0",
+    "@jetshop/ui": "^5.16.0",
     "@react-google-maps/api": "~1.7.0",
     "prop-types": "^15.6.2",
     "react": "^16.9.0",

package/schema.graphql

@@ -220,8 +220,8 @@ type Category implements Document {
   dynamicFiltering: [CategoryDynamicFilter]
 
   """
-  Get content data set via the Content Editor.NB: Carries a performance cost, as
-  asking for this will result in a separate API call in the backend.
+  Get content data set via the Content Editor. NB: Carries a performance cost,
+  as asking for this will result in a separate API call in the backend.
   """
   data: Content
 
@@ -310,11 +310,14 @@ type Consent {
 }
 
 type Content {
+  name: String
   id: ID!
   items: [ContentItem]
+  tags: [String]
 }
 
 type ContentItem {
+  name: String
   type: String!
   properties(
     """
@@ -840,6 +843,11 @@ type ExternalCustomerResult {
   customer: ExternalCustomer
 }
 
+type ExternalOrderData {
+  name: String!
+  value: String!
+}
+
 type FacebookConversionsApi {
   accessToken: String
   pixelId: String
@@ -867,8 +875,14 @@ type GoogleAnalytics {
   useArticleNumberAsId: Boolean
 }
 
+type GoogleAnalytics4 {
+  trackingId: String
+  useArticleNumberAsId: Boolean
+}
+
 type GoogleTagManager {
   containerId: String
+  useGa4Events: Boolean
 }
 
 type HtmlHead {
@@ -1340,6 +1354,9 @@ type OrderItem {
   """
   variantValue: String
   preOrderDate: DateTime
+
+  """list of name, value fields from orders coming from external systems."""
+  externalOrderData: [ExternalOrderData]
 }
 
 type OrderItemDiscount {
@@ -1426,7 +1443,10 @@ type Page implements Document {
   primaryRoute: Route
   breadcrumbText: String
 
-  """Get content data set via the Content Editor"""
+  """
+  Get content data set via the Content Editor. NB: Carries a performance cost,
+  as asking for this will result in a separate API call in the backend.
+  """
   data: Content
 
   """
@@ -2018,9 +2038,10 @@ type Query {
   personLookup(key: String!): PersonLookup
 
   """
-  Returns Content found by list of its IDs. Also not found Content IDs are listed.
+  Returns content found, either by a list of content Ids, or filtered by tags.
+  In the case of filtering by ids, not found content Ids are listed as well.
   """
-  content(ids: [String]!): MultipleContent
+  content(ids: [String], tags: [String]): MultipleContent
 
   """get channel by id, null gets default channel"""
   channel(id: String): Channel
@@ -2292,7 +2313,10 @@ type StartPage implements Document {
   primaryRoute: Route
   breadcrumbText: String
 
-  """Get content data set via the Content Editor"""
+  """
+  Get content data set via the Content Editor. NB: Carries a performance cost,
+  as asking for this will result in a separate API call in the backend.
+  """
   data: Content
 }
 
@@ -2350,6 +2374,7 @@ type Token {
 
 type Tracking {
   ga: GoogleAnalytics
+  ga4: GoogleAnalytics4
   gtm: GoogleTagManager
   fca: FacebookConversionsApi
 }

package/src/components/Shop.js

@@ -65,9 +65,9 @@ function Shop() {
             defaultTitle="Template Trend"
           />
           <ProductListProvider queries={productListQueries}>
-            <Header />
-            <Content>
-              <PaginationProvider defaultProductsPerPage={24}>
+            <PaginationProvider defaultProductsPerPage={24}>
+              <Header />
+              <Content>
                 <Switch>
                   <Route exact path="/" component={StartPage} />
                   <Route path="/favourites" component={Favourites} />
@@ -112,9 +112,9 @@ function Shop() {
                     LoadingPage={LoadingPage}
                   />
                 </Switch>
-              </PaginationProvider>
-            </Content>
-            <Footer />
+              </Content>
+              <Footer />
+            </PaginationProvider>
           </ProductListProvider>
           <ModalRoot />
           <ScrollRestorationHandler

package/src/components/StartPage/Content/StartPageHero.js

@@ -80,8 +80,8 @@ const StartPageHero = ({
       src={imageSrc.value}
       className={heroStyles}
       critical={isAboveFold?.value}
-      focalPointY={imageSrc.value.focalPointY}
-      focalPointX={imageSrc.value.focalPointX}
+      focalPointY={imageSrc.value?.focalPointY}
+      focalPointX={imageSrc.value?.focalPointX}
       aspect={'2:1'}
     >
       <Container>

package/src/shop.config.js

@@ -30,9 +30,7 @@ const config = {
       }
     ]
   },
-  trackingID: process.env.REACT_APP_GA_TRACKING_ID,
   additionalGtagTrackingIds: [],
-  tagManagerID: process.env.REACT_APP_GTM_CONTAINER_ID,
   relewareEnabled: true,
   sentry: {
     clientDSN: process.env.FLIGHT_SENTRY_CLIENT_DSN,

package/translations/default.json

@@ -41,9 +41,6 @@
   "cart_total_c0110f50": {
     "message": "Cart total"
   },
-  "categories_9d537a7a": {
-    "message": "Categories"
-  },
   "change_password_20192c50": {
     "message": "Change Password"
   },
@@ -224,9 +221,6 @@
   "hold_on_a_moment_a3f09a64": {
     "message": "Hold on a moment…"
   },
-  "home_351838cd": {
-    "message": "Home"
-  },
   "homepage_4b84763d": {
     "message": "HOMEPAGE"
   },
@@ -239,9 +233,6 @@
   "i_want_newsletters_58c52364": {
     "message": "I want newsletters"
   },
-  "image_not_found_2f99135": {
-    "message": "Image Not Found"
-  },
   "in_stock_859385c7": {
     "message": "In Stock"
   },
@@ -296,9 +287,6 @@
   "login_6f3d6249": {
     "message": "Login"
   },
-  "login_failed_please_try_again_841d7c15": {
-    "message": "Login failed. Please try again"
-  },
   "look_up_my_info_6436db80": {
     "message": "Look up my info"
   },
@@ -350,12 +338,6 @@
   "newsletters_a04708fd": {
     "message": "Newsletters"
   },
-  "next_40e12421": {
-    "message": "Next"
-  },
-  "no_e16d9132": {
-    "message": "No"
-  },
   "no_items_in_cart_cf9df6d4": {
     "message": "No items in cart."
   },
@@ -422,9 +404,6 @@
   "package_discount_66e25640": {
     "message": "Package Discount"
   },
-  "page_currentpage_of_totalpages_a773c744": {
-    "message": "Page { currentPage } of { totalPages }"
-  },
   "payment_method_84a444f1": {
     "message": "Payment method"
   },
@@ -458,15 +437,9 @@
   "postal_code_is_required_ca3b7a32": {
     "message": "Postal code is required."
   },
-  "pre_order_date_86078d45": {
-    "message": "Pre-order date"
-  },
   "pre_order_date_is_required_170e38e0": {
     "message": "Pre-order date is required"
   },
-  "prev_f82cbc48": {
-    "message": "Prev"
-  },
   "price_ffd8b80": {
     "message": "Price"
   },
@@ -497,9 +470,6 @@
   "productname_has_been_added_to_the_cart_fba79585": {
     "message": "{ productName } has been added to the cart"
   },
-  "products_c5f0793": {
-    "message": "Products"
-  },
   "quantity_20164bff": {
     "message": "Quantity"
   },
@@ -548,9 +518,6 @@
   "select_options_9ee7b227": {
     "message": "Select options"
   },
-  "select_pre_order_date_8c8d72b7": {
-    "message": "Select pre-order date"
-  },
   "select_the_variants_b3aa2844": {
     "message": "Select the variants"
   },
@@ -746,9 +713,6 @@
   "whoops_54a74974": {
     "message": "Whoops"
   },
-  "yes_dde87d5": {
-    "message": "Yes"
-  },
   "you_are_now_subscribed_71495f41": {
     "message": "You are now subscribed."
   },

package/.linaria-cache/packages/ui/ChannelSelector/Region.linaria.css

@@ -1,3 +0,0 @@
-.RegionName_r1biyodf{text-transform:uppercase;font-size:1rem;line-height:1.5rem;font-weight:600;margin:1rem 0 0.5rem 0;}
-
-