gatsby-matrix-theme 40.0.21 → 40.0.23

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [40.0.23](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v40.0.22...v40.0.23) (2024-05-02)
+
+
+### Bug Fixes
+
+* content piepline ([5e67696](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5e6769610c57d6d1f6ea732222a3401abc14fb31))
+* update core version ([58a6c36](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/58a6c36dc6fd22e44cf107b4db82157488317d14))
+* update navigation and breadcrumbs to not show on responsible gambling page type ([fca1e7c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fca1e7c140dcccd8b6bcb9924a3b6a11b938d6c7))
+
+
+* Merge branch 'tm-4238-pcsa-changes-to-rg-page' into 'master' ([24a834e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/24a834ee86b0be426f2cf78c823da3e813d8a0c7))
+
+## [40.0.22](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v40.0.21...v40.0.22) (2024-04-30)
+
+
+### Code Refactoring
+
+* change link to author name only, remove arrow and fix test ([338157c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/338157cf18940acb8246ee586c24aaf208d756d5))
+* set hide prefix as default ([2498496](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/249849657fdd21889a8a3cc07b4573c42339a0ac))
+
+
+* Merge branch 'tm-4330-author-review-credits' into 'master' ([5dd707d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5dd707d8921e51a63d87159739654237bfaa93d6))
+
 ## [40.0.21](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v40.0.20...v40.0.21) (2024-04-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "40.0.21",
+  "version": "40.0.23",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^5.11.0",
-    "gatsby-core-theme": "30.1.0",
+    "gatsby-core-theme": "30.1.1",
     "gatsby-plugin-sharp": "^5.11.0",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^5.11.0",

package/src/components/atoms/review-credits/index.js

@@ -1,8 +1,6 @@
 /* eslint-disable arrow-body-style */
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-
-import { FaArrowRight } from '@react-icons/all-files/fa/FaArrowRight';
 import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline';
 import { formatDate } from '~helpers/date-time';
 import { translate, imagePrettyUrl } from '~helpers/getters';
