gatsby-core-theme 10.0.2-beta.1 → 11.0.2

package/CHANGELOG.md

@@ -1,27 +1,72 @@
-## [10.0.2-beta.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v10.0.1...v10.0.2-beta.1) (2022-08-11)
+## [11.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.1...v11.0.2) (2022-08-23)
 
 
 ### Bug Fixes
 
+* added noindex nofollow to sports tracker pages ([44daaff](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/44daaffb912832db11afb93cc55c6ed9a3416c52))
+
+
+* Merge branch 'tm-3035-helmet-fixes' into 'master' ([2870a87](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/2870a875733f43f753ac39ca968f0bd976720472))
+
+## [11.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v11.0.0...v11.0.1) (2022-08-23)
+
+
+### Bug Fixes
+
+* add filed in main section for feedback counter ([ff3f8d6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ff3f8d67e3eaf968ac39b8a3a5eb243a6d3edeed))
 * aithor box ([7e01efc](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7e01efc0683664102bf31fa9f9a517433fc993d3))
 * aithor box ([a6fe211](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a6fe211c04d8e9aab0f1c9e0538a1d4907b92cd9))
-* archive load more translation ([913b7ed](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/913b7eddb4eb31b0e0bec3ee7d2e8f394dd6dcab))
+* api urls changes ([26a005c](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/26a005c19bbe18a6197c124213fa8de996750402))
 * changed site ([802a65d](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/802a65de7f800cf0dfe24078509e94ce5dc1a7f8))
+* changed site to irishluck ([905495f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/905495febf58fb0d729e76047214033de4c8d513))
 * publish beta pipeline ([adf73e8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/adf73e89ff71d9d610d98f0b6e898ad12192834e))
 * publish beta pipeline ([9cd3923](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/9cd3923d690b6e7ab846fd3fc6aaf7b81c776ae6))
 * publish beta pipeline ([fe158b3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/fe158b3908b53a489d48a76ba53f8dd979983e51))
 * publish beta pipeline ([e0ba3e6](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e0ba3e61fb80906de6563199d09a51eff1db9c65))
 * publish beta pipeline ([b6bf4a0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b6bf4a0b5ab08c276fbfb95039f40e81b22e1245))
 * publish beta pipeline ([edbd377](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/edbd3777ca3a86edb5517969a6de875f8ab39915))
-* publish beta pipeline ([6b9c7b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b9c7b180ff314c903fd5f7efd835bb5f47a2fe8))
-* publish beta pipeline ([b87e75e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b87e75e771a1cdc7dbcd2cb7eb99cb88165189a7))
+* remove the extra / ([ce57259](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ce572598c753605b1237d639ea8d409bb7c07da4))
 * tests fixes after upgrade ([d43145a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d43145a5fbbb69f9b07489399dc4d07b97ced7e6))
+* update gatsby api url and url during build ([ba554dd](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ba554ddaa25c34bdd396250c615521c1c2e97259))
 * updated gatsby version ([7cc884b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/7cc884b8fba89c62374d4ada6895daec25a4ad8b))
 * upgrade tests fix ([6b42efb](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b42efb251d96430a7318ca129e7b3118a219f4a))
 * upgraded gatsby, storbook ([d499750](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d49975004563aab2e7f0b5a7eea6b815bdff086c))
 
 
