gatsby-matrix-theme 3.2.24 → 3.2.28

package/CHANGELOG.md

@@ -1,3 +1,53 @@
+## [3.2.28](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.27...v3.2.28) (2022-02-08)
+
+
+### Bug Fixes
+
+* fixed prelive path ([613be59](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/613be5928fa86f418bd5296f701b32ae77d54d1d))
+* preconnectLinks removed ([325406c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/325406c1f772dce8a42c3be89a3c8213579957d4))
+
+
+* Merge branch 'tm-2681-canary-tokens' into 'master' ([bcbf07d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/bcbf07d830c41f628d180ef592ffb82a8e0f9b00))
+
+## [3.2.27](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.26...v3.2.27) (2022-02-08)
+
+
+### Bug Fixes
+
+* added canary token script ([af5479f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/af5479fa3e9814baf9a06368a560754d10f0f49e))
+
+
+### Config
+
+* updated to latest core version ([bc48d27](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/bc48d277b3dba149aeeffdaff490b8715320f288))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([23020a5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/23020a5036887d5570c1958820c4de74b211a938))
+* Merge branch 'tm-2681-canary-tokens' into 'master' ([49fca6c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/49fca6ced00281ce2a4a17f93b927179fddbf8ff))
+
+## [3.2.26](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.25...v3.2.26) (2022-02-08)
+
+
+### Bug Fixes
+
+* removing unused divs ([7f5bc6d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7f5bc6dcc182d025117e2005c3973f41973588f3))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/matrix-theme ([f704c0b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/f704c0b58a8a8e124790281ad36637454216bdde))
+
+## [3.2.25](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.24...v3.2.25) (2022-02-07)
+
+
+### Bug Fixes
+
+* clean up gatsby config ([5c2f4df](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5c2f4df24fce6888fe8222084c7d7c5cd7b1f9e5))
+* fixed conflicts ([e2b84b8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e2b84b885e229e28ca9fc71c36fc728a854d5693))
+* keep open FAQ when js is blocked ([230d1db](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/230d1db97e2fd99646ee63abab10473d204d1adc))
+* return 70 coverage ([b14b876](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b14b876bba8ffbfd90fa27da95b5bdb2650dde3e))
+
+
+* Merge branch 'tm-2697-Faq' into 'master' ([4615d58](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/4615d5853a2ef640834bbbdfc0ba019ed2987cb6))
+
 ## [3.2.24](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v3.2.23...v3.2.24) (2022-02-07)
 
 

package/gatsby-config.js

