gatsby-core-theme 1.6.17 → 1.6.21

package/CHANGELOG.md

@@ -1,3 +1,55 @@
+## [1.6.21](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.20...v1.6.21) (2021-12-07)
+
+
+### Bug Fixes
+
+* trackers ([5ad12eb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5ad12ebc2492172f7a94d680315f67b8e19fc4f9))
+
+## [1.6.20](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.19...v1.6.20) (2021-12-07)
+
+
+### Bug Fixes
+
+* close menu onclick a link ([ce4d9bb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ce4d9bbf8733bdbe3b09f7fd84226e6a084b42a7))
+* implement for all core sites ([e5c46c0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e5c46c0bee4cf5555990d7c9c5d53bc43a2c6722))
+* small issue ([30fd7e3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/30fd7e305935a00ec514321a5ca8e5a79545681c))
+* small issue ([c1c29ce](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c1c29cedca7be589e2b3f23a7d25a399f1cb7ca5))
+
+
+### Code Refactoring
+
+* add custom styles to menu ([f686a60](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f686a6059786b6c4f43cf24041f383a5bd19c0d7))
+
+
+* Merge branch 'tm-navigation-sticky' into 'master' ([0593868](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/05938683ca72db7677d3052f72fadbc26a2db613))
+* Merge branch 'navigation-menu' into 'master' ([d812530](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d8125309b039694c6e35b54d3629134697b407f4))
+
+## [1.6.19](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.18...v1.6.19) (2021-12-06)
+
+
+### Config
+
+* removed minifier ([814cb53](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/814cb532146b2d4b71f8ab3878859520b29bf757))
+
+## [1.6.18](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.17...v1.6.18) (2021-12-06)
+
+
+### Bug Fixes
+
+* add watchfooty prefix ([d7111a7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d7111a754744f8c765d56a068bc323eefcf996c4))
+* added passive scrolling ([9098cb7](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9098cb715400f38035bf29f2dc597f24d2b62672))
+* configured touch events to be passive and added minify plugin ([cb73f96](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cb73f96a89a5c2bc07f7a85cc3e3233876d987ff))
+
+
+### Code Refactoring
+
+* update schema author url ([1cf3346](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/1cf33462031e0d2cb540fcb9e6913a7cb5545f08))
+
+
+* Merge branch 'tm-2589-update-schema-author-url' into 'master' ([40e8dbc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/40e8dbc0f3263dcecf012bfc3b3aa800c1dc7aff))
+* Merge branch 'add_timezone_prefix' into 'master' ([cf13fc6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cf13fc69d6c896a018d58e96c7d0fc6721d5aef7))
+* Merge branch 'tm-2558-passive-scroll' into 'master' ([741fff3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/741fff36ba62eb4f0d1d76821581d46c0a266293))
+
 ## [1.6.17](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v1.6.16...v1.6.17) (2021-12-03)
 
 

package/gatsby-browser.js

@@ -53,5 +53,5 @@ exports.onClientEntry = () => {
 
   document.addEventListener('scroll', initGTMOnEvent);
   document.addEventListener('mousemove', initGTMOnEvent);
-  document.addEventListener('touchstart', initGTMOnEvent);
+  document.addEventListener('touchstart', initGTMOnEvent, { passive: true });
 };

package/gatsby-node.esm.js

@@ -253,16 +253,6 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           });
         }
 
