gatsby-core-theme 40.0.3 → 40.0.5

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [40.0.5](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.4...v40.0.5) (2024-10-16)
+
+
+### Bug Fixes
+
+* align with the current master ([4c4284a](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4c4284ab1196266b45f6f30acc84b6ac98c970f4))
+* content module images with data size ([daa7c0f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/daa7c0f5ef0b9a241811ecf2bb0be6bf24d5c95e))
+* new images path ([1b7bfb0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/1b7bfb0569fdd4040373c2a3cb0be7d21789a4b0))
+* preview ([83d0c2f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/83d0c2f6610c926eae74030d12cd19581176a908))
+* preview feature ([37c64ed](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/37c64ed1b1180e9f4258f7d654ace2dbd931f0aa))
+
+
+* Merge branch 'tm-4346-content-modules' into 'master' ([5392b4f](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/5392b4f946755c1219567afa463af6cb99615af1))
+
+## [40.0.4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.3...v40.0.4) (2024-10-15)
+
+
+### Bug Fixes
+
+* preview feature ([e01820d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/e01820d1a5a543dd6209c78dd3826d9b13bf3ed4))
+
 ## [40.0.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v40.0.2...v40.0.3) (2024-10-15)
 
 

package/gatsby-node.mjs

@@ -248,19 +248,6 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
   // create every single page
   Object.keys(processed.site_markets).forEach((siteMarket) => {
     if (!processed.pages[siteMarket]['page']) processed.pages[siteMarket]['page'] = [];
-    processed.pages[siteMarket]['page'].push({
-      meta_title: 'Preview',
-      relation_type: 'page',
-      path: 'preview',
-      template: 'default',
-      meta_robots: ['noindex', 'nofollow'],
-      sections: {
-        main: { modules: [] },
-        navigation: { modules: [] },
-        sidebar: { modules: [] },
-        footer: { modules: [] },
-      },
-    });
     let count = 0;
     Object.keys(processed.pages[siteMarket]).forEach((pageType) => {
       processed.pages[siteMarket][pageType].forEach((page) => {
@@ -271,10 +258,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
         const processedPage = page;
         processedPage.preconnect_links = preconnectLinks;
 
-        siteSchema =
-          page.path === 'preview'
-            ? (page.siteSchema = Object.values(schemaData || {})[0])
-            : schemaData[page['market_id']];
+        siteSchema = schemaData[page['market_id']];
         authors = response.authors;
 
         // siteInfo, siteSchema and authors are added to page for schemaGenerator()
@@ -329,8 +313,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
             path: `/${page.path}`,
             component: `${__dirname}/src/components/app-ssr.js`,
             context: {
-              ...contextData,
-              isPreview: page.path === 'preview',
+              ...contextData
             },
           });
         } else {
@@ -342,8 +325,7 @@ export const createPages = async ({ actions: { createPage } }, themeOptions) =>
             path: page.path.charAt(0) === '/' ? page.path : `/${page.path}`,
             component,
             context: {
-              ...contextData,
-              isPreview: page.path === 'preview',
+              ...contextData
             },
           });
         }

package/package.json

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

package/src/components/atoms/admin/bar/index.js

@@ -136,7 +136,9 @@ const AdminBar = ({ page, marketSections, menu }) => {
                 )}
               </li>
               <li>
-                <span className={`${styles.label} ${styles.labelBorder}`}>Footer Section</span>
+                <span className={`${styles.label} ${styles.labelBorder}`}>
+                  Footer Section
+                </span>
               </li>
               {footerExtraFields && getFooterLinks(footerExtraFields)}
             </ul>
