gatsby-core-theme 33.1.10 → 33.1.11

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [33.1.11](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.1.10...v33.1.11) (2024-07-05)
+
+
+### Bug Fixes
+
+* newsletter reverted chnaged ([82dc756](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/82dc756c4e0ea0e2243a1754225d1d2c170cb5a0))
+* remove env var ([6b2fee3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b2fee3a6332924004b077195c3843f68611c473))
+* tandc fixes ([f3c6f5e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/f3c6f5e67ec9d486cfe73af31f5c9ff3e42d63d3))
+* tandc fixes ([c7c05a0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c7c05a0639a797898db68703ef7778c5d7c27bf3))
+* tandc fixes ([0faa015](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0faa015f6acb9b48fa654dab9f787cfbf8a5cabd))
+
+
+### Code Refactoring
+
+* remove org schema, add tabindex for scrollable content ([27d632f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/27d632f762626f46c75ce6992910912634b03daa))
+
+
+* Merge branch 'tm-4453-tandc' into 'master' ([958f39b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/958f39b5f55e440f15372ba67c27b1e6a5e61a7e))
+* Merge branch 'tm-4505-aria-buttons' into 'master' ([190376e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/190376eef9e7fee44adb9fb6c2c1a753ab65aca2))
+* Merge branch 'tm-4462-newsletter-rever' into 'master' ([d4cf109](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d4cf109929300d80ab31b277f9b29707b73a9864))
+
 ## [33.1.10](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v33.1.9...v33.1.10) (2024-07-04)
 
 

package/package.json

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

package/src/components/molecules/bonus/template-one/bonus.module.scss

@@ -159,78 +159,4 @@
     padding: 0;
     margin: 0 0.8rem 0.8rem 0.8rem;
   }
-}
-
-.showTncFixed {
-  > div {
-    > div:last-child {
-      height: 42px;
-      overflow-y: scroll;
-      color: #515156;
-      font-size: 10px;
-      font-style: normal;
-      font-weight: 400;
-      line-height: 14px;
-      padding-right: 1rem;
-
-      &::-webkit-scrollbar {
-        width: 4px;
-        border-radius: 2px;
-      }
-
-      &::-webkit-scrollbar-track {
-        background: #cacaca;
-        border-radius: 2px;
-      }
-
-      &::-webkit-scrollbar-thumb {
-        background: #515156;
-        border-radius: 2px;
-      }
-    }
-  }
-
-  @include min(tablet) {
-    > div {
-      display: grid;
-      grid-template-columns: 1fr 20rem;
-      grid-template-rows: auto auto;
-
-      > div:last-of-type {
-        grid-column: 1/3;
-        grid-row: 2/3;
-        display: block;
-      }
-
-      > a {
-        grid-row: 1/2;
-        grid-column: 2/3;
-      }
-
-      > div:first-of-type {
-        grid-row: 1/2;
-        grid-column: 1/2;
-      }
-    }
-  }
-}
-
-@include min(tablet) {
-  .tncEnable {
-    > div {
-      gap: 2.4rem;
-
-      > div {
-        gap: 2.4rem;
-      }
-    }
-  }
-
-  .tncEnable .logo {
-    > img {
-      min-width: 9.6rem;
-      width: 9.6rem;
-      height: 9.6rem;
-    }
-  }
-}
+}