-        const trackerPageObject = {
-          meta_title: 'Tracker',
-          template: 'tracker',
-          title: 'Tracker',
-          type: 'page',
-          language: languageKey,
-          path: '',
-          meta_robots: ['noindex', 'nofollow'],
-        };
-
         // Operator tracker pages
         if (page.type === 'operator') {
           const operator = operators[page.relation_id];
@@ -272,7 +262,15 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           );
           tracker.forEach((trackerPath) => {
             // Create splash page
-            trackerPageObject['path'] = trackerPath;
+            const trackerPageObject = {
+              meta_title: 'Tracker',
+              template: 'tracker',
+              title: 'Tracker',
+              type: 'page',
+              language: languageKey,
+              path: trackerPath,
+              meta_robots: ['noindex', 'nofollow'],
+            };
             createPage({
               path: trackerPath,
               component: require.resolve('./src/components/app.js'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "1.6.17",
+  "version": "1.6.21",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/atoms/menu/items/item/index.js

@@ -1,9 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
 import Link from '~hooks/link';
 import useIsMobile from '~hooks/useIsMobile';
 import ConditionalWrapper from '~atoms/conditional-wrapper';
 import { imagePrettyUrl } from '~helpers/getters';
+import { NavigationContext } from '~organisms/navigation/navigationContext';
 
 import styles from './item.module.scss';
 
@@ -21,6 +22,8 @@ export default function Item({
   const [active, setActive] = useState('');
   const [opened, setOpened] = useState(false);
 
+  const { setShowMenu } = useContext(NavigationContext);
+
   useEffect(() => {
     const url = typeof window !== 'undefined' ? new URL(window.location.href) : '';
     setActive(
@@ -28,6 +31,10 @@ export default function Item({
     );
   }, [active, item]);
 
+  const handleClose = () => {
+    setShowMenu(false);
+  };
+
   const toggleDropDown = (e) => {
     e.target.classList.toggle(styles.active);
     setOpened(e.target.classList.contains(styles.active));
@@ -84,6 +91,7 @@ export default function Item({
           title={item.title}
           rel={item.nofollow && 'nofollow'}
           aria-label={`${item?.title} link`}
+          onClick={handleClose}
         >
           <ItemImage />
           {item.title}

package/src/components/molecules/menu/index.js

@@ -27,6 +27,7 @@ const Menu = ({
     },
   },
   gtmClass = '',
+  customStyles,
 }) => {
   let menuObject;
 
@@ -62,7 +63,10 @@ const Menu = ({
   return (
     <div className={styles.menuContainer}>
       <MenuIcon onClick={handleMenuIconClick} gtmClass="main-menu-gtm" />
-      <ul ref={menuListRef} className={`${menuListClasses} ${showMenu && styles.show}`}>
+      <ul
+        ref={menuListRef}
+        className={`${menuListClasses} ${showMenu && styles.show} ${styles[customStyles]}`}
+      >
         {menuObject &&
           menuObject.children.map((child) => {
             return (
@@ -113,6 +117,7 @@ Menu.propTypes = {
   }).isRequired,
   menu: PropTypes.string.isRequired,
   gtmClass: PropTypes.string,
+  customStyles: PropTypes.string,
 };
 
 export default Menu;

package/src/components/molecules/slider/index.js

@@ -162,20 +162,20 @@ function Slider({
     sliderContentNode.addEventListener('mousedown', mousedown);
     document.addEventListener('mousemove', mouseMoveDebounce);
     document.addEventListener('mouseup', mouseUpDebounce);
-    sliderContentNode.addEventListener('touchstart', mousedown);
-    sliderContentNode.addEventListener('touchmove', mouseMoveDebounce);
+    sliderContentNode.addEventListener('touchstart', mousedown, { passive: true });
+    sliderContentNode.addEventListener('touchmove', mouseMoveDebounce, { passive: true });
     sliderContentNode.addEventListener('touchend', mouseUpDebounce);
-    sliderContainerRef.current.addEventListener('wheel', onWheel);
+    sliderContainerRef.current.addEventListener('wheel', onWheel, { passive: true });
 
     return () => {
       sliderContentNode?.removeEventListener('click', click);
       sliderContentNode?.removeEventListener('mousedown', mousedown);
       document.removeEventListener('mousemove', mouseMoveDebounce);
       document.removeEventListener('mouseup', mouseUpDebounce);
-      sliderContentNode?.removeEventListener('touchstart', mousedown);
-      sliderContentNode?.removeEventListener('touchmove', mouseMoveDebounce);
+      sliderContentNode?.removeEventListener('touchstart', mousedown, { passive: true });
+      sliderContentNode?.removeEventListener('touchmove', mouseMoveDebounce, { passive: true });
       sliderContentNode?.removeEventListener('touchend', mouseUpDebounce);
-      sliderContainerRef?.current?.removeEventListener('wheel', onWheel);
+      sliderContainerRef?.current?.removeEventListener('wheel', onWheel, { passive: true });
     };
   });
 

package/src/components/organisms/navigation/index.js

@@ -33,6 +33,7 @@ const Navigation = ({
   },
   sticky = true,
   template,
+  customStyles,
 }) => {
   const navRef = useRef(React.createRef());
   const showMenu = template !== 'ppc';
@@ -72,7 +73,13 @@ const Navigation = ({
           </Link>
           {showMenu && (
             <>
-              <Menu section={section} menu={menu} options={options} gtmClass="main-menu-gtm" />
+              <Menu
+                section={section}
+                menu={menu}
+                options={options}
+                customStyles={customStyles}
+                gtmClass="main-menu-gtm"
+              />
               {hasSearch && <Search className={styles.search} searchIcon={searchIcon} />}
             </>
           )}
@@ -116,6 +123,7 @@ Navigation.propTypes = {
     }),
   }),
   sticky: PropTypes.bool,
+  customStyles: PropTypes.string,
 };
 
 export default Navigation;

package/src/helpers/schedule.js

@@ -140,14 +140,9 @@ export function formatEvents(events) {
 
   switch (siteName) {
     case 'sefodbold.dk':
-      prefix = 1;
-      break;
     case 'sesport.dk':
-      prefix = 1;
-      break;
+    case 'watchfooty.co.uk':
     case 'bekijksport.nl':
-      prefix = 1;
-      break;
     case 'livestreamsvoetbal.nl':
       prefix = 1;
       break;

package/src/helpers/schema.js

@@ -128,7 +128,7 @@ export function webPageSchema(page, pageImage) {
         contactType: 'Author',
         name: author.name || '',
         email: author.email_address || '',
-        url: `${getUrl('/')}${author.profile_page_path}`,
+        url: getUrl(author.profile_page_path || '/'),
       })),
       sameAs: socialLinks
         .map((socialLink) => page.siteSchema?.[socialLink])
@@ -216,7 +216,7 @@ export function templateSchemas(page) {
         author: {
           '@type': 'Person',
           name: page.author?.name?.substring(0, 100),
-          url: `${getUrl('/')}${page.author?.profile_page_path}`,
+          url: getUrl(page.author?.profile_page_path || '/'),
         },
         publisher: {
           '@type': 'Organization',
@@ -247,7 +247,7 @@ export function templateSchemas(page) {
         author: {
           '@type': 'Person',
           name: page.author?.name?.substring(0, 100),
-          url: `${getUrl('/')}${page.author?.profile_page_path}`,
+          url: getUrl(page.author?.profile_page_path || '/'),
         },
         publisher: {
           '@type': 'Organization',
@@ -289,7 +289,7 @@ export function templateSchemas(page) {
           author: {
             '@type': 'Person',
             name: page.author?.name?.substring(0, 100),
-            url: `${getUrl('/')}${page.author?.profile_page_path}`,
+            url: getUrl(page.author?.profile_page_path || '/'),
           },
           publisher: {
             '@type': 'Organization',