-* Merge branch 'tm-2987-gatsby-upgrade' into 'beta' ([59f9b28](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/59f9b288f99cd61f3a3064480861efc9f1263559))
+* Merge branch 'tm-3034-change-hercules-sorted-api' into 'master' ([942bd61](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/942bd61b7b3311af50b31a28e19ae8c8fc549f2e))
+* Merge branch 'tm-2987-gatsby-upgrade' into 'master' ([d808d42](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d808d429c3bc69c57b5cf3e5d03a25b8f3553944))
+* Merge branch 'tm-2815-do-you-recommend' into 'master' ([ed5d1a2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/ed5d1a24974c1251590ddf8b3c6fa364ba0a2109))
+* Merge branch 'master' into tm-2987-gatsby-upgrade ([b91fe5f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b91fe5f544d4364762fa04331952782b958f9179))
+
+# [11.0.0](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v10.0.1...v11.0.0) (2022-08-17)
+
+
+### Bug Fixes
+
+* add a check in modules in order to avoid the error ([8336e0f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8336e0fc75ed225db5bc36f5658a04d615f29cc7))
+* add a test for manually filtering inactive casinos ([b6c3277](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b6c3277d34394445d5dbd0baaa8fabd11235199f))
+* archive load more translation ([913b7ed](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/913b7eddb4eb31b0e0bec3ee7d2e8f394dd6dcab))
+* publish beta pipeline ([6b9c7b1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/6b9c7b180ff314c903fd5f7efd835bb5f47a2fe8))
+* publish beta pipeline ([b87e75e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b87e75e771a1cdc7dbcd2cb7eb99cb88165189a7))
+* remove tag when we dont have data and make style ([980c7c1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/980c7c176c92287d7d9214e390818aff8f5dafbc))
+* update filtering for cardv2 in order to remove closed casinos when using the manual filter ([b26d1f5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/b26d1f55cadc296f187c967bd53dd8cc0c3733fe))
+* update tests ([0bd6ab8](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0bd6ab82ede9a4415dddfdb80688bef48e022e83))
+* update the logic for cardv2 filtering manually ([c54f41a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c54f41a988f280a10d75286585309d968bf99682))
+
+
+### Code Refactoring
+
+* bug fixes on anchor module ([04372b3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/04372b345f1523e52b17dbeae5865b77fc354aeb))
+* set active anchor if available ([5bfcc97](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5bfcc97f0aabb4524d62d8275035e0a7dc5dd393))
+
+
+* Merge branch 'tm-2970-cardv2-module' into 'master' ([5361b56](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/5361b56ee79497fe4d956c0c1a0625057e48849c))
+* Merge branch 'master' into 'tm-2970-cardv2-module' ([c78d173](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/c78d173563117a8764e316caf88007ec5ded31e4))
+* Merge branch 'tm-2943-anchor-module' into 'master' ([185de44](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/185de443a8da578512cdf1b58ce9ed23f08a465d))
+* Merge branch 'master' into tm-2943-anchor-module ([e61c128](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/e61c1281a96b35206d15788482475f9c260dc168))
+* Merge branch 'tm-2971-updating-core' into 'master' ([0212134](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/0212134aeaefcaa2950ae13e0683453d43eb0dc8))
+* Merge branch 'master' into tm-2943-anchor-module ([07450d5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/07450d564e5256b52478d2360a15c7f4cada2e4d))
+* Merge branch 'fix-small-issues' into 'master' ([4b5165e](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4b5165e9f8df9c7453a1b6b28f80c6d16b3cf5fc))
 
 ## [10.0.1](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v10.0.0...v10.0.1) (2022-08-09)
 

package/gatsby-node.esm.js