package/src/components/molecules/bonus/template-one/bonus.stories.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import React from 'react';
 import {
   Title,
@@ -8,7 +9,7 @@ import {
 } from '@storybook/addon-docs/blocks';
 
 import Bonus from '.';
-import getPageData from '~tests/factories/pages/default.factory';
+import getOperatorData from '~tests/factories/relations/operator.factory';
 
 export default {
   title: 'Theme/Modules/Bonus/Template One',
@@ -17,34 +18,13 @@ export default {
     operator: {
       name: 'operator',
       type: { name: 'object', required: false },
-      defaultValue: '',
+      defaultValue: getOperatorData(),
       description: 'The Operator data object.',
       table: {
         type: { summary: 'object' },
         defaultValue: { summary: '' },
       },
     },
-    tncEnable: {
-      name: 'TNC',
-      type: { name: 'boolean', required: false },
-      defaultValue: false,
-      description: 'If tnc is enabel we show data for it, if is false we hide data',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: false },
-      },
-    },
-    tncFixed: {
-      name: 'TNC  Fixed',
-      type: { name: 'boolean', required: false },
-      defaultValue: false,
-      description:
-        'If tnxFix is an arg that help us to show the tnc data in the bottom of component and with scroll',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: false },
-      },
-    },
     showRoundedRating: {
       name: 'showRoundedRating',
       type: { name: 'boolean', required: false },
@@ -77,7 +57,5 @@ const Template = (args) => <Bonus {...args} />;
 
 export const Default = Template.bind({});
 Default.args = {
-  tncEnable: true,
-  tncFixed: false,
-  operator: getPageData().relation,
+  operator: getOperatorData(),
 };

package/src/components/molecules/bonus/template-one/index.js

@@ -17,22 +17,14 @@ export default function Bonus({
   module = {
     name: 'bonus',
   },
-  tnc = {
-    operator,
-    hasCollapse: false,
-    onlyMobile: true,
-    onlyDesktop: true,
-    buttonText: 'Terms and Conditions Apply',
-    initOpen: false,
-    isFixed: false,
-  },
+  tncFixed = false,
   width = '120',
   height = '120',
   showRoundedRating = false,
 }) {
   const { logo, bonus, name } = operator || {};
   return (
-    <div className={`${styles.operatorBanner || ''} ${styles.tncEnable || ''}`}>
+    <div className={`${styles.operatorBanner || ''}`}>
       <div className={styles.container}>
         <div>
           <PrettyLink
@@ -62,7 +54,7 @@ export default function Bonus({
           </PrettyLink>
           <div className={styles.bonus || ''}>
             <BonusBox item={operator} module="bonus" tracker={module?.type || 'main'} />
-            {!tnc.isFixed && <Tnc {...tnc} />}
+            {!tncFixed && <Tnc isFixed={tncFixed} operator={operator} />}
           </div>
           <OperatorCta
             operator={operator}
@@ -72,7 +64,7 @@ export default function Bonus({
             icon={<FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />}
           />
         </div>
-        {tnc.isFixed && <Tnc {...tnc} />}
+        {tncFixed && <Tnc isFixed={tncFixed} operator={operator} />}
       </div>
     </div>
   );
@@ -93,7 +85,6 @@ Bonus.propTypes = {
     status: PropTypes.string,
   }),
   tncFixed: PropTypes.bool,
-  tnc: PropTypes.shape({}),
   pageTemplate: PropTypes.string,
   module: PropTypes.shape({
     tracking_link_name: PropTypes.string,

package/src/components/molecules/bonus/template-two/bonus.stories.js

@@ -10,7 +10,7 @@ import {
 import MainProvider from '~context/MainProvider';
 
 import Bonus from '.';
-import getPageData from '~tests/factories/pages/default.factory';
+import getOperatorData from '~tests/factories/relations/operator.factory';
 
 export default {
   title: 'Theme/Modules/Bonus/Template Two',
@@ -19,23 +19,13 @@ export default {
     operator: {
       name: 'operator',
       type: { name: 'object', required: false },
-      defaultValue: '',
+      defaultValue: getOperatorData(),
       description: 'The Operator data object.',
       table: {
         type: { summary: 'object' },
         defaultValue: { summary: '' },
       },
     },
-    tncEnable: {
-      name: 'TNC',
-      type: { name: 'boolean', required: false },
-      defaultValue: false,
-      description: 'If tnc is enabel we show data for it, if is false we hide data',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: false },
-      },
-    },
     tncFixed: {
       name: 'TNC  Fixed',
       type: { name: 'boolean', required: false },
@@ -163,15 +153,13 @@ const Template = (args) => (
         versions of Lorem Ipsum.
       </div>
     </main>
-    <Bonus {...args} stickyOffset="10" />
+    <Bonus {...args} />
   </MainProvider>
 );
 
 export const Default = Template.bind({});
 Default.args = {
-  tncEnable: true,
   tncFixed: false,
-  operator: getPageData().relation,
-  floating: false,
-  showOnLoad: true,
+  operator: getOperatorData(),
+  floating: true,
 };

package/src/components/molecules/bonus/template-two/index.js

@@ -19,15 +19,7 @@ export default function TemplateOne({
   module = {
     name: 'bonus',
   },
-  tnc = {
-    operator,
-    hasCollapse: false,
-    onlyMobile: true,
-    onlyDesktop: true,
-    buttonText: 'Terms and Conditions Apply',
-    initOpen: false,
-    isFixed: false,
-  },
+  tncFixed = false,
   showWelcomeText = true,
   floating = false,
   closedBanner,
@@ -55,7 +47,7 @@ export default function TemplateOne({
       className={`${styles.operatorBanner || ''} ${!closedBanner ? styles.show : styles.hide} ${
         styles.tncEnable
       }
-      ${tnc.isFixed ? styles.showTncFixed || '' : ''} ${floating ? styles.floating : ''}`}
+      ${tncFixed ? styles.showTncFixed || '' : ''} ${floating ? styles.floating : ''}`}
     >
       <div className={styles.container}>
         <div>
@@ -93,7 +85,7 @@ export default function TemplateOne({
             )}
 
             <BonusBox item={operator} tracker={module?.type || 'main'} />
-            {!tnc.isFixed && <Tnc {...tnc} />}
+            {!tncFixed && <Tnc isFixed={tncFixed} operator={operator} />}
           </div>
         </div>
 
@@ -105,7 +97,7 @@ export default function TemplateOne({
           icon={<FaArrowRight fontSize={20} title="Right-pointing Arrow Icon" />}
           translationsObj={translationsObj}
         />
-        {tnc.isFixed && <Tnc {...tnc} />}
+        {tncFixed && <Tnc isFixed={tncFixed} operator={operator} />}
         <IoMdClose
           className={`${styles.closeBtn || ''}`}
           onClick={clickHandler}
@@ -135,8 +127,7 @@ TemplateOne.propTypes = {
     }),
     status: PropTypes.string,
   }),
-  tnc: PropTypes.shape({}),
-  stickyOffset: PropTypes.number,
+  tncFixed: PropTypes.bool,
   floating: PropTypes.bool,
   pageTemplate: PropTypes.string,
   module: PropTypes.shape({

package/src/components/molecules/newsletter/form/index.js

@@ -37,12 +37,19 @@ const NewsletterForm = ({
     getData();
   }, []);
 
+  function removeTrailingSlash(url) {
+    if (url.endsWith('/')) {
+      return url.slice(0, -1);
+    }
+    return url;
+  }
+
   const bacomApi = async (name, email, phomeNumber) => {
     // eslint-disable-next-line no-bitwise
     const timestamp = (Date.now() / 1000) | 0;
-    const refUrl = getUrl(path)?.replace('https://', '') || process.env.BACOM_REF_URL;
+    const refUrl = removeTrailingSlash(process.env.GATSBY_SITE_URL);
     const validatePhoneNr = typeof phomeNumber === 'undefined';
-    const refName = process.env.BACOM_REF_NAME;
+    const refName = getUrl(path)?.replace('https://', '') || process.env.GATSBY_SITE_NAME;
 
     await fetch(
       `https://bacom.dk/subscribe/gig/?firstname=${name}&user_ip=${ip}&ref_name=${refName}&ref_url=${refUrl}&timestamp=${timestamp}&country=${country}&email=${email}${

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

@@ -2,48 +2,24 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styles from './tnc.module.scss';
 import { getOperatorTnc } from '~helpers/getters';
-import Collapse from '~atoms/collapse';
 
-const Tnc = ({
-  operator,
-  hasCollapse = false,
-  onlyMobile = true,
-  onlyDesktop = true,
-  buttonText = 'Terms and Conditions Apply',
-  initOpen = false,
-  isFixed = false,
-}) => {
+const Tnc = ({ operator, isFixed = false }) => {
   const termsConditions = getOperatorTnc(operator);
 
   return (
     termsConditions && (
-      <>
-        {hasCollapse ? (
-          <Collapse
-            onlyMobile={onlyMobile}
-            onlyDesktop={onlyDesktop}
-            buttonText={buttonText}
-            contentText={termsConditions}
-            initOpen={initOpen}
-          />
-        ) : (
-          <div
-            className={isFixed && styles.isFixed ? styles.isFixed : ''}
-            dangerouslySetInnerHTML={{ __html: termsConditions }}
-          />
-        )}
-      </>
+      <div
+        tabIndex={`${isFixed ? 0 : -1}`}
+        className={`${styles.container} ${isFixed ? styles.isFixed : ''}`}
+        // eslint-disable-next-line react/no-danger
+        dangerouslySetInnerHTML={{ __html: termsConditions }}
+      />
     )
   );
 };
 
 Tnc.propTypes = {
-  hasCollapse: PropTypes.bool,
   isFixed: PropTypes.bool,
-  buttonText: PropTypes.string,
-  onlyMobile: PropTypes.bool,
-  onlyDesktop: PropTypes.bool,
-  initOpen: PropTypes.bool,
   operator: PropTypes.shape({
     short_name: PropTypes.string,
     type: PropTypes.string,

package/src/components/molecules/tnc/tnc.module.scss

@@ -4,29 +4,9 @@
     flex-basis: 100%;
 }
 
-.storybook {
-    max-width: 34.3rem;
-    margin: 0 auto;
-
-    .isFixed {
-        text-align: justify;
-        padding-right: 1.6rem;
-        max-height: 7.2rem;
-        flex-basis: 100%;
-        &::-webkit-scrollbar {
-            -webkit-appearance: none;
-            width: 0.4rem;
-        }
-        
-        &::-webkit-scrollbar-thumb {
-            border-radius: 2px;
-            background-color: #6B6A72;
-        }
-    
-        /* Track */
-        &::-webkit-scrollbar-track {
-            background: #e9e9e9;
-            border-radius: 2px;
-        }
-    }
+.container {
+    font-size: 1rem;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1.4rem;
 }

package/src/components/molecules/tnc/tnc.stories.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import React from 'react';
 import {
   Title,
@@ -6,106 +7,28 @@ import {
   PRIMARY_STORY,
   ArgsTable,
 } from '@storybook/addon-docs/blocks';
+import getOperatorData from '~tests/factories/relations/operator.factory';
 
-import Link from '~hooks/link';
-import styles from './tnc.module.scss';
 import Tnc from '.';
 
-const tncText = (
-  <p>
-    18+ New Players only. Play responsibly - 18+ New Players only. Play responsibly - 18+ New
-    Players only. Play responsibly -
-    <a href="https://www.begambleaware.org/" title="Gamble Aware" target="_blank" rel="noreferrer">
-      &nbsp;Begambleaware
-    </a>
-    . Full
-    <Link to="/terms-and-conditions">&nbsp;Terms&nbsp;</Link>
-    Apply.
-  </p>
-);
-
 export default {
   title: 'Theme/Molecules/Tnc',
   component: Tnc,
   argTypes: {
-    hasCollapse: {
-      name: 'hasCollapse',
-      type: { name: 'boolean', required: false },
-      defaultValue: true,
-      description:
-        'If true, the component will use the `<Collapse />` component and will show a dropdown for the T&C text.',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: true },
-      },
-    },
     isFixed: {
       name: 'isFixed',
       type: { name: 'boolean', required: false },
       defaultValue: false,
-      description:
-        'If true, will have a fixed height for the T&C text. Will only work if hasCollapsed is set to false.',
+      description: 'If true, will have a fixed height for the T&C text.',
       table: {
         type: { summary: 'boolean' },
         defaultValue: { summary: false },
       },
     },
-    onlyMobile: {
-      name: 'onlyMobile',
-      type: { name: 'boolean', required: false },
-      defaultValue: true,
-      description: 'Related to the `<Collapse />` component, if true, collapsible only on mobile.',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: true },
-      },
-    },
-    onlyDesktop: {
-      name: 'onlyDesktop',
-      type: { name: 'boolean', required: false },
-      defaultValue: true,
-      description: 'Related to the `<Collapse />` component, if true, collapsible only on desktop.',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: true },
-      },
-    },
-    buttonText: {
-      name: 'buttonText',
-      type: { name: 'string', required: false },
-      defaultValue: 'Terms and Conditions Apply',
-      description:
-        'Related to the `<Collapse />` component, this is the text that will show when the collapse is closed.',
-      table: {
-        type: { summary: 'string' },
-        defaultValue: { summary: 'Terms and Conditions Apply' },
-      },
-    },
-    initOpen: {
-      name: 'initOpen',
-      type: { name: 'boolean', required: false },
-      defaultValue: false,
-      description:
-        'Related to the `<Collapse />` component, Is True, sets the box opened on first load.',
-      table: {
-        type: { summary: 'boolean' },
-        defaultValue: { summary: false },
-      },
-    },
-    contentText: {
-      name: 'contentText',
-      type: { name: 'element', required: false },
-      defaultValue: '18+ New Players only. Play responsibly.',
-      description: 'The actual T&C text to display.',
-      table: {
-        type: { summary: 'string | element' },
-        defaultValue: { summary: '' },
-      },
-    },
     operator: {
       name: 'operator',
       type: { name: 'object', required: false },
-      defaultValue: null,
+      defaultValue: getOperatorData(),
       description: 'The operator object, passed for the T&C link.',
       table: {
         type: { summary: 'object' },
@@ -119,7 +42,7 @@ export default {
   parameters: {
     docs: {
       description: {
-        component: 'A component to display T&C text and links. Optional collapse.',
+        component: 'A component to display T&C text and links.',
       },
       page: () => (
         <>
@@ -133,19 +56,10 @@ export default {
   },
 };
 
-const Template = (args) => (
-  <div className={styles.storybook}>
-    <Tnc {...args} />
-  </div>
-);
+const Template = (args) => <Tnc {...args} />;
 
 export const Default = Template.bind({});
 Default.args = {
-  hasCollapse: true,
-  contentText: tncText,
-  onlyMobile: true,
-  onlyDesktop: true,
-  buttonText: 'Terms and Conditions Apply',
-  initOpen: false,
   isFixed: false,
+  operator: getOperatorData(),
 };

package/src/components/molecules/tnc/tnc.test.js

@@ -20,25 +20,11 @@ describe('Tnc Component', () => {
     const { container } = render(<Tnc {...args} />);
     expect(container).toBeTruthy();
   });
-  test('render tnc collapsed', () => {
-    const { container } = render(<Tnc {...args} hasCollapse />);
-    expect(container.querySelector('button')).toBeTruthy();
-    expect(container.querySelector('button').innerHTML).toBe('Terms and Conditions Apply');
-    expect(container.querySelector('button').closest('div').querySelector('div').innerHTML).toBe(
-      'test'
-    );
-    expect(container.querySelector('.isFixed')).toBeFalsy();
-  });
   test('render tnc fixed', () => {
     const { container } = render(<Tnc {...args} hasCollapse={false} isFixed />);
     expect(container.querySelector('.isFixed')).toBeTruthy();
     expect(container.querySelector('.isFixed').innerHTML).toBe('test');
   });
-  test('render tnc not fixed not collapsed', () => {
-    const { container } = render(<Tnc {...args} hasCollapse={false} isFixed={false} />);
-    expect(container.querySelector('.isFixed')).toBeFalsy();
-    expect(container.querySelector('div').innerHTML).toBe('test');
-  });
 });
 afterEach(() => {
   cleanup();

package/src/helpers/getters.mjs

@@ -305,8 +305,7 @@ export function getGameIframe(relation, language = null) {
 }
 
 export function getOperatorTnc(operator){
-  const { main } = operator?.one_liners;
-  return main?.terms_and_conditions_enabled ? main?.terms_and_conditions : null;
+  return operator?.one_liners?.main?.terms_and_conditions_enabled ? operator.one_liners?.main?.terms_and_conditions : null;
 }
 
 export function isTandcEnabled(extraFields) {

package/src/helpers/schema.js

@@ -304,37 +304,6 @@ export function organizationSchema(page, pageImage) {
     sameAs: socialLinks
       .map((socialLink) => page.siteSchema?.[socialLink])
       .filter((socialLink) => socialLink),
-    parentOrganization: {
-      '@type': 'Organization',
-      logo: {
-        '@type': 'imageObject',
-        url: 'https://www.gentoomedia.com/wp-content/themes/gentoomedia.com/assets/images/icons/beak-logo.svg',
-      },
-      name: 'Gentoo Media',
-      alternateName: 'G2M',
-      address: {
-        '@type': 'PostalAddress',
-        streetAddress: '@GiG Beach, Triq Id-Dragunara',
-        addressLocality: "Saint Julian's",
-        postalCode: 'STJ 3148',
-        addressCountry: 'MT',
-      },
-      knowsAbout: {
-        '@type': 'Thing',
-        name: 'IGaming Business',
-        sameAs: [
-          'https://en.wikipedia.org/wiki/IGaming_Business',
-          'https://www.google.com/search?q=igaming+business',
-        ],
-      },
-      sameAs: [
-        'https://www.facebook.com/gentoomedia/',
-        'https://x.com/gentoomedia',
-        'https://www.linkedin.com/company/gentoomedia/',
-        'https://www.instagram.com/gentoosocial/',
-        'https://www.gentoomedia.com/',
-      ],
-    },
   };
 
   return JSON.stringify(generateSchemaObject(schema));

package/tests/factories/relations/operator.factory.js

@@ -12,6 +12,14 @@ export default function getOperatorData(status = 'active') {
     short_name: 'rizk',
     type: 'casino',
     iframe: 'https://www.youtube.com/embed/DU1Pio4n_N0',
+    logo: {
+      width: '412',
+      height: '412',
+      title: 'Betibet logo',
+      alt: 'logo image for betibet',
+      url: 'https://assets-srv.s3.eu-west-1.amazonaws.com/1680163403/betibet-logo.png',
+      filename: '1680163403/betibet-logo.png',
+    },
     software: '',
     ribbons: ['1', '2'],
     bonus: {
@@ -48,6 +56,9 @@ export default function getOperatorData(status = 'active') {
     one_liners: {
       main: {
         one_liner: '100% Bonus + 50 free spins',
+        terms_and_conditions:
+          '<p>Indbetaling (min. 50 kr.) matches i væddemålskreditter (maks. (1.000 kr.). Væddemålskredit klar til brug ved afgørelse af væddemål til værdien af den kvalificerende indbetaling. Undt. for min. odds, væddemål og betalingsmetode gælder. Gevinst eks. indsats for væddemålskredit. Tidsbegr. &amp; regler gælder.</p>',
+        terms_and_conditions_enabled: true,
       },
     },
   };