gatsby-core-theme 36.0.0 → 36.0.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [36.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v36.0.1...v36.0.2) (2024-08-21)
+
+
+### Bug Fixes
+
+* author box reviewed by ([c7b7564](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c7b7564bcee16f5f9bfe9ce2caa0f83518c691f8))
+* tests ([6506b80](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6506b807dcef263557ad8bea26ad14a9dfb3a762))
+
+## [36.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v36.0.0...v36.0.1) (2024-08-21)
+
+
+### Bug Fixes
+
+* cards v2 ([0632f74](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0632f7482bb4ecb16e9305b4f46921ae2761e015))
+
 # [36.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v35.1.9...v36.0.0) (2024-08-21)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "36.0.0",
+  "version": "36.0.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/author-box/template-one/fact-check/index.js

@@ -1,5 +1,6 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable react/no-danger */
-import React, { useContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { FaClock } from '@react-icons/all-files/fa/FaClock';
 
@@ -14,11 +15,12 @@ export default function FactCheck({
   dateFormat = 'DD.MM.YYYY',
   dateSeparator = '/',
   readingTime = '',
-  reviewer = {},
+  reviewer,
   verifiedIconWidth = 14,
   verifiedIconHeight = 14,
   readTimeIcon = <FaClock title="Clock Icon" />,
 }) {
+
   return (
     <>
       {(readingTime || reviewer || date) && (

package/src/components/atoms/author-box/template-one/index.js

@@ -5,13 +5,13 @@ import AuthorDetails from '../details';
 import AuthorDescription from '../description';
 import FactCheck from './fact-check';
 
-export default function AuthorBox({ author, reviewer = {}, readingTime = '', date = '' }) {
+export default function AuthorBox({ author, reviewer, readingTime = '', date = '' }) {
   return (
     <div className={styles.container || ''} id="authorbox">
       <AuthorDetails author={author} />
       <AuthorDescription author={author} />
       {author?.ribbon_label && <div className={styles.ribbon || ''}>{author?.ribbon_label}</div>}
-      <FactCheck author={author} reviewer={reviewer} readingTime={readingTime} date={date} />
+      {reviewer && <FactCheck author={author} reviewer={reviewer} readingTime={readingTime} date={date} />}
     </div>
   );
 }

package/src/components/atoms/author-box/template-three/fact-check/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable react/no-danger */
 import React from 'react';
 import PropTypes from 'prop-types';
@@ -14,7 +15,7 @@ export default function FactCheck({
   dateFormat = 'DD.MM.YYYY',
   dateSeparator = '/',
   readingTime = '',
-  reviewer = {},
+  reviewer,
   verifiedIconWidth = 14,
   verifiedIconHeight = 14,
   readTimeIcon = <FaClock title="Clock Icon" />,

package/src/components/atoms/author-box/template-three/index.js

@@ -6,7 +6,7 @@ import AuthorDescription from '../description';
 import FactCheck from './fact-check';
 import Expertion from './expertion';
 
-export default function AuthorBox({ author, reviewer = {}, readingTime = '', date = '' }) {
+export default function AuthorBox({ author, reviewer, readingTime = '', date = '' }) {
   return (
     <div className={styles.container || ''} id="authorbox">
       {author?.ribbon_label && <div className={styles.ribbon || ''}>{author?.ribbon_label}</div>}

package/src/components/atoms/author-box/template-two/fact-check/index.js

@@ -1,5 +1,6 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable react/no-danger */
-import React, { useContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { FaClock } from '@react-icons/all-files/fa/FaClock';
 
@@ -14,11 +15,12 @@ export default function FactCheck({
   dateFormat = 'DD.MM.YYYY',
   dateSeparator = '/',
   readingTime = '',
-  reviewer = {},
+  reviewer,
   verifiedIconWidth = 14,
   verifiedIconHeight = 14,
   readTimeIcon = <FaClock title="Clock Icon" />,
 }) {
+
   return (
     <>
       {(readingTime || reviewer || date) && (

package/src/components/atoms/author-box/template-two/index.js

@@ -10,7 +10,7 @@ export default function AuthorBox({ author, reviewer = {}, readingTime = '', dat
     <div className={styles.container || ''} id="authorbox">
       <AuthorDetails template="templateTwo" ribbon author={author} extraInfo />
       <AuthorDescription template="templateTwo" author={author} />
-      <FactCheck author={author} reviewer={reviewer} readingTime={readingTime} date={date} />
+      {reviewer && <FactCheck author={author} reviewer={reviewer} readingTime={readingTime} date={date} />}
     </div>
   );
 }

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, cleanup, waitFor, fireEvent } from '@testing-library/react';
+import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 
 import getNavigation from '~tests/factories/sections/navigationStatic.factory';
@@ -21,7 +21,6 @@ describe('Menu Component', () => {
   test('render menu link item', async () => {
     const { container, getByText } = render(<Item item={menus.children[3]} />);
     await waitFor(() => {
-      expect(container).toBeTruthy();
       expect(container.querySelectorAll('a')).toHaveLength(1);
       expect(getByText('Sportsbooks').getAttribute('href')).toEqual('/sportsbooks');
     });
@@ -30,7 +29,6 @@ describe('Menu Component', () => {
   test('render item ', async () => {
     const { container, getByText } = render(<Item item={menus.children[3]} />);
     await waitFor(() => {
-      expect(container).toBeTruthy();
       expect(container.querySelectorAll('a')).toHaveLength(1);
       expect(getByText('Sportsbooks').getAttribute('href')).toEqual('/sportsbooks');
     });

package/src/components/molecules/footer/variables/index.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import Image from '~hooks/gatsby-img';
 import PropTypes from 'prop-types';
 
-const VariableComponent = ({ className }) => <div className={className || ''}></div>;
+const VariableComponent = ({ className }) => <div className={className || ''} />;
 
 export default VariableComponent;
 

package/src/components/molecules/footer/variables/variables.test.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import Variable from '.';
+
+describe('Variable Component', () => {
+  test('render with props', () => {
+    const { container } = render(
+      <Variable
+        className='test'
+      />
+    );
+
+    expect(container.querySelectorAll('.test')).toHaveLength(1);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/molecules/footer/variants/template-two/index.js

@@ -136,4 +136,5 @@ TemplateTwo.propTypes = {
   securityIcon: PropTypes.string,
   copyrightCustomText: PropTypes.string,
   footerMenuLimit: PropTypes.number,
+  hasVariableComponent: PropTypes.bool,
 };

package/src/components/molecules/header/variants/default/variables/variables.test.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import Variable from '.';
+
+describe('Variable Component', () => {
+  test('render with props', () => {
+    const { container } = render(
+      <Variable
+        className='test'
+      />
+    );
+
+    expect(container.querySelectorAll('.test')).toHaveLength(1);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/components/molecules/header/variants/operator/variables/variables.test.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import { render, cleanup } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+
+import Variable from '.';
+
+describe('Variable Component', () => {
+  test('render with props', () => {
+    const { container } = render(
+      <Variable
+        className='test'
+      />
+    );
+
+    expect(container.querySelectorAll('.test')).toHaveLength(1);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

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

@@ -1,13 +1,13 @@
-import React, { lazy, Suspense } from 'react';
-import PropTypes from 'prop-types';
-import { getURLParam } from 'gatsby-core-theme/src/helpers/getters';
-import Module from '~molecules/module';
-import styles from './main.module.scss';
-import keygen from '~helpers/keygen';
-import settings from '../../../constants/settings.mjs';
-import AuthorBoxComponent from '../../atoms/author-box';
-import { isSearchPath } from '~helpers/isSearchPath';
-import Search from '~pages/search';
+import React, { lazy, Suspense } from "react";
+import PropTypes from "prop-types";
+import { getURLParam } from "gatsby-core-theme/src/helpers/getters";
+import Module from "~molecules/module";
+import styles from "./main.module.scss";
+import keygen from "~helpers/keygen";
+import settings from "../../../constants/settings.mjs";
+import AuthorBoxComponent from "../../atoms/author-box";
+import { isSearchPath } from "~helpers/isSearchPath";
+import Search from "~pages/search";
 
 const Main = ({
   section = {},
@@ -20,23 +20,35 @@ const Main = ({
   const siteName = process.env.GATSBY_SITE_NAME;
   const showNewsletter =
     !(
-      settings.newsletter[siteName]?.filter_pages?.includes('*') ||
-      settings.newsletter[siteName]?.filter_pages?.includes(page?.relation_type) ||
-      settings.newsletter.default?.filter_pages?.includes(page?.relation_type) ||
+      settings.newsletter[siteName]?.filter_pages?.includes("*") ||
+      settings.newsletter[siteName]?.filter_pages?.includes(
+        page?.relation_type
+      ) ||
+      settings.newsletter.default?.filter_pages?.includes(
+        page?.relation_type
+      ) ||
       exclNewsletter
     ) && !process.env?.HIDE_NEWSLETTER;
   const pathPrefixes = isSearchPath(allMarkets, page.path);
-  const HtmlSitemap = pageContext.sitemapData ? lazy(() => import(`~atoms/sitemap`)) : null;
+  const HtmlSitemap = pageContext.sitemapData
+    ? lazy(() => import(`~atoms/sitemap`))
+    : null;
   const AuthorBox = page.author_id;
-  const NotFound = page?.path?.includes('404') ? lazy(() => import(`~atoms/not-found`)) : null;
-  const Newsletter = showNewsletter ? lazy(() => import('~molecules/newsletter')) : null;
+  const NotFound = page?.path?.includes("404")
+    ? lazy(() => import(`~atoms/not-found`))
+    : null;
+  const Newsletter = showNewsletter
+    ? lazy(() => import("~molecules/newsletter"))
+    : null;
   const NewsletterSuccess =
-    showNewsletter && typeof window !== 'undefined' && Boolean(getURLParam('subscribed'))
+    showNewsletter &&
+    typeof window !== "undefined" &&
+    Boolean(getURLParam("subscribed"))
       ? lazy(() => import(`../newsletter/success`))
       : null;
 
   return (
-    <main className={styles.modulePage || ''}>
+    <main className={styles.modulePage || ""}>
       {section.modules &&
         section.modules.map((module, index) => (
           <Module
@@ -60,17 +72,19 @@ const Main = ({
         </Suspense>
       )}
       {AuthorBox && (
-        <Suspense fallback={<></>}>
-          <AuthorBoxComponent
-            author={page.author}
-            date={page.updated_at ? page.updated_at : page.created_at}
-            readingTime={page.reading_time}
-            reviewer={page.reviewer_id && page.reviewer}
-          />
-        </Suspense>
+        <AuthorBoxComponent
+          author={page.author}
+          date={page.updated_at ? page.updated_at : page.created_at}
+          readingTime={page.reading_time}
+          reviewer={page.reviewer_id && page.reviewer}
+        />
       )}
       {pathPrefixes && (
-        <Search page={page} serverData={serverData} allMarkets={pageContext.allMarkets} />
+        <Search
+          page={page}
+          serverData={serverData}
+          allMarkets={pageContext.allMarkets}
+        />
       )}
       {Newsletter && (
         <Suspense fallback={<></>}>

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

@@ -1,38 +1,48 @@
 /* eslint-disable camelcase */
 /* eslint-disable no-useless-concat */
 /* eslint-disable no-restricted-globals */
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
+import React, { useEffect } from "react";
+import PropTypes from "prop-types";
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { v4 as uuidv4 } from 'uuid';
-import { getSection } from '~helpers/getters';
-import Header from '~molecules/header';
-import Main from '~molecules/main';
-import Footer from '~molecules/footer';
-import Navigation from '~organisms/navigation';
-import FloatingArea from '../../molecules/floating-area';
-import styles from './body.module.scss';
-import { setCookie, getCookie } from '~helpers/cookies';
-import { pageTypes } from '../../../constants/site-settings/navigation';
+import { v4 as uuidv4 } from "uuid";
+import { getSection, getMarketSection } from "~helpers/getters";
+import Header from "~molecules/header";
+import Main from "~molecules/main";
+import Footer from "~molecules/footer";
+import Navigation from "~organisms/navigation";
+import FloatingArea from "../../molecules/floating-area";
+import styles from "./body.module.scss";
+import { setCookie, getCookie } from "~helpers/cookies";
+import { pageTypes } from "../../../constants/site-settings/navigation";
 
 function Body({ pageContext, children, serverData }) {
   const getBodySection = (name) => getSection(name, pageContext);
   const { template } = pageContext.page;
-  const is404 = pageContext?.page?.path?.includes('404');
-  const main = getBodySection('main');
-  const navigation = getBodySection(pageTypes[template]?.section || pageTypes.default.section);
-  const footer = getBodySection('footer');
+  const is404 = pageContext?.page?.path?.includes("404");
+  const main = getBodySection("main");
+
+  const navigation = getMarketSection(
+    pageTypes[template]?.section || pageTypes.default.section,
+    pageContext
+  );
+
+  const footer = pageTypes[template]?.disableFooter
+    ? null
+    : getMarketSection("footer", pageContext);
 
   useEffect(() => {
-    if (!getCookie('affUUID')) {
-      setCookie('affUUID', uuidv4());
+    if (!getCookie("affUUID")) {
+      setCookie("affUUID", uuidv4());
     }
   }, []);
 
-  const customComponent = pageTypes[template]?.customComponent ?? pageTypes.default.customComponent;
-  const marketDropdown = pageTypes[template]?.marketDropdown ?? pageTypes.default.marketDropdown;
+  const customComponent =
+    pageTypes[template]?.customComponent ?? pageTypes.default.customComponent;
+  const marketDropdown =
+    pageTypes[template]?.marketDropdown ?? pageTypes.default.marketDropdown;
   const menu = pageTypes[template]?.navMenu ?? pageTypes.default.navMenu;
-  const disableSearch = pageTypes[template]?.disableSearch ?? pageTypes.default.disableSearch;
+  const disableSearch =
+    pageTypes[template]?.disableSearch ?? pageTypes.default.disableSearch;
 
   return (
     <>
@@ -53,11 +63,19 @@ function Body({ pageContext, children, serverData }) {
       )}
       {!is404 && <Header serverData={serverData} section={pageContext} />}
       {main && !children && (
-        <Main serverData={serverData} section={main} pageContext={pageContext} />
+        <Main
+          serverData={serverData}
+          section={main}
+          pageContext={pageContext}
+        />
       )}
       {children && <main>{children}</main>}
       <Footer template={template} section={footer} />
-      <FloatingArea pageContext={pageContext} template={template} customStyles={styles} />
+      <FloatingArea
+        pageContext={pageContext}
+        template={template}
+        customStyles={styles}
+      />
     </>
   );
 }

package/src/constants/site-settings/navigation.js

@@ -11,6 +11,7 @@ export const pageTypes = {
     disablePopup: true,
   },
   responsible_gambling_guide: {
+    disableFooter: true,
     section: "rg_navigation",
     showLogoWithLink: false,
     disableSearch: false,

package/src/helpers/getters.mjs

@@ -25,8 +25,7 @@ export function getExtraField(extraFields, key, defaultValue) {
   return null;
 }
 
-export function getSection(shortCode, pageContext) {
-  const page = pageContext && pageContext.page;
+export function getMarketSection(shortCode, pageContext) {
   const marketSections = pageContext && pageContext.marketSections;
 
   // market has priority over page
@@ -34,6 +33,13 @@ export function getSection(shortCode, pageContext) {
     return marketSections[shortCode];
   }
 
+  return null;
+}
+
+export function getSection(shortCode, pageContext) {
+  const page = pageContext && pageContext.page;
+  const marketSections = pageContext && pageContext.marketSections;
+
   // eslint-disable-next-line
   if (
     !page ||
@@ -42,6 +48,11 @@ export function getSection(shortCode, pageContext) {
   ) {
     return null;
   }
+  
+  // market has priority over page
+  if (marketSections[shortCode]) {
+    return marketSections[shortCode];
+  }
 
   return page.sections[shortCode] || {};
 }

package/src/helpers/processor/common.mjs

@@ -79,11 +79,8 @@ export function clonePageForCards(item, style) {
     : item.relation;
 
   if(object.relation && object.relation.bonus) {
-    delete object.relation.bonus.withdrawal_methods;
-    delete object.relation.bonus.currencies;
-    delete object.relation.bonus.license_objects;
-  
-    object.relation.bonus.deposit_methods = (object.relation.bonus.deposit_methods && object.relation.bonus.deposit_methods.length > 0) ?  object.relation.bonus.deposit_methods.slice(0, 3) : [];  
+    object.relation.bonus.withdrawal_methods = (object.relation.bonus.withdrawal_methods && object.relation.bonus.withdrawal_methods.length > 0) ?  object.relation.bonus.withdrawal_methods.slice(0, 5) : [];
+    object.relation.bonus.deposit_methods = (object.relation.bonus.deposit_methods && object.relation.bonus.deposit_methods.length > 0) ?  object.relation.bonus.deposit_methods.slice(0, 5) : [];  
   }
   
   if (

package/src/helpers/processor/index.mjs

@@ -343,6 +343,8 @@ export default {
           // add reviewer object to page
           if (page.reviewer_id !== null && data.authors[page.reviewer_id]) {
             transformedPages[market][pageType][index].reviewer = data.authors[page.reviewer_id];
+          } else {
+            transformedPages[market][pageType][index].reviewer = null;
           }
 
           // add page styles object to page

package/src/helpers/processor/modules.mjs

@@ -134,12 +134,12 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
     const selectedReviewer = module.cards_selector_filters.page_reviewer;
     const selectedCategories = module.cards_selector_filters.page_categories;
 
-    const allFilters = [selectedAuthors, selectedReviewer, selectedCategories, moduleSelectedProviders, moduleSelectedCategories, moduleSelectedTypes];
+    const allFilters = [cardType, pageTemplateId, selectedAuthors, selectedReviewer, selectedCategories, moduleSelectedProviders, moduleSelectedCategories, moduleSelectedTypes];
     const u8 = new Uint8Array(allFilters);
     const b64 = Buffer.from(u8).toString('base64');
 
-      
 
+    
     if (cardType) {
       // Get all pages by the selected page type
       const pagesGroupedByType = pagesCloned[cardType];

package/src/helpers/tracker.mjs

@@ -51,7 +51,7 @@ function deparam(paramStr) {
 }
 
 function clean(obj) {
-  for (var propName in obj) {
+  for (const propName in obj) {
     if (obj[propName] === null || obj[propName] === undefined) {
       delete obj[propName];
     }