@@ -168,7 +170,12 @@ const AdminBar = ({ page, marketSections, menu }) => {
               className={`${styles.menuItem} ${styles.preview} ${
                 !preview ? styles.previewOff : ""
               }`}
-              href={!preview ? `/preview/?path=${page.path}&market_id=${page.market_id}` : `${page.path}`}
+              target={!preview ? "_blank" : ""}
+              href={
+                !preview
+                  ? `/preview/?path=${page.path}&market_id=${page.market_id}`
+                  : `/${page.path}`
+              }
               rel="noreferrer"
             >
               {preview ? "Preview Mode On" : "Preview Mode Off"}

package/src/components/atoms/content-box/content-box.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { render, cleanup } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
@@ -7,17 +8,17 @@ import ContentBox from '.';
 const info = [
   {
     title: 'Fully licensed casinos',
-    image: '../../../images/content-1.png',
+    image: '/images/content-1.png',
     text: 'We only list and review fully licensed and legally operating casinos so you can be sure where you end up playing will be safe and secure.',
   },
   {
     title: 'Get the most for your money',
-    image: '../../../images/content-2.png',
+    image: '/images/content-2.png',
     text: 'We list all the features the Casinos have to offer so you can make an educated decision about where to place your money for maximum gains!',
   },
   {
     title: 'Authenticly written articles',
-    image: '../../../images/content-3.png',
+    image: '/images/content-3.png',
     text: 'All our Authors are professional writers with industry know-how, so you can depend on what we say is the truth!',
   },
 ];

package/src/components/atoms/disclaimer/disclaimer.test.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-unused-expressions */
+/* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { render, cleanup, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
@@ -9,10 +10,10 @@ describe('Disclaimer Component', () => {
     // eslint-disable-next-line global-require
     const func = require('../../../helpers/device-detect');
     func.isNativeImageLazyLoadingSupported = jest.fn(() => true);
-    const { container } = render(<Disclaimer dmcaImage="../../../../../images/dmca.png" />);
+    const { container } = render(<Disclaimer dmcaImage="/images/dmca.png" />);
 
     expect(container.querySelector('img')).toBeTruthy();
-    expect(container.querySelector('img')).toHaveAttribute('src', '../../../../../images/dmca.png');
+    expect(container.querySelector('img')).toHaveAttribute('src', '/images/dmca.png');
     expect(container.querySelector('img')).toHaveAttribute('loading', 'eager');
 
     const Button = container.querySelector('a');

package/src/components/molecules/cookie-modal/index.js

@@ -22,7 +22,7 @@ const CookieModal = ({
     title: '',
     path: '',
   },
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   templateTwo = false,
   hide,
 }) => {

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

@@ -47,7 +47,7 @@ const Footer = (props) => {
   const getFooterLogos = () => {
     let refactoredFooterLogos = { children: [] };
 
-    if (footerLogos === null) {
+    if (footerLogos === null || !footerLogos.children) {
       refactoredFooterLogos = {
         children: [...page?.page?.responsibleGaming],
       };
@@ -79,8 +79,8 @@ const Footer = (props) => {
     asSeenOn: getExtraField(section?.extra_fields, 'as_seen_on'),
     gamblingText: getExtraField(section?.extra_fields, 'gambling_text'),
     socialIcons: getExtraField(section?.extra_fields, 'social_icons'),
-    logo: '../../../images/logo.svg',
-    dmcaImage: '../../../images/dmca.png',
+    logo: '/images/logo.svg',
+    dmcaImage: '/images/dmca.png',
     dmcaWidth: 100,
     dmcaHeight: 30,
     securityIcon: <Security />,

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

@@ -25,7 +25,7 @@ const TemplateOne = ({
   showCopyright,
   helpText,
   phoneNum,
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   dmcaImage,
   dmcaWidth,
   dmcaHeight,

package/src/components/molecules/footer/variants/template-one/template-one.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
@@ -63,7 +64,7 @@ beforeEach(() => {
     socialIcons,
     hasDisclaimer: true,
     showCopyright: true,
-    logo: '../../../../../images/logo.svg',
+    logo: '/images/logo.svg',
     securityIcon: <Security />,
     helpText,
     phoneNum,
@@ -200,13 +201,13 @@ describe('Show Footer', () => {
     props = {
       ...props,
       showCopyright: false,
-      dmcaImage: '../../../images/dmca.png',
+      dmcaImage: '/images/dmca.png',
     };
     const { container } = renderComponent(props);
     expect(container.querySelector('.logos > a').querySelector('img')).toBeTruthy();
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'src',
-      '../../../images/dmca.png'
+      '/images/dmca.png'
     );
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'loading',

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

@@ -24,7 +24,7 @@ const TemplateThree = ({
   showCopyright,
   helpText,
   phoneNum,
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   dmcaImage,
   dmcaWidth,
   dmcaHeight,

package/src/components/molecules/footer/variants/template-three/template-three.test.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
@@ -77,7 +78,7 @@ beforeEach(() => {
     socialIcons,
     hasDisclaimer: true,
     showCopyright: true,
-    logo: '../../../../../images/logo.svg',
+    logo: '/images/logo.svg',
     securityIcon: <Security />,
     helpText,
     phoneNum,
@@ -223,13 +224,13 @@ describe('Show template one', () => {
     props = {
       ...props,
       showCopyright: false,
-      dmcaImage: '../../../../../images/dmca.png',
+      dmcaImage: '/images/dmca.png',
     };
     const { container } = renderComponent(props);
     expect(container.querySelector('.logos > a').querySelector('img')).toBeTruthy();
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'src',
-      '../../../../../images/dmca.png'
+      '/images/dmca.png'
     );
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'loading',

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

@@ -23,7 +23,7 @@ const TemplateTwo = ({
   showCopyright,
   helpText,
   phoneNum,
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   dmcaImage,
   dmcaWidth,
   dmcaHeight,

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-restricted-syntax */
 import React from 'react';
 import { render, cleanup, waitFor } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
@@ -76,7 +77,7 @@ beforeEach(() => {
     socialIcons,
     hasDisclaimer: true,
     showCopyright: true,
-    logo: '../../../../../images/logo.svg',
+    logo: '/images/logo.svg',
     securityIcon: <Security />,
     helpText,
     phoneNum,
@@ -222,13 +223,13 @@ describe('Show template one', () => {
     props = {
       ...props,
       showCopyright: false,
-      dmcaImage: '../../../../../images/dmca.png',
+      dmcaImage: '/images/dmca.png',
     };
     const { container } = renderComponent(props);
     expect(container.querySelector('.logos > a').querySelector('img')).toBeTruthy();
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'src',
-      '../../../../../images/dmca.png'
+      '/images/dmca.png'
     );
     expect(container.querySelector('.logos > a').querySelector('img')).toHaveAttribute(
       'loading',

package/src/components/organisms/cookie-consent/index.js

@@ -14,7 +14,7 @@ const CookieConsent = ({
   settingsCookie,
   children,
   cookieName = 'CookieConsent',
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   icon = null,
 }) => {
   const [showModal, setShowModal] = useState(false);

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

@@ -25,7 +25,7 @@ const Navigation = ({
   mobileAnimation = "collapseFull",
   stopScrollOnOpen = true,
   canOpenAllSubMenus = true,
-  logo = "../../../../../images/logo.svg",
+  logo = "/images/logo.svg",
   logoWidth = 200,
   logoHeight = 31,
   searchIcon = null,

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

@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 /* eslint-disable react/prop-types */
 /* eslint-disable react/forbid-prop-types */
+/* eslint-disable no-console */
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Button from '~atoms/button/button';
@@ -19,7 +20,7 @@ const Tracker = ({
   bgImage = '',
   bgVideo = '',
   redirectTimer = 3000,
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   counter = false,
   isStory = false,
   operatorLogo = false,

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

@@ -17,7 +17,7 @@ export default function TrackerGeo({
   bgImage = '',
   bgVideo = '',
   redirectTimer = 5000,
-  logo = '../../../../../images/logo.svg',
+  logo = '/images/logo.svg',
   counter = false,
   operatorLogo = false,
   operatorLogoWidth = 80,

package/src/helpers/processImageNode.js

@@ -26,17 +26,38 @@ const processImageNode = (node, moduleWidth = 960, loading) => {
     stylesClass = 'alignRight';
   }
 
-  const imgWidth = node.attribs.width
-    ? node.attribs.width > moduleWidth
-      ? moduleWidth
-      : node.attribs.width.replace('px', '')
-    : getValueFromStyle(node?.attribs?.style, 'width') || '';
-
-  const imgHeight = node.attribs.height
-    ? node.attribs.height === 'auto'
-      ? '298'
-      : node.attribs.height.replace('px', '')
-    : getValueFromStyle(node?.attribs?.style, 'height') || '';
+  let imgWidth
+
+  if (node.attribs.width) {
+    imgWidth =
+      node.attribs.width > moduleWidth
+        ? moduleWidth
+        : node.attribs.width.replace('px', '')
+  } else if (node?.attribs['data-width']) {
+    imgWidth =
+      node?.attribs['data-width'] > moduleWidth
+        ? moduleWidth
+        : node?.attribs['data-width']?.replace('px', '')
+  } else {
+    imgWidth = getValueFromStyle(node?.attribs?.style, 'width') || ''
+  }
+
+  let imgHeight
+
+  if (node.attribs.height) {
+    imgHeight =
+      node.attribs.height === 'auto'
+        ? '298'
+        : node.attribs.height.replace('px', '')
+  } else if (node.attribs['data-height']) {
+    imgHeight =
+      node.attribs['data-height'] === 'auto'
+        ? '298'
+        : node.attribs['data-height'].replace('px', '')
+  } else {
+    imgHeight = getValueFromStyle(node?.attribs?.style, 'height') || ''
+  }
+
 
   const lazyProps = {
     src: parseContentImageUrl(node.attribs.src, imgWidth, imgHeight),

package/src/helpers/server-data.js

@@ -8,7 +8,7 @@ import {getData} from '~helpers/api'
 import processor from "./processor/index.mjs";
 import { fetchSiteSettings } from './fetch-site-settings.mjs';
  
-export async function getAPIData(page, url, preview) {  
+export async function getAPIData(page, url, headers, preview) {  
   if (preview) {
     try {
       const siteName = process.env.GATSBY_SITE_NAME;      

package/src/pages/preview/index.js

@@ -37,7 +37,6 @@ const AppSSR = ({serverData }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-
   return (
     <>
       <MainProvider
@@ -88,8 +87,7 @@ export async function getServerData(props) {
   // eslint-disable-next-line no-shadow
   const { pageContext, url, headers } = props;
   let res = "";
-  const preview = pageContext.isPreview;
-  res = await getAPIData(pageContext.page, url, headers, preview);
+  res = await getAPIData(pageContext.page, url, headers, true);
 
   return res;
 }