@jetshop/template-trend 5.16.0-alpha.86c426f4 → 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.16.0-alpha.86c426f4",
+  "version": "5.16.0",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,11 +45,11 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "5.15.0-alpha.8e29bc11",
+    "@jetshop/core": "^5.16.0",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "5.15.0-alpha.8e29bc11",
-    "@jetshop/react-scripts": "5.15.0-alpha.8e29bc11",
-    "@jetshop/ui": "5.15.0-alpha.8e29bc11",
+    "@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/.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;}
-
-