@jetshop/template-trend 5.17.0-alpha.f7018eb5 → 5.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/template-trend",
-  "version": "5.17.0-alpha.f7018eb5",
+  "version": "5.17.0",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,15 +45,14 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "^5.17.0-alpha.f7018eb5",
+    "@jetshop/core": "^5.17.0",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "^5.17.0-alpha.f7018eb5",
-    "@jetshop/react-scripts": "^5.17.0-alpha.f7018eb5",
-    "@jetshop/ui": "^5.17.0-alpha.f7018eb5",
+    "@jetshop/intl": "^5.17.0",
+    "@jetshop/react-scripts": "^5.17.0",
+    "@jetshop/ui": "^5.17.0",
     "@react-google-maps/api": "~1.7.0",
     "prop-types": "^15.6.2",
     "react": "^16.9.0",
-    "react-apollo": "^3.1.5",
     "react-dom": "^16.9.0",
     "react-modal": "^3.4.5",
     "react-slider": "^1.1.4",
@@ -74,5 +73,6 @@
   },
   "resolutions": {
     "format-message-estree-util": "npm:@jetshop/format-message-estree-util"
-  }
+  },
+  "gitHead": "4710ae8ac5c7be17e7b2e722d9ff2173226326f2"
 }

package/schema.graphql

@@ -654,6 +654,7 @@ input CustomerUpdateExternalAttribute {
 
 input CustomerUpdateInput {
   pid: String
+  emailAddress: String
   organizationNumber: String
   billingAddress: CustomerUpdateBillingAddressInput!
   deliveryAddresses: [CustomerUpdateDeliveryAddressInput]
@@ -960,6 +961,7 @@ The response will contain a authorization token if the login was successful
 """
 type LoginResponse {
   token: Token!
+  customerId: Int
 }
 
 type MaskedProperty {
@@ -1122,7 +1124,7 @@ type Mutation {
   One of email, pid, externalId, memberNumber or customerId is required, along with a password. 
   Returns an authorization token if the login was successful.
   """
-  login(password: String, email: String, pid: String, externalId: String, memberNumber: String, externalHashId: String, timeStamp: String, customerId: Int): LoginResponse
+  login(password: String, email: String, pid: String, externalId: String, memberNumber: String, externalHashId: String, timeStamp: String, customerId: Int, cartId: String): LoginResponse
 
   """
   Requires a valid email and returns boolean value if successful, otherwise an error will be thrown
@@ -1164,7 +1166,7 @@ type Mutation {
   updateCustomerGroup(customerGroupAccessCode: String!): UpdateCustomerGroupResult
 
   """
-  This mutation's purpose is to update a existing customer's information. An
+  This mutation's purpose is to update an existing customer's information. An
   authorization token is needed in the request, in order to be able to update the customer.
   """
   updateCustomer(input: CustomerUpdateInput!): CustomerUpdateResponse
@@ -1257,6 +1259,7 @@ type Order {
   currency: Currency
   attachments: [OrderAttachment]
   orderPurchaseLocation: String
+  orderComments: [OrderComment]
 }
 
 type OrderAddress {
@@ -1276,6 +1279,11 @@ type OrderAttachment {
   url: String
 }
 
+type OrderComment {
+  title: String
+  text: String
+}
+
 type OrderDeliveryMethod {
   name: String
   fee: Price
@@ -2377,6 +2385,11 @@ type Tracking {
   ga4: GoogleAnalytics4
   gtm: GoogleTagManager
   fca: FacebookConversionsApi
+  trackingConsents: TrackingConsents
+}
+
+type TrackingConsents {
+  useTrackingConsentApi: Boolean
 }
 
 input UpdateCartInput {

package/src/components/Layout/Header/Header.js

@@ -43,7 +43,7 @@ const StyledLink = styled(Link)`
 `;
 
 const Container = styled('header')`
-  background-color: white;
+  background-color: #fff;
   position: relative;
   a {
     text-decoration: none;
@@ -160,7 +160,6 @@ function TopHeader() {
   const [searchOpen, setSearchOpen] = React.useState(false);
   const { loggedIn } = useAuth();
   const { routes } = useShopConfig();
-
   return (
     <HeaderContainer>
       <MaxWidth>

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

@@ -127,9 +127,7 @@ const CampaignContent = ({
   <TextColumn className={className}>
     <Title>{header.value}</Title>
     <Description>{text.value}</Description>
-    {buttonLink.value && (
-      <StyledButton to={buttonLink.value}>{buttonText.value}</StyledButton>
-    )}
+    <StyledButton to={buttonLink.value}>{buttonText.value}</StyledButton>
   </TextColumn>
 );
 

package/src/components/ui/Button.js

@@ -8,7 +8,7 @@ import { theme } from '../Theme';
 import { isRelativeUrl } from '@jetshop/core/helpers/isRelativeUrl';
 
 export const baseStyles = `
-  background-color: pink;
+  background-color: ${theme.colors.blue};
   border-color: ${theme.colors.blue};
   color: white;
   font-size: 16px;
@@ -55,7 +55,6 @@ const TrendABase = styled('a')`
   justify-content: center;
   align-items: center;
   height: 54px;
-  color: pink;
 `;
 
 const TrendLinkBase = styled(Link)`

package/src/shop.config.js

@@ -75,6 +75,7 @@ const config = {
     }
   },
   usePrimaryRouteForProducts: false,
-  useTrackingConsentAPI: true
+  useTrackingConsentAPI: true,
+  usePolyfilling: true
 };
 export default config;

package/src/theme-variables.js

@@ -10,7 +10,7 @@ module.exports = {
       tablegrey: '#F3F3F3',
       beige: '#f5f5dc',
       loadingBar: '#2f80ed',
-      blue: '#146DE1',
+      blue: '#0030EE',
       red: '#EB0000',
       background: '#f7f7f7',
       darkgrey: '#333',