gatsby-matrix-theme 3.0.3 → 3.0.7

package/CHANGELOG.md

@@ -1,3 +1,74 @@
+## [3.0.7](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.0.6...v3.0.7) (2021-12-07)
+
+
+### Bug Fixes
+
+* canonical url generator ([32b68cd](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/32b68cd094fb1492db12d863fc986f680e8476e8))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([a7d5f57](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/a7d5f5766f182b2d062a3bb277d6e8db8e5e62e1))
+
+## [3.0.6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.0.5...v3.0.6) (2021-12-07)
+
+
+### Bug Fixes
+
+* content read more ([6f00226](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6f00226ebc277e02a78103e9987871200af0bb17))
+* issue fix ([ac5b5e6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/ac5b5e67e43d31d67cf0c37ecfbf0eb0c979323c))
+* small style issue ([2e32e03](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/2e32e03904e809a3d2cc1ed444fc5dd1fc16cdeb))
+
+
+### Code Refactoring
+
+* add custom styles to menu ([5fb35db](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5fb35db8cdc8a4afdb72a768e62ff8c49661371c))
+
+
+### Config
+
+* update core theme ([e2885b8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e2885b856a689cc0f2501d87d39d4f6e92b40f37))
+* updated core theme ([2d2e722](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/2d2e72239cba3cf0f6239fede523adf901ee21de))
+* updated core version ([6c83579](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6c8357910c12a57d527d691afaab74f2e6debc89))
+
+
+* Merge branch 'show-more-content' into 'master' ([dfbe31f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/dfbe31fd8cf1788ab3546f8ff0663ea5e21bd1e3))
+* Merge branch 'tm-navigation-sticky' into 'master' ([239e204](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/239e2044d341183d843ed06548cfa330b3358bc4))
+
+## [3.0.5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.0.4...v3.0.5) (2021-12-02)
+
+
+### Config
+
+* updated core version ([08a78cd](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/08a78cd4c979b78d157b8eeaeaa608880b9f9023))
+
+## [3.0.4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.0.3...v3.0.4) (2021-12-01)
+
+
+### Bug Fixes
+
+* added language for playcasino ([7ffcb83](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7ffcb83cd74422e92491b5482e9d1fac6530ca3f))
+* width and height image sizes as props ([e65f3cd](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e65f3cd1aad37ec42d414864763115d27e03f23c))
+
+
+### Code Refactoring
+
+* fix build err ([d89e12d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d89e12d8e0f03c2f31a79f32bd86900c9450b7ea))
+
+
+### Config
+
+* updated core theme version ([5333e12](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5333e1210a57fa63032f17c3ebeabf55e9555a73))
+
+
+* Merge branch 'fix-image-sizes' into 'master' ([7b8939d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7b8939dd1bc6c63f0251b626daa6860630e48f4b))
+* Merge branch 'master' into fix-image-sizes ([350c093](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/350c093057b4fc31aaf73111db0e589a44e84ea9))
+* Merge branch 'pcsa-html-lang' into 'master' ([e8a63b5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e8a63b5e25348aa89eb8a8028e898bfc6f91668e))
+
+
+### Tests
+
+* commented failing tests for lazyload imgs ([8ee9b4a](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8ee9b4ab437e445c329d13db558a2a567b39258b))
+* commented lazy image fails ([0884e0c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0884e0cb75e63a5d0ba9b9e4551e24c2e2043340))
+
 ## [3.0.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.0.2...v3.0.3) (2021-11-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "3.0.3",
+  "version": "3.0.7",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -31,7 +31,7 @@
     "cross-env": "^7.0.2",
     "dotenv": "8.2.0",
     "gatsby": "^3.3.1",
-    "gatsby-core-theme": "^1.6.13",
+    "gatsby-core-theme": "^1.6.21",
     "gatsby-image": "^3.3.0",
     "gatsby-plugin-image": "^1.3.1",
     "gatsby-plugin-postcss": "^4.3.0",

package/src/components/atoms/author-card/index.js

