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

package/src/components/CategoryPage/Filters/BooleanFilters.js

@@ -18,6 +18,7 @@ export function BooleanFilters({ filters }) {
 
 function BooleanFilter({ filter }) {
   const { apply } = useBooleanFilter({ filter });
+
   return (
     <Checkbox
       key={filter.id}

package/src/components/Layout/Footer/FooterLinks.js

@@ -1,9 +1,9 @@
+import { useQuery } from '@apollo/client';
 import React from 'react';
 import pagesQuery from './PagesQuery.gql';
 import ContentPageLink from '@jetshop/ui/ContentPageLink';
 import t from '@jetshop/intl';
 import StoreTitleQuery from './StoreTitleQuery.gql';
-import { useQuery } from '@apollo/react-hooks';
 
 function FooterLinks() {
   const { data } = useQuery(pagesQuery);

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

@@ -43,7 +43,6 @@ const CategoryMenuContainer = ({ queryData }) => {
                 ))
               : null}
           </ul>
-
           <SubMenuWrapper
             pose={
               props.activeCategories.length > 0 &&

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

@@ -1,3 +1,4 @@
+import { useQuery } from '@apollo/client';
 import useAuth from '@jetshop/core/components/AuthContext/useAuth';
 import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
 import t from '@jetshop/intl';
@@ -5,7 +6,6 @@ import { Above } from '@jetshop/ui/Breakpoints';
 import { DrawerTrigger } from '@jetshop/ui/Modal/Drawer/DrawerTrigger';
 import { styled } from 'linaria/react';
 import React from 'react';
-import { useQuery } from 'react-apollo';
 import { Link } from 'react-router-dom';
 import { ReactComponent as Menu } from '../../../svg/Menu.svg';
 import { ReactComponent as Person } from '../../../svg/Person.svg';
@@ -160,7 +160,6 @@ function TopHeader() {
   const [searchOpen, setSearchOpen] = React.useState(false);
   const { loggedIn } = useAuth();
   const { routes } = useShopConfig();
-
   return (
     <HeaderContainer>
       <MaxWidth>

package/src/components/MyPages/CustomerNameHeader.js

@@ -1,6 +1,6 @@
+import { useQuery } from '@apollo/client';
 import t from '@jetshop/intl';
 import React from 'react';
-import { useQuery } from '@apollo/react-hooks';
 import { css } from 'linaria';
 import customerNameQuery from './CustomerNameQuery.gql';
 import { theme } from '../Theme';

package/src/components/MyPages/MyPagesStartPage.js

@@ -1,3 +1,4 @@
+import { useQuery } from '@apollo/client';
 import React, { Fragment } from 'react';
 import { styled } from 'linaria/react';
 import { ListOrder } from './Orders/ListOrder';
@@ -9,7 +10,6 @@ import { StyledCarrot } from '@jetshop/ui/Select/Components';
 import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
 import Head from '@jetshop/core/components/Head';
 import { Intl } from '@jetshop/intl';
-import { useQuery } from '@apollo/react-hooks';
 import MyPagesContent from './MyPagesContent.gql';
 
 import { theme } from '../Theme';

package/src/components/NavigationTree/NavTree.js

@@ -1,5 +1,6 @@
+import { Query } from '@apollo/client/react/components';
+
 import React, { Component } from 'react';
-import { Query } from 'react-apollo';
 import RecursiveTree from '@jetshop/ui/Menu/RecursiveTree';
 import { styled } from 'linaria/react';
 import { cx } from 'linaria';

package/src/components/ProductList/AddToCart.js

@@ -1,6 +1,6 @@
+import { useMutation } from '@apollo/client';
 import React, { useContext } from 'react';
 import { css } from 'linaria';
-import { useMutation } from '@apollo/react-hooks';
 
 import t from '@jetshop/intl';
 import { CartIdContext } from '@jetshop/core/components/Cart/CartIdContext';

package/src/components/ProductList/Favourites.js

@@ -23,6 +23,7 @@ export function Favourites() {
   const listId = null;
 
   const { products, loading } = useProductListItems(listId);
+
   const [trigger] = useNotification();
 
   const validItems = getItemsForAddToCart(products);

package/src/components/ProductList/ProductLists.gql

@@ -78,6 +78,14 @@ fragment VariantDetail on ProductVariant {
     buyable
     text
   }
+  price {
+    incVat
+    exVat
+  }
+  previousPrice {
+    incVat
+    exVat
+  }
   images {
     modifiedDate
     alt

package/src/components/ProductPage/AddToCart/AddToCartForm.js

@@ -130,10 +130,12 @@ function AddToCartForm({
             {product.hasConfigurations && (
               <ConfigurationSelector product={product} />
             )}
-            <PreOrderDateSelector
-              className={cx(dropdownStyles, preOrderDateSelectorStyles)}
-              product={product}
-            />
+            {product.isPreorder && (
+              <PreOrderDateSelector
+                className={cx(dropdownStyles, preOrderDateSelectorStyles)}
+                product={product}
+              />
+            )}
             <Price
               hidePrice={product.hidePrice}
               {...price}

package/src/components/ProductPage/PriceHistory.js

@@ -1,6 +1,6 @@
+import { useQuery } from '@apollo/client';
 import t from '@jetshop/intl';
 import React, { useContext } from 'react';
-import { useQuery } from '@apollo/react-hooks';
 import PriceHistoryQuery from './PriceHistoryQuery.gql';
 import { styled } from 'linaria/react';
 import { Price } from '@jetshop/ui/Price';

package/src/components/ProductPage/ProductPageFragment.gql

@@ -20,6 +20,7 @@ fragment ProductPage on Product {
   description
   hasVariants
   isPackage
+  isPreOrder
   hidePrice
   canonicalCategory {
     primaryRoute {

package/src/components/SearchPage/EmptySearchResults.js

@@ -1,6 +1,6 @@
+import { Query } from '@apollo/client/react/components';
 import t from '@jetshop/intl';
 import React from 'react';
-import { Query } from 'react-apollo';
 import CategoryList from './CategoryList';
 import { Header, Matches } from './SearchPage';
 import SearchTerm from './SearchTerm';

package/src/components/StartPage/StartPage.js

@@ -1,6 +1,6 @@
+import { useQuery } from '@apollo/client';
 import StartPageRenderer from '@jetshop/ui/StartPageRenderer';
 import React from 'react';
-import { useQuery } from 'react-apollo';
 import { styled } from 'linaria/react';
 import LoadingPage from '../LoadingPage';
 import StartPageCampaign from './Content/StartPageCampaign';

package/src/components/Store/Store.js

@@ -1,5 +1,5 @@
+import { useQuery } from '@apollo/client';
 import React from 'react';
-import { useQuery } from 'react-apollo';
 import { styled } from 'linaria/react';
 import MaxWidth from '../Layout/MaxWidth';
 import StoreDetail from './StoreDetail';

package/src/components/StoreLocator/StoreLocator.js

@@ -1,6 +1,7 @@
+import { Query } from '@apollo/client/react/components';
+
 import t from '@jetshop/intl';
 import React, { useState } from 'react';
-import { Query } from 'react-apollo';
 import { styled } from 'linaria/react';
 import { fuzzySearch } from '@jetshop/ui/fuzzySearch';
 import { Above } from '@jetshop/ui/Breakpoints';

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;

package/src/theme-variables.js

@@ -10,8 +10,8 @@ module.exports = {
       tablegrey: '#F3F3F3',
       beige: '#f5f5dc',
       loadingBar: '#2f80ed',
-      blue: '#146DE1',
-      red: '#EB0000',
+      blue: '#002DF1',
+      red: '#FF230A',
       background: '#f7f7f7',
       darkgrey: '#333',
       mediumgrey: '#9a9a9a',