@@ -116,9 +116,6 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
   process.env.GATSBY_SITE_NAME = String(themeOptions.siteName);
   if (process.env.GATSBY_PREVIEW_MODE === 'true') {
     console.log(chalk.magenta('info') + chalk.whiteBright(' preview mode enabled'));
-    console.log(
-      chalk.magenta('info') + chalk.whiteBright(` preview path: ${process.env.GATSBY_PREVIEW_URL} `)
-    );
     createPage({
       path: '/',
       component: require.resolve(appName),
@@ -290,6 +287,7 @@ exports.createPages = async ({ actions: { createPage } }, themeOptions) => {
           siteInfo,
           provider,
           isTracker: true,
+          meta_robots: ['noindex', 'nofollow'],
         },
       });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "10.0.2-beta.1",
+  "version": "11.0.2",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/app.js

@@ -79,21 +79,6 @@ export function Head({ pageContext }) {
   return isPreview ? <></> : <MetaData page={pageContext.page} siteInfo={pageContext.siteInfo} />;
 }
 
-// Head.propTypes = {
-//   pageContext: PropTypes.shape({
-//     isPreview: PropTypes.bool,
-//     page: PropTypes.shape({
-//       id: PropTypes.number,
-//       path: PropTypes.string,
-//     }),
-//     siteInfo: PropTypes.shape({
-//       robots_txt: PropTypes.string,
-//       site_logo: PropTypes.string,
-//       site_name: PropTypes.string,
-//     }),
-//   }),
-// };
-
 App.propTypes = {
   pageContext: PropTypes.shape({
     siteName: PropTypes.string,

package/src/components/atoms/spotlights/index.js

@@ -33,7 +33,7 @@ const Spotlights = ({ module, themeStyles = {} }) => {
             src={imageSrc}
           />
         )}
-        <label>{item.label}</label>
+        {item?.label && <label>{item.label}</label>}
         {item.subtitle && <span>{item.subtitle}</span>}
       </>
     );
@@ -84,7 +84,7 @@ const Spotlights = ({ module, themeStyles = {} }) => {
             {mode === 'image_text' &&
               (item.link && item.link.value ? (
                 <div className={styles.spotlightsTextCTA}>
-                  <div dangerouslySetInnerHTML={{ __html: item.text }} />
+                  {item?.text && <div dangerouslySetInnerHTML={{ __html: item.text }} />}
                   {item.link.type === 'external' ? (
                     <a
                       href={item.link.value}
@@ -110,7 +110,7 @@ const Spotlights = ({ module, themeStyles = {} }) => {
                   )}
                 </div>
               ) : (
-                <div dangerouslySetInnerHTML={{ __html: item.text }} />
+                item.text && <div dangerouslySetInnerHTML={{ __html: item.text }} />
               ))}
           </li>
         ))}

package/src/components/atoms/spotlights/spotlights.module.scss

@@ -30,13 +30,16 @@
 
       img {
         margin: 0 auto;
+        margin-bottom: 1rem;
       }
 
-      > a {
+      > div > a {
         @include flex-direction(column);
         color: #000;
         font-size: 2rem;
         font-weight: 700;  
+        margin-top: 1rem;
+        width: 100%;
 
         label {
           cursor: pointer;
@@ -47,15 +50,6 @@
         display: block;
       }
 
-      .spotlightsTextCTA {
-        display: flex;
-        flex-direction: column;
-        flex: 1;
-        justify-content: space-between;
-        font-size: 1.4rem;
-        color: #777;
-      }
-
       svg {
         display: none;
       }

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

@@ -45,7 +45,14 @@ function Anchor({
     }
   };
 
+  function getWindowDimensions() {
+    const { innerWidth: width } = window;
+    return width;
+  }
+
   const setActiveAnchor = () => {
+    anchorContainerRef.current && setOffsetTop(anchorContainerRef.current.offsetTop);
+
     // get element in viewport
     const currentAnchor = anchorList?.map((el) => {
       const element = document.getElementById(el.id);
@@ -78,8 +85,12 @@ function Anchor({
       const elementOffsetLeft = activeElement.offsetLeft;
 
       if (elementOffsetLeft > anchorContainerRef.current.offsetWidth - elementOffsetWidth) {
-        anchorListRef.current.scrollLeft =
-          elementOffsetWidth + elementOffsetLeft + 5 - anchorContainerRef.current.offsetWidth;
+        if (getWindowDimensions() > 960) {
+          anchorListRef.current.scrollLeft =
+            elementOffsetWidth + elementOffsetLeft + 5 - anchorContainerRef.current.offsetWidth;
+        } else {
+          anchorListRef.current.scrollLeft = elementOffsetLeft - 5;
+        }
       } else {
         anchorListRef.current.scrollLeft = 0;
       }
@@ -89,7 +100,6 @@ function Anchor({
   };
 
   useEffect(() => {
-    setOffsetTop(anchorContainerRef.current.offsetTop);
     window.addEventListener('scroll', () => setActiveAnchor());
 
     return () => window.removeEventListener('scroll', setActiveAnchor);

package/src/helpers/api.js

@@ -3,27 +3,18 @@ import chalk from 'chalk';
 import processor from './processor';
 
 const API_URL = process.env.GATSBY_API_URL;
-const PREVIEW_URL = process.env.GATSBY_PREVIEW_URL;
 
 /* eslint no-console: ["error", { allow: ["log"] }] */
 
 export async function getPreview(siteName, page = null, themeOptions) {
   return new Promise((resolve, reject) => {
-    const basicAuth =
-      process.env.GATSBY_ACTIVE_ENV === 'production'
-        ? {
-            auth: {
-              username: 'previewpages',
-              password: 'YeV3AhJo',
-            },
-          }
-        : {};
-
     axios
-      .get(`${PREVIEW_URL}?site_name=${siteName}&path=${page}&preview=1`, basicAuth)
+      .get(
+        `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}&path=${page}&preview=1&relations=1`
+      )
       .then((response) => {
         console.log(response);
-        const processed = processor.run(response.data, themeOptions);
+        const processed = processor.run(response.data.result, themeOptions);
         const siteMarket = Object.keys(processed.site_markets)[0];
         resolve({
           marketSections: processed.market_sections[siteMarket],
@@ -37,7 +28,7 @@ export async function getPreview(siteName, page = null, themeOptions) {
 }
 
 export async function getData(siteName, page = null) {
-  let path = `${API_URL}/v0.1/sites/pages/sorted?site_name=${siteName}`;
+  let path = `${API_URL}/sites/v0.1/pages/sorted?site_name=${siteName}`;
 
   if (page) {
     path += `&path=${page}`;
@@ -48,13 +39,7 @@ export async function getData(siteName, page = null) {
   const start = new Date();
   return new Promise((resolve, reject) => {
     axios
-      .get(path, {
-        headers: {
-          'Content-Type': 'application/json',
-          'X-ID': 'cf16589b8e1ad64dd6e98983f8334e6d',
-          'X-Signature': 'FYD7jWimIguFjrg8D9ibS6wIRMK53/bEqh6VrwXbNbc=',
-        },
-      })
+      .get(path)
       .then((response) => {
         const end = new Date() - start;
         console.log(chalk.green('success') + chalk.whiteBright(` calling hercules - %dms`), end);

package/src/helpers/processor/index.js

@@ -203,6 +203,12 @@ export default {
     const languageKey = Object.keys(data.relations.translations)[0];
     const translations = data.relations.translations[languageKey];
     const searchTemplatesAcitve = [];
+    let templateFeadbackCounter = null;
+
+    // create the list of templates that the feedback module will display
+    templateFeadbackCounter = Object.keys(data.templates).filter(
+      (res) => data.templates[res].feedback_counter
+    );
 
     // Check what templates should add in the search result
     Object.keys(data.templates).forEach((el) => {
@@ -305,6 +311,11 @@ export default {
               if (!page.sections.main) {
                 return;
               }
+
+              page.sections.main.feedbackCounter = templateFeadbackCounter.includes(
+                `${page.template_id}`
+              );
+
               if (item.value_type === ModuleValue.VALUE_TYPE_PREFILLED_MODULE_MARKET) {
                 page.sections.main.modules.push(cloneDeep(prefilledMarketModules[item.value_id]));
               } else {

package/src/helpers/processor/modules.js

@@ -137,6 +137,8 @@ export function processCardsV2(module, pagesCloned, pagesMappedById, pageId) {
       // eslint-disable-next-line no-unused-expressions
       pagesMappedById[page_id] && module.items.push(pagesMappedById[page_id]);
     });
+
+    module.items = filterInactiveOperators(module.items);
   } else if (cardSelector === 'use_filters') {
     let pagesList = [];
 
@@ -247,7 +249,7 @@ export function processTopListModule(module, relations, pages) {
           ? pages.operator.filter((page) => page.relation_id === item.operator_id)
           : [];
 
-      if (operatorPage.length >= 1) {
+      if (operatorPage.length >= 1 && operatorPage[0].author) {
         clone.authorName = operatorPage[0].author.name;
         clone.authorPath = operatorPage[0].author.profile_page_path;
       }

package/src/helpers/processor/modules.test.js

@@ -25,7 +25,13 @@ describe('Modules Helper', () => {
   test('Cards V2 Manual list', () => {
     const pagesNum = 10;
     const moduleData = getSampleCardsV2ModuleManual();
-    processCardsV2(moduleData, null, groupBy(getPageDataList(pagesNum), 'id', true));
+    const pageList = getPageDataList(pagesNum);
+
+    processCardsV2(
+      moduleData,
+      groupBy(pageList, 'type'),
+      groupBy(getPageDataList(pagesNum), 'id', true)
+    );
 
     expect(moduleData.items).toHaveLength(3);
 
@@ -35,6 +41,39 @@ describe('Modules Helper', () => {
     });
   });
 
+  test('Cards V2 Filter manual list when inactive operator', () => {
+    process.env.GATSBY_SITE_NAME = 'irishluck.ie';
+    const pagesNum = 13;
+    const moduleData = getSampleCardsV2ModuleManual();
+    const pageList = getPageDataList(pagesNum).map((page, i) =>
+      i % 2
+        ? { ...page, type: 'operator', relation: { ...page.relation, status: 'inactive' } }
+        : { ...page, type: 'operator', relation: { ...page.relation, status: 'active' } }
+    );
+    // eslint-disable-next-line global-require
+    const { processCardsV2: processCardsV2Clean } = require('./modules');
+    processCardsV2Clean(moduleData, groupBy(pageList, 'type'), groupBy(pageList, 'id'));
+    // console.log(pageList);
+    const item = [];
+    moduleData.cards_selector_manual_list.forEach((page) => {
+      // eslint-disable-next-line camelcase
+      const { page_id } = page;
+      pageList.map((operator) => {
+        // eslint-disable-next-line camelcase
+        if (operator.id === page_id) {
+          // eslint-disable-next-line no-unused-expressions
+          operator.relation.status === 'active' ? item.push(operator) : null;
+        }
+        return item;
+      });
+    });
+    item.forEach((element) => {
+      expect(element.relation.status).toEqual('active');
+    });
+    // expect(item.relation.status).toEqual('active');
+    expect(moduleData.num_of_items).toEqual(3);
+  });
+
   test('Cards V2 FIltered list empty', () => {
     const pagesNum = 10;
     const moduleData = getSampleCardsV2Filtered(true);
@@ -56,6 +95,7 @@ describe('Modules Helper', () => {
         ? { ...page, type: 'operator', relation: { ...page.relation, status: 'inactive' } }
         : { ...page, type: 'operator', relation: { ...page.relation, status: 'active' } }
     );
+    // eslint-disable-next-line global-require
     const { processCardsV2: processCardsV2Clean } = require('./modules');
     processCardsV2Clean(moduleData, groupBy(pageList, 'type'), groupBy(pageList, 'id'));