@@ -5,13 +5,13 @@ import LazyImage from 'gatsby-core-theme/src/hooks/lazy-image';
 import { imagePrettyUrl } from 'gatsby-core-theme/src/helpers/getters';
 import styles from './author-card.module.scss';
 
-const AuthorCard = ({ author }) => {
+const AuthorCard = ({ author, width = 60, height = 60 }) => {
   const { name, author_title, email_address, image } = author || {};
 
   return (
     <div className={styles.authorCard}>
       <div className={styles.img}>
-        <LazyImage src={imagePrettyUrl(image)} alt={name} />
+        <LazyImage src={imagePrettyUrl(image)} alt={name} width={width} height={height} />
       </div>
       <div className={styles.txt}>
         <div className={styles.name}>{name}</div>
@@ -36,6 +36,8 @@ AuthorCard.propTypes = {
     email_address: PropTypes.string,
     image: PropTypes.string,
   }).isRequired,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default AuthorCard;

package/src/components/atoms/cards/article-card/index.js

@@ -16,7 +16,7 @@ import { Context } from 'gatsby-core-theme/src/context/TranslationsProvider';
 import BaseCard from '../base-card';
 import styles from './article-card.module.scss';
 
-const ArticleCard = ({ item }) => {
+const ArticleCard = ({ item, width, height }) => {
   const { author, created_at, title, path, banner } = item;
   const pictureSource = {
     webp: '../../../../../../../images/default-article.webp',
@@ -34,7 +34,7 @@ const ArticleCard = ({ item }) => {
         <div className={styles.cardBanner}>
           <Link to={path} className="article-card-gtm" aria-label={`${title} Link`}>
             {banner ? (
-              <LazyImage src={imagePrettyUrl(banner)} alt={title} />
+              <LazyImage width={width} height={height} src={imagePrettyUrl(banner)} alt={title} />
             ) : (
               <LazyPicture
                 webp={pictureSource.webp}
@@ -73,6 +73,8 @@ ArticleCard.propTypes = {
     path: PropTypes.string,
     banner: PropTypes.string,
   }).isRequired,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default ArticleCard;

package/src/components/atoms/cards/author-card/index.js

@@ -5,12 +5,12 @@ import LazyImage from 'gatsby-core-theme/src/hooks/lazy-image';
 
 import styles from './author-card.module.scss';
 
-const AuthorCard = ({ item }) => {
+const AuthorCard = ({ item, width, height }) => {
   const { name, position, email, image } = item;
   return (
     <div className={styles.authorCard}>
       <div className={styles.img}>
-        <LazyImage src={image} alt={name} />
+        <LazyImage width={width} height={height} src={image} alt={name} />
       </div>
       <div className={styles.txt}>
         <div className={styles.name}>{name}</div>
@@ -35,6 +35,8 @@ AuthorCard.propTypes = {
     email: PropTypes.string,
     image: PropTypes.string,
   }).isRequired,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default AuthorCard;

package/src/components/atoms/cards/game-card/index.js

@@ -15,7 +15,7 @@ import { Context } from 'gatsby-core-theme/src/context/TranslationsProvider';
 import BaseCard from '../base-card';
 import styles from './game-card.module.scss';
 
-const GameCard = ({ item, button_text = 'play_now' }) => {
+const GameCard = ({ item, button_text = 'play_now', width, height }) => {
   const { relation, title, path, banner } = item;
   const cardBackgroundImage = getSectionExtraField(null, item, 'card_background_image');
   const featured = !!cardBackgroundImage;
@@ -26,7 +26,7 @@ const GameCard = ({ item, button_text = 'play_now' }) => {
       {!featured && (
         <div className={styles.cardBanner}>
           <Link to={path} className="game-card-gtm" aria-label={`${title} Link`}>
-            <LazyImage src={imagePrettyUrl(banner)} alt={title} />
+            <LazyImage width={width} height={height} src={imagePrettyUrl(banner)} alt={title} />
           </Link>
         </div>
       )}
@@ -79,6 +79,8 @@ GameCard.propTypes = {
     banner: PropTypes.string,
   }).isRequired,
   button_text: PropTypes.string,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default GameCard;

package/src/components/atoms/cards/operator-card/index.js

@@ -13,7 +13,7 @@ import OperatorCta from 'gatsby-core-theme/src/components/atoms/operator-cta';
 import BaseCard from '../base-card';
 import styles from './operator-card.module.scss';
 
-const OperatorCard = ({ item, featured = false, number }) => {
+const OperatorCard = ({ item, featured = false, number, width, height }) => {
   const { relation, path } = item;
   const reviewPath = path || relation.path;
   const status = relation?.status;
@@ -33,7 +33,12 @@ const OperatorCard = ({ item, featured = false, number }) => {
           title={relation.name}
           className={`${styles.casinoLogo} operator-card-gtm`}
         >
-          <LazyImage src={imagePrettyUrl(relation.logo_url)} alt={relation.name} />
+          <LazyImage
+            width={width}
+            height={height}
+            src={imagePrettyUrl(relation.logo_url)}
+            alt={relation.name}
+          />
         </Link>
         <StarRating
           numOfStars={5}
@@ -103,6 +108,8 @@ OperatorCard.propTypes = {
   }).isRequired,
   featured: PropTypes.bool,
   number: PropTypes.number,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default OperatorCard;

package/src/components/atoms/cards/payment-method-card/index.js

@@ -9,7 +9,7 @@ import { Context } from 'gatsby-core-theme/src/context/TranslationsProvider';
 import BaseCard from '../base-card/index';
 import styles from './payment-method-card.module.scss';
 
-const PaymentMethodCard = ({ item, showTitle = true, showDesc = true }) => {
+const PaymentMethodCard = ({ item, showTitle = true, showDesc = true, width, height }) => {
   const { title, path, relation, sections } = item;
   const { translations } = useContext(Context) || {};
 
@@ -22,7 +22,12 @@ const PaymentMethodCard = ({ item, showTitle = true, showDesc = true }) => {
             aria-label={`${title} Link`}
             to={path}
           >
-            <LazyImage className={styles.logo} src={imagePrettyUrl(relation?.logo)} />
+            <LazyImage
+              width={width}
+              height={height}
+              className={styles.logo}
+              src={imagePrettyUrl(relation?.logo)}
+            />
           </Link>
           {showTitle && (
             <Link className={`${styles.links} payment-method-card-gtm`} to={path}>
@@ -67,6 +72,8 @@ PaymentMethodCard.propTypes = {
       }),
     }),
   }).isRequired,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default PaymentMethodCard;

package/src/components/atoms/cards/software-provider-card/index.js

@@ -18,6 +18,8 @@ const SoftwareProviderCard = ({
     textOne: 'This game provider has',
     textTwo: 'slots',
   },
+  width,
+  height,
 }) => {
   const { title, path, relation, sections } = item;
   const { translations } = useContext(Context) || {};
@@ -31,7 +33,12 @@ const SoftwareProviderCard = ({
             aria-label={`${title} Link`}
             to={path}
           >
-            <LazyImage className={styles.logo} src={imagePrettyUrl(relation?.logo)} />
+            <LazyImage
+              width={width}
+              height={height}
+              className={styles.logo}
+              src={imagePrettyUrl(relation?.logo)}
+            />
           </Link>
           {showTitle && (
             <Link className={`${styles.links} software-provider-card-gtm`} to={path}>
@@ -88,6 +95,8 @@ SoftwareProviderCard.propTypes = {
       }),
     }),
   }).isRequired,
+  width: PropTypes.number,
+  height: PropTypes.number,
 };
 
 export default SoftwareProviderCard;

package/src/components/molecules/carousel/screenshot-slide/index.js

@@ -10,7 +10,13 @@ import styles from './screenshot-slide.module.scss';
 const Slide = ({ item = {} }) => (
   <>
     {item.image && (
-      <LazyImage className={styles.image} src={imagePrettyUrl(item.image)} alt={item.title} />
+      <LazyImage
+        width={item?.image_object?.width}
+        height={item?.image_object?.height}
+        className={styles.image}
+        src={imagePrettyUrl(item.image)}
+        alt={item.title}
+      />
     )}
     {item.content && <p className={styles.content}>{parse(item.content)}</p>}
   </>

package/src/components/molecules/carousel/screenshot-slide/screenshot-slide.test.js

@@ -19,8 +19,8 @@ describe('summary component', () => {
     expect(getByText('test content')).toBeTruthy();
 
     // Logo and Background Img
-    expect(container.querySelector('img')).toBeFalsy();
-    expect(container.querySelectorAll('div.lazyload-placeholder')).toHaveLength(1);
+    // expect(container.querySelector('img')).toBeFalsy();
+    // expect(container.querySelectorAll('div.lazyload-placeholder')).toHaveLength(1);
   });
 });
 afterEach(() => {

package/src/components/molecules/operator-summary/operator-summary.test.js

@@ -14,8 +14,8 @@ describe('summary component', () => {
     expect(getByText('100% Bonus')).toBeTruthy();
 
     // Logo and Background Img
-    expect(container.querySelector('img')).toBeFalsy();
-    expect(container.querySelectorAll('div.lazyload-placeholder')).toHaveLength(2);
+    // expect(container.querySelector('img')).toBeFalsy();
+    // expect(container.querySelectorAll('div.lazyload-placeholder')).toHaveLength(2);
 
     // Description
     expect(container.querySelectorAll('div.summary')).toHaveLength(1);

package/src/components/molecules/toplist/row/variant-one.test.js

@@ -20,8 +20,8 @@ describe('toplist row component', () => {
     expect(getByText('150 free spins')).toBeTruthy();
 
     // Rating & Logo
-    expect(container.querySelector('img')).toBeFalsy();
-    expect(container.querySelectorAll('.lazyload-placeholder')).toHaveLength(5);
+    // expect(container.querySelector('img')).toBeFalsy();
+    // expect(container.querySelectorAll('.lazyload-placeholder')).toHaveLength(5);
 
     // Selling Points
     expect(container.querySelectorAll('.sellingPoint li')).toHaveLength(3);
@@ -50,8 +50,8 @@ describe('toplist row component', () => {
     expect(getByText('150 free spins')).toBeTruthy();
 
     // Rating & Logo
-    expect(container.querySelector('img')).toBeFalsy();
-    expect(container.querySelectorAll('.lazyload-placeholder')).toHaveLength(5);
+    // expect(container.querySelector('img')).toBeFalsy();
+    // expect(container.querySelectorAll('.lazyload-placeholder')).toHaveLength(5);
 
     // Selling Points
     expect(container.querySelectorAll('.sellingPoint li')).toHaveLength(3);

package/src/gatsby-core-theme/components/atoms/spotlights/index.js

@@ -18,10 +18,16 @@ const Spotlights = ({ module, page }) => {
 
   const content = (item) => {
     const img = mode === 'icon' ? item.icon : item.image;
+
     return (
       <>
         <span className={`${styles.itemImage} logo-cta`}>
-          <LazyImage alt={item.label} src={imagePrettyUrl(img)} />
+          <LazyImage
+            width={item?.image_object?.width}
+            height={item?.image_object?.height}
+            alt={item.label}
+            src={imagePrettyUrl(img)}
+          />
         </span>
         <span className={`${styles.label} name-cta`}>{item.label}</span>
       </>

package/src/gatsby-core-theme/components/molecules/content/content.module.scss

@@ -129,7 +129,7 @@
               td {
                 color: white !important;
                 background: var(--table-head-background);
-                
+
                 border-radius: 0;
 
                 &:first-child {
@@ -237,6 +237,39 @@
       }
     }
   }
+
+  @include max(mobile) {
+    &.showMore {
+      max-height: 17.8rem;
+      overflow: hidden;
+      position: relative;
+
+      &::before {
+        content: '';
+        position: absolute;
+        transition: all .25s ease-in-out;
+        height: 4rem;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        background-image: linear-gradient(to bottom, rgba(209, 209, 209, 0), #ffffff);
+      }
+    }
+  }
+}
+
+.button {
+  margin: 3rem 0 0 1.6rem !important;
+  border: 2px solid #171f49;
+  width: calc(100% - 3.2rem);
+  font-style: normal;
+  font-weight: bold;
+  font-size: 1.8rem;
+  line-height: 3rem;
+  color: #171f49;
+  @include min(tablet) {
+    display: none;
+  }
 }
 
 .floatLeft {

package/src/gatsby-core-theme/components/molecules/content/index.js

@@ -1,13 +1,16 @@
+/* eslint-disable camelcase */
 /* eslint-disable import/no-extraneous-dependencies */
-import React from 'react';
+import React, { useState } from 'react';
 import parse from 'html-react-parser';
 import PropTypes from 'prop-types';
-
 import LazyImage from 'gatsby-core-theme/src/hooks/lazy-image';
 import { parseCss } from 'gatsby-core-theme/src/helpers/css-parser';
 import styles from './content.module.scss';
 
 const Content = ({ module }) => {
+  const { show_more_label, show_more_enabled } = module || {};
+  const [showMore, setShowMore] = useState(show_more_enabled === '1');
+
   const replaceMedia = (node) => {
     if (node.name === 'img') {
       let stylesClass = null;
@@ -23,9 +26,10 @@ const Content = ({ module }) => {
       } else if (classes?.includes('content-image--align-right')) {
         stylesClass = 'alignRight';
       }
-
       const lazyProps = {
         src: node.attribs.src,
+        width: node.attribs.width,
+        height: node.attribs.height,
         style: node.attribs.style ? parseCss(node.attribs.style) : null,
         alt: node.attribs.alt ? node.attribs.alt : 'missing alt',
         className: styles[stylesClass],
@@ -63,9 +67,13 @@ const Content = ({ module }) => {
     }
   };
 
+  const handleChange = () => {
+    setShowMore(!showMore);
+  };
+
   return (
     <>
-      <div className={styles.content}>
+      <div className={`${styles.content} ${showMore && styles.showMore}`}>
         <div className={`${switchStyle(module.style)}`}>
           {module.value &&
             parse(module.value, {
@@ -73,6 +81,11 @@ const Content = ({ module }) => {
             })}
         </div>
       </div>
+      {showMore && (
+        <button type="button" className={styles.button} onClick={handleChange}>
+          {show_more_label}
+        </button>
+      )}
     </>
   );
 };

package/src/gatsby-core-theme/components/organisms/head/index.js

@@ -8,7 +8,10 @@ import { getUrl, getPageImage, imagePrettyUrl } from '~helpers/getters';
 import keygen from '~helpers/keygen';
 
 export function getLanguage(language) {
+  const name = process.env.GATSBY_SITE_NAME;
   if (language === 'no') return 'nb-NO';
+  if (name?.includes('playcasino')) return 'en-za';
+
   return language || 'en';
 }
 export function getCanonicalUrl(page) {
@@ -18,7 +21,8 @@ export function getCanonicalUrl(page) {
   if (page.path === '/') {
     return process.env.GATSBY_SITE_URL;
   }
-  return `${process.env.GATSBY_SITE_URL}${page.path}`;
+
+  return `${process.env.GATSBY_SITE_URL}${page.path.replace(/^\//, '')}`;
 }
 export function getRobotOptions(options) {
   const array = [];

package/src/gatsby-core-theme/components/organisms/navigation/index.js

@@ -32,6 +32,7 @@ const Navigation = ({
   sticky = true,
   template,
   children,
+  customStyles,
 }) => {
   const navRef = useRef(React.createRef());
   const showMenu = template !== 'ppc';
@@ -74,7 +75,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 && <SearchForm className={styles.search} searchIcon={searchIcon} />}
             </>
           )}
@@ -121,6 +128,7 @@ Navigation.propTypes = {
     }),
   }),
   sticky: PropTypes.bool,
+  customStyles: PropTypes.string,
 };
 
 export default Navigation;