@jetshop/template-trend 5.8.4 → 5.11.1

package/src/components/Shop.js

@@ -1,60 +1,53 @@
-import DynamicRoute from '@jetshop/core/components/DynamicRoute';
+import React from 'react';
+import { Helmet } from 'react-helmet-async';
+import { Route, Switch } from 'react-router-dom';
+
 import CustomFont from '@jetshop/core/components/Fonts/CustomFont';
+import DynamicRoute from '@jetshop/core/components/DynamicRoute';
 import PaginationProvider from '@jetshop/core/components/Pagination/PaginationProvider';
 import { ProductListProvider } from '@jetshop/core/hooks/ProductList/ProductListContext';
 import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
+
 import GenericError from '@jetshop/ui/ErrorBoundary/Generic';
 import LoadingBar from '@jetshop/ui/Loading/LoadingBar';
 import ModalProvider from '@jetshop/ui/Modal/ModalProvider';
 import ModalRoot from '@jetshop/ui/Modal/ModalRoot';
 import ScrollRestorationHandler from '@jetshop/ui/ScrollRestorationHandler';
-import React from 'react';
-import { Helmet } from 'react-helmet-async';
-import loadable from '@loadable/component';
-import { Route, Switch } from 'react-router-dom';
-import loadFontCss from '../fonts/loadFontCss';
-import CategoryPreviewQuery from './CategoryPreviewQuery.gql';
-import PagePreviewQuery from './PagePreviewQuery.gql';
+
 import Container from './Layout/Container';
 import Content from './Layout/Content';
 import Footer from './Layout/Footer/Footer';
 import Header from './Layout/Header/Header';
+
+import ForgotPassword from './Auth/ForgotPassword.loadable';
+import LogInPage from './Auth/LogInPage.loadable';
+import ResetPassword from './Auth/ResetPassword.loadable';
+import SignUpPage from './Auth/Signup/SignUpPage.loadable';
+import CategoryPage from './CategoryPage/CategoryPage.loadable';
+import ContentPage from './ContentPage/ContentPage.loadable';
+import CookieConsent from './CookieConsent';
 import LoadingPage from './LoadingPage';
+import LogOutPage from './LogOut.loadable';
+import MyPages from './MyPages/MyPages.loadable';
+import NavTreePage from './NavigationTree/NavTreePage.loadable';
+import NotFoundPage from './NotFoundPage.loadable';
+import PreviewRoute from './PreviewRoute.loadable';
 import { Favourites } from './ProductList/Favourites';
 import { productListQueries } from './ProductList/productListQueries';
-import ProductPreviewQuery from './ProductPreviewQuery.gql';
-import routeQuery from './RouteQuery.gql';
-import { theme } from './Theme';
-import '../globalStyles';
-import CookieConsent from './CookieConsent';
-import Store from './Store/Store.loadable';
-import StoreLocator from './StoreLocator/StoreLocator.loadable';
-import NotFoundPage from './NotFoundPage.loadable';
-import LogInPage from './Auth/LogInPage.loadable';
-import NavTreePage from './NavigationTree/NavTreePage.loadable';
-import StartPage from './StartPage/StartPage.loadable';
 import ProductPage from './ProductPage/ProductPage.loadable';
-import CategoryPage from './CategoryPage/CategoryPage.loadable';
-import ContentPage from './ContentPage/ContentPage.loadable';
 import SearchPage from './SearchPage/SearchPage.loadable';
-import SignUpPage from './Auth/Signup/SignUpPage.loadable';
-import ForgotPassword from './Auth/ForgotPassword.loadable';
-import ResetPassword from './Auth/ResetPassword.loadable';
-import MyPages from './MyPages/MyPages.loadable';
+import StartPage from './StartPage/StartPage.loadable';
+import Store from './Store/Store.loadable';
+import StoreLocator from './StoreLocator/StoreLocator.loadable';
 
-const LogOutPage = loadable(
-  () => import('@jetshop/core/components/AuthContext/LogOut'),
-  {
-    fallback: <LoadingPage />
-  }
-);
+import categoryPreviewQuery from './CategoryPreviewQuery.gql';
+import pagePreviewQuery from './PagePreviewQuery.gql';
+import productPreviewQuery from './ProductPreviewQuery.gql';
+import routeQuery from './RouteQuery.gql';
 