@@ -16,13 +16,7 @@ module.exports = {
       resolve: `gatsby-core-theme`,
       options: {
         siteName: process.env.GATSBY_SITE_NAME,
-        preconnectLinks: [
-          'https://www.google-analytics.com',
-          'https://www.googletagmanager.com',
-          'https://gm.innocraft.cloud',
-          'https://assets-srv.s3.eu-west-1.amazonaws.com',
-          'https://d3449cb8ihm3k3.cloudfront.net',
-        ],
+        preconnectLinks: [process.env.IMAGE_CDN_URL],
       },
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "3.2.24",
+  "version": "3.2.28",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -31,7 +31,7 @@
     "cross-env": "^7.0.2",
     "dotenv": "8.2.0",
     "gatsby": "^3.3.1",
-    "gatsby-core-theme": "^2.2.6",
+    "gatsby-core-theme": "^3.0.0",
     "gatsby-image": "^3.3.0",
     "gatsby-plugin-image": "^1.3.1",
     "gatsby-plugin-postcss": "^4.3.0",

package/src/components/atoms/cards/game-card/index.js

@@ -25,15 +25,17 @@ const GameCard = ({ item, button_text = 'play_now', width, height }) => {
   return (
     <BaseCard item={item} isLinked cardType="game">
       {!featured && (
-        <div className={styles.cardBanner}>
-          <Link to={path} className="game-card-gtm" aria-label={`${title} Link`}>
-            {banner ? (
-              <LazyImage width={width} height={height} src={imagePrettyUrl(banner)} alt={title} />
-            ) : (
-              <GatsbyImg filename="default-slot.jpg" alt={title} />
-            )}
-          </Link>
-        </div>
+        <Link
+          to={path}
+          className={`game-card-gtm ${styles.cardBanner}`}
+          aria-label={`${title} Link`}
+        >
+          {banner ? (
+            <LazyImage width={width} height={height} src={imagePrettyUrl(banner)} alt={title} />
+          ) : (
+            <GatsbyImg filename="default-slot.jpg" alt={title} />
+          )}
+        </Link>
       )}
       <div className={`${styles.cardContent} ${featured && styles.featured}`}>
         <Link to={path} className="game-card-gtm">

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

@@ -7,15 +7,15 @@ import keygen from '~helpers/keygen';
 
 /* eslint-disable react/no-danger */
 
-const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = '' }) => {
+const Faq = ({ module, closeAll = false, openItem, closeOthers = false, icon = '' }) => {
   const { items } = module;
   const itemRefs = useRef([]);
   const btnRefs = useRef([]);
 
-  const openAllItems = () => {
+  const closeAllItems = () => {
     for (let i = 0; i < itemRefs.current.length; i += 1) {
-      itemRefs.current[i].classList.add(styles.active);
-      btnRefs.current[i].classList.add(styles.invertArrow);
+      itemRefs.current[i].classList.remove(styles.active);
+      btnRefs.current[i].classList.remove(styles.invertArrow);
     }
   };
 
@@ -45,8 +45,8 @@ const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = ''
   };
 
   useEffect(() => {
-    if (openAll) {
-      openAllItems();
+    if (closeAll) {
+      closeAllItems();
     }
   });
   useEffect(() => {
@@ -72,7 +72,7 @@ const Faq = ({ module, openAll = true, openItem, closeOthers = false, icon = ''
               </span>
             </button>
             <div
-              className={styles.content}
+              className={`${styles.content} ${styles.active}`}
               ref={(el) => (itemRefs.current[index] = el)}
               dangerouslySetInnerHTML={{ __html: item.answer }}
             />
@@ -93,7 +93,7 @@ Faq.propTypes = {
       })
     ),
   }).isRequired,
-  openAll: PropTypes.bool,
+  closeAll: PropTypes.bool,
   openItem: PropTypes.number,
   closeOthers: PropTypes.bool,
   styles: PropTypes.shape({}),

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

@@ -32,12 +32,12 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
     ? translate(translations, month, month)
     : false;
 
-  const getTitle = () => {
+  const getTitle = (className) => {
     const moduleTitle = module?.title || module?.module_title;
 
     if (!module?.module_title_tag) {
       return (
-        <h2 className={styles.noTag}>
+        <h2 className={`${styles.noTag} ${className}`}>
           {moduleTitle}
           {currentMonth ? (
             <span className={styles.toplistDate}>
@@ -51,7 +51,7 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
 
     if (module.module_title_tag)
       return (
-        <CustomTag>
+        <CustomTag className={className}>
           {moduleTitle}
           {currentMonth ? (
             <span className={styles.toplistDate}>
@@ -62,7 +62,7 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
         </CustomTag>
       );
     return (
-      <span className={styles.noTag}>
+      <span className={`${styles.noTag} ${className}`}>
         {moduleTitle}
         {currentMonth ? (
           <span className={styles.toplistDate}>
@@ -84,9 +84,7 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
           module?.style && styles[module.style]
         } ${tabsToplist ? styles.tabsToplist : null}`}
       >
-        <div className={styles.toplistTitle}>
-          {(module?.title || module.module_title) && getTitle(module)}
-        </div>
+        {(module?.title || module.module_title) && getTitle(styles.toplistTitle)}
 
         {module.link_label && (
           <Link to={module.link_value} className={`${styles.viewMore} module-title-gtm`}>
@@ -96,13 +94,12 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
         )}
       </div>
     ) : (
-      <div
-        className={`${styles.moduleTitle} ${styles[template]} ${
-          module?.style && styles[module.style]
-        } ${styles.toplistTitle} ${tabsToplist ? styles.tabsToplist : null}`}
-      >
-        {(module?.title || module.module_title) && getTitle(module)}
-      </div>
+      (module?.title || module.module_title) &&
+      getTitle(
+        `${styles.moduleTitle} ${styles[template]} ${module?.style && styles[module.style]} ${
+          styles.toplistTitle
+        } ${tabsToplist ? styles.tabsToplist : null}`
+      )
     ))
   );
 };

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

@@ -81,13 +81,13 @@ const Content = ({ module }) => {
 
   return (
     <>
-      <div className={`${styles.content} ${showMore && styles.showMore}`}>
-        <div className={`${switchStyle(module.style)}`}>
-          {module.value &&
-            parse(module.value, {
-              replace: replaceMedia,
-            })}
-        </div>
+      <div
+        className={`${styles.content} ${showMore && styles.showMore} ${switchStyle(module.style)}`}
+      >
+        {module.value &&
+          parse(module.value, {
+            replace: replaceMedia,
+          })}
       </div>
       {showMore && (
         <button type="button" className={styles.button} onClick={handleChange}>

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

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import React from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import loadable from '@loadable/component';
 import { getSection } from 'gatsby-core-theme/src/helpers/getters';
@@ -14,6 +14,26 @@ import FooterTop from '../../../../components/atoms/footer/top';
 import FooterBottom from '../../../../components/atoms/footer/bottom';
 
 function Body({ pageContext, children }) {
+  useEffect(() => {
+    if (!process.env.CANARY_TOKEN) {
+      return;
+    }
+
+    if (
+      document.domain !== `prelive.${process.env.GATSBY_SITE_NAME}` ||
+      document.domain !== process.env.GATSBY_SITE_NAME ||
+      document.domain !== `www.${process.env.GATSBY_SITE_NAME}`
+    ) {
+      // eslint-disable-next-line no-restricted-globals
+      const l = location.href;
+      const r = document.referrer;
+      const img = new Image();
+      img.src = `${'http://canarytokens.com/' + `[${process.env.CANARY_TOKEN}].jpg?l=`}${encodeURI(
+        l
+      )}&r=${encodeURI(r)}`;
+    }
+  }, []);
+
   const getBodySection = (name) => getSection(name, pageContext);
 
   const main = getBodySection('main');

package/storybook/public/{1.ac251b98.iframe.bundle.js → 1.2a2b1ee2.iframe.bundle.js}

@@ -1 +1 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{595:function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__),__webpack_require__.d(__webpack_exports__,"lazyHydrate",(function(){return m}));var _index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(1029),react__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(1),react__WEBPACK_IMPORTED_MODULE_1___default=__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__),react_dom__WEBPACK_IMPORTED_MODULE_2__=__webpack_require__(109),react_dom__WEBPACK_IMPORTED_MODULE_2___default=__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_2__),s=(__webpack_require__(537),__webpack_require__(532),__webpack_require__(2),["image","loading","isLoading","isLoaded","toggleIsLoaded","ref","imgClassName","imgStyle","objectPosition","backgroundColor","objectFit"]);function m(m,g,l,u){var b=m.image,h=m.loading,p=m.isLoading,f=m.isLoaded,j=m.toggleIsLoaded,y=m.ref,L=m.imgClassName,v=m.imgStyle,C=void 0===v?{}:v,k=m.objectPosition,w=m.backgroundColor,N=m.objectFit,P=void 0===N?"cover":N,E=Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.e)(m,s),F=b.width,R=b.height,S=b.layout,x=b.images,I=b.placeholder,J=b.backgroundColor,M=JSON.stringify(x);C=Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({objectFit:P,objectPosition:k,backgroundColor:w},C);var O=react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.b,{layout:S,width:F,height:R},react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.d,Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({},Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.h)(I,f,S,F,R,J,P,k))),react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.c,Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({},E,{width:F,height:R,className:L},Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.g)(p,f,x,h,j,M,y,C))));return g.current&&(react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot?(l.current||(l.current=react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot(g.current)),l.current.render(O)):((l.current||u.current?react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.render:react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.hydrate)(O,g.current),l.current=!0)),function(){g.current&&(react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot?l.current.render(null):react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.render(null,g.current))}}}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[1],{595:function(module,__webpack_exports__,__webpack_require__){"use strict";__webpack_require__.r(__webpack_exports__),__webpack_require__.d(__webpack_exports__,"lazyHydrate",(function(){return m}));var _index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__(1029),react__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__(1),react__WEBPACK_IMPORTED_MODULE_1___default=__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__),react_dom__WEBPACK_IMPORTED_MODULE_2__=__webpack_require__(109),react_dom__WEBPACK_IMPORTED_MODULE_2___default=__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_2__),s=(__webpack_require__(538),__webpack_require__(533),__webpack_require__(2),["image","loading","isLoading","isLoaded","toggleIsLoaded","ref","imgClassName","imgStyle","objectPosition","backgroundColor","objectFit"]);function m(m,g,l,u){var b=m.image,h=m.loading,p=m.isLoading,f=m.isLoaded,j=m.toggleIsLoaded,y=m.ref,L=m.imgClassName,v=m.imgStyle,C=void 0===v?{}:v,k=m.objectPosition,w=m.backgroundColor,N=m.objectFit,P=void 0===N?"cover":N,E=Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.e)(m,s),F=b.width,R=b.height,S=b.layout,x=b.images,I=b.placeholder,J=b.backgroundColor,M=JSON.stringify(x);C=Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({objectFit:P,objectPosition:k,backgroundColor:w},C);var O=react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.b,{layout:S,width:F,height:R},react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.d,Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({},Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.h)(I,f,S,F,R,J,P,k))),react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.c,Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.f)({},E,{width:F,height:R,className:L},Object(_index_browser_b9d6f48d_js__WEBPACK_IMPORTED_MODULE_0__.g)(p,f,x,h,j,M,y,C))));return g.current&&(react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot?(l.current||(l.current=react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot(g.current)),l.current.render(O)):((l.current||u.current?react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.render:react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.hydrate)(O,g.current),l.current=!0)),function(){g.current&&(react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.createRoot?l.current.render(null):react_dom__WEBPACK_IMPORTED_MODULE_2___default.a.render(null,g.current))}}}}]);