gatsby-matrix-theme 37.0.0 → 37.0.2

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [37.0.2](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v37.0.1...v37.0.2) (2023-11-15)
+
+
+### Bug Fixes
+
+* added prop for cookie modal ([5410c92](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5410c9222abbe1589ee116d33a1ef2b6d39d5837))
+
+## [37.0.1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v37.0.0...v37.0.1) (2023-11-15)
+
+
+### Bug Fixes
+
+* added new toplist template ([8e8baf4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/8e8baf44dc2cd0dc8c14fa87130300532d53beb1))
+* buttons fixes ([31b2695](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/31b2695dd4384e6b828b43a35327e5d46d59f2d0))
+* use the iframe module ([1938e14](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/1938e1408434990d20b53538ff756e96263fa0be))
+
+
+* Merge branch 'tm-3818-iframe' into 'master' ([0a7e047](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/0a7e047c02439c896403549a131c2a5b6b293a7d))
+
 # [37.0.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v36.0.4...v37.0.0) (2023-11-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "37.0.0",
+  "version": "37.0.2",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",

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

@@ -150,12 +150,10 @@ const NewsletterForm = ({
   }
 
   const handelSubmit = (e) => {
-    e.preventDefault();
-    const { elements } = e.target;
-    if (validationForm(elements)) {
+    if (validationForm(form.current)) {
       handleApi
-        ? handleApi(elements.name.value, elements.email.value, ip)
-        : bacomApi(elements.name.value, elements.email.value);
+        ? handleApi(form.current.name.value, form.current.email.value, ip)
+        : bacomApi(form.current.name.value, form.current.email.value);
     }
   };
 
@@ -213,7 +211,7 @@ const NewsletterForm = ({
               />
             )}
             <PrivacyandSuccess
-              onclick={() => handelSubmit()}
+              onSubmit={() => handelSubmit()}
               loading={setLogading || loading}
               btnText={formTextTranslated.buttonText}
               privacyText={privacyText}

package/src/components/atoms/newsletter/privacy&button/index.js

@@ -9,7 +9,7 @@ const PrivacyandSuccess = ({ privacyText, btnText, onSubmit = null }) => (
       // eslint-disable-next-line react/no-danger
       <p className={styles?.privacytext || ''} dangerouslySetInnerHTML={{ __html: privacyText }} />
     ) : null}
-    <Button btnText={btnText} buttonType="primary" onClick={() => onSubmit()} />
+    <Button isInternalLink={false} btnText={btnText} buttonType="primary" onClick={onSubmit} />
   </div>
 );
 

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