-const PreviewRoute = loadable(
-  () => import('@jetshop/core/components/DynamicRoute/PreviewRoute'),
-  {
-    fallback: <LoadingPage />
-  }
-);
+import { theme } from './Theme';
+import loadFontCss from '../fonts/loadFontCss';
+import '../globalStyles';
 
 function Shop() {
   const { routes } = useShopConfig();
@@ -76,49 +69,32 @@ function Shop() {
             <Content>
               <PaginationProvider defaultProductsPerPage={24}>
                 <Switch>
-                  <Route exact path="/">
-                    <StartPage />
-                  </Route>
-                  <Route path="/favourites">
-                    <Favourites />
-                  </Route>
-                  <Route path={routes.search.path}>
-                    <SearchPage />
-                  </Route>
-                  <Route path={routes.signup.path}>
-                    <SignUpPage />
-                  </Route>
-                  <Route path={routes.login.path}>
-                    <LogInPage />
-                  </Route>
-                  <Route path={routes.logout.path}>
-                    <LogOutPage />
-                  </Route>
-                  <Route path={routes.stores.path}>
-                    <StoreLocator />
-                  </Route>
-                  <Route path={`${routes.store.path}/:id`}>
-                    <Store />
-                  </Route>
-                  <Route path={routes.tree.path}>
-                    <NavTreePage />
-                  </Route>
-                  <Route path={routes.myPages.path}>
-                    <MyPages />
-                  </Route>
-                  <Route exact path={routes.forgotPassword.path}>
-                    <ForgotPassword />
-                  </Route>
-                  <Route path={`${routes.resetPassword.path}/:token`}>
-                    <ResetPassword />
-                  </Route>
+                  <Route exact path="/" component={StartPage} />
+                  <Route path="/favourites" component={Favourites} />
+                  <Route path={routes.search.path} component={SearchPage} />
+                  <Route path={routes.signup.path} component={SignUpPage} />
+                  <Route path={routes.login.path} component={LogInPage} />
+                  <Route path={routes.logout.path} component={LogOutPage} />
+                  <Route path={routes.stores.path} component={StoreLocator} />
+                  <Route path={`${routes.store.path}/:id`} component={Store} />
+                  <Route path={routes.tree.path} component={NavTreePage} />
+                  <Route path={routes.myPages.path} component={MyPages} />
+                  <Route
+                    exact
+                    path={routes.forgotPassword.path}
+                    component={ForgotPassword}
+                  />
+                  <Route
+                    path={`${routes.resetPassword.path}/:token`}
+                    component={ResetPassword}
+                  />
                   <Route
                     path="/preview"
                     render={props => (
                       <PreviewRoute
-                        productQuery={ProductPreviewQuery}
-                        categoryQuery={CategoryPreviewQuery}
-                        pageQuery={PagePreviewQuery}
+                        productQuery={productPreviewQuery}
+                        categoryQuery={categoryPreviewQuery}
+                        pageQuery={pagePreviewQuery}
                         productPage={ProductPage}
                         categoryPage={CategoryPage}
                         contentPage={ContentPage}

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

@@ -2,9 +2,6 @@ import React from 'react';
 import MaxWidth from '../../Layout/MaxWidth';
 import { styled } from 'linaria/react';
 import { theme } from '../../Theme';
-import { ReactComponent as Caret } from '@jetshop/ui/svg/Carrot.svg';
-import { Above } from '@jetshop/ui/Breakpoints';
-import { useAnimation, swipeEffect } from '@jetshop/ui/hooks';
 
 const Container = styled('div')`
   position: relative;
@@ -37,40 +34,6 @@ const ItemsContainer = styled('div')`
   }
 `;
 
-const Button = styled('button')`
-  position: absolute;
-  font-family: initial;
-  margin: 0 10px;
-  top: 50%;
-  transform: translateY(-50%);
-  z-index: 2;
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  background: rgba(255, 255, 255, 0.2);
-
-  &:focus,
-  &:active {
-    outline: none;
-  }
-
-  &:hover {
-    background: rgba(255, 255, 255, 0.6);
-  }
-
-  &.left svg {
-    transform: rotateZ(90deg);
-  }
-
-  &.right {
-    right: 0;
-
-    svg {
-      transform: rotateZ(-90deg);
-    }
-  }
-`;
-
 const Row = ({ header, children }) => {
   return (
     <MaxWidth>

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

@@ -66,12 +66,20 @@ const heroStyles = css`
   justify-content: center;
 `;
 
-const StartPageHero = ({ header, text, buttonText, buttonLink, imageSrc }) => (
+const StartPageHero = ({
+  header,
+  text,
+  buttonText,
+  buttonLink,
+  imageSrc,
+  isAboveFold
+}) => (
   <StartPageHeroWrapper>
     <Image
       fillAvailableSpace={true}
       src={imageSrc.value}
       className={heroStyles}
+      critical={isAboveFold.value}
     >
       <Container>
         <Title>{header.value}</Title>

package/src/components/StartPage/StartPage.js

@@ -2,7 +2,6 @@ import StartPageRenderer from '@jetshop/ui/StartPageRenderer';
 import React from 'react';
 import { useQuery } from 'react-apollo';
 import { styled } from 'linaria/react';
-import MaxWidth from '../Layout/MaxWidth';
 import LoadingPage from '../LoadingPage';
 import StartPageCampaign from './Content/StartPageCampaign';
 import StartPageCategories from './Content/StartPageCategories';
@@ -12,8 +11,6 @@ import StartPageProductGrid from './Content/StartPageProductGrid';
 import startPageQuery from './StartPageQuery.gql';
 import { StartPageCategoryItem } from './Content/StartPageCategories';
 
-import { theme } from '../Theme';
-
 const startPageComponents = {
   HERO: StartPageHero,
   HTML: StartPageHTMLContent,
@@ -29,16 +26,6 @@ const StartPageWrapper = styled('div')`
   flex-direction: column;
 `;
 
-export const MainSectionWrapper = styled(MaxWidth)`
-  width: 100%;
-  align-self: center;
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-  ${theme.below.sm} {
-    padding-left: 0px;
-    padding-right: 0px;
-  }
-`;
 const StartPage = ({ startPageId }) => {
   const result = useQuery(startPageQuery, {
     variables: { startPageId: startPageId }

package/src/components/StartPage/StartPageProductGridFragment.gql

@@ -24,4 +24,12 @@ fragment StartPageProductGrid on Product {
   badges {
     ...Badge
   }
+  customFields {
+    key
+    type
+    title
+    ... on CustomStringField {
+      stringValue: value
+    }
+  }
 }

package/cypress/constants.js

@@ -1,5 +0,0 @@
-export const PRODUCT_URL = 'se/accessories/watches/watch-classic-504';
-export const OUT_OF_STOCK_PRODUCT_URL = 'se/preview?articlenumber=224733';
-export const CATEGORY_URL = 'se/accessories/watches';
-export const ARTICLENUMBER_URL = 'se/articlenumber/6952315';
-export const US_ARTICLENUMBER_URL = 'int/articlenumber/6952315';

package/cypress/integration/addToCart/addToCart.spec.js

@@ -1,27 +0,0 @@
-import { PRODUCT_URL, OUT_OF_STOCK_PRODUCT_URL } from '../../constants';
-
-describe('Add to cart tests', () => {
-  it('Will add add a basic product to the cart', () => {
-    cy.visit(PRODUCT_URL);
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('exist');
-    cy.get('[data-testid="cart-button"]').click();
-    cy.get('[data-testid="item-name"]').should('not.be.empty');
-    cy.get('[data-testid="increment-quantity"]').click();
-    cy.get('[data-testid="item-quantity"]').should('contain', 2);
-    cy.get('[data-testid="remove-from-cart"]').click();
-    cy.get('[data-testid="item-name"]').should('not.exist');
-  });
-  it('Add to cart button is disabled if product is out of stock', () => {
-    cy.visit(OUT_OF_STOCK_PRODUCT_URL);
-    cy.get('button[data-testid="add-to-cart"]').should('be.disabled');
-  });
-  it('Checkout button is linked to the checkout', () => {
-    cy.visit(PRODUCT_URL);
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('button[data-testid="cart-button"]').click();
-    cy.get('[data-testid="checkout-button"]')
-      .should('have.attr', 'href')
-      .and('include', 'externalcheckout');
-  });
-});

package/cypress/integration/addToCart/disabledVariations.spec.js

@@ -1,17 +0,0 @@
-const PRODUCT_WITH_INVALID_VARIATIONS_URL = '/furniture/toldbod-pendant';
-describe('Disabled variations', () => {
-  it('Will add a product with attributes if they have been selected', () => {
-    cy.visit(PRODUCT_WITH_INVALID_VARIATIONS_URL);
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('not.exist');
-    cy.findByText('Ø 250').click();
-    cy.get('#option-Color').click();
-    cy.findByText('White', { selector: 'li[role=menuitem]' }).click();
-    cy.get('button[data-testid="add-to-cart"]').should('be.disabled');
-    cy.get('#option-Color').click();
-    cy.findByText('Black', { selector: 'li[role=menuitem]' }).click();
-    cy.findByText('Ø 250').click();
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('exist');
-  });
-});

package/cypress/integration/addToCart/newslettersubscriber.spec.js

@@ -1,24 +0,0 @@
-describe('Notify when back test', () => {
-  it('Subscribes to newsletter with a random email', () => {
-    cy.visit('/');
-    cy.get(
-      '[data-testid="newsletter-subscription-input"]'
-    ).type('edgardavids@glasses.com', { force: true });
-    cy.get('button[data-testid="newsletter-subscription-submit"]').click();
-    cy.get('p[data-testid="newsletter-subscription-success"]').should(
-      'contain',
-      'You are now subscribed'
-    );
-  });
-
-  it('Cannot subscribe with an invalid email', () => {
-    cy.visit('/');
-    cy.get(
-      '[data-testid="newsletter-subscription-input"]'
-    ).type('edgardavids.com', { force: true });
-    cy.get('button[data-testid="newsletter-subscription-submit"]').click();
-    cy.get('p[data-testid="newsletter-subscription-success"]').should(
-      'not.exist'
-    );
-  });
-});

package/cypress/integration/addToCart/notifyWhenBackInStock.spec.js

@@ -1,20 +0,0 @@
-const PRODUCT_URL = 'accessories/glasses-black';
-
-describe('Notify when back test', () => {
-  it('Will fill out notify when back with a test email', () => {
-    cy.visit(PRODUCT_URL);
-    cy.get('button[data-testid="add-to-cart"]').should('not.exist');
-    cy.get('button[data-testid="notify-when-back-button"]').click();
-    cy.get('input[data-testid="notify-when-back-input"]').type(
-      'test@example.com',
-      {
-        force: true
-      }
-    );
-    cy.get('button[data-testid="notify-when-back-ok"]').click({ force: true });
-    cy.get('p[data-testid="notify-when-back-success"]').should(
-      'contain',
-      'You are now subscribed'
-    );
-  });
-});

package/cypress/integration/addToCart/productConfigurations.spec.js

@@ -1,35 +0,0 @@
-const PRODUCT_URL = 'furniture/black-leather-sofa';
-
-describe('Add to cart product configuration tests', () => {
-  it('Will add add a product with configurations', () => {
-    cy.visit(PRODUCT_URL);
-
-    cy.get('.price').should('contain', '420');
-
-    cy.get('#option-Head').click();
-    cy.findAllByRole('menuitem', { name: 'putter' }).click();
-    cy.get('#option-Head').should('contain', 'putter');
-
-    cy.get('.price').should('contain', '370');
-
-    cy.get('#option-stick').click();
-    cy.findAllByRole('menuitem', { name: 'shiny' }).click();
-    cy.get('#option-stick').should('contain', 'shiny');
-
-    cy.get('.price').should('contain', '470');
-
-    cy.get('#option-grip').click();
-    cy.findAllByRole('menuitem', { name: 'plastic' }).click();
-    cy.get('#option-grip').should('contain', 'plastic');
-
-    cy.get('.price').should('contain', '455');
-
-    cy.findByRole('button', { name: /add to cart/i }).click();
-
-    cy.get('[data-testid="product-toast"]').should('exist');
-    cy.get('[data-testid="cart-button"]').click();
-    cy.get('[data-testid="item-name"]').should('not.be.empty');
-    cy.get('[data-testid="item-price"]').should('contain', '455');
-    cy.get('[data-testid="cart-button"]').click();
-  });
-});

package/cypress/integration/addToCart/productVariations.spec.js

@@ -1,42 +0,0 @@
-const PRODUCT_WITH_VARIATIONS_URL = 'furniture/armchair-lord';
-
-describe('Product variants', () => {
-  it('can be successfully selected and added to cart', () => {
-    cy.visit(PRODUCT_WITH_VARIATIONS_URL);
-
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('not.exist');
-    cy.findByText('Small').click();
-    cy.findByText('JA').click();
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('not.exist');
-    cy.get('input[data-testid="Skriv in ditt önskade tryck här-input"]').type(
-      'Hello, World'
-    );
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('exist');
-    cy.get('[data-testid="cart-button"]').click();
-    cy.get('[data-testid="item-name"]').should('not.be.empty');
-    cy.get('[data-testid="increment-quantity"]').click();
-    cy.get('[data-testid="item-quantity"]').should('contain', 2);
-    cy.get('[data-testid="remove-from-cart"]').click();
-    cy.get('[data-testid="item-name"]').should('not.exist');
-  });
-
-  describe('Preselection', () => {
-    it('preselects variant when included in the url', () => {
-      cy.visit('accessories/belts/belt-light?att=Mzg=');
-      cy.get('[aria-pressed="true"]').should('contain', '38');
-    });
-
-    it('preselects the cheapest variant by default', () => {
-      cy.visit('accessories/belts/belt-light');
-      cy.get('[aria-pressed="true"]').should('contain', '37');
-
-      cy.visit('/furniture/aj-floor-lamp');
-      cy.get('[aria-pressed="true"]')
-        .should('contain', 'Black')
-        .should('contain', '140');
-    });
-  });
-});

package/cypress/integration/addToCart/sizePriceChange.spec.js

@@ -1,20 +0,0 @@
-const PRODUCT_URL = 'accessories/belt-light';
-
-describe('Produce price', () => {
-  it('changes when variant is changed', () => {
-    cy.visit(PRODUCT_URL);
-    cy.get('.new-price').should('contain', '499');
-    cy.findByText('36').click();
-    cy.get('.new-price').should('contain', '563');
-    cy.findByText('38').click();
-    cy.get('.new-price').should('contain', '500');
-    cy.get('button[data-testid="add-to-cart"]').click();
-    cy.get('[data-testid="product-toast"]').should('exist');
-    cy.get('[data-testid="cart-button"]').click();
-    cy.get('[data-testid="item-name"]').should('not.be.empty');
-    cy.get('.price')
-      .first()
-      .should('contain', '500');
-    cy.get('[data-testid="cart-button"]').click();
-  });
-});

package/cypress/integration/analytics/gtag.spec.js

@@ -1,90 +0,0 @@
-import { callsTo } from '../../support/dataLayer';
-import { PRODUCT_URL, CATEGORY_URL } from '../../constants';
-const eventMatcher = eventName => [
-  function eventMatcher(calls) {
-    return calls.find(call => call[0] === 'event' && call[1] === eventName);
-  },
-  `Event ${eventName} is pushed to dataLayer`
-];
-
-const pageviewMatcher = path => [
-  function pageviewMatcher(calls) {
-    const pageViewCall = calls.find(
-      call => call[0] === 'event' && call[1] === 'page_view'
-    );
-    return pageViewCall.length > 0;
-  },
-  `Page View for "${path}" is pushed to dataLayer`
-];
-
-describe('Analytics: GTAG – Google Analytics', () => {
-  it('Start Page: Should trigger view events', () => {
-    cy.visit('/');
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('view_item_list'));
-      expect(callsTo(push)).to.satisfy(...pageviewMatcher('/'));
-    });
-  });
-
-  it('Category Page: Should trigger view events', () => {
-    cy.visit(CATEGORY_URL);
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('view_item_list'));
-      expect(callsTo(push)).to.satisfy(...pageviewMatcher(CATEGORY_URL));
-    });
-  });
-
-  it('Category Page: Should trigger click events', () => {
-    cy.visit(CATEGORY_URL);
-
-    cy.findAllByTestId('product')
-      .first()
-      .click();
-
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('select_content'));
-    });
-  });
-
-  it('Product Page: Should trigger view events', () => {
-    cy.visit(PRODUCT_URL);
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('view_item'));
-      expect(callsTo(push)).to.satisfy(...pageviewMatcher(PRODUCT_URL));
-    });
-  });
-
-  it('Product Page: Should trigger cart events', () => {
-    cy.visit(PRODUCT_URL);
-
-    // Add to cart
-    cy.findByTestId('add-to-cart').click({ force: true });
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('add_to_cart'));
-    });
-
-    // Remove from to cart
-    cy.findByTestId('cart-button').click({ force: true });
-    cy.findByTestId('remove-from-cart')
-      .first()
-      .click();
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push)).to.satisfy(...eventMatcher('remove_from_cart'));
-    });
-  });
-
-  it('Product Page: Attribute click events to the appropriate list and apppropriate currency', () => {
-    cy.visit(CATEGORY_URL);
-
-    cy.findAllByTestId('product')
-      .first()
-      .click();
-
-    cy.findByTestId('add-to-cart').click({ force: true });
-    cy.get('@gtm_dataLayer_push').should(push => {
-      expect(callsTo(push).pop()[2].currency).to.equal('SEK');
-      expect(callsTo(push).pop()[2].items[0].list_name).to.equal('Watches');
-      expect(callsTo(push)).to.satisfy(...eventMatcher('add_to_cart'));
-    });
-  });
-});