@@ -73,7 +71,7 @@ const ReviewCredits = ({
       {(author || reviewer) && (
         <div className={styles.people || ''}>
           {author && (
-            <Link to={authorLink} title={authorName}>
+            <div className={`${styles.authorCommon || ''} ${styles.author}`}>
               {authorImg && (
                 <LazyImage
                   alt={authorName}
@@ -83,20 +81,21 @@ const ReviewCredits = ({
                   src={imagePrettyUrl(authorImg, authorImageWidth, authorImageHeight)}
                 />
               )}
-              <div className={`${styles.authorCommon || ''} ${styles.author}`}>
+              <div className={styles.authorDataContainer}>
                 {showPrefix && (
                   <span className={`${styles.prefixCommon} ${styles.authorPrefix}`}>
                     {translate(translations, prefix, prefix) || getPrefixBasedOnPage}
                   </span>
                 )}
-                <span className={styles.authorName}>{authorName}</span>
+                <Link to={authorLink} title={authorName} className={styles.authorName}>
+                  {authorName}
+                </Link>
                 {showTitle && <span className={styles.authorTitle}>{authorTitle}</span>}
               </div>
-              <FaArrowRight />
-            </Link>
+            </div>
           )}
           {reviewer && (
-            <Link to={reviewerLink} title={reviewerName}>
+            <div className={`${styles.authorCommon || ''} ${styles.reviewer}`}>
               {reviewerImg && (
                 <LazyImage
                   alt={reviewerName}
@@ -106,7 +105,7 @@ const ReviewCredits = ({
                   src={imagePrettyUrl(reviewerImg, authorImageWidth, authorImageHeight)}
                 />
               )}
-              <div className={`${styles.authorCommon || ''} ${styles.reviewer}`}>
+              <div className={styles.authorDataContainer}>
                 {showPrefix && (
                   <span className={`${styles.prefixCommon} ${styles.reviewerPrefix}`}>{`${translate(
                     translations,
@@ -114,7 +113,9 @@ const ReviewCredits = ({
                     'Fact checked by'
                   )}`}</span>
                 )}
-                <span className={styles.authorName}>{reviewerName}</span>
+                <Link to={reviewerLink} title={reviewerName} className={styles.authorName}>
+                  {reviewerName}
+                </Link>
                 {showTitle && (
                   <span className={styles.reviewerTitle}>
                     {showVerification && (
@@ -129,8 +130,7 @@ const ReviewCredits = ({
                   </span>
                 )}
               </div>
-              <FaArrowRight />
-            </Link>
+            </div>
           )}
         </div>
       )}

package/src/components/atoms/review-credits/review-credits.module.scss

@@ -94,35 +94,35 @@
 .people {
   @include flex-direction(column);
   gap: 0.8rem;
+}
 
-  > a {
-    @include flex-align(center, center);
-    display: grid;
-    grid-template-columns: 4.8rem 1fr 2rem;
-    background: var(--review-credits-author-background-color, #ffffff);
-    padding: 0.6rem 0.8rem 0.6rem 0.6rem;
-    gap: 0.8rem;
-    border-radius: var(--review-credits-author-border-radius, 1.2rem);
-    border: var(--review-credits-author-border, var(--review-credits-border, none));
-    text-decoration: none;
+.authorCommon {
+  @include flex-align(center, center);
+  display: grid;
+  grid-template-columns: 4.8rem 1fr 2rem;
+  background: var(--review-credits-author-background-color, #ffffff);
+  padding: 0.6rem 0.8rem 0.6rem 0.6rem;
+  gap: 0.8rem;
+  border-radius: var(--review-credits-author-border-radius, 1.2rem);
+  border: var(--review-credits-author-border, var(--review-credits-border, none));
+  text-decoration: none;
 
-    > img {
-      border-radius: 10rem;
-      border: var(--review-credits-author-img-border, 1px solid #ececec);
-    }
+  > img {
+    border-radius: 10rem;
+    border: var(--review-credits-author-img-border, 1px solid #ececec);
+  }
 
-    > svg {
-      grid-column: 3;
-      fill: var(--review-credits-color, #64646d);
-    }
+  > svg {
+    grid-column: 3;
+    fill: var(--review-credits-color, #64646d);
+  }
 
-    @include min(tablet) {
-      padding-right: 1.6rem;
-    }
+  @include min(tablet) {
+    padding-right: 1.6rem;
   }
 }
 
-.authorCommon {
+.authorDataContainer {
   @include flex-direction(column);
   @include flex-align(flex-start, space-between);
   height: 100%;

package/src/components/atoms/review-credits/review-credits.test.js

@@ -135,8 +135,8 @@ describe('Author Component', () => {
     const { container } = render(<Author author={authorData} reviewer={reviewerData} showPrefix />);
 
     expect(container.querySelector('.author')).toBeTruthy();
-    expect(container.querySelectorAll('.author span')[1]).toHaveTextContent('John Author');
-    expect(container.querySelector('.author').closest('a')).toHaveAttribute('href', '/john-author');
+    expect(container.querySelector('.author a')).toHaveTextContent('John Author');
+    expect(container.querySelector('.author a')).toHaveAttribute('href', '/john-author');
   });
   test('Show Reviewer data', () => {
     reviewerData = {
@@ -147,11 +147,8 @@ describe('Author Component', () => {
     const { container } = render(<Author author={authorData} reviewer={reviewerData} showPrefix />);
 
     expect(container.querySelector('.reviewer')).toBeTruthy();
-    expect(container.querySelectorAll('.reviewer span')[1]).toHaveTextContent('Jane Reviewer');
-    expect(container.querySelector('.reviewer').closest('a')).toHaveAttribute(
-      'href',
-      '/jane-reviewer'
-    );
+    expect(container.querySelector('.reviewer a')).toHaveTextContent('Jane Reviewer');
+    expect(container.querySelector('.reviewer a')).toHaveAttribute('href', '/jane-reviewer');
   });
   test('No reading time or date', () => {
     const { container } = render(<Author author={authorData} />);

package/src/gatsby-core-theme/components/pages/body/index.js

@@ -28,6 +28,7 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
 
   const main = getBodySection('main');
   const navigation = getBodySection('navigation');
+  const rgNavigation = getBodySection('rg_navigation');
   const footer = getBodySection('footer');
 
   const links = getBodySection('links');
@@ -46,17 +47,19 @@ function Body({ pageContext, children, excludeTemplateInPopup = [], serverData }
 
   const { template } = pageContext.page;
 
+  const isRGpage = template === 'responsible_gambling_guide';
+
   const showExclusiveOperator = excOperator && pageType !== 'operator';
 
   const popupData = pageContext?.marketSections?.popup?.modules?.find((m) => m.name === 'top_list');
 
   return (
     <>
-      {navigation && (
+      {(rgNavigation || navigation) && (
         <Navigation
           template={template}
           pageContext={pageContext}
-          section={navigation}
+          section={isRGpage ? rgNavigation : navigation}
           searchIcon="../../../../../../images/search.svg"
           menu="main_menu"
           options={{