@@ -14,6 +14,8 @@ import styles from './cookie-modal.module.scss';
 const CookieModal = ({
   handleAcceptCookies,
   handleDeclineCookies,
+  declineButtonType = 'secondary',
+  buttonSize = 'm',
   closeModal,
   cookieLink = {
     title: '',
@@ -124,7 +126,7 @@ const CookieModal = ({
               btnText={translate(translations, 'cookie_accept_all_button', 'Accept All Cookies')}
               isInternalLink={false}
               buttonType="primary"
-              buttonSize="m"
+              buttonSize={buttonSize}
               gtmClass="cookie-consent-gtm btn-cta"
             />
           )}
@@ -136,8 +138,8 @@ const CookieModal = ({
               'I reject Non-Necessary'
             )}
             isInternalLink={false}
-            buttonType="secondary"
-            buttonSize="m"
+            buttonType={declineButtonType}
+            buttonSize={buttonSize}
             gtmClass="cookie-consent-gtm btn-cta"
           />
         </div>
@@ -189,7 +191,7 @@ const CookieModal = ({
               btnText={translate(translations, 'cookie_confirm_button', 'Confirm my choices')}
               isInternalLink={false}
               buttonType="primary"
-              buttonSize="m"
+              buttonSize={buttonSize}
               gtmClass="cookie-consent-gtm btn-cta"
             />
           </div>
@@ -204,6 +206,8 @@ CookieModal.propTypes = {
   handleDeclineCookies: PropTypes.func,
   closeModal: PropTypes.func,
   logo: PropTypes.string,
+  buttonSize: PropTypes.string,
+  declineButtonType: PropTypes.string,
   templateTwo: PropTypes.bool,
   cookieLink: PropTypes.shape({
     title: PropTypes.string,

package/src/components/molecules/wagering-calculator/wagering-calculator.module.scss

@@ -25,8 +25,8 @@
       cursor: pointer;
     }
 
-    button {
-      align-self: end;
+    a {
+      align-self: flex-end;
       height: 4.8rem !important;
       width: 100%;
     }

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

@@ -79,7 +79,10 @@ const Modules = ({ module, page, pageContext, index, exclOperator }) => {
         return loadable(() => import('../../../../components/molecules/operator-summary'));
       case 'game_iframe':
       case 'iframe':
-        return loadable(() => import('../../../../components/molecules/game-iframe'));
+        if (moduleItem?.value_type === 'template_block') {
+          return loadable(() => import('../../../../components/molecules/game-iframe'));
+        }
+        return loadable(() => import('gatsby-core-theme/src/components/atoms/iframe'));
       // Template blocks
       case 'info_grid':
       case 'information_grid':
@@ -126,18 +129,26 @@ const Modules = ({ module, page, pageContext, index, exclOperator }) => {
     ? 'archiveLabel'
     : null;
 
-  const extraProps =
-    module.name === 'bonus'
-      ? {
+  const extraProps = () => {
+    switch (module.name) {
+      case 'bonus':
+        return {
           operator: module?.value,
           logo: module?.value?.logo_url,
           hasLink: true,
           prettyLink: prettyTracker(module?.value, 'main', false, page?.template),
           isStickyCta: false,
-        }
-      : {
+        };
+      case 'iframe':
+        return {
+          src: module?.iframe_source,
+        };
+      default:
+        return {
           anchorLabel,
         };
+    }
+  };
 
   const moduleClassName = `${module.name}Module`;
 
@@ -183,7 +194,7 @@ const Modules = ({ module, page, pageContext, index, exclOperator }) => {
           module={module}
           page={page}
           pageContext={pageContext}
-          {...extraProps}
+          {...extraProps()}
           exclOperator={exclOperator}
           isHomepageFirstModule={homepageFirstModule}
         />

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

@@ -18,6 +18,7 @@ const CookieConsent = ({
   location = 'bottom',
   showOnScroll = true,
   settingsCookie,
+  settingsButtonType = 'secondary',
   isPageHomepage,
   type,
   cookieImage = '../../../images/cookie.png',
@@ -64,7 +65,7 @@ const CookieConsent = ({
                   isInternalLink={false}
                   onClick={() => setShowModal(!showModal)}
                   btnText={translate(translations, 'cookie_setting_button', 'Cookie Setting')}
-                  buttonType="secondary"
+                  buttonType={settingsButtonType}
                   buttonSize="m"
                   gtmClass="cookie-consent-gtm btn-cta"
                 />
@@ -113,6 +114,7 @@ CookieConsent.propTypes = {
   type: PropTypes.string,
   cookieName: PropTypes.string,
   showOnScroll: PropTypes.bool,
+  settingsButtonType: PropTypes.string,
   isPageHomepage: PropTypes.bool,
   cookieImage: PropTypes.string,
   logo: PropTypes.string,

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

@@ -11,6 +11,7 @@ import Row from '../../../../../components/molecules/toplist/row/variant-one';
 import styles from './list.module.scss';
 import styleTemplateOne from './template-one.module.scss';
 import styleTemplateTwo from './template-two.module.scss';
+import styleTemplateThree from './template-three.module.scss';
 
 export default function List({
   pagePath,
@@ -56,16 +57,22 @@ export default function List({
     }
   }
 
+  const templateStyle = () => {
+    switch (modulestyle) {
+      case 'template_two':
+        return styleTemplateTwo.templateTwo;
+      case 'template_three':
+        return styleTemplateThree.templateThree;
+      default:
+        return styleTemplateOne.templateOne;
+    }
+  };
+
+  const isGrid = modulestyle === 'template_two';
+
   return (
     <>
-      <ul
-        className={`${styles.list || ''} ${
-          modulestyle === 'template_two'
-            ? styleTemplateTwo.templateTwo || ''
-            : styleTemplateOne.templateOne || ''
-        } `}
-        key={keygen()}
-      >
+      <ul className={`${styles.list || ''} ${templateStyle()} `} key={keygen()}>
         {items.map((item, index) => (
           <Row
             pagePath={pagePath}
@@ -78,8 +85,9 @@ export default function List({
             key={keygen()}
             itemRefs={elRefs}
             template={template}
-            layout={modulestyle === 'template_two' ? 'grid' : 'list'}
+            layout={isGrid ? 'grid' : 'list'}
             verifyIcon={verifyIcon}
+            showAuthor={modulestyle !== 'template_three'}
           />
         ))}
       </ul>

package/src/gatsby-core-theme/components/organisms/toplist/list/template-three.module.scss

@@ -0,0 +1,28 @@
+.templateThree {
+    // @include flex-direction(column);
+    columns: 29rem;
+    gap: 1rem;
+    counter-reset: grid;
+    row-gap: 2rem;
+  
+    > li {
+      break-inside: avoid;
+      aspect-ratio: 4 / 3;
+      display: flex !important;
+      margin-bottom: 1rem;
+      margin-top: 1rem;
+  
+      > div:first-child {
+        display: flex !important;
+      }
+  
+      &:nth-child(3n) {
+        aspect-ratio: 1;
+      }
+  
+      // &:nth-child(3n - 1) {
+      //   aspect-ratio: 2 / 3;
+      // }
+    }
+  }
+  

package/src/gatsby-core-theme/components/organisms/toplist/toplist.stories.js

@@ -82,6 +82,7 @@ export default {
 
 const ToplistTemplateOne = (args) => <Toplist {...args} />;
 const ToplistTemplateTwo = (args) => <Toplist {...args} />;
+const ToplistTemplateThree = (args) => <Toplist {...args} />;
 
 export const TemplateOne = ToplistTemplateOne.bind({});
 TemplateOne.args = {
@@ -92,3 +93,8 @@ export const TemplateTwo = ToplistTemplateTwo.bind({});
 TemplateTwo.args = {
   module: getSingleToplistWithTemplate('template_two'),
 };
+
+export const TemplateThree = ToplistTemplateThree.bind({});
+TemplateThree.args = {
+  module: getSingleToplistWithTemplate('template_three'),
+};

package/storybook/public/iframe.html

@@ -361,4 +361,4 @@
           
       
           
-            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/organisms/navigation","files":"navigation.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/organisms\\/navigation\\/navigation\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/organisms/anchor","files":"anchor.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/organisms\\/anchor\\/anchor\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/bonus/template-one","files":"bonus.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/bonus\\/template-one\\/bonus\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/bonus/template-two","files":"bonus.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/bonus\\/template-two\\/bonus\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"text.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/text\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"show-more.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/show-more\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"content.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/content\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/lists","files":"lists.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/lists\\/lists\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/frame","files":"frame.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/frame\\/frame\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/table","files":"table-one.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/table\\/table-one\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/table","files":"table-two.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/table\\/table-two\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/pagination","files":"pagination.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/pagination\\/pagination\\.stories\\.js)$"}];</script><script src="runtime~main.daeb2a8f.iframe.bundle.js"></script><script src="487.2d630f0c.iframe.bundle.js"></script><script src="main.f1d5b1af.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"./src","files":"**/**/**/**/**/*.stories.js","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/organisms/navigation","files":"navigation.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/organisms\\/navigation\\/navigation\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/organisms/anchor","files":"anchor.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/organisms\\/anchor\\/anchor\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/bonus/template-one","files":"bonus.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/bonus\\/template-one\\/bonus\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/bonus/template-two","files":"bonus.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/bonus\\/template-two\\/bonus\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"text.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/text\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"show-more.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/show-more\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content","files":"content.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/content\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/lists","files":"lists.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/lists\\/lists\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/frame","files":"frame.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/frame\\/frame\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/table","files":"table-one.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/table\\/table-one\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/content/table","files":"table-two.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/content\\/table\\/table-two\\.stories\\.js)$"},{"titlePrefix":"","directory":"../node_modules/gatsby-core-theme/src/components/molecules/pagination","files":"pagination.stories.js","importPathMatcher":"^(?:\\.\\.\\/node_modules\\/gatsby-core-theme\\/src\\/components\\/molecules\\/pagination\\/pagination\\.stories\\.js)$"}];</script><script src="runtime~main.daeb2a8f.iframe.bundle.js"></script><script src="487.2d630f0c.iframe.bundle.js"></script><script src="main.670ea896.iframe.bundle.js"></script></body></html>