gatsby-core-theme 8.0.10 → 8.0.13

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [8.0.13](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.12...v8.0.13) (2022-07-25)
+
+
+### Bug Fixes
+
+* removed gtm on timeout ([d80c25c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d80c25c18a32c0d1cca37fb100fba78aa70ac7e5))
+
+## [8.0.12](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.11...v8.0.12) (2022-07-25)
+
+
+### Bug Fixes
+
+* tracker content ([76f163f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/76f163f9ccb268b2f9eb217b343ec396800fd4c8))
+
+
+* Merge branch 'tm-2929-tracker-content' into 'master' ([632ac8f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/632ac8fa2a80eefb6f9691fbf22cbd367ad92d6d))
+
+## [8.0.11](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.10...v8.0.11) (2022-07-22)
+
+
+### Bug Fixes
+
+* default toplist row changes ([8de8355](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8de8355236c9d38c5888b8f7e6959950542b32ac))
+* operator logo ([93e7021](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/93e70210ede704f43032021823030fe2c55cfa6d))
+
+
+* Merge branch 'tm-2940-operator-logo' into 'master' ([b2b48ad](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b2b48ad6ce4dc3a80c63931e6fc5a5f47eb088ad))
+
 ## [8.0.10](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v8.0.9...v8.0.10) (2022-07-18)
 
 

package/gatsby-browser.js

@@ -47,9 +47,9 @@ function initGTMOnEvent(event) {
 }
 
 exports.onClientEntry = () => {
-  document.onreadystatechange = () => {
-    if (document.readyState !== 'loading') setTimeout(initGTM, 4000);
-  };
+  // document.onreadystatechange = () => {
+  //   if (document.readyState !== 'loading') setTimeout(initGTM, 4000);
+  // };
 
   document.addEventListener('scroll', initGTMOnEvent);
   document.addEventListener('mousemove', initGTMOnEvent);

package/package.json

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

package/src/components/molecules/toplist/default-row/index.js

@@ -1,6 +1,5 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { MdCheck } from '@react-icons/all-files/md/MdCheck';
 import Bonus from '~atoms/bonus';
 import { Context } from '~context/TranslationsProvider';
 import SellingPoints from '~atoms/selling-points';
@@ -54,7 +53,7 @@ const Row = ({ item, oneliner = 'main', layout = 'list', tracker = 'main' }) =>
         <Bonus item={item} tracker={oneliner} />
       </a>
       <StarRating numOfStars={5} rating={itemRating} showLabel />
-      <SellingPoints icon={<MdCheck />} sellingPoints={item.selling_points} />
+      <SellingPoints sellingPoints={item.selling_points} />
       <div>
         <Link className={`${styles.reviewLink} toplist-variant-one-gtm`} to={item.review_link}>
           {`${translate(translations, 'read_review', 'Review')}`}

package/src/components/pages/tracker/index.js

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Button from '~atoms/button';
 import LazyImage from '~hooks/lazy-image';
-import { prettyTracker } from '~helpers/getters';
+import { prettyTracker, imagePrettyUrl, getAltText } from '~helpers/getters';
 import { generateTrackerLink } from '~helpers/generators';
 import { isMobileDevice } from '~helpers/device-detect';
 import styles from './tracker.module.scss';
@@ -19,6 +19,9 @@ const Tracker = ({
   logo = '../../../../../images/logo.svg',
   counter = false,
   isStory = false,
+  operatorLogo = false,
+  operatorLogoWidth = '80',
+  operatorLogoHeight = '80',
 }) => {
   const { operator } = pageContext;
 
@@ -88,6 +91,8 @@ const Tracker = ({
     background = <LazyImage className={styles.background} src={bgImage} alt="background image" />;
   }
 
+  const imageObject = operator?.standardised_logo_url_object || operator?.logo_url_object;
+
   return (
     <>
       {showSplashScreen && !isMobile && (
@@ -96,10 +101,23 @@ const Tracker = ({
             {background}
             <div className={styles.content}>
               <LazyImage alt="Site logo" src={logo} />
-              <p className={styles.mainText}>{`${mainText.replace(
-                '[operator_name]',
-                operator.name
-              )}`}</p>
+              <p
+                className={`${styles.mainText} ${operatorLogo && styles.mainTextWithlogo}`}
+              >{`${mainText.replace('[operator_name]', operator.name)}`}</p>
+              {operatorLogo && (
+                <LazyImage
+                  src={imagePrettyUrl(
+                    imageObject?.filename || operator?.logo_url,
+                    operatorLogoWidth,
+                    operatorLogoHeight
+                  )}
+                  alt={getAltText(imageObject, operator?.name)}
+                  loading="eager"
+                  width={operatorLogoWidth}
+                  height={operatorLogoHeight}
+                  className={styles.operatorlogo}
+                />
+              )}
               <div className={styles.bar} />
               {counter ? (
                 redirectText
@@ -138,9 +156,15 @@ Tracker.propTypes = {
   counter: PropTypes.bool,
   redirectTimer: PropTypes.number,
   isStory: PropTypes.bool,
+  operatorLogo: PropTypes.bool,
+  operatorLogoWidth: PropTypes.string,
+  operatorLogoHeight: PropTypes.string,
   pageContext: PropTypes.shape({
     operator: PropTypes.shape({
       name: PropTypes.string,
+      standardised_logo_url_object: PropTypes.shape({}),
+      logo_url_object: PropTypes.shape({}),
+      logo_url: PropTypes.string,
       links: PropTypes.shape({
         main: PropTypes.string,
         terms_and_conditions: PropTypes.string,

package/src/components/pages/tracker/tracker.module.scss

@@ -50,6 +50,17 @@
       }
     }
 
+    .mainTextWithlogo {
+      margin: 2rem 0rem 1rem;
+    }
+
+    .operatorlogo {
+      width: 80px;
+      height: 80px;
+      object-fit: contain;
+      margin-bottom: 1rem;
+    }
+
     .bar {
       height: 0.8rem;
       background: #e1dbdb;